X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-load.lisp;h=2aa6bef99443b2f879456acb71209495cda723de;hb=70c579379283da66f97906a0d62c8a5fc34e4dab;hp=b36fefb838e074cf9ed1f3dfe78cd50728fae9d8;hpb=4e3b57699314dbd3883470d9b196287b178f3e6d;p=sbcl.git diff --git a/src/code/target-load.lisp b/src/code/target-load.lisp index b36fefb..2aa6bef 100644 --- a/src/code/target-load.lisp +++ b/src/code/target-load.lisp @@ -42,9 +42,23 @@ ;;;; 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 @@ -55,12 +69,13 @@ (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) + :if-does-not-exist if-does-not-exist + :external-format external-format) (load-as-source stream verbose print))) (:binary (with-open-file (stream truename @@ -69,22 +84,30 @@ :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*)) + (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 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 "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)))))))) + ((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, @@ -101,7 +124,8 @@ ;;; 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*) @@ -113,25 +137,23 @@ (> (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. - ;; 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)) + :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)) (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 @@ -152,9 +174,6 @@ #!+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.")) - (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 @@ -184,18 +203,16 @@ (load-as-fasl filespec verbose print) (load-as-source filespec verbose print)) (let* ((pathname (pathname filespec)) - (physical-pathname (translate-logical-pathname pathname))) - (if (or (probe-file physical-pathname) (pathname-type physical-pathname)) - (internal-load physical-pathname - (truename physical-pathname) - internal-if-does-not-exist - verbose - print) - - (internal-load-default-type pathname - internal-if-does-not-exist - verbose - print))))))) + (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. @@ -234,13 +251,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)) @@ -253,18 +264,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* @@ -284,26 +288,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))))