0.8.17.30:

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

diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp
index 6834b86..f3217e6 100644 (file)
--- a/src/code/cold-init.lisp
+++ b/src/code/cold-init.lisp
@@ -49,7 +49,7 @@
 \f
 ;;;; putting ourselves out of our misery when things become too much to bear
 
-(declaim (ftype (function (simple-string) nil) critically-unreachable))
+(declaim (ftype (function (simple-string) nil) !cold-lose))
 (defun !cold-lose (msg)
   (%primitive print msg)
   (%primitive print "too early in cold init to recover from errors")
@@ -111,6 +111,9 @@
   ;; this to be initialized, so we initialize it right away.
   (show-and-call !random-cold-init)
 
+  (show-and-call !character-database-cold-init)
+
+  (show-and-call !early-package-cold-init)
   (show-and-call !package-cold-init)
   
   ;; All sorts of things need INFO and/or (SETF INFO).
@@ -213,7 +216,9 @@
 
   (show-and-call stream-cold-init-or-reset)
   (show-and-call !loader-cold-init)
+  (show-and-call !foreign-cold-init)
   (show-and-call signal-cold-init-or-reinit)
+  (/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
@@ -254,25 +259,18 @@
   ;; The show is on.
   (terpri)
   (/show0 "going into toplevel loop")
-  (handling-end-of-the-world 
+  (handling-end-of-the-world
+    (thread-init-or-reinit)
     (toplevel-init)
     (critically-unreachable "after TOPLEVEL-INIT")))
 
-(defun quit (&key recklessly-p
-                 (unix-code 0 unix-code-p)
-                 (unix-status unix-code))
+(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."
-  (declare (type (signed-byte 32) unix-status unix-code))
+  "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."
+  (declare (type (signed-byte 32) unix-status))
   (/show0 "entering QUIT")
-  ;; FIXME: UNIX-CODE was deprecated in sbcl-0.6.8, after having been
-  ;; around for less than a year. It should be safe to remove it after
-  ;; a year.
-  (when unix-code-p
-    (warn "The UNIX-CODE argument is deprecated. Use the UNIX-STATUS argument
-instead (which is another name for the same thing)."))
   (if recklessly-p
       (sb!unix:unix-exit unix-status)
       (throw '%end-of-the-world unix-status))
@@ -280,10 +278,14 @@ instead (which is another name for the same thing)."))
 \f
 ;;;; initialization functions
 
+(defun thread-init-or-reinit ()
+  (sb!thread::init-job-control)
+  (sb!thread::get-foreground))
+
 (defun reinit ()
   (without-interrupts
     (without-gcing
-      (os-cold-init-or-reinit)
+       (os-cold-init-or-reinit)
       (stream-reinit)
       (signal-cold-init-or-reinit)
       (setf (sb!alien:extern-alien "internal_errors_enabled" boolean) t)
@@ -296,19 +298,15 @@ instead (which is another name for the same thing)."))
       ;; call site.
       (set-floating-point-modes
        :traps '(:overflow #!-netbsd :invalid :divide-by-zero))
-      (sb!thread::maybe-install-futex-functions)
-
-      ;; Clear pseudo atomic in case this core wasn't compiled with
-      ;; support.
-      ;;
-      ;; FIXME: In SBCL our cores are always compiled with support. So
-      ;; we don't need to do this, do we? At least not for this
-      ;; reason.. (Perhaps we should do it anyway in case someone
-      ;; manages to save an image from within a pseudo-atomic-atomic
-      ;; operation?)
-      #!+x86 (setf *pseudo-atomic-atomic* 0)))
-  (gc-on)
-  (gc))
+      (sb!thread::maybe-install-futex-functions)))
+  (thread-init-or-reinit)
+  (gc-reinit)
+  ;; make sure TIME works correctly from saved cores
+  (setf *internal-real-time-base-seconds* nil)
+  (foreign-reinit)
+  (dolist (hook *init-hooks*)
+    (with-simple-restart (continue "Skip this initialization hook.")
+      (funcall hook))))
 \f
 ;;;; some support for any hapless wretches who end up debugging cold
 ;;;; init code
@@ -319,7 +317,7 @@ instead (which is another name for the same thing)."))
 (defun hexstr (thing)
   (/noshow0 "entering HEXSTR")
   (let ((addr (get-lisp-obj-address thing))
-       (str (make-string 10)))
+       (str (make-string 10 :element-type 'base-char)))
     (/noshow0 "ADDR and STR calculated")
     (setf (char str 0) #\0
          (char str 1) #\x)