X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fgenesis.lisp;h=cdd09417e1afbc4a18715c091ff47c047e6f7ca8;hb=acce826c593a188b231b7b7918c752bda21d0201;hp=cd5b7b09224fb90d15b488f26f94b381eaa09297;hpb=2c6b90e36a7c0377cd79625eb6c94d580f98cb93;p=sbcl.git diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp index cd5b7b0..cdd0941 100644 --- a/src/compiler/generic/genesis.lisp +++ b/src/compiler/generic/genesis.lisp @@ -12,7 +12,7 @@ ;;;; 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. +;;;; 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, @@ -30,7 +30,7 @@ ;;;; provided with absolutely no warranty. See the COPYING and CREDITS ;;;; files for more information. -(in-package "SB!IMPL") +(in-package "SB!FASL") ;;; a magic number used to identify our core files (defconstant core-magic @@ -47,29 +47,173 @@ ;;; way to do this in high level data like this (as opposed to e.g. in ;;; 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. +;;; string which is set from CVS data. (Though now as of sbcl-0.7.8 or +;;; so, we have another problem that the core incompatibility +;;; detection mechanisms are on such a hair trigger -- with even +;;; different builds from the same sources being considered +;;; incompatible -- that any coarser-grained versioning mechanisms +;;; like this are largely irrelevant as long as the hair-triggering +;;; persists.) ;;; ;;; 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) +;;; 3: added build ID to cores to discourage sbcl/.core mismatch +(defconstant sbcl-core-version-integer 3) (defun round-up (number size) #!+sb-doc "Round NUMBER up to be an integral multiple of SIZE." (* size (ceiling number size))) +;;;; implementing the concept of "vector" in (almost) portable +;;;; Common Lisp +;;;; +;;;; "If you only need to do such simple things, it doesn't really +;;;; matter which language you use." -- _ANSI Common Lisp_, p. 1, Paul +;;;; Graham (evidently not considering the abstraction "vector" to be +;;;; such a simple thing:-) + +(eval-when (:compile-toplevel :load-toplevel :execute) + (defconstant +smallvec-length+ + (expt 2 16))) + +;;; an element of a BIGVEC -- a vector small enough that we have +;;; a good chance of it being portable to other Common Lisps +(deftype smallvec () + `(simple-array (unsigned-byte 8) (,+smallvec-length+))) + +(defun make-smallvec () + (make-array +smallvec-length+ :element-type '(unsigned-byte 8))) + +;;; a big vector, implemented as a vector of SMALLVECs +;;; +;;; KLUDGE: This implementation seems portable enough for our +;;; purposes, since realistically every modern implementation is +;;; likely to support vectors of at least 2^16 elements. But if you're +;;; masochistic enough to read this far into the contortions imposed +;;; on us by ANSI and the Lisp community, for daring to use the +;;; abstraction of a large linearly addressable memory space, which is +;;; after all only directly supported by the underlying hardware of at +;;; least 99% of the general-purpose computers in use today, then you +;;; may be titillated to hear that in fact this code isn't really +;;; portable, because as of sbcl-0.7.4 we need somewhat more than +;;; 16Mbytes to represent a core, and ANSI only guarantees that +;;; ARRAY-DIMENSION-LIMIT is not less than 1024. -- WHN 2002-06-13 +(defstruct bigvec + (outer-vector (vector (make-smallvec)) :type (vector smallvec))) + +;;; analogous to SVREF, but into a BIGVEC +(defun bvref (bigvec index) + (multiple-value-bind (outer-index inner-index) + (floor index +smallvec-length+) + (aref (the smallvec + (svref (bigvec-outer-vector bigvec) outer-index)) + inner-index))) +(defun (setf bvref) (new-value bigvec index) + (multiple-value-bind (outer-index inner-index) + (floor index +smallvec-length+) + (setf (aref (the smallvec + (svref (bigvec-outer-vector bigvec) outer-index)) + inner-index) + new-value))) + +;;; analogous to LENGTH, but for a BIGVEC +;;; +;;; the length of BIGVEC, measured in the number of BVREFable bytes it +;;; can hold +(defun bvlength (bigvec) + (* (length (bigvec-outer-vector bigvec)) + +smallvec-length+)) + +;;; analogous to WRITE-SEQUENCE, but for a BIGVEC +(defun write-bigvec-as-sequence (bigvec stream &key (start 0) end) + (loop for i of-type index from start below (or end (bvlength bigvec)) do + (write-byte (bvref bigvec i) + stream))) + +;;; analogous to READ-SEQUENCE-OR-DIE, but for a BIGVEC +(defun read-bigvec-as-sequence-or-die (bigvec stream &key (start 0) end) + (loop for i of-type index from start below (or end (bvlength bigvec)) do + (setf (bvref bigvec i) + (read-byte stream)))) + +;;; Grow BIGVEC (exponentially, so that large increases in size have +;;; asymptotic logarithmic cost per byte). +(defun expand-bigvec (bigvec) + (let* ((old-outer-vector (bigvec-outer-vector bigvec)) + (length-old-outer-vector (length old-outer-vector)) + (new-outer-vector (make-array (* 2 length-old-outer-vector)))) + (dotimes (i length-old-outer-vector) + (setf (svref new-outer-vector i) + (svref old-outer-vector i))) + (loop for i from length-old-outer-vector below (length new-outer-vector) do + (setf (svref new-outer-vector i) + (make-smallvec))) + (setf (bigvec-outer-vector bigvec) + new-outer-vector)) + bigvec) + +;;;; looking up bytes and multi-byte values in a BIGVEC (considering +;;;; it as an image of machine memory) + +;;; BVREF-32 and friends. These are like SAP-REF-n, except that +;;; instead of a SAP we use a BIGVEC. +(macrolet ((make-bvref-n + (n) + (let* ((name (intern (format nil "BVREF-~A" n))) + (number-octets (/ n 8)) + (ash-list-le + (loop for i from 0 to (1- number-octets) + collect `(ash (bvref bigvec (+ byte-index ,i)) + ,(* i 8)))) + (ash-list-be + (loop for i from 0 to (1- number-octets) + collect `(ash (bvref bigvec + (+ byte-index + ,(- number-octets 1 i))) + ,(* i 8)))) + (setf-list-le + (loop for i from 0 to (1- number-octets) + append + `((bvref bigvec (+ byte-index ,i)) + (ldb (byte 8 ,(* i 8)) new-value)))) + (setf-list-be + (loop for i from 0 to (1- number-octets) + append + `((bvref bigvec (+ byte-index ,i)) + (ldb (byte 8 ,(- n 8 (* i 8))) new-value))))) + `(progn + (defun ,name (bigvec byte-index) + (aver (= sb!vm:n-word-bits 32)) + (aver (= sb!vm:n-byte-bits 8)) + (logior ,@(ecase sb!c:*backend-byte-order* + (:little-endian ash-list-le) + (:big-endian ash-list-be)))) + (defun (setf ,name) (new-value bigvec byte-index) + (aver (= sb!vm:n-word-bits 32)) + (aver (= sb!vm:n-byte-bits 8)) + (setf ,@(ecase sb!c:*backend-byte-order* + (:little-endian setf-list-le) + (:big-endian setf-list-be)))))))) + (make-bvref-n 8) + (make-bvref-n 16) + (make-bvref-n 32)) + ;;;; 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) +(defconstant dynamic-core-space-id 1) (defvar *static*) -(defconstant static-space-id 2) +(defconstant static-core-space-id 2) (defvar *read-only*) -(defconstant read-only-space-id 3) +(defconstant read-only-core-space-id 3) (defconstant descriptor-low-bits 16 "the number of bits in the low half of the descriptor") @@ -77,23 +221,25 @@ "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) +;;; a GENESIS-time representation of a memory space (e.g. read-only +;;; space, dynamic space, or static space) (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) + (name (missing-arg) :type symbol :read-only t) + (identifier (missing-arg) :type fixnum :read-only t) ;; the word address where the data will be loaded - (word-address (required-argument) :type unsigned-byte :read-only t) - ;; the data themselves. (Note that in CMU CL this was a pair - ;; of fields SAP and WORDS-ALLOCATED, but that wasn't very portable.) - (bytes (make-array target-space-alignment :element-type '(unsigned-byte 8)) - :type (simple-array (unsigned-byte 8) 1)) + (word-address (missing-arg) :type unsigned-byte :read-only t) + ;; the data themselves. (Note that in CMU CL this was a pair of + ;; fields SAP and WORDS-ALLOCATED, but that wasn't very portable.) + ;; (And then in SBCL this was a VECTOR, but turned out to be + ;; unportable too, since ANSI doesn't think that arrays longer than + ;; 1024 (!) should needed by portable CL code...) + (bytes (make-bigvec) :read-only t) ;; 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) @@ -111,20 +257,6 @@ (%make-gspace :name name :identifier identifier :word-address (ash byte-address (- sb!vm:word-shift)))) - -;;; KLUDGE: Doing it this way seems to partly replicate the -;;; functionality of Common Lisp adjustable arrays. Is there any way -;;; to do this stuff in one line of code by using standard Common Lisp -;;; stuff? -- WHN 19990816 -(defun expand-gspace-bytes (gspace) - (let* ((old-bytes (gspace-bytes gspace)) - (old-length (length old-bytes)) - (new-length (* 2 old-length)) - (new-bytes (make-array new-length :element-type '(unsigned-byte 8)))) - (replace new-bytes old-bytes :end1 old-length) - (setf (gspace-bytes gspace) - new-bytes)) - (values)) ;;;; representation of descriptors @@ -135,36 +267,38 @@ ;; 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" + "for fixnum: ~W" (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" @@ -176,21 +310,21 @@ (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))))) ;; Grow GSPACE as necessary until it's big enough to handle ;; NEW-FREE-WORD-INDEX. (do () - ((>= (length (gspace-bytes gspace)) - (* new-free-word-index sb!vm:word-bytes))) - (expand-gspace-bytes gspace)) + ((>= (bvlength (gspace-bytes gspace)) + (* new-free-word-index sb!vm:n-word-bytes))) + (expand-bigvec (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) (let ((ptr (+ (gspace-word-address gspace) old-free-word-index))) @@ -215,14 +349,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 @@ -246,14 +380,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) @@ -273,24 +407,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))) - (error "~D is too big for a fixnum." num)) - (make-random-descriptor (ash num (1- sb!vm:lowtag-bits)))) + (1+ (- sb!vm:n-word-bits sb!vm:n-lowtag-bits))) + (error "~W is too big for a fixnum." num)) + (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) @@ -320,7 +455,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*) @@ -338,32 +473,6 @@ ;;; pathname), or NIL if we're not currently cold loading any object file (defvar *cold-load-filename* nil) (declaim (type (or string null) *cold-load-filename*)) - -;;; This is vestigial support for the CMU CL byte-swapping code. CMU -;;; CL code tested for whether it needed to swap bytes in GENESIS by -;;; 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 &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. -;;; The version of the system which is fed to the cross-compiler is -;;; now written in a subset of Common Lisp which doesn't require -;;; dumping a lot of things in such a way that machine byte order -;;; matters. (Mostly this is a matter of not using any specialized -;;; array type unless there's portable, high-level code to dump it.) -;;; If it *is* a problem, and you're trying to resurrect this code, -;;; please test particularly carefully, since I haven't had a chance -;;; to test the byte-swapping code at all. -- WHN 19990816 -;;; -;;; When this variable is non-NIL, byte-swapping is enabled wherever -;;; classic GENESIS would have done it. I.e. the value of this variable -;;; is the logical complement of -;;; (EQ (SB!C:BACKEND-BYTE-ORDER SB!C:*NATIVE-BACKEND*) -;;; (SB!C:BACKEND-BYTE-ORDER SB!C:*BACKEND*)) -;;; from CMU CL. -(defvar *genesis-byte-order-swap-p*) ;;;; miscellaneous stuff to read and write the core memory @@ -373,51 +482,6 @@ "Push THING onto the given cold-load LIST." `(setq ,list (cold-cons ,thing ,list))) -(defun maybe-byte-swap (word) - (declare (type (unsigned-byte 32) word)) - (aver (= sb!vm: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) - (ash (ldb (byte 8 8) word) 16) - (ash (ldb (byte 8 16) word) 8) - (ldb (byte 8 24) word)))) - -(defun maybe-byte-swap-short (short) - (declare (type (unsigned-byte 16) short)) - (aver (= sb!vm: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) - (aver (= sb!vm: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))) - (:big-endian - (error "stub: no big-endian ports of SBCL (yet?)")))) -(defun (setf byte-vector-ref-32) (new-value byte-vector byte-index) - (aver (= sb!vm: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))) - (:big-endian - (error "stub: no big-endian ports of SBCL (yet?)"))) - new-value) - (declaim (ftype (function (descriptor sb!vm:word) descriptor) read-wordindexed)) (defun read-wordindexed (address index) #!+sb-doc @@ -426,11 +490,7 @@ (bytes (gspace-bytes gspace)) (byte-index (ash (+ index (descriptor-word-offset address)) sb!vm:word-shift)) - ;; KLUDGE: Do we really need to do byte swap here? It seems - ;; as though we shouldn't.. (This attempts to be a literal - ;; translation of CMU CL code, and I don't have a big-endian - ;; machine to test it.) -- WHN 19990817 - (value (maybe-byte-swap (byte-vector-ref-32 bytes byte-index)))) + (value (bvref-32 bytes byte-index))) (make-random-descriptor value))) (declaim (ftype (function (descriptor) descriptor) read-memory)) @@ -440,12 +500,13 @@ (read-wordindexed address 0)) ;;; (Note: In CMU CL, this function expected a SAP-typed ADDRESS -;;; value, instead of the SAPINT we use here.) -(declaim (ftype (function (sb!vm:word descriptor) (values)) note-load-time-value-reference)) +;;; value, instead of the SAP-INT we use here.) +(declaim (ftype (function (sb!vm:word descriptor) (values)) + note-load-time-value-reference)) (defun note-load-time-value-reference (address marker) (cold-push (cold-cons (cold-intern :load-time-value-fixup) - (cold-cons (sapint-to-core address) + (cold-cons (sap-int-to-core address) (cold-cons (number-to-core (descriptor-word-offset marker)) *nil-descriptor*))) @@ -469,15 +530,11 @@ sb!vm:lowtag-mask) (ash index sb!vm:word-shift)) value) - ;; Note: There's a MAYBE-BYTE-SWAP in here in CMU CL, which I - ;; think is unnecessary now that we're doing the write - ;; byte-by-byte at high level. (I can't test this, though..) -- - ;; WHN 19990817 (let* ((bytes (gspace-bytes (descriptor-intuit-gspace address))) (byte-index (ash (+ index (descriptor-word-offset address)) sb!vm:word-shift))) - (setf (byte-vector-ref-32 bytes byte-index) - (maybe-byte-swap (descriptor-bits value)))))) + (setf (bvref-32 bytes byte-index) + (descriptor-bits value))))) (declaim (ftype (function (descriptor descriptor)) write-memory)) (defun write-memory (address value) @@ -498,16 +555,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))) + (let* ((bytes (/ (* element-bits length) sb!vm:n-byte-bits)) + (des (allocate-cold-descriptor gspace + (+ bytes sb!vm:n-word-bytes) + sb!vm:other-pointer-lowtag))) (write-memory des (make-other-immediate-descriptor (ash bytes (- sb!vm:word-shift)) @@ -520,9 +577,10 @@ 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)) - (des (allocate-descriptor gspace (+ bytes (* 2 sb!vm:word-bytes)) - sb!vm:other-pointer-type))) + (let* ((bytes (/ (* element-bits length) sb!vm:n-byte-bits)) + (des (allocate-cold-descriptor gspace + (+ bytes (* 2 sb!vm:n-word-bytes)) + sb!vm:other-pointer-lowtag))) (write-memory des (make-other-immediate-descriptor 0 type)) (write-wordindexed des sb!vm:vector-length-slot @@ -538,17 +596,17 @@ ;; 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 (make-fixnum-descriptor length)) (dotimes (i length) - (setf (aref bytes (+ offset i)) + (setf (bvref bytes (+ offset i)) ;; KLUDGE: There's no guarantee that the character ;; encoding here will be the same as the character ;; encoding on the target machine, so using CHAR-CODE as @@ -557,27 +615,27 @@ ;; indices into the sequence which is used to test whether ;; a character is a STANDARD-CHAR?) -- WHN 19990817 (char-code (aref string i)))) - (setf (aref bytes (+ offset length)) + (setf (bvref bytes (+ offset length)) 0) ; null string-termination character for C des)) (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." + (warn "~W words of ~W were written, but ~W 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) @@ -587,7 +645,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)) @@ -596,18 +654,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* @@ -621,9 +679,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)))) @@ -638,9 +696,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 @@ -649,9 +707,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)))) @@ -674,16 +732,15 @@ (write-wordindexed des (1+ sb!vm:complex-double-float-imag-slot) low-bits)))) des)) +;;; Copy the given number to the core. (defun number-to-core (number) - #!+sb-doc - "Copy the given number to the core, or flame out if we can't deal with it." (typecase number (integer (if (< (integer-length number) 30) (make-fixnum-descriptor number) (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 @@ -691,34 +748,34 @@ (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) +(declaim (ftype (function (sb!vm:word) descriptor) sap-int-to-core)) +(defun sap-int-to-core (sap-int) (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)) + (make-random-descriptor sap-int)) des)) ;;; 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)) -;;; Make a simple-vector that holds the specified OBJECTS, and return its -;;; descriptor. +;;; Make a simple-vector on the target that holds the specified +;;; OBJECTS, and return its 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))) @@ -734,15 +791,15 @@ (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 sb!vm:symbol-hash-slot (make-fixnum-descriptor - (1+ (random sb!vm:*target-most-positive-fixnum*)))) + (1+ (random sb!xc:most-positive-fixnum)))) (write-wordindexed symbol sb!vm:symbol-plist-slot *nil-descriptor*) (write-wordindexed symbol sb!vm:symbol-name-slot (string-to-core name *dynamic*)) @@ -813,10 +870,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 @@ -971,7 +1028,8 @@ ;;; ;;; ;;; -;;; ) +;;; +;;; ) ;;; ;;; KLUDGE: It would be nice to implement the sublists as instances of ;;; a DEFSTRUCT (:TYPE LIST). (They'd still be lists, but at least we'd be @@ -983,19 +1041,82 @@ (defvar *cold-package-symbols*) (declaim (type list *cold-package-symbols*)) -;;; a map from descriptors to symbols, so that we can back up. The key is the -;;; address in the target core. +;;; a map from descriptors to symbols, so that we can back up. The key +;;; is the address in the target core. (defvar *cold-symbols*) (declaim (type hash-table *cold-symbols*)) +;;; sanity check for a symbol we're about to create on the target +;;; +;;; Make sure that the symbol has an appropriate package. In +;;; particular, catch the so-easy-to-make error of typing something +;;; like SB-KERNEL:%BYTE-BLT in cold sources when what you really +;;; need is SB!KERNEL:%BYTE-BLT. +(defun package-ok-for-target-symbol-p (package) + (let ((package-name (package-name package))) + (or + ;; Cold interning things in these standard packages is OK. (Cold + ;; interning things in the other standard package, CL-USER, isn't + ;; OK. We just use CL-USER to expose symbols whose homes are in + ;; other packages. Thus, trying to cold intern a symbol whose + ;; home package is CL-USER probably means that a coding error has + ;; been made somewhere.) + (find package-name '("COMMON-LISP" "KEYWORD") :test #'string=) + ;; Cold interning something in one of our target-code packages, + ;; which are ever-so-rigorously-and-elegantly distinguished by + ;; this prefix on their names, is OK too. + (string= package-name "SB!" :end1 3 :end2 3) + ;; This one is OK too, since it ends up being COMMON-LISP on the + ;; target. + (string= package-name "SB-XC") + ;; Anything else looks bad. (maybe COMMON-LISP-USER? maybe an extension + ;; package in the xc host? something we can't think of + ;; a valid reason to cold intern, anyway...) + ))) + +;;; like SYMBOL-PACKAGE, but safe for symbols which end up on the target +;;; +;;; Most host symbols we dump onto the target are created by SBCL +;;; itself, so that as long as we avoid gratuitously +;;; cross-compilation-unfriendly hacks, it just happens that their +;;; SYMBOL-PACKAGE in the host system corresponds to their +;;; SYMBOL-PACKAGE in the target system. However, that's not the case +;;; in the COMMON-LISP package, where we don't get to create the +;;; symbols but instead have to use the ones that the xc host created. +;;; In particular, while ANSI specifies which symbols are exported +;;; from COMMON-LISP, it doesn't specify that their home packages are +;;; COMMON-LISP, so the xc host can keep them in random packages which +;;; don't exist on the target (e.g. CLISP keeping some CL-exported +;;; symbols in the CLOS package). +(defun symbol-package-for-target-symbol (symbol) + ;; We want to catch weird symbols like CLISP's + ;; CL:FIND-METHOD=CLOS::FIND-METHOD, but we don't want to get + ;; sidetracked by ordinary symbols like :CHARACTER which happen to + ;; have the same SYMBOL-NAME as exports from COMMON-LISP. + (multiple-value-bind (cl-symbol cl-status) + (find-symbol (symbol-name symbol) *cl-package*) + (if (and (eq symbol cl-symbol) + (eq cl-status :external)) + ;; special case, to work around possible xc host weirdness + ;; in COMMON-LISP package + *cl-package* + ;; ordinary case + (let ((result (symbol-package symbol))) + (aver (package-ok-for-target-symbol-p result)) + result)))) + ;;; Return a handle on an interned symbol. If necessary allocate the ;;; symbol and record which package the symbol was referenced in. When ;;; we allocate the symbol, make sure we record a reference to the ;;; symbol in the home package so that the package gets set. -(defun cold-intern (symbol &optional (package (symbol-package symbol))) +(defun cold-intern (symbol + &optional + (package (symbol-package-for-target-symbol symbol))) + + (aver (package-ok-for-target-symbol-p package)) ;; Anything on the cross-compilation host which refers to the target - ;; machinery through the host SB-XC package can be translated to + ;; machinery through the host SB-XC package should be translated to ;; something on the target which refers to the same machinery ;; through the target COMMON-LISP package. (let ((p (find-package "SB-XC"))) @@ -1008,12 +1129,12 @@ ;; in COLD-INTERN-INFO. ;; (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.) + ;; 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-intern-info (get symbol 'cold-intern-info))) (unless cold-intern-info - (cond ((eq (symbol-package symbol) package) + (cond ((eq (symbol-package-for-target-symbol symbol) package) (let ((handle (allocate-symbol (symbol-name symbol)))) (setf (gethash (descriptor-bits handle) *cold-symbols*) symbol) (when (eq package *keyword-package*) @@ -1039,19 +1160,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))))) + (* 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) @@ -1090,7 +1211,7 @@ (descriptor-low *nil-descriptor*)))) (unless (= offset-wanted offset-found) ;; FIXME: should be fatal - (warn "Offset from ~S to ~S is ~D, not ~D" + (warn "Offset from ~S to ~S is ~W, not ~W" symbol nil offset-found @@ -1118,32 +1239,32 @@ ;;; intern it. (defun finish-symbols () - ;; FIXME: Why use SETQ (setting symbol value) instead of just using - ;; 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? - ;; Explain. + ;; I think the point of setting these functions into SYMBOL-VALUEs + ;; here, instead of using SYMBOL-FUNCTION, is that in CMU CL + ;; SYMBOL-FUNCTION reduces to FDEFINITION, which is a pretty + ;; hairy operation (involving globaldb.lisp etc.) which we don't + ;; want to invoke early in cold init. -- WHN 2001-12-05 + ;; + ;; FIXME: So OK, that's a reasonable reason to do something weird like + ;; this, but this is still a weird thing to do, and we should change + ;; the names to highlight that something weird is going on. Perhaps + ;; *MAYBE-GC-FUN*, *INTERNAL-ERROR-FUN*, *HANDLE-BREAKPOINT-FUN*, + ;; and *HANDLE-FUN-END-BREAKPOINT-FUN*... (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!kernel::control-stack-exhausted-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)) - (cold-set '*eval-stack-top* (make-fixnum-descriptor 0)) (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*)) @@ -1151,11 +1272,13 @@ (let* ((cold-package (car cold-package-symbols-entry)) (symbols (cdr cold-package-symbols-entry)) (shadows (package-shadowing-symbols cold-package)) + (documentation (string-to-core (documentation cold-package t))) (internal *nil-descriptor*) (external *nil-descriptor*) (imported-internal *nil-descriptor*) (imported-external *nil-descriptor*) (shadowing *nil-descriptor*)) + (declare (type package cold-package)) ; i.e. not a target descriptor (/show "dumping" cold-package symbols) ;; FIXME: Add assertions here to make sure that inappropriate stuff @@ -1178,7 +1301,8 @@ (dolist (symbol symbols) (let ((handle (car (get symbol 'cold-intern-info))) - (imported-p (not (eq (symbol-package symbol) cold-package)))) + (imported-p (not (eq (symbol-package-for-target-symbol symbol) + cold-package)))) (multiple-value-bind (found where) (find-symbol (symbol-name symbol) cold-package) (unless (and where (eq found symbol)) @@ -1195,6 +1319,7 @@ (cold-push handle imported-external) (cold-push handle external))))))) (let ((r *nil-descriptor*)) + (cold-push documentation r) (cold-push shadowing r) (cold-push imported-external r) (cold-push imported-internal r) @@ -1216,8 +1341,8 @@ (progn (cold-set 'sb!vm::*fp-constant-0d0* (number-to-core 0d0)) (cold-set 'sb!vm::*fp-constant-1d0* (number-to-core 1d0)) - (cold-set 'sb!vm::*fp-constant-0s0* (number-to-core 0s0)) - (cold-set 'sb!vm::*fp-constant-1s0* (number-to-core 1s0)) + (cold-set 'sb!vm::*fp-constant-0f0* (number-to-core 0f0)) + (cold-set 'sb!vm::*fp-constant-1f0* (number-to-core 1f0)) #!+long-float (progn (cold-set 'sb!vm::*fp-constant-0l0* (number-to-core 0L0)) @@ -1231,9 +1356,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. @@ -1284,100 +1407,131 @@ (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))))) + (legal-fun-name-or-type-error 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 + (sb!vm:extern-alien-name "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 + (sb!vm:extern-alien-name "closure_tramp")))))) fdefn)) (defun initialize-static-fns () (let ((*cold-fdefn-gspace* *static*)) - (dolist (sym sb!vm:*static-functions*) + (dolist (sym sb!vm:*static-funs*) (let* ((fdefn (cold-fdefinition-object (cold-intern sym))) (offset (- (+ (- (descriptor-low fdefn) - sb!vm:other-pointer-type) - (* sb!vm:fdefn-raw-addr-slot sb!vm:word-bytes)) + sb!vm:other-pointer-lowtag) + (* sb!vm:fdefn-raw-addr-slot sb!vm:n-word-bytes)) (descriptor-low *nil-descriptor*))) - (desired (sb!vm:static-function-offset sym))) + (desired (sb!vm:static-fun-offset sym))) (unless (= offset desired) ;; FIXME: should be fatal - (warn "Offset from FDEFN ~S to ~S is ~D, not ~D." + (warn "Offset from FDEFN ~S to ~S is ~W, not ~W." sym nil offset desired)))))) (defun list-all-fdefn-objects () (let ((result *nil-descriptor*)) - (maphash #'(lambda (key value) - (declare (ignore key)) - (cold-push value result)) + (maphash (lambda (key value) + (declare (ignore key)) + (cold-push value result)) *cold-fdefn-objects*) result)) @@ -1387,7 +1541,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))) @@ -1435,36 +1591,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*) @@ -1500,7 +1635,7 @@ (defun note-load-time-code-fixup (code-object offset value kind) ;; If CODE-OBJECT might be moved (when (= (gspace-identifier (descriptor-intuit-gspace code-object)) - dynamic-space-id) + dynamic-core-space-id) ;; FIXME: pushed thing should be a structure, not just a list (push (list code-object offset value kind) *load-time-code-fixups*)) (values)) @@ -1536,7 +1671,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)) @@ -1550,76 +1686,126 @@ 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 +backend-fasl-file-implementation+ + ;; See CMU CL source for other formerly-supported architectures + ;; (and note that you have to rewrite them to use BVREF-X + ;; instead of SAP-REF). + (:alpha + (ecase kind + (:jmp-hint + (assert (zerop (ldb (byte 2 0) value)))) + (: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 (bvref-8 gspace-bytes gspace-byte-offset) + (ldb (byte 8 48) value) + (bvref-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 (bvref-8 gspace-bytes gspace-byte-offset) + (ldb (byte 8 32) value) + (bvref-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 (bvref-8 gspace-bytes gspace-byte-offset) + (ldb (byte 8 16) value) + (bvref-8 gspace-bytes (1+ gspace-byte-offset)) + (ldb (byte 8 24) value)))) + (:lda + (setf (bvref-8 gspace-bytes gspace-byte-offset) + (ldb (byte 8 0) value) + (bvref-8 gspace-bytes (1+ gspace-byte-offset)) + (ldb (byte 8 8) value))))) + (:hppa + (ecase kind + (:load + (setf (bvref-32 gspace-bytes gspace-byte-offset) + (logior (ash (ldb (byte 11 0) value) 1) + (logand (bvref-32 gspace-bytes gspace-byte-offset) + #xffffc000)))) + (:load-short + (let ((low-bits (ldb (byte 11 0) value))) + (assert (<= 0 low-bits (1- (ash 1 4)))) + (setf (bvref-32 gspace-bytes gspace-byte-offset) + (logior (ash low-bits 17) + (logand (bvref-32 gspace-bytes gspace-byte-offset) + #xffe0ffff))))) + (:hi + (setf (bvref-32 gspace-bytes gspace-byte-offset) + (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 (bvref-32 gspace-bytes gspace-byte-offset) + #xffe00000)))) + (:branch + (let ((bits (ldb (byte 9 2) value))) + (assert (zerop (ldb (byte 2 0) value))) + (setf (bvref-32 gspace-bytes gspace-byte-offset) + (logior (ash bits 3) + (logand (bvref-32 gspace-bytes gspace-byte-offset) + #xffe0e002))))))) + (:mips (ecase kind (:jump - (aver (zerop (ash value -28))) - (setf (ldb (byte 26 0) (sap-ref-32 sap 0)) + (assert (zerop (ash value -28))) + (setf (ldb (byte 26 0) + (bvref-32 gspace-bytes gspace-byte-offset)) (ash value -2))) (:lui - (setf (sap-ref-16 sap 0) - (+ (ash value -16) - (if (logbitp 15 value) 1 0)))) + (setf (bvref-32 gspace-bytes gspace-byte-offset) + (logior (mask-field (byte 16 16) (bvref-32 gspace-bytes gspace-byte-offset)) + (+ (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 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) + (setf (bvref-32 gspace-bytes gspace-byte-offset) + (logior (mask-field (byte 16 16) (bvref-32 gspace-bytes gspace-byte-offset)) + (ldb (byte 16 0) value)))))) + (:ppc (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)))) - (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)))))) - |# + (:ba + (setf (bvref-32 gspace-bytes gspace-byte-offset) + (dpb (ash value -2) (byte 24 2) + (bvref-32 gspace-bytes gspace-byte-offset)))) + (:ha + (let* ((h (ldb (byte 16 16) value)) + (l (ldb (byte 16 0) value))) + (setf (bvref-16 gspace-bytes (+ gspace-byte-offset 2)) + (if (logbitp 15 l) (ldb (byte 16 0) (1+ h)) h)))) + (:l + (setf (bvref-16 gspace-bytes (+ gspace-byte-offset 2)) + (ldb (byte 16 0) value))))) + (:sparc + (ecase kind + (:call + (error "can't deal with call fixups yet")) + (:sethi + (setf (bvref-32 gspace-bytes gspace-byte-offset) + (dpb (ldb (byte 22 10) value) + (byte 22 0) + (bvref-32 gspace-bytes gspace-byte-offset)))) + (:add + (setf (bvref-32 gspace-bytes gspace-byte-offset) + (dpb (ldb (byte 10 0) value) + (byte 10 0) + (bvref-32 gspace-bytes gspace-byte-offset)))))) (:x86 - (let* ((un-fixed-up (byte-vector-ref-32 gspace-bytes + (let* ((un-fixed-up (bvref-32 gspace-bytes gspace-byte-offset)) (code-object-start-addr (logandc2 (descriptor-bits code-object) sb!vm:lowtag-mask))) - (aver (= code-object-start-addr + (assert (= code-object-start-addr (+ gspace-byte-address (descriptor-byte-offset code-object)))) (ecase kind (:absolute (let ((fixed-up (+ value un-fixed-up))) - (setf (byte-vector-ref-32 gspace-bytes gspace-byte-offset) + (setf (bvref-32 gspace-bytes gspace-byte-offset) fixed-up) ;; comment from CMU CL sources: ;; @@ -1639,8 +1825,8 @@ (let ((fixed-up (- (+ value un-fixed-up) gspace-byte-address gspace-byte-offset - sb!vm:word-bytes))) ; length of CALL argument - (setf (byte-vector-ref-32 gspace-bytes gspace-byte-offset) + sb!vm:n-word-bytes))) ; length of CALL argument + (setf (bvref-32 gspace-bytes gspace-byte-offset) fixed-up) ;; Note relative fixups that point outside the code ;; object, which is to say all relative fixups, since @@ -1649,75 +1835,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))) - (aver (<= 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))) - (aver (zerop (ldb (byte 2 0) value))) - (logior (ash bits 3) - (logand inst #xffe0e002))))))))) - (#.sb!c:alpha-fasl-file-implementation - (ecase kind - (:jmp-hint - (aver (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 - (aver (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 () @@ -1727,12 +1845,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*)) @@ -1744,39 +1866,44 @@ ;;;; 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-funs* + ;; We start out with a copy of the ordinary *FOP-FUNS*. The ones + ;; which aren't appropriate for cold load will be destructively + ;; modified. + (copy-seq *fop-funs*)) -(defvar *normal-fop-functions*) +(defvar *normal-fop-funs*) ;;; 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) - (aver (member pushp '(nil t :nope))) +;;; (2) stores its definition in the *COLD-FOP-FUNS* vector, +;;; instead of storing in the *FOP-FUNS* vector. +(defmacro define-cold-fop ((name &key (pushp t) (stackp t)) &rest forms) + (aver (member pushp '(nil t))) + (aver (member stackp '(nil t))) (let ((code (get name 'fop-code)) (fname (symbolicate "COLD-" name))) (unless code (error "~S is not a defined FOP." name)) `(progn (defun ,fname () - ,@(if (eq pushp :nope) - forms - `((with-fop-stack ,pushp ,@forms)))) - (setf (svref *cold-fop-functions* ,code) #',fname)))) - -(defmacro clone-cold-fop ((name &optional (pushp t)) (small-name) &rest forms) - (aver (member pushp '(nil t :nope))) + ,@(if stackp + `((with-fop-stack ,pushp ,@forms)) + forms)) + (setf (svref *cold-fop-funs* ,code) #',fname)))) + +(defmacro clone-cold-fop ((name &key (pushp t) (stackp t)) (small-name) &rest forms) + (aver (member pushp '(nil t))) + (aver (member stackp '(nil t))) `(progn (macrolet ((clone-arg () '(read-arg 4))) - (define-cold-fop (,name ,pushp) ,@forms)) + (define-cold-fop (,name :pushp ,pushp :stackp ,stackp) ,@forms)) (macrolet ((clone-arg () '(read-arg 1))) - (define-cold-fop (,small-name ,pushp) ,@forms)))) + (define-cold-fop (,small-name :pushp ,pushp :stackp ,stackp) ,@forms)))) ;;; Cause a fop to be undefined in cold load. (defmacro not-cold-fop (name) @@ -1784,18 +1911,18 @@ (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 +;;; 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." - (let* ((*normal-fop-functions* *fop-functions*) - (*fop-functions* *cold-fop-functions*) + (let* ((*normal-fop-funs* *fop-funs*) + (*fop-funs* *cold-fop-funs*) (*cold-load-filename* (etypecase filename (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 @@ -1809,24 +1936,23 @@ (define-cold-fop (fop-empty-list) *nil-descriptor*) (define-cold-fop (fop-truth) (cold-intern t)) -(define-cold-fop (fop-normal-load :nope) - (setq *fop-functions* *normal-fop-functions*)) +(define-cold-fop (fop-normal-load :stackp nil) + (setq *fop-funs* *normal-fop-funs*)) -(define-fop (fop-maybe-cold-load 82 :nope) +(define-fop (fop-maybe-cold-load 82 :stackp nil) (when *cold-load-filename* - (setq *fop-functions* *cold-fop-functions*))) + (setq *fop-funs* *cold-fop-funs*))) -(define-cold-fop (fop-maybe-cold-load :nope)) +(define-cold-fop (fop-maybe-cold-load :stackp nil)) (clone-cold-fop (fop-struct) (fop-small-struct) (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)) @@ -1890,11 +2016,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) @@ -1920,9 +2046,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 @@ -1977,16 +2103,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)) @@ -1999,38 +2125,39 @@ (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) - (t (error "losing element size: ~D" sizebits)))) + (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: ~W" 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)))) - (read-sequence-or-die (descriptor-bytes result) - *fasl-file* - :start start - :end end) + sb!vm:n-byte-bits)))) + (read-bigvec-as-sequence-or-die (descriptor-bytes result) + *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* - :start start - :end end) + (end (+ start (* len sb!vm:n-word-bytes)))) + (read-bigvec-as-sequence-or-die (descriptor-bytes result) + *fasl-input-stream* + :start start + :end end) result)) (not-cold-fop fop-double-float-vector) @@ -2044,10 +2171,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*) @@ -2055,15 +2182,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))) @@ -2075,7 +2203,7 @@ ;;;; cold fops for loading numbers (defmacro define-cold-number-fop (fop) - `(define-cold-fop (,fop :nope) + `(define-cold-fop (,fop :stackp nil) ;; Invoke the ordinary warm version of this fop to push the ;; number. (,fop) @@ -2096,12 +2224,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)))) @@ -2114,10 +2242,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))) @@ -2131,12 +2259,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))) @@ -2166,10 +2294,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))) @@ -2207,11 +2335,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) @@ -2236,13 +2364,13 @@ (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) +(define-cold-fop (fop-funcall-for-effect :pushp nil) (if (= (read-arg 1) 0) (cold-push (pop-stack) *current-reversed-cold-toplevels*) @@ -2250,32 +2378,34 @@ ;;;; cold fops for fixing up circularities -(define-cold-fop (fop-rplaca nil) +(define-cold-fop (fop-rplaca :pushp nil) (let ((obj (svref *current-fop-table* (read-arg 4))) (idx (read-arg 4))) (write-memory (cold-nthcdr idx obj) (pop-stack)))) -(define-cold-fop (fop-rplacd nil) +(define-cold-fop (fop-rplacd :pushp nil) (let ((obj (svref *current-fop-table* (read-arg 4))) (idx (read-arg 4))) (write-wordindexed (cold-nthcdr idx obj) 1 (pop-stack)))) -(define-cold-fop (fop-svset nil) +(define-cold-fop (fop-svset :pushp nil) (let ((obj (svref *current-fop-table* (read-arg 4))) (idx (read-arg 4))) (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) +(define-cold-fop (fop-structset :pushp nil) (let ((obj (svref *current-fop-table* (read-arg 4))) (idx (read-arg 4))) (write-wordindexed obj (1+ idx) (pop-stack)))) -(define-cold-fop (fop-nthcdr t) +;;; In the original CMUCL code, this actually explicitly declared PUSHP +;;; to be T, even though that's what it defaults to in DEFINE-COLD-FOP. +(define-cold-fop (fop-nthcdr) (cold-nthcdr (read-arg 4) (pop-stack))) (defun cold-nthcdr (index obj) @@ -2285,10 +2415,22 @@ ;;;; cold fops for loading code objects and functions -(define-cold-fop (fop-fset nil) - (let ((fn (pop-stack)) - (name (pop-stack))) - (cold-fset name fn))) +;;; 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 :pushp nil) + (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))) @@ -2296,8 +2438,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) @@ -2316,17 +2456,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 @@ -2344,36 +2481,36 @@ (let* ((start (+ (descriptor-byte-offset des) (ash header-n-words sb!vm:word-shift))) (end (+ start code-size))) - (read-sequence-or-die (descriptor-bytes des) - *fasl-file* - :start start - :end end) + (read-bigvec-as-sequence-or-die (descriptor-bytes des) + *fasl-input-stream* + :start start + :end end) #!+sb-show (when *show-pre-fixup-code-p* (format *trace-output* - "~&/raw code from code-fop ~D ~D:~%" + "~&/raw code from code-fop ~W ~W:~%" 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~%" (+ i (gspace-byte-address (descriptor-gspace des))) - (byte-vector-ref-32 (descriptor-bytes des) i))))) + (bvref-32 (descriptor-bytes des) i))))) des))) (define-cold-code-fop fop-code (read-arg 4) (read-arg 4)) (define-cold-code-fop fop-small-code (read-arg 1) (read-arg 2)) -(clone-cold-fop (fop-alter-code nil) +(clone-cold-fop (fop-alter-code :pushp nil) (fop-byte-alter-code) (let ((slot (clone-arg)) (value (pop-stack)) (code (pop-stack))) (write-wordindexed code slot value))) -(define-cold-fop (fop-function-entry) +(define-cold-fop (fop-fun-entry) (let* ((type (pop-stack)) (arglist (pop-stack)) (name (pop-stack)) @@ -2381,18 +2518,17 @@ (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)) + (error "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 @@ -2410,8 +2546,7 @@ ;; code instead of a pointer back to the object ;; itself.) Ask on the mailing list whether ;; this is documented somewhere, and if not, - ;; try to reverse engineer some documentation - ;; before release. + ;; try to reverse engineer some documentation. #!-x86 ;; a pointer back to the function object, as ;; described in CMU CL @@ -2423,15 +2558,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) @@ -2439,9 +2575,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)) @@ -2451,13 +2587,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 @@ -2469,10 +2606,10 @@ (let* ((start (+ (descriptor-byte-offset des) (ash header-n-words sb!vm:word-shift))) (end (+ start length))) - (read-sequence-or-die (descriptor-bytes des) - *fasl-file* - :start start - :end end)) + (read-bigvec-as-sequence-or-die (descriptor-bytes des) + *fasl-input-stream* + :start start + :end end)) des)) (define-cold-fop (fop-assembler-routine) @@ -2502,20 +2639,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" @@ -2530,6 +2663,15 @@ (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 @@ -2537,70 +2679,67 @@ (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 - ;; #define CORE_VALIDATE 3845 - ;; #define CORE_VERSION 3860 - ;; #define CORE_MACHINE_STATE 3862 - ;; (Except that some of them are obsolete and should be deleted instead.) - ;; also - ;; #define DYNAMIC_SPACE_ID (1) - ;; #define STATIC_SPACE_ID (2) - ;; #define READ_ONLY_SPACE_ID (3) - - ;; writing entire families of named constants from SB!VM + + ;; writing entire families of named constants (let ((constants nil)) - (do-external-symbols (symbol (find-package "SB!VM")) - (when (constantp symbol) - (let ((name (symbol-name symbol))) - (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 naming - (record-with-munged-name (prefix string priority) - (record (concatenate - 'simple-string - prefix - (delete #\- (string-capitalize string))) - priority)) - (test-tail (tail prefix priority) - (when (tail-comp name tail) - (record-with-munged-name prefix - (subseq name 0 - (- (length name) - (length tail))) - priority))) - (test-head (head prefix priority) - (when (head-comp name head) - (record-with-munged-name prefix - (subseq name (length head)) - priority))) - ;; machinery for new-style SBCL Lisp-to-C naming - (record-with-translated-name (priority) - (record (substitute #\_ #\- name) - priority))) - ;; This style of munging of names is used in the code - ;; inherited from CMU CL. - (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) - ;; This simpler style of translation of names seems less - ;; confusing, and is used for newer code. - (when (some (lambda (suffix) (tail-comp name suffix)) - #("-START" "-END")) - (record-with-translated-name 6)))))) + (dolist (package-name '(;; Even in CMU CL, constants from VM + ;; were automatically propagated + ;; into the runtime. + "SB!VM" + ;; In SBCL, we also propagate various + ;; magic numbers related to file format, + ;; which live here instead of SB!VM. + "SB!FASL")) + (do-external-symbols (symbol (find-package package-name)) + (when (constantp symbol) + (let ((name (symbol-name symbol))) + (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) + (maybe-record-with-translated-name '("-CORE-ENTRY-TYPE-CODE") 7) + (maybe-record-with-translated-name '("-CORE-SPACE-ID") 8)))))) (setf constants (sort constants - #'(lambda (const1 const2) - (if (= (second const1) (second const2)) + (lambda (const1 const2) + (if (= (second const1) (second const2)) (< (third const1) (third const2)) (< (second const1) (second const2)))))) (let ((prev-priority (second (car constants)))) @@ -2639,34 +2778,58 @@ (format t " /* 0x~X */~@[ /* ~A */~]~%" value doc)))) (terpri)) - ;; writing codes/strings for internal errors - (format t "#define ERRORS { \\~%") - ;; FIXME: Is this just DO-VECTOR? + ;; writing information about internal errors (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 \\~%}~%") + (let ((current-error (aref internal-errors i))) + ;; FIXME: this UNLESS should go away (see also FIXME in + ;; interr.lisp) -- APD, 2002-03-05 + (unless (eq nil (car current-error)) + (format t "#define ~A ~D~%" + (substitute #\_ #\- (symbol-name (car current-error))) + i))))) (terpri) + ;; FIXME: The SPARC has a PSEUDO-ATOMIC-TRAP that differs between + ;; platforms. If we export this from the SB!VM package, it gets + ;; written out as #define trap_PseudoAtomic, which is confusing as + ;; the runtime treats trap_ as the prefix for illegal instruction + ;; type things. We therefore don't export it, but instead do + #!+sparc + (when (boundp 'sb!vm::pseudo-atomic-trap) + (format t "#define PSEUDO_ATOMIC_TRAP ~D /* 0x~:*~X */~%" sb!vm::pseudo-atomic-trap) + (terpri)) + ;; possibly this is another candidate for a rename (to + ;; pseudo-atomic-trap-number or pseudo-atomic-magic-constant + ;; [possibly applicable to other platforms]) + + (dolist (symbol '(sb!vm::float-traps-byte sb!vm::float-exceptions-byte sb!vm::float-sticky-bits sb!vm::float-rounding-mode)) + (format t "#define ~A_POSITION ~A /* ~:*0x~X */~%" + (substitute #\_ #\- (symbol-name symbol)) + (sb!xc:byte-position (symbol-value symbol))) + (format t "#define ~A_MASK 0x~X /* ~:*~A */~%" + (substitute #\_ #\- (symbol-name symbol)) + (sb!xc:mask-field (symbol-value symbol) -1))) + ;; writing primitive object layouts (let ((structs (sort (copy-list sb!vm:*primitive-objects*) #'string< - :key #'(lambda (obj) - (symbol-name - (sb!vm:primitive-object-name obj)))))) + :key (lambda (obj) + (symbol-name + (sb!vm:primitive-object-name obj)))))) (format t "#ifndef LANGUAGE_ASSEMBLY~2%") (format t "#define LISPOBJ(x) ((lispobj)x)~2%") (dolist (obj structs) (format t "struct ~A {~%" - (nsubstitute #\_ #\- + (substitute #\_ #\- (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]~];~%" (getf (sb!vm:slot-options slot) :c-type "lispobj") - (nsubstitute #\_ #\- - (string-downcase (string (sb!vm:slot-name slot)))) + (substitute #\_ #\- + (string-downcase (string (sb!vm:slot-name slot)))) (sb!vm:slot-rest-p slot))) (format t "};~2%")) (format t "#else /* LANGUAGE_ASSEMBLY */~2%") @@ -2679,26 +2842,26 @@ (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%")) ;; 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. + ;; FIXME: It would be nice to use longer names than NIL and + ;; (particularly) T in #define statements. (format t "#define ~A LISPOBJ(0x~X)~%" - (nsubstitute #\_ #\- - (remove-if #'(lambda (char) - (member char '(#\% #\* #\. #\!))) - (symbol-name symbol))) + (substitute #\_ #\- + (remove-if (lambda (char) + (member char '(#\% #\* #\. #\!))) + (symbol-name symbol))) (if *static* ; if we ran GENESIS ;; 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:word-bytes - sb!vm:other-pointer-type + sb!vm:n-word-bytes + sb!vm:other-pointer-lowtag (if symbol (sb!vm:static-symbol-offset symbol) 0))))) ;; Voila. @@ -2719,19 +2882,20 @@ (format t "#X~8,'0X: ~S~%" (cdr routine) (car routine))) (let ((funs nil) (undefs nil)) - (maphash #'(lambda (name fdefn) - (let ((fun (read-wordindexed fdefn - sb!vm:fdefn-function-slot))) - (if (= (descriptor-bits fun) - (descriptor-bits *nil-descriptor*)) - (push name undefs) - (let ((addr (read-wordindexed fdefn - sb!vm:fdefn-raw-addr-slot))) - (push (cons name (descriptor-bits addr)) - funs))))) + (maphash (lambda (name fdefn) + (let ((fun (read-wordindexed fdefn + 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))) + (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 @@ -2746,33 +2910,20 @@ 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 #'fun-name-block-name)) + (dolist (name undefs) + (format t "~S~%" name))) + + (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)) @@ -2781,18 +2932,24 @@ initially undefined function references:~2%") (defvar *core-file*) (defvar *data-page*) -;;; KLUDGE: These numbers correspond to values in core.h. If they're -;;; documented anywhere, I haven't found it. (I haven't tried very -;;; hard yet.) -- WHN 19990826 -(defparameter version-entry-type-code 3860) -(defparameter validate-entry-type-code 3845) -(defparameter directory-entry-type-code 3841) -(defparameter new-directory-entry-type-code 3861) -(defparameter initial-function-entry-type-code 3863) -(defparameter end-entry-type-code 3840) - -(declaim (ftype (function (sb!vm:word) sb!vm:word) write-long)) -(defun write-long (num) ; FIXME: WRITE-WORD would be a better name. +;;; magic numbers to identify entries in a core file +;;; +;;; (In case you were wondering: No, AFAIK there's no special magic about +;;; these which requires them to be in the 38xx range. They're just +;;; arbitrary words, tested not for being in a particular range but just +;;; for equality. However, if you ever need to look at a .core file and +;;; figure out what's going on, it's slightly convenient that they're +;;; all in an easily recognizable range, and displacing the range away from +;;; zero seems likely to reduce the chance that random garbage will be +;;; misinterpreted as a .core file.) +(defconstant version-core-entry-type-code 3860) +(defconstant build-id-core-entry-type-code 3899) +(defconstant new-directory-core-entry-type-code 3861) +(defconstant initial-fun-core-entry-type-code 3863) +(defconstant end-core-entry-type-code 3840) + +(declaim (ftype (function (sb!vm:word) sb!vm:word) write-word)) +(defun write-word (num) (ecase sb!c:*backend-byte-order* (:little-endian (dotimes (i 4) @@ -2811,7 +2968,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*))) @@ -2830,7 +2987,9 @@ initially undefined function references:~2%") ;; be zero-filled. This will always be true under Mach on machines ;; where the page size is equal. (RT is 4K, PMAX is 4K, Sun 3 is ;; 8K). - (write-sequence (gspace-bytes gspace) *core-file* :end total-bytes) + (write-bigvec-as-sequence (gspace-bytes gspace) + *core-file* + :end total-bytes) (force-output *core-file*) (file-position *core-file* posn) @@ -2840,18 +2999,14 @@ initially undefined function references:~2%") ;; DATA PAGE ;; ADDRESS ;; PAGE COUNT - (write-long (gspace-identifier gspace)) - (write-long (gspace-free-word-index gspace)) - (write-long *data-page*) + (write-word (gspace-identifier gspace)) + (write-word (gspace-free-word-index gspace)) + (write-word *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. (aver (zerop rem)) - (write-long floor)) - (write-long pages) + (write-word floor)) + (write-word pages) (incf *data-page* pages))) @@ -2876,36 +3031,52 @@ initially undefined function references:~2%") :if-exists :rename-and-delete) ;; Write the magic number. - (write-long core-magic) + (write-word core-magic) ;; Write the Version entry. - (write-long version-entry-type-code) - (write-long 3) - (write-long sbcl-core-version-integer) + (write-word version-core-entry-type-code) + (write-word 3) + (write-word sbcl-core-version-integer) + + ;; Write the build ID. + (write-word build-id-core-entry-type-code) + (let ((build-id (with-open-file (s "output/build-id.tmp" + :direction :input) + (read s)))) + (declare (type simple-string build-id)) + (/show build-id (length build-id)) + ;; Write length of build ID record: BUILD-ID-CORE-ENTRY-TYPE-CODE + ;; word, this length word, and one word for each char of BUILD-ID. + (write-word (+ 2 (length build-id))) + (dovector (char build-id) + ;; (We write each character as a word in order to avoid + ;; having to think about word alignment issues in the + ;; sbcl-0.7.8 version of coreparse.c.) + (write-word (char-code char)))) ;; Write the New Directory entry header. - (write-long new-directory-entry-type-code) - (write-long 17) ; length = (5 words/space) * 3 spaces + 2 for header. + (write-word new-directory-core-entry-type-code) + (write-word 17) ; length = (5 words/space) * 3 spaces + 2 for header. (output-gspace *read-only*) (output-gspace *static*) (output-gspace *dynamic*) ;; Write the initial function. - (write-long initial-function-entry-type-code) - (write-long 3) + (write-word initial-fun-core-entry-type-code) + (write-word 3) (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))) + (initial-fun (read-wordindexed cold-fdefn + sb!vm:fdefn-fun-slot))) (format t - "~&/(DESCRIPTOR-BITS INITIAL-FUNCTION)=#X~X~%" - (descriptor-bits initial-function)) - (write-long (descriptor-bits initial-function))) + "~&/(DESCRIPTOR-BITS INITIAL-FUN)=#X~X~%" + (descriptor-bits initial-fun)) + (write-word (descriptor-bits initial-fun))) ;; Write the End entry. - (write-long end-entry-type-code) - (write-long 2))) + (write-word end-core-entry-type-code) + (write-word 2))) (format t "done]~%") (force-output) @@ -2933,16 +3104,6 @@ initially undefined function references:~2%") ;;; the executable which will load the core. ;;; MAP-FILE-NAME gets (?) a map file. (dunno about this -- WHN 19990815) ;;; -;;; other arguments: -;;; BYTE-ORDER-SWAP-P controls whether GENESIS tries to swap bytes -;;; in some places in the output. It's only appropriate when -;;; cross-compiling from a machine with one byte order to a -;;; machine with the opposite byte order, which is irrelevant in -;;; current (19990816) SBCL, since only the X86 architecture is -;;; supported. If you're trying to add support for more -;;; architectures, see the comments on DEFVAR -;;; *GENESIS-BYTE-ORDER-SWAP-P* for more information. -;;; ;;; FIXME: GENESIS doesn't belong in SB!VM. Perhaps in %KERNEL for now, ;;; perhaps eventually in SB-LD or SB-BOOT. (defun sb!vm:genesis (&key @@ -2950,8 +3111,7 @@ initially undefined function references:~2%") symbol-table-file-name core-file-name map-file-name - c-header-file-name - byte-order-swap-p) + c-header-file-name) (when (and core-file-name (not symbol-table-file-name)) @@ -2971,7 +3131,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 @@ -2993,24 +3153,24 @@ initially undefined function references:~2%") (let* ((*foreign-symbol-placeholder-value* (if core-file-name nil 0)) (*load-time-value-counter* 0) - (*genesis-byte-order-swap-p* byte-order-swap-p) (*cold-fdefn-objects* (make-hash-table :test 'equal)) (*cold-symbols* (make-hash-table :test 'equal)) (*cold-package-symbols* nil) (*read-only* (make-gspace :read-only - read-only-space-id + read-only-core-space-id sb!vm:read-only-space-start)) (*static* (make-gspace :static - static-space-id + static-core-space-id sb!vm:static-space-start)) (*dynamic* (make-gspace :dynamic - dynamic-space-id - sb!vm:dynamic-space-start)) + dynamic-core-space-id + #!+gencgc sb!vm:dynamic-space-start + #!-gencgc sb!vm:dynamic-0-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*) @@ -3052,6 +3212,7 @@ initially undefined function references:~2%") (let ((package (find-package (sb-cold:package-data-name pd)))) (labels (;; Call FN on every node of the TREE. (mapc-on-tree (fn tree) + (declare (type function fn)) (typecase tree (cons (mapc-on-tree fn (car tree)) (mapc-on-tree fn (cdr tree))) @@ -3088,11 +3249,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.