(in-package "SB!FASL")
\f
+;;;; 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.
(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)
#!-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)
(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)))
(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 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 ~D, ~
- but this version of SBCL uses ~
- format version ~D.~:@>"
- 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+)))))))
+ ;; 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
+ "~@<incompatible ~S in fasl file ~S: ~2I~_~
+ Of features affecting binary compatibility, ~4I~_~S~2I~_~
+ this runtime has ~4I~_~A,~2I~_~
+ while the fasl expects ~4I~_~A.~:>"
+ '*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.
(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)
(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 load-as-fasl (stream verbose print)
;; KLUDGE: ANSI says it's good to do something with the :PRINT
(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-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)))
+ (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
;;; 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)))
-
\f
;;;; stuff for debugging/tuning by collecting statistics on FOPs (?)
(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*)
projects / sbcl.git / blobdiff