X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fgenesis.lisp;h=40478a59b4c5f3fd05a711b5d7d475e8b101cf6e;hb=545fa4548b327804cf78afe38a2ecd94ced86162;hp=277f0c6849624e84c660bf640de3e6311dbb2467;hpb=f3783ae14bde14c5aefd3d9383d89379defcb00f;p=sbcl.git diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp index 277f0c6..40478a5 100644 --- a/src/compiler/generic/genesis.lisp +++ b/src/compiler/generic/genesis.lisp @@ -6,13 +6,20 @@ ;;;; As explained by Rob MacLachlan on the CMU CL mailing list Wed, 06 ;;;; Jan 1999 11:05:02 -0500, this cold load generator more or less ;;;; fakes up static function linking. I.e. it makes sure that all the -;;;; functions in the fasl files it reads are bound to the +;;;; DEFUN-defined functions in the fasl files it reads are bound to the ;;;; corresponding symbols before execution starts. It doesn't do ;;;; anything to initialize variable values; instead it just arranges ;;;; for !COLD-INIT to be called at cold load time. !COLD-INIT is ;;;; responsible for explicitly initializing anything which has to be ;;;; initialized early before it transfers control to the ordinary ;;;; top-level forms. +;;;; +;;;; (In CMU CL, and in SBCL as of 0.6.9 anyway, functions not defined +;;;; by DEFUN aren't set up specially by GENESIS. In particular, +;;;; structure slot accessors are not set up. Slot accessors are +;;;; available at cold init time because they're usually compiled +;;;; inline. They're not available as out-of-line functions until the +;;;; toplevel forms installing them have run.) ;;;; This software is part of the SBCL system. See the README file for ;;;; more information. @@ -23,12 +30,9 @@ ;;;; provided with absolutely no warranty. See the COPYING and CREDITS ;;;; files for more information. -(in-package "SB!IMPL") - -(file-comment - "$Header$") +(in-package "SB!FASL") -;;; a magic number used to identify core files +;;; a magic number used to identify our core files (defconstant core-magic (logior (ash (char-code #\S) 24) (ash (char-code #\B) 16) @@ -44,7 +48,12 @@ ;;; IP packets), and in fact the CMU CL version number never ended up ;;; being incremented past 0. A better approach might be to use a ;;; string which is set from CVS data. -(defconstant sbcl-core-version-integer 0) +;;; +;;; 0: inherited from CMU CL +;;; 1: rearranged static symbols for sbcl-0.6.8 +;;; 2: eliminated non-ANSI %DEFCONSTANT/%%DEFCONSTANT support, +;;; deleted a slot from DEBUG-SOURCE structure +(defconstant sbcl-core-version-integer 2) (defun round-up (number size) #!+sb-doc @@ -53,6 +62,9 @@ ;;;; representation of spaces in the core +;;; If there is more than one dynamic space in memory (i.e., if a +;;; copying GC is in use), then only the active dynamic space gets +;;; dumped to core. (defvar *dynamic*) (defconstant dynamic-space-id 1) @@ -62,16 +74,16 @@ (defvar *read-only*) (defconstant read-only-space-id 3) -(eval-when (:compile-toplevel :execute :load-toplevel) - (defconstant descriptor-low-bits 16 - "the number of bits in the low half of the descriptor") - (defconstant target-space-alignment (ash 1 descriptor-low-bits) - "the alignment requirement for spaces in the target. - Must be at least (ASH 1 DESCRIPTOR-LOW-BITS)")) +(defconstant descriptor-low-bits 16 + "the number of bits in the low half of the descriptor") +(defconstant target-space-alignment (ash 1 descriptor-low-bits) + "the alignment requirement for spaces in the target. + Must be at least (ASH 1 DESCRIPTOR-LOW-BITS)") ;;; a GENESIS-time representation of a memory space (e.g. read-only space, ;;; dynamic space, or static space) -(defstruct (gspace (:constructor %make-gspace)) +(defstruct (gspace (:constructor %make-gspace) + (:copier nil)) ;; name and identifier for this GSPACE (name (required-argument) :type symbol :read-only t) (identifier (required-argument) :type fixnum :read-only t) @@ -121,40 +133,43 @@ (defstruct (descriptor (:constructor make-descriptor - (high low &optional gspace word-offset))) + (high low &optional gspace word-offset)) + (:copier nil)) ;; the GSPACE that this descriptor is allocated in, or NIL if not set yet. (gspace nil :type (or gspace null)) ;; the offset in words from the start of GSPACE, or NIL if not set yet - (word-offset nil :type (or (unsigned-byte #.sb!vm:word-bits) null)) - ;; the high and low halves of the descriptor KLUDGE: Judging from - ;; the comments in genesis.lisp of the CMU CL old-rt compiler, this - ;; split dates back from a very early version of genesis where - ;; 32-bit integers were represented as conses of two 16-bit - ;; integers. In any system with nice (UNSIGNED-BYTE 32) structure - ;; slots, like CMU CL >= 17 or any version of SBCL, there seems to - ;; be no reason to persist in this. -- WHN 19990917 - high low) + (word-offset nil :type (or (unsigned-byte #.sb!vm:n-word-bits) null)) + ;; the high and low halves of the descriptor + ;; + ;; KLUDGE: Judging from the comments in genesis.lisp of the CMU CL + ;; old-rt compiler, this split dates back from a very early version + ;; of genesis where 32-bit integers were represented as conses of + ;; two 16-bit integers. In any system with nice (UNSIGNED-BYTE 32) + ;; structure slots, like CMU CL >= 17 or any version of SBCL, there + ;; seems to be no reason to persist in this. -- WHN 19990917 + high + low) (def!method print-object ((des descriptor) stream) (let ((lowtag (descriptor-lowtag des))) (print-unreadable-object (des stream :type t) - (cond ((or (= lowtag sb!vm:even-fixnum-type) - (= lowtag sb!vm:odd-fixnum-type)) + (cond ((or (= lowtag sb!vm:even-fixnum-lowtag) + (= lowtag sb!vm:odd-fixnum-lowtag)) (let ((unsigned (logior (ash (descriptor-high des) (1+ (- descriptor-low-bits - sb!vm:lowtag-bits))) + sb!vm:n-lowtag-bits))) (ash (descriptor-low des) - (- 1 sb!vm:lowtag-bits))))) + (- 1 sb!vm:n-lowtag-bits))))) (format stream "for fixnum: ~D" (if (> unsigned #x1FFFFFFF) (- unsigned #x40000000) unsigned)))) - ((or (= lowtag sb!vm:other-immediate-0-type) - (= lowtag sb!vm:other-immediate-1-type)) + ((or (= lowtag sb!vm:other-immediate-0-lowtag) + (= lowtag sb!vm:other-immediate-1-lowtag)) (format stream "for other immediate: #X~X, type #b~8,'0B" - (ash (descriptor-bits des) (- sb!vm:type-bits)) - (logand (descriptor-low des) sb!vm:type-mask))) + (ash (descriptor-bits des) (- sb!vm:n-widetag-bits)) + (logand (descriptor-low des) sb!vm:widetag-mask))) (t (format stream "for pointer: #X~X, lowtag #b~3,'0B, ~A" @@ -166,12 +181,12 @@ (gspace-name gspace) "unknown")))))))) -(defun allocate-descriptor (gspace length lowtag) - #!+sb-doc - "Return a descriptor for a block of LENGTH bytes out of GSPACE. The free - word index is boosted as necessary, and if additional memory is needed, we - grow the GSPACE. The descriptor returned is a pointer of type LOWTAG." - (let* ((bytes (round-up length (ash 1 sb!vm:lowtag-bits))) +;;; Return a descriptor for a block of LENGTH bytes out of GSPACE. The +;;; free word index is boosted as necessary, and if additional memory +;;; is needed, we grow the GSPACE. The descriptor returned is a +;;; pointer of type LOWTAG. +(defun allocate-cold-descriptor (gspace length lowtag) + (let* ((bytes (round-up length (ash 1 sb!vm:n-lowtag-bits))) (old-free-word-index (gspace-free-word-index gspace)) (new-free-word-index (+ old-free-word-index (ash bytes (- sb!vm:word-shift))))) @@ -205,14 +220,14 @@ (defun descriptor-fixnum (des) (let ((bits (descriptor-bits des))) - (if (logbitp (1- sb!vm:word-bits) bits) - ;; KLUDGE: The (- SB!VM:WORD-BITS 2) term here looks right to - ;; me, and it works, but in CMU CL it was (1- SB!VM:WORD-BITS), + (if (logbitp (1- sb!vm:n-word-bits) bits) + ;; KLUDGE: The (- SB!VM:N-WORD-BITS 2) term here looks right to + ;; me, and it works, but in CMU CL it was (1- SB!VM:N-WORD-BITS), ;; and although that doesn't make sense for me, or work for me, ;; it's hard to see how it could have been wrong, since CMU CL ;; genesis worked. It would be nice to understand how this came ;; to be.. -- WHN 19990901 - (logior (ash bits -2) (ash -1 (- sb!vm:word-bits 2))) + (logior (ash bits -2) (ash -1 (- sb!vm:n-word-bits 2))) (ash bits -2)))) ;;; common idioms @@ -236,14 +251,14 @@ (let ((lowtag (descriptor-lowtag des)) (high (descriptor-high des)) (low (descriptor-low des))) - (if (or (eql lowtag sb!vm:function-pointer-type) - (eql lowtag sb!vm:instance-pointer-type) - (eql lowtag sb!vm:list-pointer-type) - (eql lowtag sb!vm:other-pointer-type)) + (if (or (eql lowtag sb!vm:fun-pointer-lowtag) + (eql lowtag sb!vm:instance-pointer-lowtag) + (eql lowtag sb!vm:list-pointer-lowtag) + (eql lowtag sb!vm:other-pointer-lowtag)) (dolist (gspace (list *dynamic* *static* *read-only*) (error "couldn't find a GSPACE for ~S" des)) - ;; This code relies on the fact that GSPACEs are aligned such that - ;; the descriptor-low-bits low bits are zero. + ;; This code relies on the fact that GSPACEs are aligned + ;; such that the descriptor-low-bits low bits are zero. (when (and (>= high (ash (gspace-word-address gspace) (- sb!vm:word-shift descriptor-low-bits))) (<= high (ash (+ (gspace-word-address gspace) @@ -263,24 +278,25 @@ (defun make-random-descriptor (value) (make-descriptor (logand (ash value (- descriptor-low-bits)) (1- (ash 1 - (- sb!vm:word-bits descriptor-low-bits)))) + (- sb!vm:n-word-bits + descriptor-low-bits)))) (logand value (1- (ash 1 descriptor-low-bits))))) (defun make-fixnum-descriptor (num) (when (>= (integer-length num) - (1+ (- sb!vm:word-bits sb!vm:lowtag-bits))) + (1+ (- sb!vm:n-word-bits sb!vm:n-lowtag-bits))) (error "~D is too big for a fixnum." num)) - (make-random-descriptor (ash num (1- sb!vm:lowtag-bits)))) + (make-random-descriptor (ash num (1- sb!vm:n-lowtag-bits)))) (defun make-other-immediate-descriptor (data type) - (make-descriptor (ash data (- sb!vm:type-bits descriptor-low-bits)) + (make-descriptor (ash data (- sb!vm:n-widetag-bits descriptor-low-bits)) (logior (logand (ash data (- descriptor-low-bits - sb!vm:type-bits)) + sb!vm:n-widetag-bits)) (1- (ash 1 descriptor-low-bits))) type))) (defun make-character-descriptor (data) - (make-other-immediate-descriptor data sb!vm:base-char-type)) + (make-other-immediate-descriptor data sb!vm:base-char-widetag)) (defun descriptor-beyond (des offset type) (let* ((low (logior (+ (logandc2 (descriptor-low des) sb!vm:lowtag-mask) @@ -310,7 +326,7 @@ ;;; a handle on the trap object (defvar *unbound-marker*) -;; was: (make-other-immediate-descriptor 0 sb!vm:unbound-marker-type) +;; was: (make-other-immediate-descriptor 0 sb!vm:unbound-marker-widetag) ;;; a handle on the NIL object (defvar *nil-descriptor*) @@ -334,7 +350,7 @@ ;;; comparing the byte order of *BACKEND* to the byte order of ;;; *NATIVE-BACKEND*, a concept which doesn't exist in SBCL. Instead, ;;; in SBCL byte order swapping would need to be explicitly requested -;;; with a keyword argument to GENESIS. +;;; with a &KEY argument to GENESIS. ;;; ;;; I'm not sure whether this is a problem or not, and I don't have a ;;; machine with different byte order to test to find out for sure. @@ -365,8 +381,8 @@ (defun maybe-byte-swap (word) (declare (type (unsigned-byte 32) word)) - (assert (= sb!vm:word-bits 32)) - (assert (= sb!vm:byte-bits 8)) + (aver (= sb!vm:n-word-bits 32)) + (aver (= sb!vm:byte-bits 8)) (if (not *genesis-byte-order-swap-p*) word (logior (ash (ldb (byte 8 0) word) 24) @@ -376,37 +392,48 @@ (defun maybe-byte-swap-short (short) (declare (type (unsigned-byte 16) short)) - (assert (= sb!vm:word-bits 32)) - (assert (= sb!vm:byte-bits 8)) + (aver (= sb!vm:n-word-bits 32)) + (aver (= sb!vm:byte-bits 8)) (if (not *genesis-byte-order-swap-p*) short (logior (ash (ldb (byte 8 0) short) 8) (ldb (byte 8 8) short)))) -;;; like SAP-REF-32, except that instead of a SAP we use a byte vector -(defun byte-vector-ref-32 (byte-vector byte-index) - (assert (= sb!vm:word-bits 32)) - (assert (= sb!vm:byte-bits 8)) +;;; BYTE-VECTOR-REF-32 and friends. These are like SAP-REF-n, except +;;; that instead of a SAP we use a byte vector +(macrolet ((make-byte-vector-ref-n + (n) + (let* ((name (intern (format nil "BYTE-VECTOR-REF-~A" n))) + (number-octets (/ n 8)) + (ash-list + (loop for i from 0 to (1- number-octets) + collect `(ash (aref byte-vector (+ byte-index ,i)) + ,(* i 8)))) + (setf-list + (loop for i from 0 to (1- number-octets) + append + `((aref byte-vector (+ byte-index ,i)) + (ldb (byte 8 ,(* i 8)) new-value))))) + `(progn + (defun ,name (byte-vector byte-index) + (aver (= sb!vm:n-word-bits 32)) + (aver (= sb!vm:byte-bits 8)) (ecase sb!c:*backend-byte-order* (:little-endian - (logior (ash (aref byte-vector (+ byte-index 0)) 0) - (ash (aref byte-vector (+ byte-index 1)) 8) - (ash (aref byte-vector (+ byte-index 2)) 16) - (ash (aref byte-vector (+ byte-index 3)) 24))) + (logior ,@ash-list)) (:big-endian (error "stub: no big-endian ports of SBCL (yet?)")))) -(defun (setf byte-vector-ref-32) (new-value byte-vector byte-index) - (assert (= sb!vm:word-bits 32)) - (assert (= sb!vm:byte-bits 8)) + (defun (setf ,name) (new-value byte-vector byte-index) + (aver (= sb!vm:n-word-bits 32)) + (aver (= sb!vm:byte-bits 8)) (ecase sb!c:*backend-byte-order* (:little-endian - (setf (aref byte-vector (+ byte-index 0)) (ldb (byte 8 0) new-value) - (aref byte-vector (+ byte-index 1)) (ldb (byte 8 8) new-value) - (aref byte-vector (+ byte-index 2)) (ldb (byte 8 16) new-value) - (aref byte-vector (+ byte-index 3)) (ldb (byte 8 24) new-value))) + (setf ,@setf-list)) (:big-endian - (error "stub: no big-endian ports of SBCL (yet?)"))) - new-value) + (error "stub: no big-endian ports of SBCL (yet?)")))))))) + (make-byte-vector-ref-n 8) + (make-byte-vector-ref-n 16) + (make-byte-vector-ref-n 32)) (declaim (ftype (function (descriptor sb!vm:word) descriptor) read-wordindexed)) (defun read-wordindexed (address index) @@ -488,16 +515,16 @@ #!+sb-doc "Allocate LENGTH words in GSPACE and return a new descriptor of type LOWTAG pointing to them." - (allocate-descriptor gspace (ash length sb!vm:word-shift) lowtag)) + (allocate-cold-descriptor gspace (ash length sb!vm:word-shift) lowtag)) (defun allocate-unboxed-object (gspace element-bits length type) #!+sb-doc "Allocate LENGTH units of ELEMENT-BITS bits plus a header word in GSPACE and return an ``other-pointer'' descriptor to them. Initialize the header word with the resultant length and TYPE." (let* ((bytes (/ (* element-bits length) sb!vm:byte-bits)) - (des (allocate-descriptor gspace - (+ bytes sb!vm:word-bytes) - sb!vm:other-pointer-type))) + (des (allocate-cold-descriptor gspace + (+ bytes sb!vm:word-bytes) + sb!vm:other-pointer-lowtag))) (write-memory des (make-other-immediate-descriptor (ash bytes (- sb!vm:word-shift)) @@ -511,8 +538,9 @@ ;; FIXME: Here and in ALLOCATE-UNBOXED-OBJECT, BYTES is calculated using ;; #'/ instead of #'CEILING, which seems wrong. (let* ((bytes (/ (* element-bits length) sb!vm:byte-bits)) - (des (allocate-descriptor gspace (+ bytes (* 2 sb!vm:word-bytes)) - sb!vm:other-pointer-type))) + (des (allocate-cold-descriptor gspace + (+ bytes (* 2 sb!vm:word-bytes)) + sb!vm:other-pointer-lowtag))) (write-memory des (make-other-immediate-descriptor 0 type)) (write-wordindexed des sb!vm:vector-length-slot @@ -530,7 +558,7 @@ (des (allocate-vector-object gspace sb!vm:byte-bits (1+ length) - sb!vm:simple-string-type)) + sb!vm:simple-string-widetag)) (bytes (gspace-bytes gspace)) (offset (+ (* sb!vm:vector-data-offset sb!vm:word-bytes) (descriptor-byte-offset des)))) @@ -554,20 +582,20 @@ (defun bignum-to-core (n) #!+sb-doc "Copy a bignum to the cold core." - (let* ((words (ceiling (1+ (integer-length n)) sb!vm:word-bits)) + (let* ((words (ceiling (1+ (integer-length n)) sb!vm:n-word-bits)) (handle (allocate-unboxed-object *dynamic* - sb!vm:word-bits + sb!vm:n-word-bits words - sb!vm:bignum-type))) + sb!vm:bignum-widetag))) (declare (fixnum words)) (do ((index 1 (1+ index)) - (remainder n (ash remainder (- sb!vm:word-bits)))) + (remainder n (ash remainder (- sb!vm:n-word-bits)))) ((> index words) (unless (zerop (integer-length remainder)) ;; FIXME: Shouldn't this be a fatal error? (warn "~D words of ~D were written, but ~D bits were left over." words n remainder))) - (let ((word (ldb (byte sb!vm:word-bits 0) remainder))) + (let ((word (ldb (byte sb!vm:n-word-bits 0) remainder))) (write-wordindexed handle index (make-descriptor (ash word (- descriptor-low-bits)) (ldb (byte descriptor-low-bits 0) @@ -577,7 +605,7 @@ (defun number-pair-to-core (first second type) #!+sb-doc "Makes a number pair of TYPE (ratio or complex) and fills it in." - (let ((des (allocate-unboxed-object *dynamic* sb!vm:word-bits 2 type))) + (let ((des (allocate-unboxed-object *dynamic* sb!vm:n-word-bits 2 type))) (write-wordindexed des 1 first) (write-wordindexed des 2 second) des)) @@ -586,18 +614,18 @@ (etypecase x (single-float (let ((des (allocate-unboxed-object *dynamic* - sb!vm:word-bits + sb!vm:n-word-bits (1- sb!vm:single-float-size) - sb!vm:single-float-type))) + sb!vm:single-float-widetag))) (write-wordindexed des sb!vm:single-float-value-slot (make-random-descriptor (single-float-bits x))) des)) (double-float (let ((des (allocate-unboxed-object *dynamic* - sb!vm:word-bits + sb!vm:n-word-bits (1- sb!vm:double-float-size) - sb!vm:double-float-type)) + sb!vm:double-float-widetag)) (high-bits (make-random-descriptor (double-float-high-bits x))) (low-bits (make-random-descriptor (double-float-low-bits x)))) (ecase sb!c:*backend-byte-order* @@ -611,9 +639,9 @@ #!+(and long-float x86) (long-float (let ((des (allocate-unboxed-object *dynamic* - sb!vm:word-bits + sb!vm:n-word-bits (1- sb!vm:long-float-size) - sb!vm:long-float-type)) + sb!vm:long-float-widetag)) (exp-bits (make-random-descriptor (long-float-exp-bits x))) (high-bits (make-random-descriptor (long-float-high-bits x))) (low-bits (make-random-descriptor (long-float-low-bits x)))) @@ -628,9 +656,9 @@ (defun complex-single-float-to-core (num) (declare (type (complex single-float) num)) - (let ((des (allocate-unboxed-object *dynamic* sb!vm:word-bits + (let ((des (allocate-unboxed-object *dynamic* sb!vm:n-word-bits (1- sb!vm:complex-single-float-size) - sb!vm:complex-single-float-type))) + sb!vm:complex-single-float-widetag))) (write-wordindexed des sb!vm:complex-single-float-real-slot (make-random-descriptor (single-float-bits (realpart num)))) (write-wordindexed des sb!vm:complex-single-float-imag-slot @@ -639,9 +667,9 @@ (defun complex-double-float-to-core (num) (declare (type (complex double-float) num)) - (let ((des (allocate-unboxed-object *dynamic* sb!vm:word-bits + (let ((des (allocate-unboxed-object *dynamic* sb!vm:n-word-bits (1- sb!vm:complex-double-float-size) - sb!vm:complex-double-float-type))) + sb!vm:complex-double-float-widetag))) (let* ((real (realpart num)) (high-bits (make-random-descriptor (double-float-high-bits real))) (low-bits (make-random-descriptor (double-float-low-bits real)))) @@ -673,7 +701,7 @@ (bignum-to-core number))) (ratio (number-pair-to-core (number-to-core (numerator number)) (number-to-core (denominator number)) - sb!vm:ratio-type)) + sb!vm:ratio-widetag)) ((complex single-float) (complex-single-float-to-core number)) ((complex double-float) (complex-double-float-to-core number)) #!+long-float @@ -681,16 +709,16 @@ (error "~S isn't a cold-loadable number at all!" number)) (complex (number-pair-to-core (number-to-core (realpart number)) (number-to-core (imagpart number)) - sb!vm:complex-type)) + sb!vm:complex-widetag)) (float (float-to-core number)) (t (error "~S isn't a cold-loadable number at all!" number)))) (declaim (ftype (function (sb!vm:word) descriptor) sap-to-core)) (defun sapint-to-core (sapint) (let ((des (allocate-unboxed-object *dynamic* - sb!vm:word-bits + sb!vm:n-word-bits (1- sb!vm:sap-size) - sb!vm:sap-type))) + sb!vm:sap-widetag))) (write-wordindexed des sb!vm:sap-pointer-slot (make-random-descriptor sapint)) @@ -698,7 +726,7 @@ ;;; Allocate a cons cell in GSPACE and fill it in with CAR and CDR. (defun cold-cons (car cdr &optional (gspace *dynamic*)) - (let ((dest (allocate-boxed-object gspace 2 sb!vm:list-pointer-type))) + (let ((dest (allocate-boxed-object gspace 2 sb!vm:list-pointer-lowtag))) (write-memory dest car) (write-wordindexed dest 1 cdr) dest)) @@ -707,8 +735,8 @@ ;;; descriptor. (defun vector-in-core (&rest objects) (let* ((size (length objects)) - (result (allocate-vector-object *dynamic* sb!vm:word-bits size - sb!vm:simple-vector-type))) + (result (allocate-vector-object *dynamic* sb!vm:n-word-bits size + sb!vm:simple-vector-widetag))) (dotimes (index size) (write-wordindexed result (+ index sb!vm:vector-data-offset) (pop objects))) @@ -716,7 +744,7 @@ ;;;; symbol magic -;;; FIXME: This should be a keyword argument of ALLOCATE-SYMBOL. +;;; FIXME: This should be a &KEY argument of ALLOCATE-SYMBOL. (defvar *cold-symbol-allocation-gspace* nil) ;;; Allocate (and initialize) a symbol. @@ -724,9 +752,9 @@ (declare (simple-string name)) (let ((symbol (allocate-unboxed-object (or *cold-symbol-allocation-gspace* *dynamic*) - sb!vm:word-bits + sb!vm:n-word-bits (1- sb!vm:symbol-size) - sb!vm:symbol-header-type))) + sb!vm:symbol-header-widetag))) (write-wordindexed symbol sb!vm:symbol-value-slot *unbound-marker*) #!+x86 (write-wordindexed symbol @@ -803,10 +831,10 @@ (let ((result (allocate-boxed-object *dynamic* ;; KLUDGE: Why 1+? -- WHN 19990901 (1+ target-layout-length) - sb!vm:instance-pointer-type))) + sb!vm:instance-pointer-lowtag))) (write-memory result - (make-other-immediate-descriptor target-layout-length - sb!vm:instance-header-type)) + (make-other-immediate-descriptor + target-layout-length sb!vm:instance-header-widetag)) ;; KLUDGE: The offsets into LAYOUT below should probably be pulled out ;; of the cross-compiler's tables at genesis time instead of inserted @@ -999,8 +1027,8 @@ ;; (CAR COLD-INTERN-INFO) = descriptor of symbol ;; (CDR COLD-INTERN-INFO) = list of packages, other than symbol's ;; own package, referring to symbol - ;; (*COLD-PACKAGE-SYMBOLS* and *COLD-SYMBOLS* store basically the same - ;; information, but with the mapping running the opposite way.) + ;; (*COLD-PACKAGE-SYMBOLS* and *COLD-SYMBOLS* store basically the + ;; same information, but with the mapping running the opposite way.) (cold-intern-info (get symbol 'cold-intern-info))) (unless cold-intern-info (cond ((eq (symbol-package symbol) package) @@ -1029,19 +1057,19 @@ (defun make-nil-descriptor () (let* ((des (allocate-unboxed-object *static* - sb!vm:word-bits + sb!vm:n-word-bits sb!vm:symbol-size 0)) (result (make-descriptor (descriptor-high des) (+ (descriptor-low des) (* 2 sb!vm:word-bytes) - (- sb!vm:list-pointer-type - sb!vm:other-pointer-type))))) + (- sb!vm:list-pointer-lowtag + sb!vm:other-pointer-lowtag))))) (write-wordindexed des 1 (make-other-immediate-descriptor 0 - sb!vm:symbol-header-type)) + sb!vm:symbol-header-widetag)) (write-wordindexed des (+ 1 sb!vm:symbol-value-slot) result) @@ -1112,18 +1140,16 @@ ;; the function values for these things?? I.e. why do we need this ;; section at all? Is it because all the FDEFINITION stuff gets in ;; the way of reading function values and is too hairy to rely on at - ;; cold boot? FIXME: 5/6 of these are in *STATIC-SYMBOLS* in - ;; parms.lisp, but %HANDLE-FUNCTION-END-BREAKPOINT is not. Why? + ;; cold boot? FIXME: Most of these are in *STATIC-SYMBOLS* in + ;; parms.lisp, but %HANDLE-FUN-END-BREAKPOINT is not. Why? ;; Explain. (macrolet ((frob (symbol) `(cold-set ',symbol (cold-fdefinition-object (cold-intern ',symbol))))) - (frob !cold-init) - (frob sb!impl::maybe-gc) + (frob maybe-gc) (frob internal-error) (frob sb!di::handle-breakpoint) - (frob sb!di::handle-function-end-breakpoint) - (frob sb!impl::fdefinition-object)) + (frob sb!di::handle-fun-end-breakpoint)) (cold-set '*current-catch-block* (make-fixnum-descriptor 0)) (cold-set '*current-unwind-protect-block* (make-fixnum-descriptor 0)) @@ -1131,9 +1157,7 @@ (cold-set '*free-interrupt-context-index* (make-fixnum-descriptor 0)) - ;; FIXME: *!INITIAL-LAYOUTS* should be exported from SB!KERNEL, or - ;; perhaps from SB-LD. - (cold-set 'sb!kernel::*!initial-layouts* (cold-list-all-layouts)) + (cold-set '*!initial-layouts* (cold-list-all-layouts)) (/show "dumping packages" (mapcar #'car *cold-package-symbols*)) (let ((initial-symbols *nil-descriptor*)) @@ -1221,9 +1245,7 @@ (cold-set 'sb!vm::*fp-constant-lg2* (number-to-core (log 2L0 10L0))) (cold-set 'sb!vm::*fp-constant-ln2* (number-to-core - (log 2L0 2.718281828459045235360287471352662L0)))) - #!+gencgc - (cold-set 'sb!vm::*SCAVENGE-READ-ONLY-GSPACE* *nil-descriptor*))) + (log 2L0 2.718281828459045235360287471352662L0)))))) ;;; Make a cold list that can be used as the arg list to MAKE-PACKAGE in order ;;; to make a package that is similar to PKG. @@ -1274,79 +1296,110 @@ (cold-push (string-to-core (package-name pkg)) res) res)) -;;;; fdefinition objects +;;;; functions and fdefinition objects ;;; a hash table mapping from fdefinition names to descriptors of cold -;;; objects. Note: Since fdefinition names can be lists like '(SETF -;;; FOO), and we want to have only one entry per name, this must be an -;;; 'EQUAL hash table, not the default 'EQL. +;;; objects +;;; +;;; Note: Since fdefinition names can be lists like '(SETF FOO), and +;;; we want to have only one entry per name, this must be an 'EQUAL +;;; hash table, not the default 'EQL. (defvar *cold-fdefn-objects*) (defvar *cold-fdefn-gspace* nil) -;;; Given a cold representation of an FDEFN name, return a warm representation. -;;; -;;; Note: Despite the name, this actually has little to do with -;;; FDEFNs, it's just a function for warming up values, and the only -;;; values it knows how to warm up are symbols and lists. (The -;;; connection to FDEFNs is that symbols and lists are the only -;;; possible names for functions.) -(declaim (ftype (function (descriptor) (or symbol list)) warm-fdefn-name)) -(defun warm-fdefn-name (des) - (ecase (descriptor-lowtag des) - (#.sb!vm:list-pointer-type ; FIXME: no #. - (if (= (descriptor-bits des) (descriptor-bits *nil-descriptor*)) - nil - ;; FIXME: If we cold-intern this again, we might get a different - ;; name. Check to make sure that any hash tables along the way - ;; are 'EQUAL not 'EQL. - (cons (warm-fdefn-name (read-wordindexed des sb!vm:cons-car-slot)) - (warm-fdefn-name (read-wordindexed des sb!vm:cons-cdr-slot))))) - (#.sb!vm:other-pointer-type ; FIXME: no #. - (or (gethash (descriptor-bits des) *cold-symbols*) - (descriptor-bits des))))) +;;; Given a cold representation of a symbol, return a warm +;;; representation. +(defun warm-symbol (des) + ;; Note that COLD-INTERN is responsible for keeping the + ;; *COLD-SYMBOLS* table up to date, so if DES happens to refer to an + ;; uninterned symbol, the code below will fail. But as long as we + ;; don't need to look up uninterned symbols during bootstrapping, + ;; that's OK.. + (multiple-value-bind (symbol found-p) + (gethash (descriptor-bits des) *cold-symbols*) + (declare (type symbol symbol)) + (unless found-p + (error "no warm symbol")) + symbol)) + +;;; like CL:CAR, CL:CDR, and CL:NULL but for cold values +(defun cold-car (des) + (aver (= (descriptor-lowtag des) sb!vm:list-pointer-lowtag)) + (read-wordindexed des sb!vm:cons-car-slot)) +(defun cold-cdr (des) + (aver (= (descriptor-lowtag des) sb!vm:list-pointer-lowtag)) + (read-wordindexed des sb!vm:cons-cdr-slot)) +(defun cold-null (des) + (= (descriptor-bits des) + (descriptor-bits *nil-descriptor*))) + +;;; Given a cold representation of a function name, return a warm +;;; representation. +(declaim (ftype (function (descriptor) (or symbol list)) warm-fun-name)) +(defun warm-fun-name (des) + (let ((result + (ecase (descriptor-lowtag des) + (#.sb!vm:list-pointer-lowtag + (aver (not (cold-null des))) ; function named NIL? please no.. + ;; Do cold (DESTRUCTURING-BIND (COLD-CAR COLD-CADR) DES ..). + (let* ((car-des (cold-car des)) + (cdr-des (cold-cdr des)) + (cadr-des (cold-car cdr-des)) + (cddr-des (cold-cdr cdr-des))) + (aver (cold-null cddr-des)) + (list (warm-symbol car-des) + (warm-symbol cadr-des)))) + (#.sb!vm:other-pointer-lowtag + (warm-symbol des))))) + (unless (legal-function-name-p result) + (error "not a legal function name: ~S" result)) + result)) (defun cold-fdefinition-object (cold-name &optional leave-fn-raw) (declare (type descriptor cold-name)) - (let ((warm-name (warm-fdefn-name cold-name))) + (let ((warm-name (warm-fun-name cold-name))) (or (gethash warm-name *cold-fdefn-objects*) (let ((fdefn (allocate-boxed-object (or *cold-fdefn-gspace* *dynamic*) (1- sb!vm:fdefn-size) - sb!vm:other-pointer-type))) + sb!vm:other-pointer-lowtag))) (setf (gethash warm-name *cold-fdefn-objects*) fdefn) (write-memory fdefn (make-other-immediate-descriptor - (1- sb!vm:fdefn-size) sb!vm:fdefn-type)) + (1- sb!vm:fdefn-size) sb!vm:fdefn-widetag)) (write-wordindexed fdefn sb!vm:fdefn-name-slot cold-name) (unless leave-fn-raw - (write-wordindexed fdefn sb!vm:fdefn-function-slot + (write-wordindexed fdefn sb!vm:fdefn-fun-slot *nil-descriptor*) (write-wordindexed fdefn sb!vm:fdefn-raw-addr-slot (make-random-descriptor - (lookup-foreign-symbol "undefined_tramp")))) + (cold-foreign-symbol-address-as-integer + "undefined_tramp")))) fdefn)))) -(defun cold-fset (cold-name defn) +;;; Handle the at-cold-init-time, fset-for-static-linkage operation +;;; requested by FOP-FSET. +(defun static-fset (cold-name defn) (declare (type descriptor cold-name)) (let ((fdefn (cold-fdefinition-object cold-name t)) - (type (logand (descriptor-low (read-memory defn)) sb!vm:type-mask))) - (write-wordindexed fdefn sb!vm:fdefn-function-slot defn) + (type (logand (descriptor-low (read-memory defn)) sb!vm:widetag-mask))) + (write-wordindexed fdefn sb!vm:fdefn-fun-slot defn) (write-wordindexed fdefn sb!vm:fdefn-raw-addr-slot (ecase type - (#.sb!vm:function-header-type + (#.sb!vm:simple-fun-header-widetag #!+sparc defn #!-sparc (make-random-descriptor (+ (logandc2 (descriptor-bits defn) sb!vm:lowtag-mask) - (ash sb!vm:function-code-offset + (ash sb!vm:simple-fun-code-offset sb!vm:word-shift)))) - (#.sb!vm:closure-header-type + (#.sb!vm:closure-header-widetag (make-random-descriptor - (lookup-foreign-symbol "closure_tramp"))))) + (cold-foreign-symbol-address-as-integer "closure_tramp"))))) fdefn)) (defun initialize-static-fns () @@ -1354,7 +1407,7 @@ (dolist (sym sb!vm:*static-functions*) (let* ((fdefn (cold-fdefinition-object (cold-intern sym))) (offset (- (+ (- (descriptor-low fdefn) - sb!vm:other-pointer-type) + sb!vm:other-pointer-lowtag) (* sb!vm:fdefn-raw-addr-slot sb!vm:word-bytes)) (descriptor-low *nil-descriptor*))) (desired (sb!vm:static-function-offset sym))) @@ -1377,7 +1430,9 @@ (defvar *cold-foreign-symbol-table*) (declaim (type hash-table *cold-foreign-symbol-table*)) -(defun load-foreign-symbol-table (filename) +;;; Read the sbcl.nm file to find the addresses for foreign-symbols in +;;; the C runtime. +(defun load-cold-foreign-symbol-table (filename) (with-open-file (file filename) (loop (let ((line (read-line file nil nil))) @@ -1425,36 +1480,15 @@ (setf (gethash name *cold-foreign-symbol-table*) value)))))) (values))) -(defun lookup-foreign-symbol (name) - #!+x86 - (let ((prefixes - #!+linux #(;; FIXME: How many of these are actually - ;; needed? The first four are taken from rather - ;; disorganized CMU CL code, which could easily - ;; have had redundant values in it.. - "_" - "__" - "__libc_" - "ldso_stub__" - ;; ..and the fifth seems to match most - ;; actual symbols, at least in RedHat 6.2. - "") - #!+freebsd #("" "ldso_stub__") - #!+openbsd #("_"))) - (or (some (lambda (prefix) - (gethash (concatenate 'string prefix name) - *cold-foreign-symbol-table* - nil)) - prefixes) - *foreign-symbol-placeholder-value* - (progn - (format *error-output* "~&The foreign symbol table is:~%") - (maphash (lambda (k v) - (format *error-output* "~&~S = #X~8X~%" k v)) - *cold-foreign-symbol-table*) - (format *error-output* "~&The prefix table is: ~S~%" prefixes) - (error "The foreign symbol ~S is undefined." name)))) - #!-x86 (error "non-x86 unsupported in SBCL (but see old CMU CL code)")) +(defun cold-foreign-symbol-address-as-integer (name) + (or (find-foreign-symbol-in-table name *cold-foreign-symbol-table*) + *foreign-symbol-placeholder-value* + (progn + (format *error-output* "~&The foreign symbol table is:~%") + (maphash (lambda (k v) + (format *error-output* "~&~S = #X~8X~%" k v)) + *cold-foreign-symbol-table*) + (error "The foreign symbol ~S is undefined." name)))) (defvar *cold-assembler-routines*) @@ -1526,7 +1560,8 @@ (declaim (ftype (function (descriptor sb!vm:word)) calc-offset)) (defun calc-offset (code-object offset-from-tail-of-header) (let* ((header (read-memory code-object)) - (header-n-words (ash (descriptor-bits header) (- sb!vm:type-bits))) + (header-n-words (ash (descriptor-bits header) + (- sb!vm:n-widetag-bits))) (header-n-bytes (ash header-n-words sb!vm:word-shift)) (result (+ offset-from-tail-of-header header-n-bytes))) result)) @@ -1540,72 +1575,52 @@ offset-within-code-object)) (gspace-byte-address (gspace-byte-address (descriptor-gspace code-object)))) - (ecase sb!c:*backend-fasl-file-implementation* - ;; Classic CMU CL supported these, and I haven't gone out of my way - ;; to break them, but I have no way of testing them.. -- WHN 19990817 - #| - (#.sb!c:pmax-fasl-file-implementation - (ecase kind - (:jump - (assert (zerop (ash value -28))) - (setf (ldb (byte 26 0) (sap-ref-32 sap 0)) - (ash value -2))) - (:lui - (setf (sap-ref-16 sap 0) - (+ (ash value -16) - (if (logbitp 15 value) 1 0)))) - (:addi - (setf (sap-ref-16 sap 0) - (ldb (byte 16 0) value))))) - (#.sb!c:sparc-fasl-file-implementation - (let ((inst (maybe-byte-swap (sap-ref-32 sap 0)))) + (ecase +backend-fasl-file-implementation+ + ;; See CMU CL source for other formerly-supported architectures + ;; (and note that you have to rewrite them to use VECTOR-REF + ;; unstead of SAP-REF). + (:alpha (ecase kind - (:call - (error "Can't deal with call fixups yet.")) - (:sethi - (setf inst - (dpb (ldb (byte 22 10) value) - (byte 22 0) - inst))) - (:add - (setf inst - (dpb (ldb (byte 10 0) value) - (byte 10 0) - inst)))) - (setf (sap-ref-32 sap 0) - (maybe-byte-swap inst)))) - ((#.sb!c:rt-fasl-file-implementation - #.sb!c:rt-afpa-fasl-file-implementation) - (ecase kind - (:cal - (setf (sap-ref-16 sap 2) - (maybe-byte-swap-short - (ldb (byte 16 0) value)))) - (:cau - (let ((high (ldb (byte 16 16) value))) - (setf (sap-ref-16 sap 2) - (maybe-byte-swap-short - (if (logbitp 15 value) (1+ high) high))))) - (:ba - (unless (zerop (ash value -24)) - (warn "#X~8,'0X out of range for branch-absolute." value)) - (let ((inst (maybe-byte-swap-short (sap-ref-16 sap 0)))) + (:jmp-hint + (assert (zerop (ldb (byte 2 0) value))) + #+nil ;; was commented out in cmucl source too. Don't know what + ;; it does -dan 2001.05.03 (setf (sap-ref-16 sap 0) - (maybe-byte-swap-short - (dpb (ldb (byte 8 16) value) - (byte 8 0) - inst)))) - (setf (sap-ref-16 sap 2) - (maybe-byte-swap-short (ldb (byte 16 0) value)))))) - |# + (logior (sap-ref-16 sap 0) (ldb (byte 14 0) (ash value -2))))) + (:bits-63-48 + (let* ((value (if (logbitp 15 value) (+ value (ash 1 16)) value)) + (value (if (logbitp 31 value) (+ value (ash 1 32)) value)) + (value (if (logbitp 47 value) (+ value (ash 1 48)) value))) + (setf (byte-vector-ref-8 gspace-bytes gspace-byte-offset) + (ldb (byte 8 48) value) + (byte-vector-ref-8 gspace-bytes (1+ gspace-byte-offset)) + (ldb (byte 8 56) value)))) + (:bits-47-32 + (let* ((value (if (logbitp 15 value) (+ value (ash 1 16)) value)) + (value (if (logbitp 31 value) (+ value (ash 1 32)) value))) + (setf (byte-vector-ref-8 gspace-bytes gspace-byte-offset) + (ldb (byte 8 32) value) + (byte-vector-ref-8 gspace-bytes (1+ gspace-byte-offset)) + (ldb (byte 8 40) value)))) + (:ldah + (let ((value (if (logbitp 15 value) (+ value (ash 1 16)) value))) + (setf (byte-vector-ref-8 gspace-bytes gspace-byte-offset) + (ldb (byte 8 16) value) + (byte-vector-ref-8 gspace-bytes (1+ gspace-byte-offset)) + (ldb (byte 8 24) value)))) + (:lda + (setf (byte-vector-ref-8 gspace-bytes gspace-byte-offset) + (ldb (byte 8 0) value) + (byte-vector-ref-8 gspace-bytes (1+ gspace-byte-offset)) + (ldb (byte 8 8) value))))) (:x86 (let* ((un-fixed-up (byte-vector-ref-32 gspace-bytes gspace-byte-offset)) (code-object-start-addr (logandc2 (descriptor-bits code-object) sb!vm:lowtag-mask))) - (assert (= code-object-start-addr - (+ gspace-byte-address - (descriptor-byte-offset code-object)))) + (assert (= code-object-start-addr + (+ gspace-byte-address + (descriptor-byte-offset code-object)))) (ecase kind (:absolute (let ((fixed-up (+ value un-fixed-up))) @@ -1639,75 +1654,7 @@ (note-load-time-code-fixup code-object after-header value - kind)))))) - ;; CMU CL supported these, and I haven't gone out of my way to break - ;; them, but I have no way of testing them.. -- WHN 19990817 - #| - (#.sb!c:hppa-fasl-file-implementation - (let ((inst (maybe-byte-swap (sap-ref-32 sap 0)))) - (setf (sap-ref-32 sap 0) - (maybe-byte-swap - (ecase kind - (:load - (logior (ash (ldb (byte 11 0) value) 1) - (logand inst #xffffc000))) - (:load-short - (let ((low-bits (ldb (byte 11 0) value))) - (assert (<= 0 low-bits (1- (ash 1 4)))) - (logior (ash low-bits 17) - (logand inst #xffe0ffff)))) - (:hi - (logior (ash (ldb (byte 5 13) value) 16) - (ash (ldb (byte 2 18) value) 14) - (ash (ldb (byte 2 11) value) 12) - (ash (ldb (byte 11 20) value) 1) - (ldb (byte 1 31) value) - (logand inst #xffe00000))) - (:branch - (let ((bits (ldb (byte 9 2) value))) - (assert (zerop (ldb (byte 2 0) value))) - (logior (ash bits 3) - (logand inst #xffe0e002))))))))) - (#.sb!c:alpha-fasl-file-implementation - (ecase kind - (:jmp-hint - (assert (zerop (ldb (byte 2 0) value))) - #+nil - (setf (sap-ref-16 sap 0) - (logior (sap-ref-16 sap 0) (ldb (byte 14 0) (ash value -2))))) - (:bits-63-48 - (let* ((value (if (logbitp 15 value) (+ value (ash 1 16)) value)) - (value (if (logbitp 31 value) (+ value (ash 1 32)) value)) - (value (if (logbitp 47 value) (+ value (ash 1 48)) value))) - (setf (sap-ref-8 sap 0) (ldb (byte 8 48) value)) - (setf (sap-ref-8 sap 1) (ldb (byte 8 56) value)))) - (:bits-47-32 - (let* ((value (if (logbitp 15 value) (+ value (ash 1 16)) value)) - (value (if (logbitp 31 value) (+ value (ash 1 32)) value))) - (setf (sap-ref-8 sap 0) (ldb (byte 8 32) value)) - (setf (sap-ref-8 sap 1) (ldb (byte 8 40) value)))) - (:ldah - (let ((value (if (logbitp 15 value) (+ value (ash 1 16)) value))) - (setf (sap-ref-8 sap 0) (ldb (byte 8 16) value)) - (setf (sap-ref-8 sap 1) (ldb (byte 8 24) value)))) - (:lda - (setf (sap-ref-8 sap 0) (ldb (byte 8 0) value)) - (setf (sap-ref-8 sap 1) (ldb (byte 8 8) value))))) - (#.sb!c:sgi-fasl-file-implementation - (ecase kind - (:jump - (assert (zerop (ash value -28))) - (setf (ldb (byte 26 0) (sap-ref-32 sap 0)) - (ash value -2))) - (:lui - (setf (sap-ref-16 sap 2) - (+ (ash value -16) - (if (logbitp 15 value) 1 0)))) - (:addi - (setf (sap-ref-16 sap 2) - (ldb (byte 16 0) value))))) - |# - )) + kind)))))) )) (values)) (defun resolve-assembler-fixups () @@ -1717,12 +1664,16 @@ (when value (do-cold-fixup (second fixup) (third fixup) value (fourth fixup)))))) +;;; *COLD-FOREIGN-SYMBOL-TABLE* becomes *!INITIAL-FOREIGN-SYMBOLS* in +;;; the core. When the core is loaded, !LOADER-COLD-INIT uses this to +;;; create *STATIC-FOREIGN-SYMBOLS*, which the code in +;;; target-load.lisp refers to. (defun linkage-info-to-core () (let ((result *nil-descriptor*)) - (maphash #'(lambda (symbol value) - (cold-push (cold-cons (string-to-core symbol) - (number-to-core value)) - result)) + (maphash (lambda (symbol value) + (cold-push (cold-cons (string-to-core symbol) + (number-to-core value)) + result)) *cold-foreign-symbol-table*) (cold-set (cold-intern '*!initial-foreign-symbols*) result)) (let ((result *nil-descriptor*)) @@ -1734,22 +1685,26 @@ ;;;; general machinery for cold-loading FASL files -(defvar *cold-fop-functions* (replace (make-array 256) *fop-functions*) - #!+sb-doc - "FOP functions for cold loading") +;;; FOP functions for cold loading +(defvar *cold-fop-functions* + ;; We start out with a copy of the ordinary *FOP-FUNCTIONS*. The + ;; ones which aren't appropriate for cold load will be destructively + ;; modified. + (copy-seq *fop-functions*)) (defvar *normal-fop-functions*) -;;; This is like DEFINE-FOP which defines fops for warm load, but unlike -;;; DEFINE-FOP, this version -;;; (1) looks up the code for this name (created by a previous DEFINE-FOP) -;;; instead of creating a code, and -;;; (2) stores its definition in the *COLD-FOP-FUNCTIONS* vector, instead -;;; of storing in the *FOP-FUNCTIONS* vector. +;;; Cause a fop to have a special definition for cold load. +;;; +;;; This is similar to DEFINE-FOP, but unlike DEFINE-FOP, this version +;;; (1) looks up the code for this name (created by a previous +;; DEFINE-FOP) instead of creating a code, and +;;; (2) stores its definition in the *COLD-FOP-FUNCTIONS* vector, +;;; instead of storing in the *FOP-FUNCTIONS* vector. (defmacro define-cold-fop ((name &optional (pushp t)) &rest forms) - (check-type pushp (member nil t :nope)) + (aver (member pushp '(nil t :nope))) (let ((code (get name 'fop-code)) - (fname (concat-pnames 'cold- name))) + (fname (symbolicate "COLD-" name))) (unless code (error "~S is not a defined FOP." name)) `(progn @@ -1760,7 +1715,7 @@ (setf (svref *cold-fop-functions* ,code) #',fname)))) (defmacro clone-cold-fop ((name &optional (pushp t)) (small-name) &rest forms) - (check-type pushp (member nil t :nope)) + (aver (member pushp '(nil t :nope))) `(progn (macrolet ((clone-arg () '(read-arg 4))) (define-cold-fop (,name ,pushp) ,@forms)) @@ -1772,8 +1727,9 @@ `(define-cold-fop (,name) (error "The fop ~S is not supported in cold load." ',name))) -;;; COLD-LOAD loads stuff into the core image being built by calling FASLOAD -;;; with the fop function table rebound to a table of cold loading functions. +;;; COLD-LOAD loads stuff into the core image being built by calling +;;; LOAD-AS-FASL with the fop function table rebound to a table of cold +;;; loading functions. (defun cold-load (filename) #!+sb-doc "Load the file named by FILENAME into the cold load image being built." @@ -1783,7 +1739,7 @@ (string filename) (pathname (namestring filename))))) (with-open-file (s filename :element-type '(unsigned-byte 8)) - (fasload s nil nil)))) + (load-as-fasl s nil nil)))) ;;;; miscellaneous cold fops @@ -1811,10 +1767,9 @@ (let* ((size (clone-arg)) (result (allocate-boxed-object *dynamic* (1+ size) - sb!vm:instance-pointer-type))) + sb!vm:instance-pointer-lowtag))) (write-memory result (make-other-immediate-descriptor - size - sb!vm:instance-header-type)) + size sb!vm:instance-header-widetag)) (do ((index (1- size) (1- index))) ((minusp index)) (declare (fixnum index)) @@ -1848,7 +1803,7 @@ (declare (type index old-length)) (declare (type fixnum old-depthoid)) (declare (type list old-inherits-list)) - (assert (eq name old-name)) + (aver (eq name old-name)) (let ((length (descriptor-fixnum length-des)) (inherits-list (listify-cold-inherits cold-inherits)) (depthoid (descriptor-fixnum depthoid-des))) @@ -1878,11 +1833,11 @@ ;;;; cold fops for loading symbols -;;; Load a symbol SIZE characters long from *FASL-FILE* and intern -;;; that symbol in PACKAGE. +;;; Load a symbol SIZE characters long from *FASL-INPUT-STREAM* and +;;; intern that symbol in PACKAGE. (defun cold-load-symbol (size package) (let ((string (make-string size))) - (read-string-as-bytes *fasl-file* string) + (read-string-as-bytes *fasl-input-stream* string) (cold-intern (intern string package) package))) (macrolet ((frob (name pname-len package-len) @@ -1908,9 +1863,9 @@ (fop-uninterned-small-symbol-save) (let* ((size (clone-arg)) (name (make-string size))) - (read-string-as-bytes *fasl-file* name) - (let ((symbol (allocate-symbol name))) - (push-fop-table symbol)))) + (read-string-as-bytes *fasl-input-stream* name) + (let ((symbol-des (allocate-symbol name))) + (push-fop-table symbol-des)))) ;;;; cold fops for loading lists @@ -1965,16 +1920,16 @@ (fop-small-string) (let* ((len (clone-arg)) (string (make-string len))) - (read-string-as-bytes *fasl-file* string) + (read-string-as-bytes *fasl-input-stream* string) (string-to-core string))) (clone-cold-fop (fop-vector) (fop-small-vector) (let* ((size (clone-arg)) (result (allocate-vector-object *dynamic* - sb!vm:word-bits + sb!vm:n-word-bits size - sb!vm:simple-vector-type))) + sb!vm:simple-vector-widetag))) (do ((index (1- size) (1- index))) ((minusp index)) (declare (fixnum index)) @@ -1987,12 +1942,12 @@ (let* ((len (read-arg 4)) (sizebits (read-arg 1)) (type (case sizebits - (1 sb!vm:simple-bit-vector-type) - (2 sb!vm:simple-array-unsigned-byte-2-type) - (4 sb!vm:simple-array-unsigned-byte-4-type) - (8 sb!vm:simple-array-unsigned-byte-8-type) - (16 sb!vm:simple-array-unsigned-byte-16-type) - (32 sb!vm:simple-array-unsigned-byte-32-type) + (1 sb!vm:simple-bit-vector-widetag) + (2 sb!vm:simple-array-unsigned-byte-2-widetag) + (4 sb!vm:simple-array-unsigned-byte-4-widetag) + (8 sb!vm:simple-array-unsigned-byte-8-widetag) + (16 sb!vm:simple-array-unsigned-byte-16-widetag) + (32 sb!vm:simple-array-unsigned-byte-32-widetag) (t (error "losing element size: ~D" sizebits)))) (result (allocate-vector-object *dynamic* sizebits len type)) (start (+ (descriptor-byte-offset result) @@ -2001,22 +1956,23 @@ (ceiling (* len sizebits) sb!vm:byte-bits)))) (read-sequence-or-die (descriptor-bytes result) - *fasl-file* + *fasl-input-stream* :start start :end end) result)) (define-cold-fop (fop-single-float-vector) (let* ((len (read-arg 4)) - (result (allocate-vector-object *dynamic* - sb!vm:word-bits - len - sb!vm:simple-array-single-float-type)) + (result (allocate-vector-object + *dynamic* + sb!vm:n-word-bits + len + sb!vm:simple-array-single-float-widetag)) (start (+ (descriptor-byte-offset result) (ash sb!vm:vector-data-offset sb!vm:word-shift))) (end (+ start (* len sb!vm:word-bytes)))) (read-sequence-or-die (descriptor-bytes result) - *fasl-file* + *fasl-input-stream* :start start :end end) result)) @@ -2032,10 +1988,10 @@ (data-vector (pop-stack)) (result (allocate-boxed-object *dynamic* (+ sb!vm:array-dimensions-offset rank) - sb!vm:other-pointer-type))) + sb!vm:other-pointer-lowtag))) (write-memory result (make-other-immediate-descriptor rank - sb!vm:simple-array-type)) + sb!vm:simple-array-widetag)) (write-wordindexed result sb!vm:array-fill-pointer-slot *nil-descriptor*) (write-wordindexed result sb!vm:array-data-slot data-vector) (write-wordindexed result sb!vm:array-displacement-slot *nil-descriptor*) @@ -2043,15 +1999,16 @@ (let ((total-elements 1)) (dotimes (axis rank) (let ((dim (pop-stack))) - (unless (or (= (descriptor-lowtag dim) sb!vm:even-fixnum-type) - (= (descriptor-lowtag dim) sb!vm:odd-fixnum-type)) + (unless (or (= (descriptor-lowtag dim) sb!vm:even-fixnum-lowtag) + (= (descriptor-lowtag dim) sb!vm:odd-fixnum-lowtag)) (error "non-fixnum dimension? (~S)" dim)) (setf total-elements (* total-elements (logior (ash (descriptor-high dim) - (- descriptor-low-bits (1- sb!vm:lowtag-bits))) + (- descriptor-low-bits + (1- sb!vm:n-lowtag-bits))) (ash (descriptor-low dim) - (- 1 sb!vm:lowtag-bits))))) + (- 1 sb!vm:n-lowtag-bits))))) (write-wordindexed result (+ sb!vm:array-dimensions-offset axis) dim))) @@ -2084,12 +2041,12 @@ #!+long-float (define-cold-fop (fop-long-float) - (ecase sb!c:*backend-fasl-file-implementation* - (:x86 ; 80 bit long-float format - (prepare-for-fast-read-byte *fasl-file* - (let* ((des (allocate-unboxed-object *dynamic* sb!vm:word-bits + (ecase +backend-fasl-file-implementation+ + (:x86 ; (which has 80-bit long-float format) + (prepare-for-fast-read-byte *fasl-input-stream* + (let* ((des (allocate-unboxed-object *dynamic* sb!vm:n-word-bits (1- sb!vm:long-float-size) - sb!vm:long-float-type)) + sb!vm:long-float-widetag)) (low-bits (make-random-descriptor (fast-read-u-integer 4))) (high-bits (make-random-descriptor (fast-read-u-integer 4))) (exp-bits (make-random-descriptor (fast-read-s-integer 2)))) @@ -2102,10 +2059,10 @@ ;; SBCL. #+nil (#.sb!c:sparc-fasl-file-implementation ; 128 bit long-float format - (prepare-for-fast-read-byte *fasl-file* - (let* ((des (allocate-unboxed-object *dynamic* sb!vm:word-bits + (prepare-for-fast-read-byte *fasl-input-stream* + (let* ((des (allocate-unboxed-object *dynamic* sb!vm:n-word-bits (1- sb!vm:long-float-size) - sb!vm:long-float-type)) + sb!vm:long-float-widetag)) (low-bits (make-random-descriptor (fast-read-u-integer 4))) (mid-bits (make-random-descriptor (fast-read-u-integer 4))) (high-bits (make-random-descriptor (fast-read-u-integer 4))) @@ -2119,12 +2076,12 @@ #!+long-float (define-cold-fop (fop-complex-long-float) - (ecase sb!c:*backend-fasl-file-implementation* - (:x86 ; 80 bit long-float format - (prepare-for-fast-read-byte *fasl-file* - (let* ((des (allocate-unboxed-object *dynamic* sb!vm:word-bits + (ecase +backend-fasl-file-implementation+ + (:x86 ; (which has 80-bit long-float format) + (prepare-for-fast-read-byte *fasl-input-stream* + (let* ((des (allocate-unboxed-object *dynamic* sb!vm:n-word-bits (1- sb!vm:complex-long-float-size) - sb!vm:complex-long-float-type)) + sb!vm:complex-long-float-widetag)) (real-low-bits (make-random-descriptor (fast-read-u-integer 4))) (real-high-bits (make-random-descriptor (fast-read-u-integer 4))) (real-exp-bits (make-random-descriptor (fast-read-s-integer 2))) @@ -2154,10 +2111,10 @@ ;; This was supported in CMU CL, but isn't currently supported in SBCL. #+nil (#.sb!c:sparc-fasl-file-implementation ; 128 bit long-float format - (prepare-for-fast-read-byte *fasl-file* - (let* ((des (allocate-unboxed-object *dynamic* sb!vm:word-bits + (prepare-for-fast-read-byte *fasl-input-stream* + (let* ((des (allocate-unboxed-object *dynamic* sb!vm:n-word-bits (1- sb!vm:complex-long-float-size) - sb!vm:complex-long-float-type)) + sb!vm:complex-long-float-widetag)) (real-low-bits (make-random-descriptor (fast-read-u-integer 4))) (real-mid-bits (make-random-descriptor (fast-read-u-integer 4))) (real-high-bits (make-random-descriptor (fast-read-u-integer 4))) @@ -2195,11 +2152,11 @@ (define-cold-fop (fop-ratio) (let ((den (pop-stack))) - (number-pair-to-core (pop-stack) den sb!vm:ratio-type))) + (number-pair-to-core (pop-stack) den sb!vm:ratio-widetag))) (define-cold-fop (fop-complex) (let ((im (pop-stack))) - (number-pair-to-core (pop-stack) im sb!vm:complex-type))) + (number-pair-to-core (pop-stack) im sb!vm:complex-widetag))) ;;;; cold fops for calling (or not calling) @@ -2224,11 +2181,11 @@ (make-descriptor 0 0 nil counter))) (defun finalize-load-time-value-noise () - (cold-set (cold-intern 'sb!impl::*!load-time-values*) + (cold-set (cold-intern '*!load-time-values*) (allocate-vector-object *dynamic* - sb!vm:word-bits + sb!vm:n-word-bits *load-time-value-counter* - sb!vm:simple-vector-type))) + sb!vm:simple-vector-widetag))) (define-cold-fop (fop-funcall-for-effect nil) (if (= (read-arg 1) 0) @@ -2254,8 +2211,8 @@ (write-wordindexed obj (+ idx (ecase (descriptor-lowtag obj) - (#.sb!vm:instance-pointer-type 1) - (#.sb!vm:other-pointer-type 2))) + (#.sb!vm:instance-pointer-lowtag 1) + (#.sb!vm:other-pointer-lowtag 2))) (pop-stack)))) (define-cold-fop (fop-structset nil) @@ -2273,10 +2230,22 @@ ;;;; cold fops for loading code objects and functions +;;; the names of things which have had COLD-FSET used on them already +;;; (used to make sure that we don't try to statically link a name to +;;; more than one definition) +(defparameter *cold-fset-warm-names* + ;; This can't be an EQL hash table because names can be conses, e.g. + ;; (SETF CAR). + (make-hash-table :test 'equal)) + (define-cold-fop (fop-fset nil) - (let ((fn (pop-stack)) - (name (pop-stack))) - (cold-fset name fn))) + (let* ((fn (pop-stack)) + (cold-name (pop-stack)) + (warm-name (warm-fun-name cold-name))) + (if (gethash warm-name *cold-fset-warm-names*) + (error "duplicate COLD-FSET for ~S" warm-name) + (setf (gethash warm-name *cold-fset-warm-names*) t)) + (static-fset cold-name fn))) (define-cold-fop (fop-fdefinition) (cold-fdefinition-object (pop-stack))) @@ -2284,8 +2253,6 @@ (define-cold-fop (fop-sanctify-for-execution) (pop-stack)) -(not-cold-fop fop-make-byte-compiled-function) - ;;; Setting this variable shows what code looks like before any ;;; fixups (or function headers) are applied. #!+sb-show (defvar *show-pre-fixup-code-p* nil) @@ -2304,17 +2271,14 @@ ;; Note: we round the number of constants up to ensure ;; that the code vector will be properly aligned. (round-up raw-header-n-words 2)) - (des (allocate-descriptor - ;; In the X86 with CGC, code can't be relocated, so - ;; we have to put it into static space. In all other - ;; configurations, code can go into dynamic space. - #!+(and x86 cgc) *static* ; KLUDGE: Why? -- WHN 19990907 - #!-(and x86 cgc) *dynamic* - (+ (ash header-n-words sb!vm:word-shift) code-size) - sb!vm:other-pointer-type))) + (des (allocate-cold-descriptor *dynamic* + (+ (ash header-n-words + sb!vm:word-shift) + code-size) + sb!vm:other-pointer-lowtag))) (write-memory des - (make-other-immediate-descriptor header-n-words - sb!vm:code-header-type)) + (make-other-immediate-descriptor + header-n-words sb!vm:code-header-widetag)) (write-wordindexed des sb!vm:code-code-size-slot (make-fixnum-descriptor @@ -2333,7 +2297,7 @@ (ash header-n-words sb!vm:word-shift))) (end (+ start code-size))) (read-sequence-or-die (descriptor-bytes des) - *fasl-file* + *fasl-input-stream* :start start :end end) #!+sb-show @@ -2369,18 +2333,18 @@ (offset (calc-offset code-object (read-arg 4))) (fn (descriptor-beyond code-object offset - sb!vm:function-pointer-type)) + sb!vm:fun-pointer-lowtag)) (next (read-wordindexed code-object sb!vm:code-entry-points-slot))) (unless (zerop (logand offset sb!vm:lowtag-mask)) ;; FIXME: This should probably become a fatal error. (warn "unaligned function entry: ~S at #X~X" name offset)) (write-wordindexed code-object sb!vm:code-entry-points-slot fn) (write-memory fn - (make-other-immediate-descriptor (ash offset - (- sb!vm:word-shift)) - sb!vm:function-header-type)) + (make-other-immediate-descriptor + (ash offset (- sb!vm:word-shift)) + sb!vm:simple-fun-header-widetag)) (write-wordindexed fn - sb!vm:function-self-slot + sb!vm:simple-fun-self-slot ;; KLUDGE: Wiring decisions like this in at ;; this level ("if it's an x86") instead of a ;; higher level of abstraction ("if it has such @@ -2411,15 +2375,16 @@ ;; -- WHN 19990907 (make-random-descriptor (+ (descriptor-bits fn) - (- (ash sb!vm:function-code-offset sb!vm:word-shift) + (- (ash sb!vm:simple-fun-code-offset + sb!vm:word-shift) ;; FIXME: We should mask out the type ;; bits, not assume we know what they ;; are and subtract them out this way. - sb!vm:function-pointer-type)))) - (write-wordindexed fn sb!vm:function-next-slot next) - (write-wordindexed fn sb!vm:function-name-slot name) - (write-wordindexed fn sb!vm:function-arglist-slot arglist) - (write-wordindexed fn sb!vm:function-type-slot type) + sb!vm:fun-pointer-lowtag)))) + (write-wordindexed fn sb!vm:simple-fun-next-slot next) + (write-wordindexed fn sb!vm:simple-fun-name-slot name) + (write-wordindexed fn sb!vm:simple-fun-arglist-slot arglist) + (write-wordindexed fn sb!vm:simple-fun-type-slot type) fn)) (define-cold-fop (fop-foreign-fixup) @@ -2427,9 +2392,9 @@ (code-object (pop-stack)) (len (read-arg 1)) (sym (make-string len))) - (read-string-as-bytes *fasl-file* sym) + (read-string-as-bytes *fasl-input-stream* sym) (let ((offset (read-arg 4)) - (value (lookup-foreign-symbol sym))) + (value (cold-foreign-symbol-address-as-integer sym))) (do-cold-fixup code-object offset value kind)) code-object)) @@ -2439,13 +2404,14 @@ ;; Note: we round the number of constants up to ensure that ;; the code vector will be properly aligned. (round-up sb!vm:code-constants-offset 2)) - (des (allocate-descriptor *read-only* - (+ (ash header-n-words sb!vm:word-shift) - length) - sb!vm:other-pointer-type))) + (des (allocate-cold-descriptor *read-only* + (+ (ash header-n-words + sb!vm:word-shift) + length) + sb!vm:other-pointer-lowtag))) (write-memory des - (make-other-immediate-descriptor header-n-words - sb!vm:code-header-type)) + (make-other-immediate-descriptor + header-n-words sb!vm:code-header-widetag)) (write-wordindexed des sb!vm:code-code-size-slot (make-fixnum-descriptor @@ -2458,7 +2424,7 @@ (ash header-n-words sb!vm:word-shift))) (end (+ start length))) (read-sequence-or-die (descriptor-bytes des) - *fasl-file* + *fasl-input-stream* :start start :end end)) des)) @@ -2490,19 +2456,16 @@ ;;;; emitting C header file -(defun tail-comp (string tail) +(defun tailwise-equal (string tail) (and (>= (length string) (length tail)) (string= string tail :start1 (- (length string) (length tail))))) -(defun head-comp (string head) - (and (>= (length string) (length head)) - (string= string head :end1 (length head)))) - (defun write-c-header () + ;; writing beginning boilerplate (format t "/*~%") (dolist (line - '("This is a machine-generated file. Do not edit it by hand." + '("This is a machine-generated file. Please do not edit it by hand." "" "This file contains low-level information about the" "internals of a particular version and configuration" @@ -2514,17 +2477,25 @@ (format t " * ~A~%" line)) (format t " */~%") (terpri) - (format t "#ifndef _SBCL_H_~%#define _SBCL_H_~%") (terpri) + ;; propagating *SHEBANG-FEATURES* into C-level #define's + (dolist (shebang-feature-name (sort (mapcar #'symbol-name + sb-cold:*shebang-features*) + #'string<)) + (format t + "#define LISP_FEATURE_~A~%" + (substitute #\_ #\- shebang-feature-name))) + (terpri) + + ;; writing miscellaneous constants (format t "#define SBCL_CORE_VERSION_INTEGER ~D~%" sbcl-core-version-integer) (format t "#define SBCL_VERSION_STRING ~S~%" (sb!xc:lisp-implementation-version)) (format t "#define CORE_MAGIC 0x~X~%" core-magic) (terpri) - ;; FIXME: Other things from core.h should be defined here too: ;; #define CORE_END 3840 ;; #define CORE_NDIRECTORY 3861 @@ -2537,38 +2508,52 @@ ;; #define STATIC_SPACE_ID (2) ;; #define READ_ONLY_SPACE_ID (3) + ;; writing entire families of named constants from SB!VM (let ((constants nil)) (do-external-symbols (symbol (find-package "SB!VM")) (when (constantp symbol) (let ((name (symbol-name symbol))) - (labels - ((record (prefix string priority) - (push (list (concatenate - 'simple-string - prefix - (delete #\- (string-capitalize string))) - priority - (symbol-value symbol) - (fdocumentation symbol 'variable)) - constants)) - (test-tail (tail prefix priority) - (when (tail-comp name tail) - (record prefix - (subseq name 0 - (- (length name) - (length tail))) - priority))) - (test-head (head prefix priority) - (when (head-comp name head) - (record prefix - (subseq name (length head)) - priority)))) - (test-tail "-TYPE" "type_" 0) - (test-tail "-FLAG" "flag_" 1) - (test-tail "-TRAP" "trap_" 2) - (test-tail "-SUBTYPE" "subtype_" 3) - (test-head "TRACE-TABLE-" "tracetab_" 4) - (test-tail "-SC-NUMBER" "sc_" 5))))) + (labels (;; shared machinery + (record (string priority) + (push (list string + priority + (symbol-value symbol) + (documentation symbol 'variable)) + constants)) + ;; machinery for old-style CMU CL Lisp-to-C + ;; arbitrary renaming, being phased out in favor of + ;; the newer systematic RECORD-WITH-TRANSLATED-NAME + ;; renaming + (record-with-munged-name (prefix string priority) + (record (concatenate + 'simple-string + prefix + (delete #\- (string-capitalize string))) + priority)) + (maybe-record-with-munged-name (tail prefix priority) + (when (tailwise-equal name tail) + (record-with-munged-name prefix + (subseq name 0 + (- (length name) + (length tail))) + priority))) + ;; machinery for new-style SBCL Lisp-to-C naming + (record-with-translated-name (priority) + (record (substitute #\_ #\- name) + priority)) + (maybe-record-with-translated-name (suffixes priority) + (when (some (lambda (suffix) + (tailwise-equal name suffix)) + suffixes) + (record-with-translated-name priority)))) + + (maybe-record-with-translated-name '("-LOWTAG") 0) + (maybe-record-with-translated-name '("-WIDETAG") 1) + (maybe-record-with-munged-name "-FLAG" "flag_" 2) + (maybe-record-with-munged-name "-TRAP" "trap_" 3) + (maybe-record-with-munged-name "-SUBTYPE" "subtype_" 4) + (maybe-record-with-munged-name "-SC-NUMBER" "sc_" 5) + (maybe-record-with-translated-name '("-START" "-END") 6))))) (setf constants (sort constants #'(lambda (const1 const2) @@ -2577,23 +2562,50 @@ (< (second const1) (second const2)))))) (let ((prev-priority (second (car constants)))) (dolist (const constants) - (unless (= prev-priority (second const)) - (terpri) - (setf prev-priority (second const))) - (format t - "#define ~A ~D /* 0x~X */~@[ /* ~A */~]~%" - (first const) - (third const) - (third const) - (fourth const)))) - (terpri) - (format t "#define ERRORS { \\~%") - ;; FIXME: Is this just DO-VECTOR? - (let ((internal-errors sb!c:*backend-internal-errors*)) - (dotimes (i (length internal-errors)) - (format t " ~S, /*~D*/ \\~%" (cdr (aref internal-errors i)) i))) - (format t " NULL \\~%}~%") + (destructuring-bind (name priority value doc) const + (unless (= prev-priority priority) + (terpri) + (setf prev-priority priority)) + (format t "#define ~A " name) + (format t + ;; KLUDGE: As of sbcl-0.6.7.14, we're dumping two + ;; different kinds of values here, (1) small codes + ;; and (2) machine addresses. The small codes can be + ;; dumped as bare integer values. The large machine + ;; addresses might cause problems if they're large + ;; and represented as (signed) C integers, so we + ;; want to force them to be unsigned. We do that by + ;; wrapping them in the LISPOBJ macro. (We could do + ;; it with a bare "(unsigned)" cast, except that + ;; this header file is used not only in C files, but + ;; also in assembly files, which don't understand + ;; the cast syntax. The LISPOBJ macro goes away in + ;; assembly files, but that shouldn't matter because + ;; we don't do arithmetic on address constants in + ;; assembly files. See? It really is a kludge..) -- + ;; WHN 2000-10-18 + (let (;; cutoff for treatment as a small code + (cutoff (expt 2 16))) + (cond ((minusp value) + (error "stub: negative values unsupported")) + ((< value cutoff) + "~D") + (t + "LISPOBJ(~D)"))) + value) + (format t " /* 0x~X */~@[ /* ~A */~]~%" value doc)))) (terpri)) + + ;; writing codes/strings for internal errors + (format t "#define ERRORS { \\~%") + ;; FIXME: Is this just DOVECTOR? + (let ((internal-errors sb!c:*backend-internal-errors*)) + (dotimes (i (length internal-errors)) + (format t " ~S, /*~D*/ \\~%" (cdr (aref internal-errors i)) i))) + (format t " NULL \\~%}~%") + (terpri) + + ;; writing primitive object layouts (let ((structs (sort (copy-list sb!vm:*primitive-objects*) #'string< :key #'(lambda (obj) (symbol-name @@ -2605,7 +2617,7 @@ "struct ~A {~%" (nsubstitute #\_ #\- (string-downcase (string (sb!vm:primitive-object-name obj))))) - (when (sb!vm:primitive-object-header obj) + (when (sb!vm:primitive-object-widetag obj) (format t " lispobj header;~%")) (dolist (slot (sb!vm:primitive-object-slots obj)) (format t " ~A ~A~@[[1]~];~%" @@ -2627,6 +2639,8 @@ (- (* (sb!vm:slot-offset slot) sb!vm:word-bytes) lowtag))) (terpri)))) (format t "#endif /* LANGUAGE_ASSEMBLY */~2%")) + + ;; writing static symbol offsets (dolist (symbol (cons nil sb!vm:*static-symbols*)) ;; FIXME: It would be nice to use longer names NIL and (particularly) T ;; in #define statements. @@ -2639,10 +2653,12 @@ ;; We actually ran GENESIS, use the real value. (descriptor-bits (cold-intern symbol)) ;; We didn't run GENESIS, so guess at the address. - (+ sb!vm:*static-space-start* + (+ sb!vm:static-space-start sb!vm:word-bytes - sb!vm:other-pointer-type + sb!vm:other-pointer-lowtag (if symbol (sb!vm:static-symbol-offset symbol) 0))))) + + ;; Voila. (format t "~%#endif~%")) ;;;; writing map file @@ -2662,17 +2678,18 @@ (undefs nil)) (maphash #'(lambda (name fdefn) (let ((fun (read-wordindexed fdefn - sb!vm:fdefn-function-slot))) + sb!vm:fdefn-fun-slot))) (if (= (descriptor-bits fun) (descriptor-bits *nil-descriptor*)) (push name undefs) - (let ((addr (read-wordindexed fdefn - sb!vm:fdefn-raw-addr-slot))) + (let ((addr (read-wordindexed + fdefn sb!vm:fdefn-raw-addr-slot))) (push (cons name (descriptor-bits addr)) funs))))) *cold-fdefn-objects*) (format t "~%~|~%initially defined functions:~2%") - (dolist (info (sort funs #'< :key #'cdr)) + (setf funs (sort funs #'< :key #'cdr)) + (dolist (info funs) (format t "0x~8,'0X: ~S #X~8,'0X~%" (cdr info) (car info) (- (cdr info) #x17))) (format t @@ -2687,33 +2704,30 @@ cross-compiler knew their inline definition and used that everywhere that they were called before the out-of-line definition is installed, as is fairly common for structure accessors.) initially undefined function references:~2%") - (labels ((key (name) - (etypecase name - (symbol (symbol-name name)) - ;; FIXME: should use standard SETF-function parsing logic - (list (key (second name)))))) - (dolist (name (sort undefs #'string< :key #'key)) - (format t "~S" name) - ;; FIXME: This ACCESSOR-FOR stuff should go away when the - ;; code has stabilized. (It's only here to help me - ;; categorize the flood of undefined functions caused by - ;; completely rewriting the bootstrap process. Hopefully any - ;; future maintainers will mostly have small numbers of - ;; undefined functions..) - (let ((accessor-for (info :function :accessor-for name))) - (when accessor-for - (format t " (accessor for ~S)" accessor-for))) - (format t "~%"))))) - - (format t "~%~|~%layout names:~2%") - (collect ((stuff)) - (maphash #'(lambda (name gorp) - (declare (ignore name)) - (stuff (cons (descriptor-bits (car gorp)) - (cdr gorp)))) - *cold-layouts*) - (dolist (x (sort (stuff) #'< :key #'car)) - (apply #'format t "~8,'0X: ~S[~D]~%~10T~S~%" x))) + + (setf undefs (sort undefs #'string< :key #'function-name-block-name)) + (dolist (name undefs) + (format t "~S" name) + ;; FIXME: This ACCESSOR-FOR stuff should go away when the + ;; code has stabilized. (It's only here to help me + ;; categorize the flood of undefined functions caused by + ;; completely rewriting the bootstrap process. Hopefully any + ;; future maintainers will mostly have small numbers of + ;; undefined functions..) + (let ((accessor-for (info :function :accessor-for name))) + (when accessor-for + (format t " (accessor for ~S)" accessor-for))) + (format t "~%"))) + + (format t "~%~|~%layout names:~2%") + (collect ((stuff)) + (maphash #'(lambda (name gorp) + (declare (ignore name)) + (stuff (cons (descriptor-bits (car gorp)) + (cdr gorp)))) + *cold-layouts*) + (dolist (x (sort (stuff) #'< :key #'car)) + (apply #'format t "~8,'0X: ~S[~D]~%~10T~S~%" x)))) (values)) @@ -2786,11 +2800,7 @@ initially undefined function references:~2%") (write-long *data-page*) (multiple-value-bind (floor rem) (floor (gspace-byte-address gspace) sb!c:*backend-page-size*) - ;; FIXME: Define an INSIST macro which does like ASSERT, but - ;; less expensively (ERROR, not CERROR), and which reports - ;; "internal error" on failure. Use it here and elsewhere in the - ;; system. - (assert (zerop rem)) + (aver (zerop rem)) (write-long floor)) (write-long pages) @@ -2838,7 +2848,7 @@ initially undefined function references:~2%") (let* ((cold-name (cold-intern '!cold-init)) (cold-fdefn (cold-fdefinition-object cold-name)) (initial-function (read-wordindexed cold-fdefn - sb!vm:fdefn-function-slot))) + sb!vm:fdefn-fun-slot))) (format t "~&/(DESCRIPTOR-BITS INITIAL-FUNCTION)=#X~X~%" (descriptor-bits initial-function)) @@ -2912,7 +2922,7 @@ initially undefined function references:~2%") ;; Read symbol table, if any. (when symbol-table-file-name - (load-foreign-symbol-table symbol-table-file-name)) + (load-cold-foreign-symbol-table symbol-table-file-name)) ;; Now that we've successfully read our only input file (by ;; loading the symbol table, if any), it's a good time to ensure @@ -2940,18 +2950,18 @@ initially undefined function references:~2%") (*cold-package-symbols* nil) (*read-only* (make-gspace :read-only read-only-space-id - sb!vm:*read-only-space-start*)) + sb!vm:read-only-space-start)) (*static* (make-gspace :static static-space-id - sb!vm:*static-space-start*)) + sb!vm:static-space-start)) (*dynamic* (make-gspace :dynamic dynamic-space-id - sb!vm:*dynamic-space-start*)) + sb!vm:dynamic-space-start)) (*nil-descriptor* (make-nil-descriptor)) (*current-reversed-cold-toplevels* *nil-descriptor*) (*unbound-marker* (make-other-immediate-descriptor 0 - sb!vm:unbound-marker-type)) + sb!vm:unbound-marker-widetag)) *cold-assembler-fixups* *cold-assembler-routines* #!+x86 *load-time-code-fixups*) @@ -2983,7 +2993,7 @@ initially undefined function references:~2%") ;; much. (And the old CMU CL code is still useful for making ;; sure that the appropriate keywords and internal symbols end ;; up interned in the target Lisp, which is good, e.g. in order - ;; to make keyword arguments work right and in order to make + ;; to make &KEY arguments work right and in order to make ;; BACKTRACEs into target Lisp system code be legible.) (dolist (exported-name (sb-cold:read-from-file "common-lisp-exports.lisp-expr")) @@ -3029,11 +3039,17 @@ initially undefined function references:~2%") ;; Tell the target Lisp how much stuff we've allocated. (cold-set 'sb!vm:*read-only-space-free-pointer* - (allocate-descriptor *read-only* 0 sb!vm:even-fixnum-type)) + (allocate-cold-descriptor *read-only* + 0 + sb!vm:even-fixnum-lowtag)) (cold-set 'sb!vm:*static-space-free-pointer* - (allocate-descriptor *static* 0 sb!vm:even-fixnum-type)) + (allocate-cold-descriptor *static* + 0 + sb!vm:even-fixnum-lowtag)) (cold-set 'sb!vm:*initial-dynamic-space-free-pointer* - (allocate-descriptor *dynamic* 0 sb!vm:even-fixnum-type)) + (allocate-cold-descriptor *dynamic* + 0 + sb!vm:even-fixnum-lowtag)) (/show "done setting free pointers") ;; Write results to files.