0.9.16.28:

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

diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp
index 4545f0c..eb223cb 100644 (file)
--- a/src/code/cold-init.lisp
+++ b/src/code/cold-init.lisp
@@ -104,6 +104,10 @@
         *cold-init-complete-p* nil
         *type-system-initialized* nil)
 
+  ;; I'm not sure where eval is first called, so I put this first.
+  #!+sb-eval
+  (show-and-call sb!eval::!full-eval-cold-init)
+
   (show-and-call thread-init-or-reinit)
   (show-and-call !typecheckfuns-cold-init)
 
@@ -113,6 +117,7 @@
   (show-and-call !random-cold-init)
 
   (show-and-call !character-database-cold-init)
+  (show-and-call !character-name-database-cold-init)
 
   (show-and-call !early-package-cold-init)
   (show-and-call !package-cold-init)
@@ -145,6 +150,7 @@
   (show-and-call !policy-cold-init-or-resanify)
   (/show0 "back from !POLICY-COLD-INIT-OR-RESANIFY")
 
+  (show-and-call !constantp-cold-init)
   (show-and-call !early-proclaim-cold-init)
 
   ;; KLUDGE: Why are fixups mixed up with toplevel forms? Couldn't
@@ -285,6 +291,7 @@ 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)
@@ -304,7 +311,12 @@ UNIX-like systems, UNIX-STATUS is used as the status code."
   (gc-reinit)
   ;; make sure TIME works correctly from saved cores
   (setf *internal-real-time-base-seconds* nil)
+  (setf *gc-run-time* 0)
   (foreign-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)
+    (sb!debug::disable-debugger))
   (dolist (hook *init-hooks*)
     (with-simple-restart (continue "Skip this initialization hook.")
       (funcall hook))))