X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-init.lisp;h=202a479cf393355ec2fb61ab8b143abaf345fdcd;hb=34664ac9b1d27f0dff2514c388cf10813a9b1108;hp=260ae433a00cadf80f04e3e83f57a4bf5fb89f1c;hpb=68fd2d2dd6f265669a8957accd8a33e62786a97e;p=sbcl.git diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp index 260ae43..202a479 100644 --- a/src/code/cold-init.lisp +++ b/src/code/cold-init.lisp @@ -22,27 +22,34 @@ ;;; anything whose name matches a magic character pattern is ;;; uninterned. ;;; -;;; FIXME: should also go through globaldb (and perhaps other tables) -;;; blowing away associated entries +;;; 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) (dolist (package (list-all-packages)) (do-symbols (symbol package) - (let ((name (symbol-name symbol))) - (when (or (string= name "!" :end1 1 :end2 1) - (and (>= (length name) 2) - (string= name "*!" :end1 2 :end2 2))) - (/show0 "uninterning cold-init-only symbol..") - (/primitive-print name) - (unintern symbol package) - (setf any-changes? t))))) + (let ((name (symbol-name symbol))) + (when (or (string= name "!" :end1 1 :end2 1) + (and (>= (length name) 2) + (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)) +(declaim (ftype (function (simple-string) nil) !cold-lose)) (defun !cold-lose (msg) (%primitive print msg) (%primitive print "too early in cold init to recover from errors") @@ -85,14 +92,12 @@ ;; !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 - *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 + (setf *after-gc-hooks* nil + *gc-inhibit* t + *gc-pending* nil + #!+sb-thread *stop-for-gc-pending* #!+sb-thread nil + sb!unix::*interrupts-enabled* t + sb!unix::*interrupt-pending* nil *break-on-signals* nil *maximum-error-depth* 10 *current-error-depth* 0 @@ -106,6 +111,9 @@ ;; this to be initialized, so we initialize it right away. (show-and-call !random-cold-init) + (show-and-call !character-database-cold-init) + + (show-and-call !early-package-cold-init) (show-and-call !package-cold-init) ;; All sorts of things need INFO and/or (SETF INFO). @@ -114,6 +122,7 @@ ;; This needs to be done early, but needs to be after INFO is ;; initialized. + (show-and-call !function-names-cold-init) (show-and-call !fdefn-cold-init) ;; Various toplevel forms call MAKE-ARRAY, which calls SUBTYPEP, so @@ -135,6 +144,8 @@ (show-and-call !policy-cold-init-or-resanify) (/show0 "back from !POLICY-COLD-INIT-OR-RESANIFY") + (show-and-call !early-proclaim-cold-init) + ;; KLUDGE: Why are fixups mixed up with toplevel forms? Couldn't ;; fixups be done separately? Wouldn't that be clearer and better? ;; -- WHN 19991204 @@ -144,47 +155,47 @@ (/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 (hexstr r-c-tl-length))) - (/show0 "(hexstr calculated..)") - (/primitive-print hexstr))) + (/show0 "(length calculated..)") + (let ((hexstr (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*) - ;; (Now that we've NREVERSEd it, it's - ;; somewhat scrambled, so keep anyone - ;; else from trying to get at it.) - (makunbound '*!reversed-cold-toplevels*))) + (nreverse *!reversed-cold-toplevels*) + ;; (Now that we've NREVERSEd it, it's + ;; somewhat scrambled, so keep anyone + ;; else from trying to get at it.) + (makunbound '*!reversed-cold-toplevels*))) #!+sb-show (when (zerop (mod index-in-cold-toplevels 1024)) - (/show0 "INDEX-IN-COLD-TOPLEVELS=..") - (/hexstr index-in-cold-toplevels)) + (/show0 "INDEX-IN-COLD-TOPLEVELS=..") + (/hexstr index-in-cold-toplevels)) #!+sb-show (setf index-in-cold-toplevels - (the fixnum (1+ index-in-cold-toplevels))) + (the fixnum (1+ index-in-cold-toplevels))) (typecase toplevel-thing - (function - (funcall toplevel-thing)) - (cons - (case (first toplevel-thing) - (:load-time-value - (setf (svref *!load-time-values* (third toplevel-thing)) - (funcall (second toplevel-thing)))) - (:load-time-value-fixup - (setf (sap-ref-32 (second toplevel-thing) 0) - (get-lisp-obj-address - (svref *!load-time-values* (third toplevel-thing))))) - #!+(and x86 gencgc) - (:load-time-code-fixup - (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*"))))) + (function + (funcall toplevel-thing)) + (cons + (case (first toplevel-thing) + (:load-time-value + (setf (svref *!load-time-values* (third toplevel-thing)) + (funcall (second toplevel-thing)))) + (:load-time-value-fixup + (setf (sap-ref-word (second toplevel-thing) 0) + (get-lisp-obj-address + (svref *!load-time-values* (third toplevel-thing))))) + #!+(and (or x86 x86-64) gencgc) + (:load-time-code-fixup + (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") ;; Set sane values again, so that the user sees sane values instead @@ -195,24 +206,30 @@ ;; DEFTYPEs are. (setf *type-system-initialized* t) + ;; now that the type system is definitely initialized, fixup UNKNOWN + ;; types that have crept in. + (show-and-call !fixup-type-cold-init) + ;; run the PROCLAIMs. + (show-and-call !late-proclaim-cold-init) + (show-and-call os-cold-init-or-reinit) + (show-and-call thread-init-or-reinit) (show-and-call stream-cold-init-or-reset) (show-and-call !loader-cold-init) + (show-and-call !foreign-cold-init) (show-and-call signal-cold-init-or-reinit) + (/show0 "enabling internal errors") (setf (sb!alien:extern-alien "internal_errors_enabled" boolean) t) ;; 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 - #!+alpha :underflow - :invalid - :divide-by-zero)) + + ;; FIXME: For some unknown reason, NetBSD/x86 won't run with the + ;; :invalid trap enabled. That should be fixed, but not today... + ;; PEM -- April 5, 2004 + (set-floating-point-modes + :traps '(:overflow #!-netbsd :invalid :divide-by-zero)) (show-and-call !class-finalize) @@ -234,7 +251,6 @@ (setf *cold-init-complete-p* t) ;; The system is finally ready for GC. - (setf *already-maybe-gcing* nil) (/show0 "enabling GC") (gc-on) (/show0 "doing first GC") @@ -244,25 +260,17 @@ ;; The show is on. (terpri) (/show0 "going into toplevel loop") - (handling-end-of-the-world + (handling-end-of-the-world (toplevel-init) (critically-unreachable "after TOPLEVEL-INIT"))) -(defun quit (&key recklessly-p - (unix-code 0 unix-code-p) - (unix-status unix-code)) +(defun quit (&key recklessly-p (unix-status 0)) #!+sb-doc - "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-status unix-code)) + "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-status)) (/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. - (when unix-code-p - (warn "The UNIX-CODE argument is deprecated. Use the UNIX-STATUS argument -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)) @@ -270,36 +278,36 @@ instead (which is another name for the same thing).")) ;;;; initialization functions +(defun thread-init-or-reinit () + (sb!thread::init-initial-thread) + (sb!thread::init-job-control) + (sb!thread::get-foreground)) + (defun reinit () + (setf *default-external-format* nil) (without-interrupts (without-gcing - (os-cold-init-or-reinit) + (os-cold-init-or-reinit) + (thread-init-or-reinit) (stream-reinit) (signal-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. - #!+alpha :underflow)) - ;; Clear pseudo atomic in case this core wasn't compiled with - ;; support. + ;; 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. ;; - ;; FIXME: In SBCL our cores are always compiled with support. So - ;; we don't need to do this, do we? At least not for this - ;; reason.. (Perhaps we should do it anyway in case someone - ;; manages to save an image from within a pseudo-atomic-atomic - ;; operation?) - #!+x86 (setf *pseudo-atomic-atomic* 0)) - (gc-on))) + ;; see also comment at the previous SET-FLOATING-POINT-MODES + ;; call site. + (set-floating-point-modes + :traps '(:overflow #!-netbsd :invalid :divide-by-zero)))) + (gc-reinit) + ;; make sure TIME works correctly from saved cores + (setf *internal-real-time-base-seconds* nil) + (foreign-reinit) + (dolist (hook *init-hooks*) + (with-simple-restart (continue "Skip this initialization hook.") + (funcall hook)))) ;;;; some support for any hapless wretches who end up debugging cold ;;;; init code @@ -310,20 +318,20 @@ instead (which is another name for the same thing).")) (defun hexstr (thing) (/noshow0 "entering HEXSTR") (let ((addr (get-lisp-obj-address thing)) - (str (make-string 10))) + (str (make-string 10 :element-type 'base-char))) (/noshow0 "ADDR and STR calculated") (setf (char str 0) #\0 - (char str 1) #\x) + (char str 1) #\x) (/noshow0 "CHARs 0 and 1 set") (dotimes (i 8) (/noshow0 "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)) - (/noshow0 "NIBBLE and CHR calculated") - (setf (char str (- 9 i)) chr - addr (ash addr -4)))) + (chr (char "0123456789abcdef" nibble))) + (declare (type (unsigned-byte 4) nibble) + (base-char chr)) + (/noshow0 "NIBBLE and CHR calculated") + (setf (char str (- 9 i)) chr + addr (ash addr -4)))) str)) #!+sb-show @@ -332,10 +340,10 @@ instead (which is another name for the same thing).")) (simple-string (sb!sys:%primitive print x)) (symbol (sb!sys:%primitive print (symbol-name x))) (list (let ((count 0)) - (sb!sys:%primitive print "list:") - (dolist (i x) - (when (>= (incf count) 4) - (sb!sys:%primitive print "...") - (return)) - (cold-print i)))) + (sb!sys:%primitive print "list:") + (dolist (i x) + (when (>= (incf count) 4) + (sb!sys:%primitive print "...") + (return)) + (cold-print i)))) (t (sb!sys:%primitive print (hexstr x)))))