X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fgenesis.lisp;h=ed462886a2646d1f16d56e9fe0e3ab74a7891cea;hb=902e93736a0888aa6b04dc328b1eb328423bf426;hp=4960357ade1472d0887f159d84a9aee5a852ae5b;hpb=aa61c7571b33b86981301f34d3acdb66666f53a3;p=sbcl.git diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp index 4960357..ed46288 100644 --- a/src/compiler/generic/genesis.lisp +++ b/src/compiler/generic/genesis.lisp @@ -47,32 +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") @@ -80,8 +221,8 @@ "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 @@ -89,10 +230,12 @@ (identifier (missing-arg) :type fixnum :read-only t) ;; the word address where the data will be loaded (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.) - (bytes (make-array target-space-alignment :element-type '(unsigned-byte 8)) - :type (simple-array (unsigned-byte 8) 1)) + ;; 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:N-WORD-BYTES bytes) in BYTES, or equivalently the number of ;; words actually written in BYTES. In order to convert to an actual @@ -114,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 @@ -160,7 +289,7 @@ (ash (descriptor-low des) (- 1 sb!vm:n-lowtag-bits))))) (format stream - "for fixnum: ~D" + "for fixnum: ~W" (if (> unsigned #x1FFFFFFF) (- unsigned #x40000000) unsigned)))) @@ -193,9 +322,9 @@ ;; Grow GSPACE as necessary until it's big enough to handle ;; NEW-FREE-WORD-INDEX. (do () - ((>= (length (gspace-bytes gspace)) + ((>= (bvlength (gspace-bytes gspace)) (* new-free-word-index sb!vm:n-word-bytes))) - (expand-gspace-bytes gspace)) + (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))) @@ -285,7 +414,7 @@ (defun make-fixnum-descriptor (num) (when (>= (integer-length num) (1+ (- sb!vm:n-word-bits sb!vm:n-lowtag-bits))) - (error "~D is too big for a fixnum." num)) + (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) @@ -344,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 @@ -379,62 +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:n-word-bits 32)) - (aver (= sb!vm:n-byte-bits 8)) - (if (not *genesis-byte-order-swap-p*) - word - (logior (ash (ldb (byte 8 0) word) 24) - (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:n-word-bits 32)) - (aver (= sb!vm:n-byte-bits 8)) - (if (not *genesis-byte-order-swap-p*) - short - (logior (ash (ldb (byte 8 0) short) 8) - (ldb (byte 8 8) short)))) - -;;; BYTE-VECTOR-REF-32 and friends. These are like SAP-REF-n, except -;;; that instead of a SAP we use a byte vector -(macrolet ((make-byte-vector-ref-n - (n) - (let* ((name (intern (format nil "BYTE-VECTOR-REF-~A" n))) - (number-octets (/ n 8)) - (ash-list - (loop for i from 0 to (1- number-octets) - collect `(ash (aref byte-vector (+ byte-index ,i)) - ,(* i 8)))) - (setf-list - (loop for i from 0 to (1- number-octets) - append - `((aref byte-vector (+ byte-index ,i)) - (ldb (byte 8 ,(* i 8)) new-value))))) - `(progn - (defun ,name (byte-vector byte-index) - (aver (= sb!vm:n-word-bits 32)) - (aver (= sb!vm:n-byte-bits 8)) - (ecase sb!c:*backend-byte-order* - (:little-endian - (logior ,@ash-list)) - (:big-endian - (error "stub: no big-endian ports of SBCL (yet?)")))) - (defun (setf ,name) (new-value byte-vector byte-index) - (aver (= sb!vm:n-word-bits 32)) - (aver (= sb!vm:n-byte-bits 8)) - (ecase sb!c:*backend-byte-order* - (:little-endian - (setf ,@setf-list)) - (:big-endian - (error "stub: no big-endian ports of SBCL (yet?)")))))))) - (make-byte-vector-ref-n 8) - (make-byte-vector-ref-n 16) - (make-byte-vector-ref-n 32)) - (declaim (ftype (function (descriptor sb!vm:word) descriptor) read-wordindexed)) (defun read-wordindexed (address index) #!+sb-doc @@ -443,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)) @@ -457,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*))) @@ -486,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) @@ -558,7 +598,7 @@ (des (allocate-vector-object gspace sb!vm:n-byte-bits (1+ length) - sb!vm:simple-string-widetag)) + sb!vm:simple-base-string-widetag)) (bytes (gspace-bytes gspace)) (offset (+ (* sb!vm:vector-data-offset sb!vm:n-word-bytes) (descriptor-byte-offset des)))) @@ -566,7 +606,7 @@ 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 @@ -575,7 +615,7 @@ ;; 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)) @@ -593,7 +633,7 @@ ((> 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:n-word-bits 0) remainder))) (write-wordindexed handle index @@ -692,9 +732,8 @@ (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) @@ -713,15 +752,15 @@ (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:n-word-bits (1- sb!vm:sap-size) 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. @@ -731,8 +770,8 @@ (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:n-word-bits size @@ -760,7 +799,7 @@ (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*)) @@ -989,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 @@ -1001,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"))) @@ -1026,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 + ;; 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*) @@ -1108,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 @@ -1150,14 +1253,14 @@ (macrolet ((frob (symbol) `(cold-set ',symbol (cold-fdefinition-object (cold-intern ',symbol))))) - (frob maybe-gc) + (frob sub-gc) (frob internal-error) + (frob sb!kernel::control-stack-exhausted-error) (frob sb!di::handle-breakpoint) (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)) @@ -1169,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 @@ -1196,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)) @@ -1213,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) @@ -1234,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)) @@ -1356,8 +1463,7 @@ (warm-symbol cadr-des)))) (#.sb!vm:other-pointer-lowtag (warm-symbol des))))) - (unless (legal-fun-name-p result) - (error "not a legal function name: ~S" result)) + (legal-fun-name-or-type-error result) result)) (defun cold-fdefinition-object (cold-name &optional leave-fn-raw) @@ -1379,7 +1485,7 @@ sb!vm:fdefn-raw-addr-slot (make-random-descriptor (cold-foreign-symbol-address-as-integer - "undefined_tramp")))) + (sb!vm:extern-alien-name "undefined_tramp"))))) fdefn)))) ;;; Handle the at-cold-init-time, fset-for-static-linkage operation @@ -1403,7 +1509,8 @@ sb!vm:word-shift)))) (#.sb!vm:closure-header-widetag (make-random-descriptor - (cold-foreign-symbol-address-as-integer "closure_tramp"))))) + (cold-foreign-symbol-address-as-integer + (sb!vm:extern-alien-name "closure_tramp")))))) fdefn)) (defun initialize-static-fns () @@ -1417,14 +1524,14 @@ (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)) @@ -1528,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)) @@ -1581,44 +1688,114 @@ (descriptor-gspace code-object)))) (ecase +backend-fasl-file-implementation+ ;; See CMU CL source for other formerly-supported architectures - ;; (and note that you have to rewrite them to use VECTOR-REF - ;; unstead of SAP-REF). + ;; (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))) - #+nil ;; was commented out in cmucl source too. Don't know what - ;; it does -dan 2001.05.03 - (setf (sap-ref-16 sap 0) - (logior (sap-ref-16 sap 0) (ldb (byte 14 0) (ash value -2))))) + (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 (byte-vector-ref-8 gspace-bytes gspace-byte-offset) + (setf (bvref-8 gspace-bytes gspace-byte-offset) (ldb (byte 8 48) value) - (byte-vector-ref-8 gspace-bytes (1+ gspace-byte-offset)) + (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 (byte-vector-ref-8 gspace-bytes gspace-byte-offset) + (setf (bvref-8 gspace-bytes gspace-byte-offset) (ldb (byte 8 32) value) - (byte-vector-ref-8 gspace-bytes (1+ gspace-byte-offset)) + (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 (byte-vector-ref-8 gspace-bytes gspace-byte-offset) + (setf (bvref-8 gspace-bytes gspace-byte-offset) (ldb (byte 8 16) value) - (byte-vector-ref-8 gspace-bytes (1+ gspace-byte-offset)) + (bvref-8 gspace-bytes (1+ gspace-byte-offset)) (ldb (byte 8 24) value)))) (:lda - (setf (byte-vector-ref-8 gspace-bytes gspace-byte-offset) + (setf (bvref-8 gspace-bytes gspace-byte-offset) (ldb (byte 8 0) value) - (byte-vector-ref-8 gspace-bytes (1+ gspace-byte-offset)) + (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 + (assert (zerop (ash value -28))) + (setf (ldb (byte 26 0) + (bvref-32 gspace-bytes gspace-byte-offset)) + (ash value -2))) + (:lui + (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 (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 + (: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))) @@ -1628,7 +1805,7 @@ (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: ;; @@ -1649,7 +1826,7 @@ gspace-byte-address gspace-byte-offset sb!vm:n-word-bytes))) ; length of CALL argument - (setf (byte-vector-ref-32 gspace-bytes gspace-byte-offset) + (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 @@ -1690,41 +1867,43 @@ ;;;; general machinery for cold-loading FASL files ;;; FOP functions for cold loading -(defvar *cold-fop-functions* - ;; We start out with a copy of the ordinary *FOP-FUNCTIONS*. The - ;; ones which aren't appropriate for cold load will be destructively +(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-functions*)) + (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) @@ -1737,8 +1916,8 @@ (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))))) @@ -1757,14 +1936,14 @@ (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) @@ -1842,7 +2021,7 @@ (defun cold-load-symbol (size package) (let ((string (make-string size))) (read-string-as-bytes *fasl-input-stream* string) - (cold-intern (intern string package) package))) + (cold-intern (intern string package)))) (macrolet ((frob (name pname-len package-len) `(define-cold-fop (,name) @@ -1952,17 +2131,17 @@ (8 sb!vm:simple-array-unsigned-byte-8-widetag) (16 sb!vm:simple-array-unsigned-byte-16-widetag) (32 sb!vm:simple-array-unsigned-byte-32-widetag) - (t (error "losing element size: ~D" sizebits)))) + (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:n-byte-bits)))) - (read-sequence-or-die (descriptor-bytes result) - *fasl-input-stream* - :start start - :end end) + (read-bigvec-as-sequence-or-die (descriptor-bytes result) + *fasl-input-stream* + :start start + :end end) result)) (define-cold-fop (fop-single-float-vector) @@ -1975,10 +2154,10 @@ (start (+ (descriptor-byte-offset result) (ash sb!vm:vector-data-offset sb!vm:word-shift))) (end (+ start (* len sb!vm:n-word-bytes)))) - (read-sequence-or-die (descriptor-bytes result) - *fasl-input-stream* - :start start - :end end) + (read-bigvec-as-sequence-or-die (descriptor-bytes result) + *fasl-input-stream* + :start start + :end end) result)) (not-cold-fop fop-double-float-vector) @@ -2024,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) @@ -2191,7 +2370,7 @@ *load-time-value-counter* 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*) @@ -2199,17 +2378,17 @@ ;;;; 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 @@ -2219,12 +2398,14 @@ (#.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) @@ -2242,7 +2423,7 @@ ;; (SETF CAR). (make-hash-table :test 'equal)) -(define-cold-fop (fop-fset nil) +(define-cold-fop (fop-fset :pushp nil) (let* ((fn (pop-stack)) (cold-name (pop-stack)) (warm-name (warm-fun-name cold-name))) @@ -2300,14 +2481,14 @@ (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-input-stream* - :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:n-word-bytes))) @@ -2315,21 +2496,21 @@ (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)) @@ -2340,8 +2521,7 @@ 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 @@ -2366,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 @@ -2427,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-input-stream* - :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) @@ -2464,9 +2643,7 @@ (and (>= (length string) (length tail)) (string= string tail :start1 (- (length string) (length tail))))) -(defun write-c-header () - - ;; writing beginning boilerplate +(defun write-boilerplate () (format t "/*~%") (dolist (line '("This is a machine-generated file. Please do not edit it by hand." @@ -2479,11 +2656,9 @@ "load and run 'core' files, which are basically programs" "in SBCL's own format.")) (format t " * ~A~%" line)) - (format t " */~%") - (terpri) - (format t "#ifndef _SBCL_H_~%#define _SBCL_H_~%") - (terpri) + (format t " */~%")) +(defun write-config-h () ;; propagating *SHEBANG-FEATURES* into C-level #define's (dolist (shebang-feature-name (sort (mapcar #'symbol-name sb-cold:*shebang-features*) @@ -2492,76 +2667,80 @@ "#define LISP_FEATURE_~A~%" (substitute #\_ #\- shebang-feature-name))) (terpri) - - ;; writing miscellaneous constants + ;; and miscellaneous constants (format t "#define SBCL_CORE_VERSION_INTEGER ~D~%" sbcl-core-version-integer) (format t "#define SBCL_VERSION_STRING ~S~%" (sb!xc:lisp-implementation-version)) (format t "#define CORE_MAGIC 0x~X~%" core-magic) - (terpri) - ;; FIXME: Other things from core.h should be defined here too: - ;; #define CORE_END 3840 - ;; #define CORE_NDIRECTORY 3861 - ;; #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 + (format t "#ifndef LANGUAGE_ASSEMBLY~2%") + (format t "#define LISPOBJ(x) ((lispobj)x)~2%") + (format t "#else /* LANGUAGE_ASSEMBLY */~2%") + (format t "#define LISPOBJ(thing) thing~2%") + (format t "#endif /* LANGUAGE_ASSEMBLY */~2%") + (terpri)) + +(defun write-constants-h () + ;; 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 - ;; 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))))) + (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)))) @@ -2600,39 +2779,58 @@ (format t " /* 0x~X */~@[ /* ~A */~]~%" value doc)))) (terpri)) - ;; writing codes/strings for internal errors - (format t "#define ERRORS { \\~%") - ;; FIXME: Is this just DOVECTOR? + ;; 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)))) + + + +(defun write-primitive-object (obj) ;; 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)))))) (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-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 "};~2%") (format t "#else /* LANGUAGE_ASSEMBLY */~2%") - (format t "#define LISPOBJ(thing) thing~2%") - (dolist (obj structs) (let ((name (sb!vm:primitive-object-name obj)) (lowtag (eval (sb!vm:primitive-object-lowtag obj)))) (when lowtag @@ -2641,18 +2839,18 @@ (substitute #\_ #\- (string name)) (substitute #\_ #\- (string (sb!vm:slot-name slot))) (- (* (sb!vm:slot-offset slot) sb!vm:n-word-bytes) lowtag))) - (terpri)))) + (terpri))) (format t "#endif /* LANGUAGE_ASSEMBLY */~2%")) - ;; writing static symbol offsets +(defun write-static-symbols () (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)) @@ -2660,10 +2858,8 @@ (+ sb!vm:static-space-start sb!vm:n-word-bytes sb!vm:other-pointer-lowtag - (if symbol (sb!vm:static-symbol-offset symbol) 0))))) + (if symbol (sb!vm:static-symbol-offset symbol) 0)))))) - ;; Voila. - (format t "~%#endif~%")) ;;;; writing map file @@ -2680,16 +2876,16 @@ (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-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))))) + (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%") (setf funs (sort funs #'< :key #'cdr)) @@ -2715,10 +2911,10 @@ initially undefined function references:~2%") (format t "~%~|~%layout names:~2%") (collect ((stuff)) - (maphash #'(lambda (name gorp) - (declare (ignore name)) - (stuff (cons (descriptor-bits (car gorp)) - (cdr gorp)))) + (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)))) @@ -2730,18 +2926,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) @@ -2779,7 +2981,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) @@ -2789,14 +2993,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*) (aver (zerop rem)) - (write-long floor)) - (write-long pages) + (write-word floor)) + (write-word pages) (incf *data-page* pages))) @@ -2821,36 +3025,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-fun-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) @@ -2878,16 +3098,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 @@ -2895,8 +3105,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-dir-name) (when (and core-file-name (not symbol-table-file-name)) @@ -2910,8 +3119,7 @@ initially undefined function references:~2%") ;; we're not e.g. also creating a header file when we ;; create a core. (format nil "creating core ~S" core-file-name) - (format nil "creating header ~S" c-header-file-name))) - + (format nil "creating headers in ~S" c-header-dir-name))) (let* ((*cold-foreign-symbol-table* (make-hash-table :test 'equal))) ;; Read symbol table, if any. @@ -2926,8 +3134,7 @@ initially undefined function references:~2%") (when filename (ensure-directories-exist filename :verbose t)))) (frob core-file-name) - (frob map-file-name) - (frob c-header-file-name)) + (frob map-file-name)) ;; (This shouldn't matter in normal use, since GENESIS normally ;; only runs once in any given Lisp image, but it could reduce @@ -2938,19 +3145,19 @@ 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 @@ -2997,6 +3204,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))) @@ -3053,15 +3261,42 @@ initially undefined function references:~2%") ;; lexical variable, and it's annoying to have WRITE-MAP (to ;; *STANDARD-OUTPUT*) not be parallel to WRITE-INITIAL-CORE-FILE ;; (to a stream explicitly passed as an argument). + (macrolet ((out-to (name &body body) + `(let ((fn (format nil "~A/~A.h" c-header-dir-name ,name))) + (ensure-directories-exist fn) + (with-open-file (*standard-output* fn + :if-exists :supersede :direction :output) + (write-boilerplate) + (let ((n (substitute #\_ #\- (string-upcase ,name)))) + (format + t + "#ifndef SBCL_GENESIS_~A~%#define SBCL_GENESIS_~A 1~%" + n n)) + ,@body + (format t + "#endif /* SBCL_GENESIS_~A */~%" + (string-upcase ,name)))))) (when map-file-name (with-open-file (*standard-output* map-file-name :direction :output :if-exists :supersede) (write-map))) - (when c-header-file-name - (with-open-file (*standard-output* c-header-file-name - :direction :output - :if-exists :supersede) - (write-c-header))) + (out-to "config" (write-config-h)) + (out-to "constants" (write-constants-h)) + (let ((structs (sort (copy-list sb!vm:*primitive-objects*) #'string< + :key (lambda (obj) + (symbol-name + (sb!vm:primitive-object-name obj)))))) + (dolist (obj structs) + (out-to + (string-downcase (string (sb!vm:primitive-object-name obj))) + (write-primitive-object obj))) + (out-to "primitive-objects" + (dolist (obj structs) + (format t "~&#include \"~A.h\"~%" + (string-downcase + (string (sb!vm:primitive-object-name obj))))))) + (out-to "static-symbols" (write-static-symbols)) + (when core-file-name - (write-initial-core-file core-file-name))))) + (write-initial-core-file core-file-name))))))