X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-init.lisp;h=d3417f236732616f09143af8454589d704f02d5e;hb=b8f63d9b4e978bec3bfc1f4fc471e5ed946781fd;hp=3f24bb5df029dd6e7486c3f4ec59a038200e9ab8;hpb=b08344ddbb8d0193054b72c01be7e367422ccf03;p=sbcl.git diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp index 3f24bb5..d3417f2 100644 --- a/src/code/cold-init.lisp +++ b/src/code/cold-init.lisp @@ -45,29 +45,30 @@ ;;; a SIMPLE-VECTOR set by genesis (defvar *!load-time-values*) +(defun !cold-lose (msg) + (%primitive print msg) + (%primitive print "too early in cold init to recover from errors") + (%halt)) + #!+gengc (defun do-load-time-value-fixup (object offset index) (declare (type index offset)) - (macrolet ((lose (msg) - `(progn - (%primitive print ,msg) - (%halt)))) - (let ((value (svref *!load-time-values* index))) - (typecase object - (list - (case offset - (0 (setf (car object) value)) - (1 (setf (cdr object) value)) - (t (lose "bogus offset in cons cell")))) - (instance - (setf (%instance-ref object (- offset sb!vm:instance-slots-offset)) - value)) - (code-component - (setf (code-header-ref object offset) value)) - (simple-vector - (setf (svref object (- offset sb!vm:vector-data-offset)) value)) - (t - (lose "unknown kind of object for load-time-value fixup")))))) + (let ((value (svref *!load-time-values* index))) + (typecase object + (list + (case offset + (0 (setf (car object) value)) + (1 (setf (cdr object) value)) + (t (!cold-lose "bogus offset in cons cell")))) + (instance + (setf (%instance-ref object (- offset sb!vm:instance-slots-offset)) + value)) + (code-component + (setf (code-header-ref object offset) value)) + (simple-vector + (setf (svref object (- offset sb!vm:vector-data-offset)) value)) + (t + (!cold-lose "unknown kind of object for load-time-value fixup"))))) (eval-when (:compile-toplevel :execute) ;; FIXME: Perhaps we should make SHOW-AND-CALL-AND-FMAKUNBOUND, too, @@ -93,7 +94,7 @@ (setf *gc-notify-stream* nil) (setf *before-gc-hooks* nil) (setf *after-gc-hooks* nil) - #!+gengc (setf sb!conditions::*handler-clusters* nil) + #!+gengc (setf *handler-clusters* nil) #!-gengc (setf *already-maybe-gcing* t *gc-inhibit* t *need-to-collect-garbage* nil @@ -134,19 +135,24 @@ ;; forms of the corresponding source files. (show-and-call !package-cold-init) - - ;; Set sane values for our toplevel forms. - (show-and-call !set-sane-cookie-defaults) + (show-and-call !policy-cold-init-or-resanify) + (/show0 "back from !POLICY-COLD-INIT-OR-RESANIFY") ;; KLUDGE: Why are fixups mixed up with toplevel forms? Couldn't ;; fixups be done separately? Wouldn't that be clearer and better? ;; -- WHN 19991204 (/show0 "doing cold toplevel forms and fixups") - (/show0 "(LENGTH *!REVERSED-COLD-TOPLEVELS*)=..") + (/show0 "(LISTP *!REVERSED-COLD-TOPLEVELS*)=..") #!+sb-show (%primitive print - (sb!impl::hexstr (length *!reversed-cold-toplevels*))) - (let (#!+sb-show (index-in-cold-toplevels 0) - #!+sb-show (filename-in-cold-toplevels nil)) + (if (listp *!reversed-cold-toplevels*) "true" "NIL")) + (/show0 "about to calculate (LENGTH *!REVERSED-COLD-TOPLEVELS*)") + (/show0 "(LENGTH *!REVERSED-COLD-TOPLEVELS*)=..") + #!+sb-show (let ((r-c-tl-length (length *!reversed-cold-toplevels*))) + (/show0 "(length calculated..)") + (let ((hexstr (sb!impl::hexstr r-c-tl-length))) + (/show0 "(hexstr calculated..)") + (%primitive print hexstr))) + (let (#!+sb-show (index-in-cold-toplevels 0)) #!+sb-show (declare (type fixnum index-in-cold-toplevels)) (dolist (toplevel-thing (prog1 (nreverse *!reversed-cold-toplevels*) @@ -185,24 +191,19 @@ (fourth toplevel-thing) (fifth toplevel-thing))) (t - (%primitive print - "bogus fixup code in *!REVERSED-COLD-TOPLEVELS*") - (%halt)))) - (t - (%primitive print "bogus function in *!REVERSED-COLD-TOPLEVELS*") - (%halt))))) + (!cold-lose "bogus fixup code in *!REVERSED-COLD-TOPLEVELS*")))) + (t (!cold-lose "bogus function in *!REVERSED-COLD-TOPLEVELS*"))))) (/show0 "done with loop over cold toplevel forms and fixups") - ;; Set sane values again, so that the user sees sane values instead of - ;; whatever is left over from the last DECLAIM. - (show-and-call !set-sane-cookie-defaults) + ;; Set sane values again, so that the user sees sane values instead + ;; of whatever is left over from the last DECLAIM/PROCLAIM. + (show-and-call !policy-cold-init-or-resanify) - ;; Only do this after top level forms have run, 'cause that's where + ;; Only do this after toplevel forms have run, 'cause that's where ;; DEFTYPEs are. (setf *type-system-initialized* t) (show-and-call os-cold-init-or-reinit) - (show-and-call !filesys-cold-init) (show-and-call stream-cold-init-or-reset) (show-and-call !loader-cold-init) @@ -219,8 +220,8 @@ (show-and-call !class-finalize) ;; The reader and printer are initialized very late, so that they - ;; can even do hairy things like invoking the compiler as part of - ;; their initialization. + ;; can do hairy things like invoking the compiler as part of their + ;; initialization. (show-and-call !reader-cold-init) (let ((*readtable* *standard-readtable*)) (show-and-call !sharpm-cold-init) @@ -242,10 +243,6 @@ (/show0 "done initializing") (setf *cold-init-complete-p* t) - ;; Unintern no-longer-needed stuff before we GC. - #!-sb-fluid - (!unintern-init-only-stuff) - ;; The system is finally ready for GC. #!-gengc (setf *already-maybe-gcing* nil) (/show0 "enabling GC") @@ -268,7 +265,7 @@ and so forth) unless RECKLESSLY-P is non-NIL. On UNIX-like systems, UNIX-STATUS is used as the status code." (declare (type (signed-byte 32) unix-code)) - ;; TO DO: UNIX-CODE was deprecated in sbcl-0.6.8, after having been + ;; FIXME: UNIX-CODE was deprecated in sbcl-0.6.8, after having been ;; around for less than a year. It should be safe to remove it after ;; a year. (when unix-code-p @@ -289,13 +286,17 @@ instead (which is another name for the same thing).")) (gc-cold-init-or-reinit) (setf (sb!alien:extern-alien "internal_errors_enabled" boolean) t) (set-floating-point-modes :traps - ;; PRINT seems to not like x86 NPX denormal - ;; floats like LEAST-NEGATIVE-SINGLE-FLOAT, so - ;; the :UNDERFLOW exceptions are disabled by - ;; default. Joe User can explicitly enable them - ;; if desired. - '(:overflow #!-x86 :underflow :invalid - :divide-by-zero)) + '(:overflow + :invalid + :divide-by-zero + ;; PRINT seems not to like x86 NPX + ;; denormal floats like + ;; LEAST-NEGATIVE-SINGLE-FLOAT, so + ;; the :UNDERFLOW exceptions are + ;; disabled by default. Joe User can + ;; explicitly enable them if + ;; desired. + #!-x86 :underflow)) ;; Clear pseudo atomic in case this core wasn't compiled with ;; support. ;; @@ -310,19 +311,24 @@ instead (which is another name for the same thing).")) ;;;; some support for any hapless wretches who end up debugging cold ;;;; init code -;;; Decode THING into hex using only machinery available early in cold -;;; init. +;;; Decode THING into hexadecimal notation using only machinery +;;; available early in cold init. #!+sb-show (defun hexstr (thing) + (/show0 "entering HEXSTR") (let ((addr (sb!kernel:get-lisp-obj-address thing)) (str (make-string 10))) + (/show0 "ADDR and STR calculated") (setf (char str 0) #\0 (char str 1) #\x) + (/show0 "CHARs 0 and 1 set") (dotimes (i 8) + (/show0 "at head of DOTIMES loop") (let* ((nibble (ldb (byte 4 0) addr)) (chr (char "0123456789abcdef" nibble))) (declare (type (unsigned-byte 4) nibble) (base-char chr)) + (/show0 "NIBBLE and CHR calculated") (setf (char str (- 9 i)) chr addr (ash addr -4)))) str))