X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-load.lisp;h=9ae8a460cd22349209aa02d5869d1620d2f970da;hb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;hp=ddfb6832c54a0ac213791b90d2be1c39409795c1;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git diff --git a/src/code/target-load.lisp b/src/code/target-load.lisp index ddfb683..9ae8a46 100644 --- a/src/code/target-load.lisp +++ b/src/code/target-load.lisp @@ -11,232 +11,208 @@ ;;;; provided with absolutely no warranty. See the COPYING and CREDITS ;;;; files for more information. -(in-package "SB!IMPL") +(in-package "SB!FASL") -(file-comment - "$Header$") - -(defvar *load-source-types* '("lisp" "l" "cl" "lsp") - #!+sb-doc - "The source file types which LOAD recognizes.") - -(defvar *load-object-types* - '(#.sb!c:*backend-fasl-file-type* - #.(sb!c:backend-byte-fasl-file-type) - "fasl") +(defvar *load-source-default-type* "lisp" #!+sb-doc - "A list of the object file types recognized by LOAD.") - -(declaim (list *load-source-types* *load-object-types*)) + "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*)) -;;;; SLOLOAD - -;;; something not EQ to anything read from a file -;;; FIXME: shouldn't be DEFCONSTANT; and maybe make a shared EOF cookie in -;;; SB-INT:*EOF-VALUE*? -(defconstant load-eof-value '(())) +;;;; LOAD-AS-SOURCE ;;; Load a text file. -(defun sloload (stream verbose print) - (do-load-verbose stream verbose) - (do ((sexpr (read stream nil load-eof-value) - (read stream nil load-eof-value))) - ((eq sexpr load-eof-value) +(defun load-as-source (stream verbose print) + (maybe-announce-load stream verbose) + (do ((sexpr (read stream nil *eof-object*) + (read stream nil *eof-object*))) + ((eq sexpr *eof-object*) t) (if print - (let ((results (multiple-value-list (eval sexpr)))) - (load-fresh-line) - (format t "~{~S~^, ~}~%" results)) - (eval sexpr)))) + (let ((results (multiple-value-list (eval sexpr)))) + (load-fresh-line) + (format t "~{~S~^, ~}~%" results)) + (eval sexpr)))) ;;;; 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 "~@" + (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. +;;; +;;; FIXME: with the addition of the EXTERNAL-FORMAT argument, this +;;; interface has become truly sucky. (defun internal-load (pathname truename if-does-not-exist verbose print - &optional contents) + &optional contents external-format) (declare (type (member nil :error) if-does-not-exist)) (unless truename (if if-does-not-exist - (error 'simple-file-error - :pathname pathname - :format-control "~S does not exist." - :format-arguments (list (namestring pathname))) - (return-from internal-load nil))) + (error 'simple-file-error + :pathname pathname + :format-control "~S does not exist." + :format-arguments (list (namestring pathname))) + (return-from internal-load nil))) (let ((*load-truename* truename) - (*load-pathname* pathname)) + (*load-pathname* (merge-pathnames pathname))) (case contents (:source (with-open-file (stream truename - :direction :input - :if-does-not-exist if-does-not-exist) - (sloload stream verbose print))) + :direction :input + :if-does-not-exist if-does-not-exist + :external-format external-format) + (load-as-source stream verbose print))) (:binary (with-open-file (stream truename - :direction :input - :if-does-not-exist if-does-not-exist - :element-type '(unsigned-byte 8)) - (fasload stream verbose print))) + :direction :input + :if-does-not-exist if-does-not-exist + :element-type '(unsigned-byte 8)) + (load-as-fasl stream verbose print))) (t - (let ((first-line (with-open-file (stream truename :direction :input) - (read-line stream nil))) - (fhs sb!c:*fasl-header-string-start-string*)) - (cond - ((and first-line - (>= (length (the simple-string first-line)) - (length fhs)) - (string= first-line fhs :end1 (length fhs))) - (internal-load pathname truename if-does-not-exist verbose print - :binary)) - (t - (when (member (pathname-type truename) - *load-object-types* - :test #'string=) - (error "File has a fasl file type, but no fasl file header:~% ~S" - (namestring truename))) - (internal-load pathname truename if-does-not-exist verbose print - :source)))))))) + (let* ((fhsss *fasl-header-string-start-string*) + (first-line (make-array (length fhsss) + :element-type '(unsigned-byte 8))) + (read-length + (with-open-file (stream truename + :direction :input + :element-type '(unsigned-byte 8)) + (read-sequence first-line stream)))) + (cond + ((and (= read-length (length fhsss)) + (do ((i 0 (1+ i))) + ((= i read-length) t) + (when (/= (char-code (aref fhsss i)) (aref first-line i)) + (return)))) + (internal-load pathname truename if-does-not-exist verbose print + :binary)) + (t + (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 external-format)))))))) -;;; a helper function for INTERNAL-LOAD-DEFAULT-TYPE -(defun try-default-types (pathname types lp-type) - ;; Modified 18-Jan-97/pw for logical-pathname support. - ;; - ;; FIXME: How does logical-pathname support interact with - ;; *LOAD-SOURCE-TYPES* and *LOAD-OBJECT-TYPES*? - (flet ((frob (pathname type) - (let* ((pn (make-pathname :type type :defaults pathname)) - (tn (probe-file pn))) - (values pn tn)))) - (if (typep pathname 'logical-pathname) - (frob pathname lp-type) - (dolist (type types (values nil nil)) - (multiple-value-bind (pn tn) (frob pathname type) - (when tn - (return (values pn tn)))))))) +;;; a helper function for INTERNAL-LOAD-DEFAULT-TYPE: Try the default +;;; file type TYPE and return (VALUES PATHNAME TRUENAME) for a match, +;;; or (VALUES PATHNAME NIL) if the file doesn't exist. +;;; +;;; This is analogous to CMU CL's TRY-DEFAULT-TYPES, but we only try a +;;; single type. By avoiding CMU CL's generality here, we avoid having +;;; to worry about some annoying ambiguities. (E.g. what if the +;;; possible types are ".lisp" and ".cl", and both "foo.lisp" and +;;; "foo.cl" exist?) +(defun try-default-type (pathname type) + (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 the file -;;; does not exist. -(defun internal-load-default-type (pathname if-does-not-exist verbose print) +;;; a helper function for LOAD: Handle the case of INTERNAL-LOAD where +;;; the file does not exist. +(defun internal-load-default-type + (pathname if-does-not-exist verbose print external-format) (declare (type (member nil :error) if-does-not-exist)) - ;; FIXME: How do the fixed "LISP" and "FASL" types interact with the - ;; *LOAD-SOURCE-TYPES* and *LOAD-OBJECT-TYPES* values? (multiple-value-bind (src-pn src-tn) - (try-default-types pathname *load-source-types* "LISP") + (try-default-type pathname *load-source-default-type*) (multiple-value-bind (obj-pn obj-tn) - (try-default-types pathname *load-object-types* "FASL") + (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." - (namestring obj-tn) - (namestring src-tn)) - ;; FIXME: In CMU CL one of these was a CONTINUE case. - ;; There's not one now. I don't remember how restart-case - ;; works very well, make sure that it doesn't do anything - ;; weird when we don't specify the CONTINUE case. - (source () :report "load source file" - (internal-load src-pn src-tn if-does-not-exist verbose print - :source)) - (object () :report "load object file" - (internal-load src-pn obj-tn if-does-not-exist verbose print - :binary)))) + 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." + (namestring obj-tn) + (namestring src-tn)) + (source () :report "load source file" + (internal-load src-pn src-tn if-does-not-exist verbose print + :source external-format)) + (object () :report "load object file" + (internal-load src-pn obj-tn if-does-not-exist verbose print + :binary)))) (obj-tn - (internal-load obj-pn obj-tn if-does-not-exist verbose print :binary)) + (internal-load obj-pn obj-tn if-does-not-exist verbose print :binary)) (src-pn - (internal-load src-pn src-tn if-does-not-exist verbose print :source)) + (internal-load src-pn src-tn if-does-not-exist + verbose print :source external-format)) (t - (internal-load pathname nil if-does-not-exist verbose print nil)))))) + (internal-load pathname nil if-does-not-exist + verbose print nil external-format)))))) -;;; This function mainly sets up special bindings and then calls sub-functions. -;;; We conditionally bind the switches with PROGV so that people can set them -;;; in their init files and have the values take effect. If the compiler is -;;; loaded, we make the compiler-policy local to LOAD by binding it to itself. -;;; -;;; FIXME: ANSI specifies an EXTERNAL-FORMAT keyword argument. +;;; This function mainly sets up special bindings and then calls +;;; sub-functions. We conditionally bind the switches with PROGV so +;;; that people can set them in their init files and have the values +;;; take effect. If the compiler is loaded, we make the +;;; compiler-policy local to LOAD by binding it to itself. ;;; ;;; 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 ;;; non-compiled file. Check whether this bug exists in SBCL and fix it if so. (defun load (filespec - &key - (verbose *load-verbose*) - (print *load-print*) - (if-does-not-exist t)) + &key + (verbose *load-verbose*) + (print *load-print*) + (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*." - - (let ((sb!c::*default-cookie* sb!c::*default-cookie*) - (sb!c::*default-interface-cookie* sb!c::*default-interface-cookie*) - (*package* *package*) - (*readtable* *readtable*) - (*load-depth* (1+ *load-depth*)) - ;; The old CMU CL LOAD function used an IF-DOES-NOT-EXIST argument of - ;; (MEMBER :ERROR NIL) type. ANSI constrains us to accept a generalized - ;; boolean argument value for this externally-visible function, but the - ;; internal functions still use the old convention. - (internal-if-does-not-exist (if if-does-not-exist :error nil))) - ;; FIXME: This VALUES wrapper is inherited from CMU CL. - ;; Once SBCL gets function return type checking right, we can - ;; achieve a similar effect better by adding FTYPE declarations. + "Load the file given by FILESPEC into the Lisp environment, returning + T on success." + (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 + ;; scope. CMU CL did this, and it seems reasonable, but it + ;; might not be right; after all, things like (PROCLAIM '(TYPE + ;; ..)) don't have file scope, and I can't find anything under + ;; PROCLAIM or COMPILE-FILE or LOAD or OPTIMIZE which + ;; justifies this behavior. Hmm. -- WHN 2001-04-06 + (sb!c::*policy* sb!c::*policy*) + ;; The ANSI spec for LOAD says "LOAD binds *READTABLE* and + ;; *PACKAGE* to the values they held before loading the file." + (*package* (sane-package)) + (*readtable* *readtable*) + ;; The old CMU CL LOAD function used an IF-DOES-NOT-EXIST + ;; argument of (MEMBER :ERROR NIL) type. ANSI constrains us to + ;; accept a generalized boolean argument value for this + ;; externally-visible function, but the internal functions + ;; still use the old convention. + (internal-if-does-not-exist (if if-does-not-exist :error nil))) + ;; FIXME: This VALUES wrapper is inherited from CMU CL. Once SBCL + ;; gets function return type checking right, we can achieve a + ;; similar effect better by adding FTYPE declarations. (values (if (streamp filespec) - (if (or (equal (stream-element-type filespec) - '(unsigned-byte 8))) - (fasload filespec verbose print) - (sloload 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))))))))) + (if (or (equal (stream-element-type filespec) + '(unsigned-byte 8))) + (load-as-fasl filespec verbose print) + (load-as-source filespec 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 nil external-format) + (internal-load-default-type + pathname internal-if-does-not-exist + verbose print external-format))))))) ;;; 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. @@ -245,112 +221,77 @@ (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))) + (declare (fixnum i)) + (setf (code-header-ref code (decf index)) (pop-stack))) (sb!sys:without-gcing - (read-n-bytes *fasl-file* - (code-instructions code) - 0 - #!-gengc code-length - #!+gengc (* code-length sb!vm:word-bytes))) + (read-n-bytes *fasl-input-stream* + (code-instructions code) + 0 + 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)) (with-fop-stack t (let ((stuff (list (pop-stack)))) (dotimes (i box-num) - (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")))) ) + (declare (fixnum i)) + (push (pop-stack) stuff)) + (let* ((dbi (car (last stuff))) ; debug-info + (tto (first stuff))) ; trace-table-offset - (setq stuff (nreverse stuff)) + (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) - (format t - " : ~S ~S ~S ~S~%" - (sb!c::compiled-debug-info-p dbi) - (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~%"))) + ;; FIXME: *LOAD-CODE-VERBOSE* should probably be #!+SB-SHOW. + (when *load-code-verbose* + (format t "stuff: ~S~%" stuff) + (format t + " : ~S ~S ~S ~S~%" + (sb!c::compiled-debug-info-p dbi) + (sb!c::debug-info-p dbi) + (sb!c::compiled-debug-info-name dbi) + tto) + (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))) - (index (+ sb!vm:code-trace-table-offset-slot box-num))) - (declare (type index index)) - (when *load-code-verbose* - (format t - " obj addr=~X~%" - (sb!kernel::get-lisp-obj-address code))) - (setf (%code-debug-info code) (pop stuff)) - (dotimes (i box-num) - (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)) - code))))) + (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* + (format t + " obj addr=~X~%" + (sb!kernel::get-lisp-obj-address code))) + (setf (%code-debug-info code) (pop stuff)) + (dotimes (i box-num) + (declare (fixnum i)) + (setf (code-header-ref code (decf index)) (pop stuff))) + (sb!sys:without-gcing + (read-n-bytes *fasl-input-stream* + (code-instructions code) + 0 + code-length)) + code))))) ;;;; 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 "" - 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))))