0.pre7.47:

[sbcl.git] / src / code / cold-init.lisp

diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp
index 22330f4..187c47b 100644 (file)
--- a/src/code/cold-init.lisp
+++ b/src/code/cold-init.lisp
@@ -50,26 +50,6 @@
   (%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
@@ -90,21 +70,19 @@
   ;; !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)
 
   ;; Anyone might call RANDOM to initialize a hash value or something;
   ;; and there's nothing which needs to be initialized in order for
@@ -155,6 +133,7 @@
                 (/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
@@ -180,11 +159,7 @@
            #!-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)
@@ -213,6 +188,11 @@
 
   ;; 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
@@ -241,7 +221,7 @@
   ;; 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.
@@ -284,7 +264,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
@@ -306,7 +286,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)))
 \f
 ;;;; some support for any hapless wretches who end up debugging cold