X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-init.lisp;h=ef011a2cb3ab855c645bd3a1a8fd1f4da1974f5a;hb=451d6e4af62dc8bbad57219c403d4395db84a4d6;hp=034e5bfb53f0454361cc835899de58dc2d889961;hpb=48ce739de247d0613759bb676ca7e72e687e35b9;p=sbcl.git

diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp
index 034e5bf..ef011a2 100644
--- a/src/code/cold-init.lisp
+++ b/src/code/cold-init.lisp
@@ -96,13 +96,19 @@
         *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.
+  (show-and-call !eval-cold-init)
 
   (show-and-call thread-init-or-reinit)
   (show-and-call !typecheckfuns-cold-init)
@@ -112,6 +118,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)
 
@@ -224,14 +233,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)
 
@@ -268,10 +270,12 @@
 
 (defun quit (&key recklessly-p (unix-status 0))
   #!+sb-doc
-  "Terminate the current Lisp. Things are cleaned up (with
-UNWIND-PROTECT and so forth) unless RECKLESSLY-P is non-NIL. On
-UNIX-like systems, UNIX-STATUS is used as the status code."
+  "Terminate the current Lisp. *EXIT-HOOKS* are pending unwind-protect
+cleanup forms are run unless RECKLESSLY-P is true. On UNIX-like
+systems, UNIX-STATUS is used as the status code."
   (declare (type (signed-byte 32) unix-status))
+  ;; FIXME: Windows is not "unix-like", but still has the same
+  ;; unix-status... maybe we should just revert to calling it :STATUS?
   (/show0 "entering QUIT")
   (if recklessly-p
       (sb!unix:unix-exit unix-status)
@@ -286,35 +290,27 @@ UNIX-like systems, UNIX-STATUS is used as the status code."
   (sb!thread::get-foreground))
 
 (defun reinit ()
+  #!+win32
+  (setf sb!win32::*ansi-codepage* nil)
   (setf *default-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)
-      ;; 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))))
+  (setf sb!alien::*default-c-string-external-format* nil)
+  ;; 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)
     (sb!debug::disable-debugger))
-  (dolist (hook *init-hooks*)
-    (with-simple-restart (continue "Skip this initialization hook.")
-      (funcall hook))))
+  (call-hooks "initialization" *init-hooks*))
 
 ;;;; some support for any hapless wretches who end up debugging cold
 ;;;; init code
@@ -343,14 +339,20 @@ UNIX-like systems, UNIX-STATUS is used as the status code."
 
 #!+sb-show
 (defun cold-print (x)
-  (typecase x
-    (simple-string (sb!sys:%primitive print x))
-    (symbol (sb!sys:%primitive print (symbol-name x)))
-    (list (let ((count 0))
-            (sb!sys:%primitive print "list:")
-            (dolist (i x)
-              (when (>= (incf count) 4)
-                (sb!sys:%primitive print "...")
-                (return))
-              (cold-print i))))
-    (t (sb!sys:%primitive print (hexstr x)))))
+  (labels ((%cold-print (obj depthoid)
+             (if (> depthoid 4)
+                 (sb!sys:%primitive print "...")
+                 (typecase obj
+                   (simple-string
+                    (sb!sys:%primitive print obj))
+                   (symbol
+                    (sb!sys:%primitive print (symbol-name obj)))
+                   (cons
+                    (sb!sys:%primitive print "cons:")
+                    (let ((d (1+ depthoid)))
+                      (%cold-print (car obj) d)
+                      (%cold-print (cdr obj) d)))
+                   (t
+                    (sb!sys:%primitive print (hexstr x)))))))
+    (%cold-print x 0))
+  (values))
\ No newline at end of file