X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-init.lisp;h=6bb7b33fd4b4db00de1c96c7a0d46bcfda827e8a;hb=35bfc07cbd9aa8029e9cc42f1a3fab27f1a673f4;hp=fd3ee813c4167cca85e6ba984cfc5bdbb7282679;hpb=444d2072bc52e60a41af62ee22e343e76109212f;p=sbcl.git

diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp
index fd3ee81..6bb7b33 100644
--- 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)
 
@@ -224,14 +228,7 @@
   (/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: 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 float-cold-init-or-reinit)
 
   (show-and-call !class-finalize)
 
@@ -287,26 +284,23 @@ 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)
+      #!-win32
+      (signal-cold-init-or-reinit)
       (setf (sb!alien:extern-alien "internal_errors_enabled" boolean) t)
-      ;; 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.
-      ;;
-      ;; see also comment at the previous SET-FLOATING-POINT-MODES
-      ;; call site.
-      (set-floating-point-modes
-       :traps '(:overflow #!-netbsd :invalid :divide-by-zero))))
+      (float-cold-init-or-reinit)))
   (gc-reinit)
-  ;; make sure TIME works correctly from saved cores
-  (setf *internal-real-time-base-seconds* nil)
   (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)
+    (sb!debug::disable-debugger))
   (dolist (hook *init-hooks*)
     (with-simple-restart (continue "Skip this initialization hook.")
       (funcall hook))))