X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-load.lisp;h=87403bacf01aa019e0bc4c4a21bb07d10c0e52fc;hb=771b864c8f32af7734bc0550aeaf1539fc4df194;hp=9254a35e0eefe67ff9ac60cddc220063dd9db132;hpb=7cec182a00d4143dc7cfd43fc55c6691e356e609;p=sbcl.git diff --git a/src/code/target-load.lisp b/src/code/target-load.lisp index 9254a35..87403ba 100644 --- a/src/code/target-load.lisp +++ b/src/code/target-load.lisp @@ -42,7 +42,18 @@ ;;;; 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. (defun internal-load (pathname truename if-does-not-exist verbose print &optional contents) (declare (type (member nil :error) if-does-not-exist)) @@ -81,8 +92,10 @@ :binary)) (t (when (string= (pathname-type truename) *fasl-file-type*) - (error "File has a fasl file type, but no fasl file header:~% ~S" - (namestring truename))) + (error 'fasl-header-missing + :stream (namestring truename) + :fhsss first-line + :expected fhsss)) (internal-load pathname truename if-does-not-exist verbose print :source)))))))) @@ -96,7 +109,7 @@ ;;; 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 @@ -113,7 +126,7 @@ (> (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. @@ -152,9 +165,7 @@ #!+sb-doc "Load the file given by FILESPEC into the Lisp environment, returning T on success." - (unless (eq external-format :default) - (error "Non-:DEFAULT EXTERNAL-FORMAT values are not supported.")) - + (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 @@ -183,40 +194,20 @@ '(unsigned-byte 8))) (load-as-fasl filespec verbose print) (load-as-source filespec verbose print)) - (let (;; FIXME: MERGE-PATHNAMES doesn't work here for - ;; FILESPEC="TEST:Load-Test" and - ;; (LOGICAL-PATHNAME-TRANSLATIONS "TEST") - ;; = (("**;*.*.*" "/foo/bar/**/*.*")). - ;; Physicalizing the pathname before merging - ;; is a workaround, but the ANSI spec talks about - ;; MERGE-PATHNAMES accepting (and returning) - ;; logical pathnames, so a true fix would probably - ;; include fixing MERGE-PATHNAMES, then probably - ;; revisiting this code. - (ppn (physicalize-pathname (pathname filespec)))) - (if (wild-pathname-p ppn) - (let ((files (directory ppn))) - #!+high-security - (when (null files) - (error 'file-error :pathname filespec)) - (dolist (file files t) - (internal-load ppn - file - internal-if-does-not-exist - verbose - print))) - (let ((tn (probe-file ppn))) - (if (or tn (pathname-type ppn)) - (internal-load ppn - tn - internal-if-does-not-exist - verbose - print) - (internal-load-default-type - ppn - 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))))))) ;;; 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. @@ -255,13 +246,7 @@ (declare (fixnum i)) (push (pop-stack) stuff)) (let* ((dbi (car (last stuff))) ; debug-info - (tto (first stuff)) ; trace-table-offset - ;; Old CMU CL code had maybe-we-shouldn't-load-to-dyn-space - ;; pussyfooting around here, apparently dating back to the - ;; stone age of the X86 port, but in SBCL we always load - ;; to dynamic space. FIXME: So now this "variable" could go - ;; away entirely. - (load-to-dynamic-space t)) + (tto (first stuff))) ; trace-table-offset (setq stuff (nreverse stuff)) @@ -274,18 +259,11 @@ (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* @@ -305,26 +283,10 @@ ;;;; 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)) - - -;;; SB!SYS:GET-DYNAMIC-FOREIGN-SYMBOL-ADDRESS is in foreign.lisp, on -;;; platforms that have dynamic loading -(defun foreign-symbol-address-as-integer (foreign-symbol) - (or (find-foreign-symbol-in-table 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))))