X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-init.lisp;h=cb4c684510fbfe7f8703ebaf617c05d895eb88c8;hb=860543cc7ba0266e41e1d41ac9b6a208f3795f1a;hp=23906300d4df0581aec14e628bb078eec8039af5;hpb=5277a0cbf1a72243cad6808883a4847acefc8e6b;p=sbcl.git diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp index 2390630..cb4c684 100644 --- a/src/code/cold-init.lisp +++ b/src/code/cold-init.lisp @@ -22,8 +22,8 @@ ;;; 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) @@ -35,6 +35,13 @@ (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? @@ -88,8 +95,7 @@ (setf *gc-notify-stream* nil *before-gc-hooks* nil *after-gc-hooks* nil - *already-maybe-gcing* t - *gc-inhibit* t + *gc-inhibit* 1 *need-to-collect-garbage* nil sb!unix::*interrupts-enabled* t sb!unix::*interrupt-pending* nil @@ -107,13 +113,14 @@ (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) ;; 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 +142,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 @@ -178,10 +187,10 @@ (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*"))))) @@ -195,6 +204,9 @@ ;; DEFTYPEs are. (setf *type-system-initialized* t) + ;; run the PROCLAIMs. + (show-and-call !late-proclaim-cold-init) + (show-and-call os-cold-init-or-reinit) (show-and-call stream-cold-init-or-reset) @@ -204,15 +216,9 @@ ;; 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)) + + ;; 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) @@ -234,7 +240,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") @@ -276,20 +281,13 @@ instead (which is another name for the same thing).")) (os-cold-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. - #!-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. ;; @@ -298,8 +296,9 @@ 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 *pseudo-atomic-atomic* 0)) - (gc-on))) + #!+x86 (setf *pseudo-atomic-atomic* 0))) + (gc-on) + (gc)) ;;;; some support for any hapless wretches who end up debugging cold ;;;; init code @@ -309,7 +308,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