X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fgenesis.lisp;h=234871d29d69b519b1e033f839294bd04680d827;hb=89eb73c035f05ae53b1148ef8a83e1d4030b2dd8;hp=228dad2fb6cada25fffbfd2191a9da486765f3ce;hpb=6fb6e66f531dfb6140ec3e0cc8f84f6ecd1927ca;p=sbcl.git diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp index 228dad2..234871d 100644 --- a/src/compiler/generic/genesis.lisp +++ b/src/compiler/generic/genesis.lisp @@ -94,9 +94,9 @@ (bytes (make-array target-space-alignment :element-type '(unsigned-byte 8)) :type (simple-array (unsigned-byte 8) 1)) ;; the index of the next unwritten word (i.e. chunk of - ;; SB!VM:WORD-BYTES bytes) in BYTES, or equivalently the number of + ;; SB!VM:N-WORD-BYTES bytes) in BYTES, or equivalently the number of ;; words actually written in BYTES. In order to convert to an actual - ;; index into BYTES, thus must be multiplied by SB!VM:WORD-BYTES. + ;; index into BYTES, thus must be multiplied by SB!VM:N-WORD-BYTES. (free-word-index 0)) (defun gspace-byte-address (gspace) @@ -138,7 +138,7 @@ ;; 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)) + (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 @@ -156,9 +156,9 @@ (= 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) @@ -168,8 +168,8 @@ (= 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" @@ -186,7 +186,7 @@ ;;; 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:lowtag-bits))) + (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))))) @@ -194,7 +194,7 @@ ;; NEW-FREE-WORD-INDEX. (do () ((>= (length (gspace-bytes gspace)) - (* new-free-word-index sb!vm:word-bytes))) + (* new-free-word-index sb!vm:n-word-bytes))) (expand-gspace-bytes gspace)) ;; Now that GSPACE is big enough, we can meaningfully grab a chunk of it. (setf (gspace-free-word-index gspace) new-free-word-index) @@ -220,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 @@ -278,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) @@ -325,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*) @@ -380,8 +381,8 @@ (defun maybe-byte-swap (word) (declare (type (unsigned-byte 32) word)) - (aver (= sb!vm:word-bits 32)) - (aver (= sb!vm:byte-bits 8)) + (aver (= sb!vm:n-word-bits 32)) + (aver (= sb!vm:n-byte-bits 8)) (if (not *genesis-byte-order-swap-p*) word (logior (ash (ldb (byte 8 0) word) 24) @@ -391,8 +392,8 @@ (defun maybe-byte-swap-short (short) (declare (type (unsigned-byte 16) short)) - (aver (= sb!vm:word-bits 32)) - (aver (= sb!vm:byte-bits 8)) + (aver (= sb!vm:n-word-bits 32)) + (aver (= sb!vm:n-byte-bits 8)) (if (not *genesis-byte-order-swap-p*) short (logior (ash (ldb (byte 8 0) short) 8) @@ -415,16 +416,16 @@ (ldb (byte 8 ,(* i 8)) new-value))))) `(progn (defun ,name (byte-vector byte-index) - (aver (= sb!vm:word-bits 32)) - (aver (= sb!vm:byte-bits 8)) + (aver (= sb!vm:n-word-bits 32)) + (aver (= sb!vm:n-byte-bits 8)) (ecase sb!c:*backend-byte-order* (:little-endian (logior ,@ash-list)) (:big-endian (error "stub: no big-endian ports of SBCL (yet?)")))) (defun (setf ,name) (new-value byte-vector byte-index) - (aver (= sb!vm:word-bits 32)) - (aver (= sb!vm:byte-bits 8)) + (aver (= sb!vm:n-word-bits 32)) + (aver (= sb!vm:n-byte-bits 8)) (ecase sb!c:*backend-byte-order* (:little-endian (setf ,@setf-list)) @@ -520,9 +521,9 @@ "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)) + (let* ((bytes (/ (* element-bits length) sb!vm:n-byte-bits)) (des (allocate-cold-descriptor gspace - (+ bytes sb!vm:word-bytes) + (+ bytes sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))) (write-memory des (make-other-immediate-descriptor (ash bytes @@ -536,9 +537,9 @@ header word with TYPE and the length slot with LENGTH." ;; 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)) + (let* ((bytes (/ (* element-bits length) sb!vm:n-byte-bits)) (des (allocate-cold-descriptor gspace - (+ bytes (* 2 sb!vm:word-bytes)) + (+ bytes (* 2 sb!vm:n-word-bytes)) sb!vm:other-pointer-lowtag))) (write-memory des (make-other-immediate-descriptor 0 type)) (write-wordindexed des @@ -555,11 +556,11 @@ ;; extra null byte at the end to aid in call-out to C.) (let* ((length (length string)) (des (allocate-vector-object gspace - sb!vm:byte-bits + sb!vm:n-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) + (offset (+ (* sb!vm:vector-data-offset sb!vm:n-word-bytes) (descriptor-byte-offset des)))) (write-wordindexed des sb!vm:vector-length-slot @@ -581,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) @@ -604,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)) @@ -613,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* @@ -638,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)))) @@ -655,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 @@ -666,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)))) @@ -700,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 @@ -708,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)) @@ -734,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))) @@ -751,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 @@ -832,8 +833,8 @@ (1+ target-layout-length) 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 @@ -1056,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) + (* 2 sb!vm:n-word-bytes) (- 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) @@ -1351,7 +1352,7 @@ (warm-symbol cadr-des)))) (#.sb!vm:other-pointer-lowtag (warm-symbol des))))) - (unless (legal-function-name-p result) + (unless (legal-fun-name-p result) (error "not a legal function name: ~S" result)) result)) @@ -1365,7 +1366,7 @@ (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-fun-slot @@ -1382,12 +1383,12 @@ (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))) + (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:simple-fun-header-type + (#.sb!vm:simple-fun-header-widetag #!+sparc defn #!-sparc @@ -1396,7 +1397,7 @@ sb!vm:lowtag-mask) (ash sb!vm:simple-fun-code-offset sb!vm:word-shift)))) - (#.sb!vm:closure-header-type + (#.sb!vm:closure-header-widetag (make-random-descriptor (cold-foreign-symbol-address-as-integer "closure_tramp"))))) fdefn)) @@ -1407,7 +1408,7 @@ (let* ((fdefn (cold-fdefinition-object (cold-intern sym))) (offset (- (+ (- (descriptor-low fdefn) sb!vm:other-pointer-lowtag) - (* sb!vm:fdefn-raw-addr-slot sb!vm:word-bytes)) + (* sb!vm:fdefn-raw-addr-slot sb!vm:n-word-bytes)) (descriptor-low *nil-descriptor*))) (desired (sb!vm:static-function-offset sym))) (unless (= offset desired) @@ -1559,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)) @@ -1642,7 +1644,7 @@ (let ((fixed-up (- (+ value un-fixed-up) gspace-byte-address gspace-byte-offset - sb!vm:word-bytes))) ; length of CALL argument + sb!vm:n-word-bytes))) ; length of CALL argument (setf (byte-vector-ref-32 gspace-bytes gspace-byte-offset) fixed-up) ;; Note relative fixups that point outside the code @@ -1767,8 +1769,7 @@ (1+ size) 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)) @@ -1926,9 +1927,9 @@ (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)) @@ -1941,19 +1942,19 @@ (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) (ash sb!vm:vector-data-offset sb!vm:word-shift))) (end (+ start (ceiling (* len sizebits) - sb!vm:byte-bits)))) + sb!vm:n-byte-bits)))) (read-sequence-or-die (descriptor-bytes result) *fasl-input-stream* :start start @@ -1962,13 +1963,14 @@ (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)))) + (end (+ start (* len sb!vm:n-word-bytes)))) (read-sequence-or-die (descriptor-bytes result) *fasl-input-stream* :start start @@ -1989,7 +1991,7 @@ 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*) @@ -2003,9 +2005,10 @@ (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))) @@ -2041,9 +2044,9 @@ (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:word-bits + (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)))) @@ -2057,9 +2060,9 @@ #+nil (#.sb!c:sparc-fasl-file-implementation ; 128 bit long-float format (prepare-for-fast-read-byte *fasl-input-stream* - (let* ((des (allocate-unboxed-object *dynamic* sb!vm:word-bits + (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))) @@ -2076,9 +2079,9 @@ (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:word-bits + (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))) @@ -2109,9 +2112,9 @@ #+nil (#.sb!c:sparc-fasl-file-implementation ; 128 bit long-float format (prepare-for-fast-read-byte *fasl-input-stream* - (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-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))) @@ -2149,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) @@ -2180,9 +2183,9 @@ (defun finalize-load-time-value-noise () (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) @@ -2274,8 +2277,8 @@ 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 @@ -2303,7 +2306,7 @@ "~&/raw code from code-fop ~D ~D:~%" nconst code-size) - (do ((i start (+ i sb!vm:word-bytes))) + (do ((i start (+ i sb!vm:n-word-bytes))) ((>= i end)) (format *trace-output* "/#X~8,'0x: #X~8,'0x~%" @@ -2339,7 +2342,7 @@ (write-memory fn (make-other-immediate-descriptor (ash offset (- sb!vm:word-shift)) - sb!vm:simple-fun-header-type)) + sb!vm:simple-fun-header-widetag)) (write-wordindexed fn sb!vm:simple-fun-self-slot ;; KLUDGE: Wiring decisions like this in at @@ -2407,8 +2410,8 @@ 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 @@ -2545,7 +2548,7 @@ (record-with-translated-name priority)))) (maybe-record-with-translated-name '("-LOWTAG") 0) - (maybe-record-with-munged-name "-TYPE" "type_" 1) + (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) @@ -2614,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]~];~%" @@ -2633,7 +2636,7 @@ (format t "#define ~A_~A_OFFSET ~D~%" (substitute #\_ #\- (string name)) (substitute #\_ #\- (string (sb!vm:slot-name slot))) - (- (* (sb!vm:slot-offset slot) sb!vm:word-bytes) lowtag))) + (- (* (sb!vm:slot-offset slot) sb!vm:n-word-bytes) lowtag))) (terpri)))) (format t "#endif /* LANGUAGE_ASSEMBLY */~2%")) @@ -2651,7 +2654,7 @@ (descriptor-bits (cold-intern symbol)) ;; We didn't run GENESIS, so guess at the address. (+ sb!vm:static-space-start - sb!vm:word-bytes + sb!vm:n-word-bytes sb!vm:other-pointer-lowtag (if symbol (sb!vm:static-symbol-offset symbol) 0))))) @@ -2702,19 +2705,9 @@ that they were called before the out-of-line definition is installed, as is fairly common for structure accessors.) initially undefined function references:~2%") - (setf undefs (sort undefs #'string< :key #'function-name-block-name)) + (setf undefs (sort undefs #'string< :key #'fun-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 "~S~%" name))) (format t "~%~|~%layout names:~2%") (collect ((stuff)) @@ -2763,7 +2756,7 @@ initially undefined function references:~2%") (defun output-gspace (gspace) (force-output *core-file*) (let* ((posn (file-position *core-file*)) - (bytes (* (gspace-free-word-index gspace) sb!vm:word-bytes)) + (bytes (* (gspace-free-word-index gspace) sb!vm:n-word-bytes)) (pages (ceiling bytes sb!c:*backend-page-size*)) (total-bytes (* pages sb!c:*backend-page-size*))) @@ -2958,7 +2951,7 @@ initially undefined function references:~2%") (*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*)