X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fload.lisp;h=57aa9bfa6df794e482c938acd426734391867f3d;hb=c47519c9e63fd32a635943a84ec13d8a60d95f08;hp=cea8927f0afc5eadb2933366de472ac89c7b811f;hpb=08307967c71c580058a503d46aa087cfefcf8c69;p=sbcl.git diff --git a/src/code/load.lisp b/src/code/load.lisp index cea8927..57aa9bf 100644 --- a/src/code/load.lisp +++ b/src/code/load.lisp @@ -16,6 +16,12 @@ (in-package "SB!FASL") +;;;; There looks to be an exciting amount of state being modified +;;;; here: certainly enough that I (dan, 2003.1.22) don't want to mess +;;;; around deciding how to thread-safetify it. So we use a Big Lock. +;;;; Because this code is mutually recursive with the compiler, we use +;;;; the *big-compiler-lock* + ;;;; miscellaneous load utilities ;;; Output the current number of semicolons after a fresh-line. @@ -45,8 +51,8 @@ #!-sb-fluid (declaim (inline read-byte)) -;;; Expands into code to read an N-byte unsigned integer using -;;; fast-read-byte. +;;; This expands into code to read an N-byte unsigned integer using +;;; FAST-READ-BYTE. (defmacro fast-read-u-integer (n) (declare (optimize (speed 0))) (do ((res '(fast-read-byte) @@ -55,7 +61,7 @@ (cnt 1 (1+ cnt))) ((>= cnt n) res))) -;;; Like Fast-Read-U-Integer, but the size may be determined at run time. +;;; like FAST-READ-U-INTEGER, but the size may be determined at run time (defmacro fast-read-var-u-integer (n) (let ((n-pos (gensym)) (n-res (gensym)) @@ -199,6 +205,70 @@ (progn ,@forms) (setq *fop-stack-pointer* ,n-index))))))) +;;;; Conditions signalled on invalid fasls (wrong fasl version, etc), +;;;; so that user code (esp. ASDF) can reasonably handle attempts to +;;;; load such fasls by recompiling them, etc. For simplicity's sake +;;;; make only condition INVALID-FASL part of the public interface, +;;;; and keep the guts internal. + +(define-condition invalid-fasl (error) + ((stream :reader invalid-fasl-stream :initarg :stream) + (expected :reader invalid-fasl-expected :initarg :expected)) + (:report + (lambda (condition stream) + (format stream "~S is an invalid fasl file." + (invalid-fasl-stream condition))))) + +(define-condition invalid-fasl-header (invalid-fasl) + ((byte :reader invalid-fasl-byte :initarg :byte) + (byte-nr :reader invalid-fasl-byte-nr :initarg :byte-nr)) + (:report + (lambda (condition stream) + (format stream "~@<~S contains an illegal byte in the FASL header at ~ + position ~A: Expected ~A, got ~A.~:@>" + (invalid-fasl-stream condition) + (invalid-fasl-byte-nr condition) + (invalid-fasl-byte condition) + (invalid-fasl-expected condition))))) + +(define-condition invalid-fasl-version (invalid-fasl) + ((variant :reader invalid-fasl-variant :initarg :variant) + (version :reader invalid-fasl-version :initarg :version)) + (:report + (lambda (condition stream) + (format stream "~@<~S is in ~A fasl file format version ~W, ~ + but this version of SBCL uses format version ~W.~:@>" + (invalid-fasl-stream condition) + (invalid-fasl-variant condition) + (invalid-fasl-version condition) + (invalid-fasl-expected condition))))) + +(define-condition invalid-fasl-implementation (invalid-fasl) + ((implementation :reader invalid-fasl-implementation + :initarg :implementation)) + (:report + (lambda (condition stream) + (format stream "~S was compiled for implementation ~A, but this is a ~A." + (invalid-fasl-stream condition) + (invalid-fasl-implementation condition) + (invalid-fasl-expected condition))))) + +(define-condition invalid-fasl-features (invalid-fasl) + ((potential-features :reader invalid-fasl-potential-features + :initarg :potential-features) + (features :reader invalid-fasl-features :initarg :features)) + (:report + (lambda (condition stream) + (format stream "~@" + '*features* + (invalid-fasl-stream condition) + (invalid-fasl-potential-features condition) + (invalid-fasl-features condition) + (invalid-fasl-expected condition))))) + ;;;; LOAD-AS-FASL ;;;; ;;;; Note: LOAD-AS-FASL is used not only by LOAD, but also (with @@ -216,11 +286,15 @@ (let ((byte (read-byte stream nil))) (when byte - ;; Read the string part of the fasl header, or die. + ;; Read and validate constant string prefix in fasl header. (let* ((fhsss *fasl-header-string-start-string*) (fhsss-length (length fhsss))) (unless (= byte (char-code (schar fhsss 0))) - (error "illegal first byte in fasl file header")) + (error 'invalid-fasl-header + :stream stream + :first-byte-p t + :byte byte + :expected (char-code (schar fhsss 0)))) (do ((byte (read-byte stream) (read-byte stream)) (count 1 (1+ count))) ((= byte +fasl-header-string-stop-char-code+) @@ -228,36 +302,51 @@ (declare (fixnum byte count)) (when (and (< count fhsss-length) (not (eql byte (char-code (schar fhsss count))))) - (error - "illegal subsequent (not first) byte in fasl file header")))) - - ;; Read and validate implementation and version, or die. - (let* ((implementation-length (read-arg 4)) - (implementation-string (make-string implementation-length)) - (ignore (read-string-as-bytes stream implementation-string)) - (implementation (keywordicate implementation-string)) - ;; FIXME: The logic above to read a keyword from the fasl file - ;; could probably be shared with the read-a-keyword fop. - (version (read-arg 4))) - (declare (ignore ignore)) - (flet ((check-version (variant possible-implementation needed-version) - (when (string= possible-implementation implementation) - (unless (= version needed-version) - (error "~@<~S is in ~A fasl file format version ~W, ~ - but this version of SBCL uses ~ - format version ~W.~:@>" - stream - variant - version - needed-version)) - t))) - (or (check-version "native code" - +backend-fasl-file-implementation+ - +fasl-file-version+) - (error "~S was compiled for implementation ~A, but this is a ~A." - stream - implementation - +backend-fasl-file-implementation+))))))) + (error 'invalid-fasl-header + :stream stream + :byte-nr count + :byte byte + :expected (char-code (schar fhsss count)))))) + + ;; Read and validate version-specific compatibility stuff. + (flet ((string-from-stream () + (let* ((length (read-arg 4)) + (result (make-string length))) + (read-string-as-bytes stream result) + result))) + ;; Read and validate implementation and version. + (let* ((implementation (keywordicate (string-from-stream))) + ;; FIXME: The logic above to read a keyword from the fasl file + ;; could probably be shared with the read-a-keyword fop. + (version (read-arg 4))) + (flet ((check-version (variant + possible-implementation + needed-version) + (when (string= possible-implementation implementation) + (or (= version needed-version) + (error 'invalid-fasl-version + ;; :error :wrong-version + :stream stream + :variant variant + :version version + :expected needed-version))))) + (or (check-version "native code" + +backend-fasl-file-implementation+ + +fasl-file-version+) + (error 'invalid-fasl-implementation + :stream stream + :implementation implementation + :expected +backend-fasl-file-implementation+)))) + ;; Read and validate *FEATURES* which affect binary compatibility. + (let ((faff-in-this-file (string-from-stream))) + (unless (string= faff-in-this-file *features-affecting-fasl-format*) + (error 'invalid-fasl-features + :stream stream + :potential-features *features-potentially-affecting-fasl-format* + :expected *features-affecting-fasl-format* + :features faff-in-this-file))) + ;; success + t)))) ;; Setting this variable gives you a trace of fops as they are loaded and ;; executed. @@ -327,25 +416,21 @@ (when (zerop (file-length stream)) (error "attempt to load an empty FASL file:~% ~S" (namestring stream))) (maybe-announce-load stream verbose) - (let* ((*fasl-input-stream* stream) - (*current-fop-table* (or (pop *free-fop-tables*) (make-array 1000))) - (*current-fop-table-size* (length *current-fop-table*)) - (*fop-stack-pointer-on-entry* *fop-stack-pointer*)) - (unwind-protect - ;; FIXME: This should probably become - ;; (LOOP WHILE (LOAD-FASL-GROUP-STREAM)) - ;; but as a LOOP newbie I don't want to do that until I can - ;; test it. - (do ((loaded-group (load-fasl-group stream) (load-fasl-group stream))) - ((not loaded-group))) - (setq *fop-stack-pointer* *fop-stack-pointer-on-entry*) - (push *current-fop-table* *free-fop-tables*) - ;; NIL out the stack and table, so that we don't hold onto garbage. - ;; - ;; FIXME: Couldn't we just get rid of the free fop table pool so - ;; that some of this NILing out would go away? - (fill *fop-stack* nil :end *fop-stack-pointer-on-entry*) - (fill *current-fop-table* nil))) + (sb!thread:with-recursive-lock (sb!c::*big-compiler-lock*) + (let* ((*fasl-input-stream* stream) + (*current-fop-table* (or (pop *free-fop-tables*) (make-array 1000))) + (*current-fop-table-size* (length *current-fop-table*)) + (*fop-stack-pointer-on-entry* *fop-stack-pointer*)) + (unwind-protect + (loop while (load-fasl-group stream)) + (setq *fop-stack-pointer* *fop-stack-pointer-on-entry*) + (push *current-fop-table* *free-fop-tables*) + ;; NIL out the stack and table, so that we don't hold onto garbage. + ;; + ;; FIXME: Couldn't we just get rid of the free fop table pool so + ;; that some of this NILing out would go away? + (fill *fop-stack* nil :end *fop-stack-pointer-on-entry*) + (fill *current-fop-table* nil)))) t) ;;; This is used in in target-load and also genesis, using @@ -353,14 +438,14 @@ ;;; code for foreign symbol lookup should be here. (defun find-foreign-symbol-in-table (name table) (let ((prefixes - #!+(or linux freebsd) #("" "ldso_stub__") - #!+openbsd #("" "_"))) + #!+(or osf1 sunos linux freebsd darwin) #("" "ldso_stub__") + #!+openbsd #(""))) + (declare (notinline some)) ; to suppress bug 117 bogowarning (some (lambda (prefix) (gethash (concatenate 'string prefix name) table nil)) prefixes))) - ;;;; stuff for debugging/tuning by collecting statistics on FOPs (?)