X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fgeneric%2Fgenesis.lisp;h=582bb3dc26bca1d9e664bdbb27c4fa39f7649a11;hb=993d5b779638756473181dda8d928d33038d4cc3;hp=3dd6e37517b6d69ebfc66135ca3423c7202abc55;hpb=7848e760d71ba19c6b69b636d12b7ebd28696bf8;p=sbcl.git diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp index 3dd6e37..582bb3d 100644 --- a/src/compiler/generic/genesis.lisp +++ b/src/compiler/generic/genesis.lisp @@ -6,13 +6,20 @@ ;;;; As explained by Rob MacLachlan on the CMU CL mailing list Wed, 06 ;;;; Jan 1999 11:05:02 -0500, this cold load generator more or less ;;;; fakes up static function linking. I.e. it makes sure that all the -;;;; functions in the fasl files it reads are bound to the +;;;; DEFUN-defined functions in the fasl files it reads are bound to the ;;;; corresponding symbols before execution starts. It doesn't do ;;;; anything to initialize variable values; instead it just arranges ;;;; for !COLD-INIT to be called at cold load time. !COLD-INIT is ;;;; responsible for explicitly initializing anything which has to be ;;;; initialized early before it transfers control to the ordinary ;;;; top-level forms. +;;;; +;;;; (In CMU CL, and in SBCL as of 0.6.9 anyway, functions not defined +;;;; by DEFUN aren't set up specially by GENESIS. In particular, +;;;; structure slot accessors are not set up. Slot accessors are +;;;; available at cold init time because they're usually compiled +;;;; inline. They're not available as out-of-line functions until the +;;;; toplevel forms installing them have run.) ;;;; This software is part of the SBCL system. See the README file for ;;;; more information. @@ -25,9 +32,6 @@ (in-package "SB!IMPL") -(file-comment - "$Header$") - ;;; a magic number used to identify our core files (defconstant core-magic (logior (ash (char-code #\S) 24) @@ -44,7 +48,12 @@ ;;; IP packets), and in fact the CMU CL version number never ended up ;;; being incremented past 0. A better approach might be to use a ;;; string which is set from CVS data. -(defconstant sbcl-core-version-integer 0) +;;; +;;; 0: inherited from CMU CL +;;; 1: rearranged static symbols for sbcl-0.6.8 +;;; 2: eliminated non-ANSI %DEFCONSTANT/%%DEFCONSTANT support, +;;; deleted a slot from DEBUG-SOURCE structure +(defconstant sbcl-core-version-integer 2) (defun round-up (number size) #!+sb-doc @@ -62,12 +71,11 @@ (defvar *read-only*) (defconstant read-only-space-id 3) -(eval-when (:compile-toplevel :execute :load-toplevel) - (defconstant descriptor-low-bits 16 - "the number of bits in the low half of the descriptor") - (defconstant target-space-alignment (ash 1 descriptor-low-bits) - "the alignment requirement for spaces in the target. - Must be at least (ASH 1 DESCRIPTOR-LOW-BITS)")) +(defconstant descriptor-low-bits 16 + "the number of bits in the low half of the descriptor") +(defconstant target-space-alignment (ash 1 descriptor-low-bits) + "the alignment requirement for spaces in the target. + Must be at least (ASH 1 DESCRIPTOR-LOW-BITS)") ;;; a GENESIS-time representation of a memory space (e.g. read-only space, ;;; dynamic space, or static space) @@ -1740,16 +1748,17 @@ (defvar *normal-fop-functions*) -;;; This is like DEFINE-FOP which defines fops for warm load, but unlike -;;; DEFINE-FOP, this version -;;; (1) looks up the code for this name (created by a previous DEFINE-FOP) -;;; instead of creating a code, and -;;; (2) stores its definition in the *COLD-FOP-FUNCTIONS* vector, instead -;;; of storing in the *FOP-FUNCTIONS* vector. +;;; Cause a fop to have a special definition for cold load. +;;; +;;; This is similar to DEFINE-FOP, but unlike DEFINE-FOP, this version +;;; (1) looks up the code for this name (created by a previous +;; DEFINE-FOP) instead of creating a code, and +;;; (2) stores its definition in the *COLD-FOP-FUNCTIONS* vector, +;;; instead of storing in the *FOP-FUNCTIONS* vector. (defmacro define-cold-fop ((name &optional (pushp t)) &rest forms) (check-type pushp (member nil t :nope)) (let ((code (get name 'fop-code)) - (fname (concat-pnames 'cold- name))) + (fname (symbolicate "COLD-" name))) (unless code (error "~S is not a defined FOP." name)) `(progn @@ -1772,8 +1781,9 @@ `(define-cold-fop (,name) (error "The fop ~S is not supported in cold load." ',name))) -;;; COLD-LOAD loads stuff into the core image being built by calling FASLOAD -;;; with the fop function table rebound to a table of cold loading functions. +;;; COLD-LOAD loads stuff into the core image being built by calling +;;; FASLOAD 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." @@ -2500,6 +2510,7 @@ (defun write-c-header () + ;; writing beginning boilerplate (format t "/*~%") (dolist (line '("This is a machine-generated file. Do not edit it by hand." @@ -2514,17 +2525,16 @@ (format t " * ~A~%" line)) (format t " */~%") (terpri) - (format t "#ifndef _SBCL_H_~%#define _SBCL_H_~%") (terpri) + ;; writing miscellaneous constants (format t "#define SBCL_CORE_VERSION_INTEGER ~D~%" sbcl-core-version-integer) (format t "#define SBCL_VERSION_STRING ~S~%" (sb!xc:lisp-implementation-version)) (format t "#define CORE_MAGIC 0x~X~%" core-magic) (terpri) - ;; FIXME: Other things from core.h should be defined here too: ;; #define CORE_END 3840 ;; #define CORE_NDIRECTORY 3861 @@ -2537,6 +2547,7 @@ ;; #define STATIC_SPACE_ID (2) ;; #define READ_ONLY_SPACE_ID (3) + ;; writing entire families of named constants from SB!VM (let ((constants nil)) (do-external-symbols (symbol (find-package "SB!VM")) (when (constantp symbol) @@ -2579,7 +2590,7 @@ (test-tail "-SUBTYPE" "subtype_" 3) (test-head "TRACE-TABLE-" "tracetab_" 4) (test-tail "-SC-NUMBER" "sc_" 5) - ;; This simpler style of munging of names seems less + ;; 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")) @@ -2592,23 +2603,50 @@ (< (second const1) (second const2)))))) (let ((prev-priority (second (car constants)))) (dolist (const constants) - (unless (= prev-priority (second const)) - (terpri) - (setf prev-priority (second const))) - (format t - "#define ~A ~D /* 0x~X */~@[ /* ~A */~]~%" - (first const) - (third const) - (third const) - (fourth const)))) - (terpri) - (format t "#define ERRORS { \\~%") - ;; FIXME: Is this just DO-VECTOR? - (let ((internal-errors sb!c:*backend-internal-errors*)) - (dotimes (i (length internal-errors)) - (format t " ~S, /*~D*/ \\~%" (cdr (aref internal-errors i)) i))) - (format t " NULL \\~%}~%") + (destructuring-bind (name priority value doc) const + (unless (= prev-priority priority) + (terpri) + (setf prev-priority priority)) + (format t "#define ~A " name) + (format t + ;; KLUDGE: As of sbcl-0.6.7.14, we're dumping two + ;; different kinds of values here, (1) small codes + ;; and (2) machine addresses. The small codes can be + ;; dumped as bare integer values. The large machine + ;; addresses might cause problems if they're large + ;; and represented as (signed) C integers, so we + ;; want to force them to be unsigned. We do that by + ;; wrapping them in the LISPOBJ macro. (We could do + ;; it with a bare "(unsigned)" cast, except that + ;; this header file is used not only in C files, but + ;; also in assembly files, which don't understand + ;; the cast syntax. The LISPOBJ macro goes away in + ;; assembly files, but that shouldn't matter because + ;; we don't do arithmetic on address constants in + ;; assembly files. See? It really is a kludge..) -- + ;; WHN 2000-10-18 + (let (;; cutoff for treatment as a small code + (cutoff (expt 2 16))) + (cond ((minusp value) + (error "stub: negative values unsupported")) + ((< value cutoff) + "~D") + (t + "LISPOBJ(~D)"))) + value) + (format t " /* 0x~X */~@[ /* ~A */~]~%" value doc)))) (terpri)) + + ;; writing codes/strings for internal errors + (format t "#define ERRORS { \\~%") + ;; FIXME: Is this just DO-VECTOR? + (let ((internal-errors sb!c:*backend-internal-errors*)) + (dotimes (i (length internal-errors)) + (format t " ~S, /*~D*/ \\~%" (cdr (aref internal-errors i)) i))) + (format t " NULL \\~%}~%") + (terpri) + + ;; writing primitive object layouts (let ((structs (sort (copy-list sb!vm:*primitive-objects*) #'string< :key #'(lambda (obj) (symbol-name @@ -2642,6 +2680,8 @@ (- (* (sb!vm:slot-offset slot) sb!vm:word-bytes) lowtag))) (terpri)))) (format t "#endif /* LANGUAGE_ASSEMBLY */~2%")) + + ;; writing static symbol offsets (dolist (symbol (cons nil sb!vm:*static-symbols*)) ;; FIXME: It would be nice to use longer names NIL and (particularly) T ;; in #define statements. @@ -2658,6 +2698,8 @@ sb!vm:word-bytes sb!vm:other-pointer-type (if symbol (sb!vm:static-symbol-offset symbol) 0))))) + + ;; Voila. (format t "~%#endif~%")) ;;;; writing map file