X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-init.lisp;h=bbecff2e4aef2427bd0ae7dbd5986c4b9349bba9;hb=8286d1fc02d1e769a766fbf1670bca474237161f;hp=7bcaca1247eea7b0950d98542eed119bef18e6ac;hpb=1bdc658b910e7dcc76f606b2c7c9c64012b6ee11;p=sbcl.git diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp index 7bcaca1..bbecff2 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: should also go through globaldb (and perhaps other tables) +;;; blowing away associated entries (defun !unintern-init-only-stuff () (do ((any-changes? nil nil)) (nil) @@ -31,44 +34,36 @@ (and (>= (length name) 2) (string= name "*!" :end1 2 :end2 2))) (/show0 "uninterning cold-init-only symbol..") - #!+sb-show (%primitive print name) + (/primitive-print name) (unintern symbol package) (setf any-changes? t))))) (unless any-changes? (return)))) -;;;; !COLD-INIT - -;;; a list of toplevel things set by GENESIS -(defvar *!reversed-cold-toplevels*) - -;;; a SIMPLE-VECTOR set by genesis -(defvar *!load-time-values*) +;;;; 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)) -#!+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"))))) +;;; 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 +(defvar *!reversed-cold-toplevels*) + +;;; a SIMPLE-VECTOR set by GENESIS +(defvar *!load-time-values*) (eval-when (:compile-toplevel :execute) ;; FIXME: Perhaps we should make SHOW-AND-CALL-AND-FMAKUNBOUND, too, @@ -76,7 +71,7 @@ ;; not to use it for the COLD-INIT-OR-REINIT functions.) (sb!xc:defmacro show-and-call (name) `(progn - #!+sb-show (%primitive print ,(symbol-name name)) + (/primitive-print ,(symbol-name name)) (,name)))) ;;; called when a cold system starts up @@ -90,27 +85,30 @@ ;; !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-verbose* nil) - (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) + (setf *gc-notify-stream* nil + *before-gc-hooks* nil + *after-gc-hooks* nil + *already-maybe-gcing* t + *gc-inhibit* t + *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 !exhaust-cold-init) + (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 ;; this to be initialized, so we initialize it right away. (show-and-call !random-cold-init) + (show-and-call !package-cold-init) + ;; All sorts of things need INFO and/or (SETF INFO). (/show0 "about to SHOW-AND-CALL !GLOBALDB-COLD-INIT") (show-and-call !globaldb-cold-init) @@ -134,7 +132,7 @@ ;; functions are called in the same relative order as the toplevel ;; forms of the corresponding source files. - (show-and-call !package-cold-init) + ;;(show-and-call !package-cold-init) (show-and-call !policy-cold-init-or-resanify) (/show0 "back from !POLICY-COLD-INIT-OR-RESANIFY") @@ -143,17 +141,17 @@ ;; -- WHN 19991204 (/show0 "doing cold toplevel forms and fixups") (/show0 "(LISTP *!REVERSED-COLD-TOPLEVELS*)=..") - #!+sb-show (%primitive print - (if (listp *!reversed-cold-toplevels*) "true" "NIL")) + (/hexstr (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))) + (let ((hexstr (hexstr r-c-tl-length))) (/show0 "(hexstr calculated..)") - (%primitive print hexstr))) + (/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*) ;; (Now that we've NREVERSEd it, it's @@ -163,7 +161,7 @@ #!+sb-show (when (zerop (mod index-in-cold-toplevels 1024)) (/show0 "INDEX-IN-COLD-TOPLEVELS=..") - (%primitive print (sb!impl::hexstr index-in-cold-toplevels))) + (/hexstr index-in-cold-toplevels)) #!+sb-show (setf index-in-cold-toplevels (the fixnum (1+ index-in-cold-toplevels))) @@ -176,20 +174,15 @@ (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*"))))) @@ -212,8 +205,13 @@ ;; 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 + #!+alpha :underflow :invalid :divide-by-zero)) @@ -232,19 +230,12 @@ ;; 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) ;; 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") @@ -255,7 +246,8 @@ (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) @@ -264,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. @@ -273,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 @@ -283,7 +277,7 @@ 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 @@ -296,7 +290,7 @@ instead (which is another name for the same thing).")) ;; disabled by default. Joe User can ;; explicitly enable them if ;; desired. - #!-x86 :underflow)) + #!+alpha :underflow)) ;; Clear pseudo atomic in case this core wasn't compiled with ;; support. ;; @@ -305,7 +299,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 @@ -316,7 +310,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