;;;; provided with absolutely no warranty. See the COPYING and CREDITS
;;;; files for more information.
-(in-package "SB!IMPL")
+(in-package "SB!FASL")
(defvar *load-source-default-type* "lisp"
#!+sb-doc
"The source file types which LOAD looks for by default.")
+(declaim (type (or pathname null) *load-truename* *load-pathname*))
(defvar *load-truename* nil
#!+sb-doc
"the TRUENAME of the file that LOAD is currently loading")
-
(defvar *load-pathname* nil
#!+sb-doc
"the defaulted pathname that LOAD is currently loading")
-
-(declaim (type (or pathname null) *load-truename* *load-pathname*))
\f
;;;; LOAD-AS-SOURCE
;;; Load a text file.
(defun load-as-source (stream verbose print)
- (do-load-verbose stream verbose)
+ (maybe-announce-load stream verbose)
(do ((sexpr (read stream nil *eof-object*)
(read stream nil *eof-object*)))
((eq sexpr *eof-object*)
(let ((results (multiple-value-list (eval sexpr))))
(load-fresh-line)
(format t "~{~S~^, ~}~%" results))
- (eval sexpr))))
+ (eval sexpr))))
\f
;;;; LOAD itself
-;;; a helper function for LOAD: Load the stuff in a file when we have the name.
+(define-condition fasl-header-missing (invalid-fasl)
+ ((fhsss :reader invalid-fasl-fhsss :initarg :fhsss))
+ (:report
+ (lambda (condition stream)
+ (format stream "~@<File ~S has a fasl file type, but no fasl header:~%~
+ Expected ~S, but got ~S.~:@>"
+ (invalid-fasl-stream condition)
+ (invalid-fasl-expected condition)
+ (invalid-fasl-fhsss condition)))))
+
+;;; a helper function for LOAD: Load the stuff in a file when we have
+;;; the name.
(defun internal-load (pathname truename if-does-not-exist verbose print
&optional contents)
(declare (type (member nil :error) if-does-not-exist))
(t
(let ((first-line (with-open-file (stream truename :direction :input)
(read-line stream nil)))
- (fhs sb!c:*fasl-header-string-start-string*))
+ (fhsss *fasl-header-string-start-string*))
(cond
((and first-line
(>= (length (the simple-string first-line))
- (length fhs))
- (string= first-line fhs :end1 (length fhs)))
+ (length fhsss))
+ (string= first-line fhsss :end1 (length fhsss)))
(internal-load pathname truename if-does-not-exist verbose print
:binary))
(t
- (when (string= (pathname-type truename)
- sb!c:*backend-fasl-file-type*)
- (error "File has a fasl file type, but no fasl file header:~% ~S"
- (namestring truename)))
+ (when (string= (pathname-type truename) *fasl-file-type*)
+ (error 'fasl-header-missing
+ :stream (namestring truename)
+ :fhsss first-line
+ :expected fhsss))
(internal-load pathname truename if-does-not-exist verbose print
:source))))))))
;;; possible types are ".lisp" and ".cl", and both "foo.lisp" and
;;; "foo.cl" exist?)
(defun try-default-type (pathname type)
- (let ((pn (make-pathname :type type :defaults pathname)))
+ (let ((pn (translate-logical-pathname (make-pathname :type type :defaults pathname))))
(values pn (probe-file pn))))
;;; a helper function for LOAD: Handle the case of INTERNAL-LOAD where
(multiple-value-bind (src-pn src-tn)
(try-default-type pathname *load-source-default-type*)
(multiple-value-bind (obj-pn obj-tn)
- (try-default-type pathname sb!c:*backend-fasl-file-type*)
+ (try-default-type pathname *fasl-file-type*)
(cond
((and obj-tn
src-tn
(> (file-write-date src-tn) (file-write-date obj-tn)))
(restart-case
(error "The object file ~A is~@
- older than the presumed source:~% ~A."
+ older than the presumed source:~% ~A."
(namestring obj-tn)
(namestring src-tn))
;; FIXME: In CMU CL one of these was a CONTINUE case.
;;; take effect. If the compiler is loaded, we make the
;;; compiler-policy local to LOAD by binding it to itself.
;;;
-;;; FIXME: ANSI specifies a &KEY :EXTERNAL-FORMAT argument.
-;;;
;;; FIXME: Daniel Barlow's ilsb.tar ILISP-for-SBCL patches contain an
;;; implementation of "DEFUN SOURCE-FILE" which claims, in a comment, that CMU
;;; CL does not correctly record source file information when LOADing a
&key
(verbose *load-verbose*)
(print *load-print*)
- (if-does-not-exist t))
+ (if-does-not-exist t)
+ (external-format :default))
#!+sb-doc
- "Loads the file given by FILESPEC into the Lisp environment, returning
- T on success. These options are defined:
-
- :IF-DOES-NOT-EXIST
- What should we do if the file can't be located? If true (the
- default), signal an error. If NIL, simply return NIL.
-
- :VERBOSE
- If true, print a line describing each file loaded. The default
- is *LOAD-VERBOSE*.
-
- :PRINT
- If true, print information about loaded values. When loading the
- source, the result of evaluating each top-level form is printed.
- The default is *LOAD-PRINT*."
-
+ "Load the file given by FILESPEC into the Lisp environment, returning
+ T on success."
+ (declare (ignore external-format))
(let ((*load-depth* (1+ *load-depth*))
;; KLUDGE: I can't find in the ANSI spec where it says that
;; DECLAIM/PROCLAIM of optimization policy should have file
'(unsigned-byte 8)))
(load-as-fasl filespec verbose print)
(load-as-source filespec verbose print))
- (let ((pn (merge-pathnames (pathname filespec)
- *default-pathname-defaults*)))
- (if (wild-pathname-p pn)
- (let ((files (directory pn)))
- #!+high-security
- (when (null files)
- (error 'file-error :pathname filespec))
- (dolist (file files t)
- (internal-load pn
- file
- internal-if-does-not-exist
- verbose
- print)))
- (let ((tn (probe-file pn)))
- (if (or tn (pathname-type pn))
- (internal-load pn
- tn
- internal-if-does-not-exist
- verbose
- print)
- (internal-load-default-type
- pn
- internal-if-does-not-exist
- verbose
- print)))))))))
+ (let* ((pathname (pathname filespec))
+ (physical-pathname (translate-logical-pathname pathname))
+ (probed-file (probe-file physical-pathname)))
+ (if (or probed-file
+ (pathname-type physical-pathname))
+ (internal-load physical-pathname
+ probed-file
+ internal-if-does-not-exist
+ verbose
+ print)
+ (internal-load-default-type pathname
+ internal-if-does-not-exist
+ verbose
+ print)))))))
\f
;;; Load a code object. BOX-NUM objects are popped off the stack for
;;; the boxed storage section, then SIZE bytes of code are read in.
(declare (fixnum box-num code-length))
(with-fop-stack t
(let ((code (%primitive sb!c:allocate-code-object box-num code-length))
- (index (+ #!-gengc sb!vm:code-trace-table-offset-slot
- #!+gengc sb!vm:code-debug-info-slot
- box-num)))
+ (index (+ sb!vm:code-trace-table-offset-slot box-num)))
(declare (type index index))
- #!-gengc (setf (%code-debug-info code) (pop-stack))
+ (setf (%code-debug-info code) (pop-stack))
(dotimes (i box-num)
(declare (fixnum i))
(setf (code-header-ref code (decf index)) (pop-stack)))
(sb!sys:without-gcing
- (read-n-bytes *fasl-file*
+ (read-n-bytes *fasl-input-stream*
(code-instructions code)
0
- #!-gengc code-length
- #!+gengc (* code-length sb!vm:word-bytes)))
+ code-length))
code)))
+;;; Moving native code during a GC or purify is not so trivial on the
+;;; x86 port.
+;;;
+;;; Our strategy for allowing the loading of x86 native code into the
+;;; dynamic heap requires that the addresses of fixups be saved for
+;;; all these code objects. After a purify these fixups can be
+;;; dropped. In CMU CL, this policy was enabled with
+;;; *ENABLE-DYNAMIC-SPACE-CODE*; in SBCL it's always used.
#!+x86
(defun load-code (box-num code-length)
(declare (fixnum box-num code-length))
(declare (fixnum i))
(push (pop-stack) stuff))
(let* ((dbi (car (last stuff))) ; debug-info
- (tto (first stuff)) ; trace-table-offset
- (load-to-dynamic-space
- (or *enable-dynamic-space-code*
- ;; definitely byte-compiled code?
- (and *load-byte-compiled-code-to-dynamic-space*
- (sb!c::debug-info-p dbi)
- (not (sb!c::compiled-debug-info-p dbi)))
- ;; or a x86 top level form?
- (and *load-x86-tlf-to-dynamic-space*
- (sb!c::compiled-debug-info-p dbi)
- (string= (sb!c::compiled-debug-info-name dbi)
- "top-level form")))) )
+ (tto (first stuff))) ; trace-table-offset
(setq stuff (nreverse stuff))
- ;; Check that tto is always a list for byte-compiled
- ;; code. Could be used an alternate check.
- (when (and (typep tto 'list)
- (not (and (sb!c::debug-info-p dbi)
- (not (sb!c::compiled-debug-info-p dbi)))))
- ;; FIXME: What is this for?
- (format t "* tto list on non-bc code: ~S~% ~S ~S~%"
- stuff dbi tto))
-
;; FIXME: *LOAD-CODE-VERBOSE* should probably be #!+SB-SHOW.
(when *load-code-verbose*
(format t "stuff: ~S~%" stuff)
(sb!c::debug-info-p dbi)
(sb!c::compiled-debug-info-name dbi)
tto)
- (if load-to-dynamic-space
- (format t " loading to the dynamic space~%")
- (format t " loading to the static space~%")))
+ (format t " loading to the dynamic space~%"))
- (let ((code
- (if load-to-dynamic-space
- (%primitive sb!c:allocate-dynamic-code-object
- box-num
- code-length)
- (%primitive sb!c:allocate-code-object
- box-num
- code-length)))
+ (let ((code (%primitive sb!c:allocate-code-object
+ box-num
+ code-length))
(index (+ sb!vm:code-trace-table-offset-slot box-num)))
(declare (type index index))
(when *load-code-verbose*
(declare (fixnum i))
(setf (code-header-ref code (decf index)) (pop stuff)))
(sb!sys:without-gcing
- (read-n-bytes *fasl-file* (code-instructions code) 0 code-length))
+ (read-n-bytes *fasl-input-stream*
+ (code-instructions code)
+ 0
+ code-length))
code)))))
\f
;;;; linkage fixups
-;;; how we learn about assembler routines and foreign symbols at startup
+;;; how we learn about assembler routines at startup
(defvar *!initial-assembler-routines*)
-(defvar *!initial-foreign-symbols*)
+
(defun !loader-cold-init ()
+ (/show0 "/!loader-cold-init")
(dolist (routine *!initial-assembler-routines*)
- (setf (gethash (car routine) *assembler-routines*) (cdr routine)))
- (dolist (symbol *!initial-foreign-symbols*)
- (setf (gethash (car symbol) *static-foreign-symbols*) (cdr symbol))))
-
-(declaim (ftype (function (string) sb!vm:word)
- foreign-symbol-address-as-integer))
-(defun foreign-symbol-address-as-integer (foreign-symbol)
- (or (gethash foreign-symbol *static-foreign-symbols*)
- (gethash (concatenate 'simple-string
- #!+linux "ldso_stub__"
- #!+openbsd "_"
- #!+freebsd "ldso_stub__"
- foreign-symbol)
- *static-foreign-symbols*)
- (sb!sys:get-dynamic-foreign-symbol-address foreign-symbol)
- (error "unknown foreign symbol: ~S" foreign-symbol)))
-
-(defun foreign-symbol-address (symbol)
- (int-sap (foreign-symbol-address-as-integer
- (sb!vm:extern-alien-name symbol))))
+ (setf (gethash (car routine) *assembler-routines*) (cdr routine))))
projects / sbcl.git / blobdiff