X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fload.lisp;h=2c3371b7b3dabdd28f5fbc62ff9c26ae731638b2;hb=b1b85bbf17f686a0787304a04cf0e01e8216d038;hp=f97af523961521d077631b09225e91c119c44fdd;hpb=0ba72140fb0956f4cafd7b4aca6b6ffb0aa83c05;p=sbcl.git diff --git a/src/code/load.lisp b/src/code/load.lisp index f97af52..2c3371b 100644 --- a/src/code/load.lisp +++ b/src/code/load.lisp @@ -51,6 +51,10 @@ #!-sb-fluid (declaim (inline read-byte)) +;;; FIXME: why do all of these reading functions and macros declare +;;; (SPEED 0)? was there some bug in the compiler which has since +;;; been fixed? --njf, 2004-09-08 + ;;; This expands into code to read an N-byte unsigned integer using ;;; FAST-READ-BYTE. (defmacro fast-read-u-integer (n) @@ -87,7 +91,7 @@ (cnt 1 (1+ cnt))) ((>= cnt n) res)))) -;;; Read an N-byte unsigned integer from the *FASL-INPUT-STREAM* +;;; Read an N-byte unsigned integer from the *FASL-INPUT-STREAM*. (defmacro read-arg (n) (declare (optimize (speed 0))) (if (= n 1) @@ -97,11 +101,19 @@ (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. -;;; -;;; (for the names: There seem to be only two cases, so it could be -;;; named READ-U-INTEGER-8 and READ-U-INTEGER-32 or something.) +(declaim (inline read-byte-arg read-halfword-arg read-word-arg)) +(defun read-byte-arg () + (declare (optimize (speed 0))) + (read-arg 1)) + +(defun read-halfword-arg () + (declare (optimize (speed 0))) + (read-arg #.(/ sb!vm:n-word-bytes 2))) + +(defun read-word-arg () + (declare (optimize (speed 0))) + (read-arg #.sb!vm:n-word-bytes)) + ;;;; the fop table @@ -146,64 +158,47 @@ ;;;; the fop stack -;;; (This is in a SIMPLE-VECTOR, but it grows down, since it is -;;; somewhat cheaper to test for overflow that way.) -(defvar *fop-stack* (make-array 100)) -(declaim (simple-vector *fop-stack*)) - -;;; the index of the most recently pushed item on the fop stack -(defvar *fop-stack-pointer* 100) - -;;; the current index into the fop stack when we last recursively -;;; entered LOAD -(defvar *fop-stack-pointer-on-entry*) -(declaim (type index *fop-stack-pointer* *fop-stack-pointer-on-entry*)) - -(defun grow-fop-stack () - (let* ((size (length (the simple-vector *fop-stack*))) - (new-size (* size 2)) - (new-stack (make-array new-size))) - (declare (fixnum size new-size) (simple-vector new-stack)) - (replace new-stack (the simple-vector *fop-stack*) :start1 size) - (incf *fop-stack-pointer-on-entry* size) - (setq *fop-stack-pointer* size) - (setq *fop-stack* new-stack))) +;;; (This is to be bound by LOAD to an adjustable (VECTOR T) with +;;; FILL-POINTER, for use as a stack with VECTOR-PUSH-EXTEND.) +(defvar *fop-stack*) +(declaim (type (vector t) *fop-stack*)) ;;; Cache information about the fop stack in local variables. Define a ;;; local macro to pop from the stack. Push the result of evaluation -;;; if specified. +;;; if PUSHP. (defmacro with-fop-stack (pushp &body forms) (aver (member pushp '(nil t :nope))) - (let ((n-stack (gensym)) - (n-index (gensym)) - (n-res (gensym))) - `(let ((,n-stack *fop-stack*) - (,n-index *fop-stack-pointer*)) - (declare (simple-vector ,n-stack) (type index ,n-index)) + (with-unique-names (fop-stack) + `(let ((,fop-stack *fop-stack*)) + (declare (type (vector t) ,fop-stack)) (macrolet ((pop-stack () - `(prog1 - (svref ,',n-stack ,',n-index) - (incf ,',n-index))) - (call-with-popped-things (fun n) - (let ((n-start (gensym))) - `(let ((,n-start (+ ,',n-index ,n))) - (declare (type index ,n-start)) - (setq ,',n-index ,n-start) - (,fun ,@(make-list n :initial-element - `(svref ,',n-stack - (decf ,n-start)))))))) + `(vector-pop ,',fop-stack)) + (call-with-popped-args (fun n) + `(%call-with-popped-args ,fun ,n ,',fop-stack))) ,(if pushp - `(let ((,n-res (progn ,@forms))) - (when (zerop ,n-index) - (grow-fop-stack) - (setq ,n-index *fop-stack-pointer* - ,n-stack *fop-stack*)) - (decf ,n-index) - (setq *fop-stack-pointer* ,n-index) - (setf (svref ,n-stack ,n-index) ,n-res)) - `(prog1 - (progn ,@forms) - (setq *fop-stack-pointer* ,n-index))))))) + `(vector-push-extend (progn ,@forms) ,fop-stack) + `(progn ,@forms)))))) + +;;; Call FUN with N arguments popped from STACK. +(defmacro %call-with-popped-args (fun n stack) + ;; N's integer value must be known at macroexpansion time. + (declare (type index n)) + (with-unique-names (n-stack old-length new-length) + (let ((argtmps (make-gensym-list n))) + `(let* ((,n-stack ,stack) + (,old-length (fill-pointer ,n-stack)) + (,new-length (- ,old-length ,n)) + ,@(loop for i from 0 below n collecting + `(,(nth i argtmps) + (aref ,n-stack (+ ,new-length ,i))))) + (declare (type (vector t) ,n-stack)) + (setf (fill-pointer ,n-stack) ,new-length) + ;; (For some applications it might be appropriate to FILL the + ;; popped area with NIL here, to avoid holding onto garbage. For + ;; sbcl-0.8.7.something, though, it shouldn't matter, because + ;; we're using this only to pop stuff off *FOP-STACK*, and the + ;; entire *FOP-STACK* can be GCed as soon as LOAD returns.) + (,fun ,@argtmps))))) ;;;; Conditions signalled on invalid fasls (wrong fasl version, etc), ;;;; so that user code (esp. ASDF) can reasonably handle attempts to @@ -211,7 +206,7 @@ ;;;; make only condition INVALID-FASL part of the public interface, ;;;; and keep the guts internal. -(define-condition sb!ext::invalid-fasl (error) +(define-condition invalid-fasl (error) ((stream :reader invalid-fasl-stream :initarg :stream) (expected :reader invalid-fasl-expected :initarg :expected)) (:report @@ -219,7 +214,7 @@ (format stream "~S is an invalid fasl file." (invalid-fasl-stream condition))))) -(define-condition invalid-fasl-header (sb!ext::invalid-fasl) +(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 @@ -231,7 +226,7 @@ (invalid-fasl-byte condition) (invalid-fasl-expected condition))))) -(define-condition invalid-fasl-version (sb!ext::invalid-fasl) +(define-condition invalid-fasl-version (invalid-fasl) ((variant :reader invalid-fasl-variant :initarg :variant) (version :reader invalid-fasl-version :initarg :version)) (:report @@ -243,7 +238,7 @@ (invalid-fasl-version condition) (invalid-fasl-expected condition))))) -(define-condition invalid-fasl-implementation (sb!ext::invalid-fasl) +(define-condition invalid-fasl-implementation (invalid-fasl) ((implementation :reader invalid-fasl-implementation :initarg :implementation)) (:report @@ -253,7 +248,7 @@ (invalid-fasl-implementation condition) (invalid-fasl-expected condition))))) -(define-condition invalid-fasl-features (sb!ext::invalid-fasl) +(define-condition invalid-fasl-features (invalid-fasl) ((potential-features :reader invalid-fasl-potential-features :initarg :potential-features) (features :reader invalid-fasl-features :initarg :features)) @@ -310,7 +305,7 @@ ;; Read and validate version-specific compatibility stuff. (flet ((string-from-stream () - (let* ((length (read-arg 4)) + (let* ((length (read-word-arg)) (result (make-string length))) (read-string-as-bytes stream result) result))) @@ -318,7 +313,7 @@ (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))) + (version (read-word-arg))) (flet ((check-version (variant possible-implementation needed-version) @@ -353,12 +348,16 @@ #!+sb-show (defvar *show-fops-p* nil) +;; buffer for loading symbols +(defvar *fasl-symbol-buffer*) +(declaim (simple-string *fasl-symbol-buffer*)) + +;;; ;;; 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. +;;; Dispatch to the right function for each fop. (defun load-fasl-group (stream) (when (check-fasl-header stream) (catch 'fasl-group-end @@ -369,43 +368,26 @@ ;; Do some debugging output. #!+sb-show (when *show-fops-p* - (let ((ptr *fop-stack-pointer*) - (stack *fop-stack*)) - (fresh-line *trace-output*) - ;; The FOP operations are stack based, so it's sorta - ;; logical to display the operand before the operator. - ;; ("reverse Polish notation") - (unless (= ptr (length stack)) - (write-char #\space *trace-output*) - (prin1 (svref stack ptr) *trace-output*) - (terpri *trace-output*)) - ;; Display the operator. - (format *trace-output* - "~&~S (#X~X at ~D) (~S)~%" - (svref *fop-names* byte) - byte - (1- (file-position stream)) - (svref *fop-funs* byte)))) + (let* ((stack *fop-stack*) + (ptr (1- (fill-pointer *fop-stack*)))) + (fresh-line *trace-output*) + ;; The FOP operations are stack based, so it's sorta + ;; logical to display the operand before the operator. + ;; ("reverse Polish notation") + (unless (= ptr -1) + (write-char #\space *trace-output*) + (prin1 (aref stack ptr) *trace-output*) + (terpri *trace-output*)) + ;; Display the operator. + (format *trace-output* + "~&~S (#X~X at ~D) (~S)~%" + (aref *fop-names* byte) + byte + (1- (file-position stream)) + (svref *fop-funs* byte)))) ;; Actually execute the fop. - (if (eql byte 3) - ;; FIXME: This is the special case for FOP-BYTE-PUSH. - ;; Benchmark to see whether it's really worth special - ;; casing it. If it is, at least express the test in - ;; terms of a symbolic name for the FOP-BYTE-PUSH code, - ;; not a bare '3' (!). Failing that, remove the special - ;; case (and the comment at the head of this function - ;; which mentions it). - (let ((index *fop-stack-pointer*)) - (declare (type index index)) - (when (zerop index) - (grow-fop-stack) - (setq index *fop-stack-pointer*)) - (decf index) - (setq *fop-stack-pointer* index) - (setf (svref *fop-stack* index) - (svref *current-fop-table* (read-byte stream)))) - (funcall (the function (svref *fop-funs* 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 @@ -418,34 +400,19 @@ (maybe-announce-load stream verbose) (sb!thread:with-recursive-lock (sb!c::*big-compiler-lock*) (let* ((*fasl-input-stream* stream) + (*fasl-symbol-buffer* (make-string 100)) (*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*)) + (*fop-stack* (make-array 100 :fill-pointer 0 :adjustable t))) (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. + ;; NIL out the 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*) + ;; FIXME: Could we just get rid of the free fop table pool so + ;; that this would go away? (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 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 (?)