X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-init.lisp;h=eae152783df6dab8ac3507f5315f0b205bb7ff57;hb=840832c6ca7fae0af981d721bdbb38e567d575cf;hp=acfccc0b120252cabecc1ddd55f21598e6337a3d;hpb=d7f6139a91d7d9b0667a597584ae306d958bb2f4;p=sbcl.git diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp index acfccc0..eae1527 100644 --- a/src/code/cold-init.lisp +++ b/src/code/cold-init.lisp @@ -21,6 +21,9 @@ ;;; which might be tedious to maintain, instead we use a hack: ;;; anything whose name matches a magic character pattern is ;;; uninterned. +;;; +;;; FIXME: Are there other tables that need to have entries removed? +;;; What about symbols of the form DEF!FOO? (defun !unintern-init-only-stuff () (do ((any-changes? nil nil)) (nil) @@ -32,11 +35,35 @@ (string= name "*!" :end1 2 :end2 2))) (/show0 "uninterning cold-init-only symbol..") (/primitive-print name) + ;; FIXME: Is this (FIRST (LAST *INFO-ENVIRONMENT*)) really + ;; meant to be an idiom to use? Is there a more obvious + ;; name for this? [e.g. (GLOBAL-ENVIRONMENT)?] + (do-info ((first (last *info-environment*)) + :name entry :class class :type type) + (when (eq entry symbol) + (clear-info class type entry))) (unintern symbol package) (setf any-changes? t))))) (unless any-changes? (return)))) +;;;; putting ourselves out of our misery when things become too much to bear + +(declaim (ftype (function (simple-string) nil) critically-unreachable)) +(defun !cold-lose (msg) + (%primitive print msg) + (%primitive print "too early in cold init to recover from errors") + (%halt)) + +;;; last-ditch error reporting for things which should never happen +;;; and which, if they do happen, are sufficiently likely to torpedo +;;; the normal error-handling system that we want to bypass it +(declaim (ftype (function (simple-string) nil) critically-unreachable)) +(defun critically-unreachable (where) + (%primitive print "internal error: Control should never reach here, i.e.") + (%primitive print where) + (%halt)) + ;;;; !COLD-INIT ;;; a list of toplevel things set by GENESIS @@ -45,31 +72,6 @@ ;;; 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)) - (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, ;; and use it for most of the cold-init functions. (Just be careful @@ -85,29 +87,26 @@ (/show0 "entering !COLD-INIT") - (%primitive print "//entering !COLD-INIT") ; REMOVEME - ;; FIXME: It'd probably be cleaner to have most of the stuff here ;; 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. - (setf *gc-notify-stream* nil) - (setf *before-gc-hooks* nil) - (setf *after-gc-hooks* nil) - #!+gengc (setf *handler-clusters* nil) - #!-gengc (setf *already-maybe-gcing* t - *gc-inhibit* t - *need-to-collect-garbage* nil - sb!unix::*interrupts-enabled* t - sb!unix::*interrupt-pending* nil) - (setf *break-on-signals* nil) - (setf *maximum-error-depth* 10) - (setf *current-error-depth* 0) - (setf *cold-init-complete-p* nil) - (setf *type-system-initialized* nil) - - (%primitive print "//done with SETFs") ; REMOVEME + (setf *gc-notify-stream* nil + *before-gc-hooks* nil + *after-gc-hooks* nil + *already-maybe-gcing* t + *gc-inhibit* 1 + *need-to-collect-garbage* nil + sb!unix::*interrupts-enabled* t + sb!unix::*interrupt-pending* nil + *break-on-signals* nil + *maximum-error-depth* 10 + *current-error-depth* 0 + *cold-init-complete-p* nil + *type-system-initialized* nil) + + (show-and-call !typecheckfuns-cold-init) ;; Anyone might call RANDOM to initialize a hash value or something; ;; and there's nothing which needs to be initialized in order for @@ -139,8 +138,6 @@ ;; functions are called in the same relative order as the toplevel ;; forms of the corresponding source files. - (%primitive print "//about to !POLICY-COLD-INIT-OR-RESANIFY") ; REMOVEME - ;;(show-and-call !package-cold-init) (show-and-call !policy-cold-init-or-resanify) (/show0 "back from !POLICY-COLD-INIT-OR-RESANIFY") @@ -160,7 +157,6 @@ (/primitive-print hexstr))) (let (#!+sb-show (index-in-cold-toplevels 0)) #!+sb-show (declare (type fixnum index-in-cold-toplevels)) - (%primitive print "//about to DOLIST TOPLEVEL-THING") ; REMOVEME (dolist (toplevel-thing (prog1 (nreverse *!reversed-cold-toplevels*) @@ -184,25 +180,19 @@ (setf (svref *!load-time-values* (third toplevel-thing)) (funcall (second toplevel-thing)))) (:load-time-value-fixup - #!-gengc (setf (sap-ref-32 (second toplevel-thing) 0) (get-lisp-obj-address - (svref *!load-time-values* (third toplevel-thing)))) - #!+gengc - (!do-load-time-value-fixup (second toplevel-thing) - (third toplevel-thing) - (fourth toplevel-thing))) + (svref *!load-time-values* (third toplevel-thing))))) #!+(and x86 gencgc) (:load-time-code-fixup - (sb!vm::!do-load-time-code-fixup (second toplevel-thing) - (third toplevel-thing) - (fourth toplevel-thing) - (fifth toplevel-thing))) + (sb!vm::!envector-load-time-code-fixup (second toplevel-thing) + (third toplevel-thing) + (fourth toplevel-thing) + (fifth toplevel-thing))) (t (!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") - (%primitive print "//done with DOLIST TOPLEVEL-THING") ; REMOVEME ;; Set sane values again, so that the user sees sane values instead ;; of whatever is left over from the last DECLAIM/PROCLAIM. @@ -221,17 +211,10 @@ ;; FIXME: This list of modes should be defined in one place and ;; explicitly shared between here and REINIT. - ;; - ;; FIXME: In CMU CL, this is done "here" (i.e. in the analogous - ;; lispinit.lisp code) for every processor architecture. But Daniel - ;; Barlow's Alpha patches suppress it for Alpha. Why the difference? - #!+alpha - (set-floating-point-modes :traps '(:overflow - #!-x86 :underflow - :invalid - :divide-by-zero)) - - (%primitive print "//about to !CLASS-FINALIZE") ; REMOVEME + + ;; Why was this marked #!+alpha? CMUCL does it here on all architectures + (set-floating-point-modes :traps '(:overflow :invalid :divide-by-zero)) + (show-and-call !class-finalize) ;; The reader and printer are initialized very late, so that they @@ -247,33 +230,24 @@ ;; the ANSI-specified initial value of *PACKAGE* (setf *package* (find-package "COMMON-LISP-USER")) - ;; FIXME: I'm not sure where it should be done, but CL-USER really - ;; ought to USE-PACKAGE publicly accessible packages like SB-DEBUG - ;; (for ARG and VAR), SB-EXT, SB-EXT-C-CALL, and SB-EXT-ALIEN so - ;; that the user has a hint about which symbols we consider public. - ;; (Perhaps SB-DEBUG wouldn't need to be in the list if ARG and VAR - ;; could be typed directly, with no parentheses, at the debug prompt - ;; the way that e.g. F or BACKTRACE can be?) - - (/show0 "done initializing") + + (/show0 "done initializing, setting *COLD-INIT-COMPLETE-P*") (setf *cold-init-complete-p* t) - (%primitive print "//set *COLD-INIT-COMPLETE-P*") ; REMOVEME ;; The system is finally ready for GC. - #!-gengc (setf *already-maybe-gcing* nil) + (setf *already-maybe-gcing* nil) (/show0 "enabling GC") (gc-on) (/show0 "doing first GC") (gc :full t) (/show0 "back from first GC") - (%primitive print "//back from first GC") ; REMOVEME - ;; The show is on. (terpri) (/show0 "going into toplevel loop") (handling-end-of-the-world - (toplevel-init))) + (toplevel-init) + (critically-unreachable "after TOPLEVEL-INIT"))) (defun quit (&key recklessly-p (unix-code 0 unix-code-p) @@ -282,7 +256,8 @@ "Terminate the current Lisp. Things are cleaned up (with UNWIND-PROTECT 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)) + (declare (type (signed-byte 32) unix-status unix-code)) + (/show0 "entering QUIT") ;; 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. @@ -291,7 +266,8 @@ instead (which is another name for the same thing).")) (if recklessly-p (sb!unix:unix-exit unix-status) - (throw '%end-of-the-world unix-status))) + (throw '%end-of-the-world unix-status)) + (critically-unreachable "after trying to die in QUIT")) ;;;; initialization functions @@ -301,20 +277,14 @@ instead (which is another name for the same thing).")) (os-cold-init-or-reinit) (stream-reinit) (signal-cold-init-or-reinit) - (gc-cold-init-or-reinit) + (gc-reinit) (setf (sb!alien:extern-alien "internal_errors_enabled" boolean) t) - (set-floating-point-modes :traps - '(: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)) + ;; 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. + (set-floating-point-modes :traps '(:overflow :invalid :divide-by-zero)) + ;; Clear pseudo atomic in case this core wasn't compiled with ;; support. ;; @@ -323,7 +293,7 @@ instead (which is another name for the same thing).")) ;; reason.. (Perhaps we should do it anyway in case someone ;; manages to save an image from within a pseudo-atomic-atomic ;; operation?) - #!+x86 (setf sb!impl::*pseudo-atomic-atomic* 0)) + #!+x86 (setf *pseudo-atomic-atomic* 0)) (gc-on))) ;;;; some support for any hapless wretches who end up debugging cold @@ -334,7 +304,7 @@ instead (which is another name for the same thing).")) #!+sb-show (defun hexstr (thing) (/noshow0 "entering HEXSTR") - (let ((addr (sb!kernel:get-lisp-obj-address thing)) + (let ((addr (get-lisp-obj-address thing)) (str (make-string 10))) (/noshow0 "ADDR and STR calculated") (setf (char str 0) #\0