X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fload.lisp;h=48c3ccb50c86e52d2af0056a8265a8fdcd82d7ca;hb=58084279740fc96c6ffcd14e86dca73b71b7c288;hp=756dcc023db2bb7659b0e27d87fbd4f5e7c401de;hpb=2c6b90e36a7c0377cd79625eb6c94d580f98cb93;p=sbcl.git diff --git a/src/code/load.lisp b/src/code/load.lisp index 756dcc0..48c3ccb 100644 --- a/src/code/load.lisp +++ b/src/code/load.lisp @@ -14,60 +14,14 @@ ;;;; provided with absolutely no warranty. See the COPYING and CREDITS ;;;; files for more information. -(in-package "SB!IMPL") - -;;;; variables - -;;; FIXME: It's awkward having LOAD stuff in SB!IMPL and dump stuff in -;;; SB!C. Among other things, it makes it hard to figure out where -;;; *FASL-HEADER-STRING-START-STRING* and -;;; *FASL-HEADER-STRING-STOP-CHAR-CODE* should go. Perhaps we should -;;; make a package called SB-DUMP or SB-LD which includes all -;;; knowledge of both loading and dumping. - -;;; This value is used to identify fasl files. Even though this is not -;;; declared as a constant (because ANSI Common Lisp has no facility -;;; for declaring values which are constant under EQUAL but not EQL), -;;; obviously you shouldn't mess with it lightly. If you do set a new -;;; value for some reason, keep these things in mind: -;;; * To avoid confusion with the similar but incompatible CMU CL -;;; fasl file format, the value should not be "FASL FILE", which -;;; is what CMU CL used for the same purpose. -;;; * Since its presence at the head of a file is used by LOAD to -;;; decide whether a file is to be fasloaded or sloloaded, the value -;;; should be something which can't legally appear at the head of a -;;; Lisp source file. -;;; * The value should not contain any line-terminating characters, -;;; because they're hard to express portably and because the LOAD -;;; code might reasonably use READ-LINE to get the value to compare -;;; against. -(defparameter sb!c:*fasl-header-string-start-string* "# FASL" - #!+sb-doc - "a string which appears at the start of a fasl file header") - -(defparameter sb!c:*fasl-header-string-stop-char-code* 255 - #!+sb-doc - "the code for a character which terminates a fasl file header") - -(defvar *load-depth* 0 - #!+sb-doc - "the current number of recursive loads") -(declaim (type index *load-depth*)) - -;;; the FASL file we're reading from -(defvar *fasl-file*) -(declaim (type lisp-stream *fasl-file*)) - -(defvar *load-print* nil - #!+sb-doc - "the default for the :PRINT argument to LOAD") -(defvar *load-verbose* nil - ;; Note that CMU CL's default for this was T, and ANSI says it's - ;; implementation-dependent. We choose NIL on the theory that it's - ;; a nicer default behavior for Unix programs. - #!+sb-doc - "the default for the :VERBOSE argument to LOAD") +(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. @@ -82,10 +36,9 @@ (write-string semicolons)) (write-char #\space))) -;;; If VERBOSE, output (to *STANDARD-OUTPUT*) a message about how we're -;;; loading from STREAM-WE-ARE-LOADING-FROM. -;;; FIXME: non-mnemonic name -(defun do-load-verbose (stream-we-are-loading-from verbose) +;;; If VERBOSE, output (to *STANDARD-OUTPUT*) a message about how +;;; we're loading from STREAM-WE-ARE-LOADING-FROM. +(defun maybe-announce-load (stream-we-are-loading-from verbose) (when verbose (load-fresh-line) (let ((name #-sb-xc-host (file-name stream-we-are-loading-from) @@ -98,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) @@ -108,8 +61,8 @@ (cnt 1 (1+ cnt))) ((>= cnt n) res))) -;;; Like Fast-Read-U-Integer, but the size may be determined at run time. -(defmacro fast-read-variable-u-integer (n) +;;; 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)) (n-cnt (gensym))) @@ -134,15 +87,16 @@ (cnt 1 (1+ cnt))) ((>= cnt n) res)))) -;;; Read an N-byte unsigned integer from the *FASL-FILE* +;;; Read an N-byte unsigned integer from the *FASL-INPUT-STREAM* (defmacro read-arg (n) (declare (optimize (speed 0))) (if (= n 1) - `(the (unsigned-byte 8) (read-byte *fasl-file*)) - `(prepare-for-fast-read-byte *fasl-file* + `(the (unsigned-byte 8) (read-byte *fasl-input-stream*)) + `(prepare-for-fast-read-byte *fasl-input-stream* (prog1 (fast-read-u-integer ,n) (done-with-fast-read-byte))))) + ;;; FIXME: This deserves a more descriptive name, and should probably ;;; be implemented as an ordinary function, not a macro. ;;; @@ -155,9 +109,11 @@ ;;; offset. We may need to have several, since LOAD can be called ;;; recursively. -(defvar *free-fop-tables* (list (make-array 1000)) - #!+sb-doc - "List of free fop tables for the fasloader.") +;;; a list of free fop tables for the fasloader +;;; +;;; FIXME: Is it really a win to have this permanently bound? +;;; Couldn't we just bind it on entry to LOAD-AS-FASL? +(defvar *free-fop-tables* (list (make-array 1000))) ;;; the current fop table (defvar *current-fop-table*) @@ -249,12 +205,12 @@ (progn ,@forms) (setq *fop-stack-pointer* ,n-index))))))) -;;;; FASLOAD +;;;; LOAD-AS-FASL ;;;; -;;;; Note: FASLOAD is used not only by LOAD, but also (after suitable -;;;; modification of the fop table) in genesis. Therefore, it's needed -;;;; not only in the target Lisp, but also in the cross-compilation -;;;; host. +;;;; Note: LOAD-AS-FASL is used not only by LOAD, but also (with +;;;; suitable modification of the fop table) in GENESIS. Therefore, +;;;; it's needed not only in the target Lisp, but also in the +;;;; cross-compilation host. ;;; a helper function for LOAD-FASL-GROUP ;;; @@ -266,60 +222,79 @@ (let ((byte (read-byte stream nil))) (when byte - ;; Read the string part of the fasl header, or die. - (let* ((fhsss sb!c:*fasl-header-string-start-string*) + ;; 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 fasl file header")) + (error "illegal first byte in fasl file header")) (do ((byte (read-byte stream) (read-byte stream)) (count 1 (1+ count))) - ((= byte sb!c:*fasl-header-string-stop-char-code*) + ((= byte +fasl-header-string-stop-char-code+) t) (declare (fixnum byte count)) (when (and (< count fhsss-length) (not (eql byte (char-code (schar fhsss count))))) - (error "illegal 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 was compiled for ~A fasl file format ~ - version ~D, but we need version ~D.~:@>" - stream - variant - version - needed-version)) - t))) - (or (check-version "native code" - #.sb!c:*backend-fasl-file-implementation* - #.sb!c:*backend-fasl-file-version*) - (check-version "byte code" - #.(sb!c:backend-byte-fasl-file-implementation) - sb!c:byte-fasl-file-version) - (error "~S was compiled for implementation ~A, but this is a ~A." - stream - implementation - sb!c:*backend-fasl-file-implementation*))))))) + (error + "illegal subsequent (not first) byte in fasl file header")))) + + ;; 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 "~@<~S is in ~A fasl file format version ~W, ~ + but this version of SBCL uses ~ + format version ~W.~:@>" + stream + variant + version + needed-version))))) + (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+)))) + ;; 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 + "~@" + '*features* + stream + *features-potentially-affecting-fasl-format* + *features-affecting-fasl-format* + faff-in-this-file))) + ;; success + t)))) ;; Setting this variable gives you a trace of fops as they are loaded and ;; executed. #!+sb-show (defvar *show-fops-p* nil) -;;; a helper function for FASLOAD +;;; a helper function for LOAD-AS-FASL ;;; -;;; Return true if we successfully load a group from the stream, or NIL if EOF -;;; was encountered while trying to read from the stream. Dispatch to the right -;;; function for each fop. Special-case FOP-BYTE-PUSH since it is real common. +;;; Return true if we successfully load a group from the stream, or +;;; NIL if EOF was encountered while trying to read from the stream. +;;; Dispatch to the right function for each fop. Special-case +;;; FOP-BYTE-PUSH since it is real common. (defun load-fasl-group (stream) (when (check-fasl-header stream) (catch 'fasl-group-end @@ -346,7 +321,7 @@ (svref *fop-names* byte) byte (1- (file-position stream)) - (svref *fop-functions* byte)))) + (svref *fop-funs* byte)))) ;; Actually execute the fop. (if (eql byte 3) @@ -366,9 +341,9 @@ (setq *fop-stack-pointer* index) (setf (svref *fop-stack* index) (svref *current-fop-table* (read-byte stream)))) - (funcall (the function (svref *fop-functions* byte)))))))))) + (funcall (the function (svref *fop-funs* byte)))))))))) -(defun fasload (stream verbose print) +(defun load-as-fasl (stream verbose print) ;; KLUDGE: ANSI says it's good to do something with the :PRINT ;; argument to LOAD when we're fasloading a file, but currently we ;; don't. (CMU CL did, but implemented it in a non-ANSI way, and I @@ -376,27 +351,37 @@ (declare (ignore print)) (when (zerop (file-length stream)) (error "attempt to load an empty FASL file:~% ~S" (namestring stream))) - (do-load-verbose stream verbose) - (let* ((*fasl-file* 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))) + (maybe-announce-load stream verbose) + (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 +;;; *COLD-FOREIGN-SYMBOL-TABLE*. All the speculative prefix-adding +;;; code for foreign symbol lookup should be here. +(defun find-foreign-symbol-in-table (name table) + (let ((prefixes + #!+(or osf1 sunos linux freebsd) #("" "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 (?) @@ -422,8 +407,8 @@ (let ((n (svref ,vec i))) (push (cons (svref *fop-names* i) n) ,lvar) (incf ,tvar n))) - (setq ,lvar (subseq (sort ,lvar #'(lambda (x y) - (> (cdr x) (cdr y)))) + (setq ,lvar (subseq (sort ,lvar (lambda (x y) + (> (cdr x) (cdr y)))) 0 10))))) (breakdown counts total-count *fop-counts*)