X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-init.lisp;h=9e3359ed3ee0f026cfe38391132e0f74dcaf7112;hb=2419deec84b45d81610dc8d3db610c3e2f7b9486;hp=69e0541ba5793694231a6c4616825b84912696a4;hpb=8c82cc1e67fe8116431a1d2d4e79005114ff1697;p=sbcl.git

diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp
index 69e0541..9e3359e 100644
--- a/src/code/cold-init.lisp
+++ b/src/code/cold-init.lisp
@@ -96,13 +96,16 @@
         *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
+        *allow-with-interrupts* t
+        *interrupts-enabled* t
+        *interrupt-pending* nil
         *break-on-signals* nil
         *maximum-error-depth* 10
         *current-error-depth* 0
         *cold-init-complete-p* nil
-        *type-system-initialized* nil)
+        *type-system-initialized* nil
+        sb!vm:*alloc-signal* nil
+        sb!kernel::*gc-epoch* (cons nil nil))
 
   ;; I'm not sure where eval is first called, so I put this first.
   #!+sb-eval
@@ -116,6 +119,9 @@
   ;; this to be initialized, so we initialize it right away.
   (show-and-call !random-cold-init)
 
+  ;; Must be done before any non-opencoded array references are made.
+  (show-and-call !hairy-data-vector-reffer-init)
+
   (show-and-call !character-database-cold-init)
   (show-and-call !character-name-database-cold-init)
 
@@ -285,20 +291,18 @@ UNIX-like systems, UNIX-STATUS is used as the status code."
 (defun reinit ()
   (setf *default-external-format* nil)
   (setf sb!alien::*default-c-string-external-format* nil)
-  (without-interrupts
-    (without-gcing
-        (os-cold-init-or-reinit)
-      (thread-init-or-reinit)
-      (stream-reinit)
-      #!-win32
-      (signal-cold-init-or-reinit)
-      (setf (sb!alien:extern-alien "internal_errors_enabled" boolean) t)
-      (float-cold-init-or-reinit)))
+  ;; WITHOUT-GCING implies WITHOUT-INTERRUPTS.
+  (without-gcing
+    (os-cold-init-or-reinit)
+    (thread-init-or-reinit)
+    (stream-reinit t)
+    #!-win32
+    (signal-cold-init-or-reinit)
+    (setf (sb!alien:extern-alien "internal_errors_enabled" boolean) t)
+    (float-cold-init-or-reinit))
   (gc-reinit)
-  ;; make sure TIME works correctly from saved cores
-  (setf *internal-real-time-base-seconds* nil)
-  (setf *gc-run-time* 0)
   (foreign-reinit)
+  (time-reinit)
   ;; If the debugger was disabled in the saved core, we need to
   ;; re-disable ldb again.
   (when (eq *invoke-debugger-hook* 'sb!debug::debugger-disabled-hook)