X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-init.lisp;h=b6dd3240731b831677e04458e8e0435ea3525891;hb=68c539ab90bb39f342229e68bf9286f63824597a;hp=4bc3375e511e432fa0a997adc7af8ee753b378c7;hpb=49dfecae13e0faa1af793c32ed25d44d62da157a;p=sbcl.git diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp index 4bc3375..b6dd324 100644 --- a/src/code/cold-init.lisp +++ b/src/code/cold-init.lisp @@ -11,9 +11,6 @@ ;;;; files for more information. (in-package "SB!IMPL") - -(file-comment - "$Header$") ;;;; burning our ships behind us @@ -48,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, @@ -88,7 +86,7 @@ (/show0 "entering !COLD-INIT") ;; FIXME: It'd probably be cleaner to have most of the stuff here - ;; handled by calls a la !GC-COLD-INIT, !ERROR-COLD-INIT, and + ;; handled by calls like !GC-COLD-INIT, !ERROR-COLD-INIT, and ;; !UNIX-COLD-INIT. And *TYPE-SYSTEM-INITIALIZED* could be changed to ;; *TYPE-SYSTEM-INITIALIZED-WHEN-BOUND* so that it doesn't need to ;; be explicitly set in order to be meaningful. @@ -96,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 @@ -137,9 +135,8 @@ ;; 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? @@ -188,24 +185,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) @@ -222,8 +214,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) @@ -245,10 +237,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") @@ -261,7 +249,7 @@ (terpri) (/show0 "going into toplevel loop") (handling-end-of-the-world - (toplevel))) + (toplevel-init))) (defun quit (&key recklessly-p (unix-code 0 unix-code-p) @@ -271,7 +259,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