X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-load.lisp;h=9ae8a460cd22349209aa02d5869d1620d2f970da;hb=127fd3d2fb843c6bb7ad0763e143d81877e760e8;hp=2e687c5c25858e0a226cc6595ef0669b64efcef1;hpb=126e0a851c7e170b13c206c530083fc48572ea60;p=sbcl.git diff --git a/src/code/target-load.lisp b/src/code/target-load.lisp index 2e687c5..9ae8a46 100644 --- a/src/code/target-load.lisp +++ b/src/code/target-load.lisp @@ -31,13 +31,13 @@ (defun load-as-source (stream verbose print) (maybe-announce-load stream verbose) (do ((sexpr (read stream nil *eof-object*) - (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)) + (let ((results (multiple-value-list (eval sexpr)))) + (load-fresh-line) + (format t "~{~S~^, ~}~%" results)) (eval sexpr)))) ;;;; LOAD itself @@ -48,56 +48,66 @@ (lambda (condition stream) (format stream "~@" - (invalid-fasl-stream condition) - (invalid-fasl-expected condition) - (invalid-fasl-fhsss condition))))) + (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) - (load-as-source 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)) - (load-as-fasl 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))) - (fhsss *fasl-header-string-start-string*)) - (cond - ((and first-line - (>= (length (the simple-string first-line)) - (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) *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)))))))) + (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: Try the default ;;; file type TYPE and return (VALUES PATHNAME TRUENAME) for a match, @@ -114,37 +124,36 @@ ;;; 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) +(defun internal-load-default-type + (pathname if-does-not-exist verbose print external-format) (declare (type (member nil :error) if-does-not-exist)) (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 *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." - (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 @@ -157,57 +166,53 @@ ;;; 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) - (external-format :default)) + &key + (verbose *load-verbose*) + (print *load-print*) + (if-does-not-exist t) + (external-format :default)) #!+sb-doc "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))) + ;; 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))) - (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) - (internal-load-default-type pathname - 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. @@ -216,17 +221,17 @@ (declare (fixnum box-num code-length)) (with-fop-stack t (let ((code (%primitive sb!c:allocate-code-object box-num code-length)) - (index (+ sb!vm:code-trace-table-offset-slot box-num))) + (index (+ sb!vm:code-trace-table-offset-slot box-num))) (declare (type index index)) (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-input-stream* - (code-instructions code) - 0 - code-length)) + (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 @@ -243,69 +248,50 @@ (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 + (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)) - ;; 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) + ;; 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 (%primitive sb!c:allocate-dynamic-code-object + (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))))) + (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) (unsigned-byte #.sb!vm:n-machine-word-bits)) - foreign-symbol-address-as-integer)) - - -;;; SB!SYS:GET-DYNAMIC-FOREIGN-SYMBOL-ADDRESS is in foreign.lisp, on -;;; platforms that have dynamic loading -(defun foreign-symbol-address-as-integer-or-nil (foreign-symbol) - (or (find-foreign-symbol-in-table foreign-symbol *static-foreign-symbols*) - (sb!sys:get-dynamic-foreign-symbol-address foreign-symbol))) - -(defun foreign-symbol-address-as-integer (foreign-symbol) - (or (foreign-symbol-address-as-integer-or-nil 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))))