X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-init.lisp;h=f2dca7de812cac3e6ae7ad1e6033ea6618949c7b;hb=86210c4e406c1b2ff10cc3bac0e71435867db48b;hp=1e4a912230c71e0c5acab2e51af82d569dbf89a4;hpb=ba7659c92f2b7fac7e9532a3db9114c5bdc4ab55;p=sbcl.git

diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp
index 1e4a912..f2dca7d 100644
--- a/src/code/cold-init.lisp
+++ b/src/code/cold-init.lisp
@@ -21,6 +21,9 @@
 ;;; which might be tedious to maintain, instead we use a hack:
 ;;; anything whose name matches a magic character pattern is
 ;;; uninterned.
+;;;
+;;; FIXME: should also go through globaldb (and perhaps other tables)
+;;; blowing away associated entries
 (defun !unintern-init-only-stuff ()
   (do ((any-changes? nil nil))
       (nil)
@@ -37,6 +40,23 @@
     (unless any-changes?
       (return))))
 
+;;;; putting ourselves out of our misery when things become too much to bear
+
+(declaim (ftype (function (simple-string) nil) critically-unreachable))
+(defun !cold-lose (msg)
+  (%primitive print msg)
+  (%primitive print "too early in cold init to recover from errors")
+  (%halt))
+
+;;; last-ditch error reporting for things which should never happen
+;;; and which, if they do happen, are sufficiently likely to torpedo
+;;; the normal error-handling system that we want to bypass it
+(declaim (ftype (function (simple-string) nil) critically-unreachable))
+(defun critically-unreachable (where)
+  (%primitive print "internal error: Control should never reach here, i.e.")
+  (%primitive print where)
+  (%halt))
+
 ;;;; !COLD-INIT
 
 ;;; a list of toplevel things set by GENESIS
@@ -45,11 +65,6 @@
 ;;; a SIMPLE-VECTOR set by GENESIS
 (defvar *!load-time-values*)
 
-(defun !cold-lose (msg)
-  (%primitive print msg)
-  (%primitive print "too early in cold init to recover from errors")
-  (%halt))
-
 (eval-when (:compile-toplevel :execute)
   ;; FIXME: Perhaps we should make SHOW-AND-CALL-AND-FMAKUNBOUND, too,
   ;; and use it for most of the cold-init functions. (Just be careful
@@ -84,6 +99,7 @@
         *cold-init-complete-p* nil
         *type-system-initialized* nil)
 
+  (show-and-call !exhaust-cold-init)
   (show-and-call !typecheckfuns-cold-init)
 
   ;; Anyone might call RANDOM to initialize a hash value or something;
@@ -163,10 +179,10 @@
 		   (svref *!load-time-values* (third toplevel-thing)))))
 	   #!+(and x86 gencgc)
 	   (:load-time-code-fixup
-	    (sb!vm::!do-load-time-code-fixup (second toplevel-thing)
-					     (third  toplevel-thing)
-					     (fourth toplevel-thing)
-					     (fifth  toplevel-thing)))
+	    (sb!vm::!envector-load-time-code-fixup (second toplevel-thing)
+						   (third  toplevel-thing)
+						   (fourth toplevel-thing)
+						   (fifth  toplevel-thing)))
 	   (t
 	    (!cold-lose "bogus fixup code in *!REVERSED-COLD-TOPLEVELS*"))))
 	(t (!cold-lose "bogus function in *!REVERSED-COLD-TOPLEVELS*")))))
@@ -189,15 +205,9 @@
 
   ;; FIXME: This list of modes should be defined in one place and
   ;; explicitly shared between here and REINIT.
-  ;;
-  ;; FIXME: In CMU CL, this is done "here" (i.e. in the analogous
-  ;; lispinit.lisp code) for every processor architecture. But Daniel
-  ;; Barlow's Alpha patches suppress it for Alpha. Why the difference?
-  #!+alpha
-  (set-floating-point-modes :traps '(:overflow
-				     #!-x86 :underflow
-				     :invalid
-				     :divide-by-zero))
+
+  ;; Why was this marked #!+alpha?  CMUCL does it here on all architectures
+  (set-floating-point-modes :traps '(:overflow :invalid :divide-by-zero))
 
   (show-and-call !class-finalize)
 
@@ -230,7 +240,8 @@
   (terpri)
   (/show0 "going into toplevel loop")
   (handling-end-of-the-world 
-    (toplevel-init)))
+    (toplevel-init)
+    (critically-unreachable "after TOPLEVEL-INIT")))
 
 (defun quit (&key recklessly-p
 		  (unix-code 0 unix-code-p)
@@ -249,7 +260,8 @@
 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)))
+      (throw '%end-of-the-world unix-status))
+  (critically-unreachable "after trying to die in QUIT"))
 
 ;;;; initialization functions
 
@@ -261,18 +273,12 @@ instead (which is another name for the same thing)."))
       (signal-cold-init-or-reinit)
       (gc-reinit)
       (setf (sb!alien:extern-alien "internal_errors_enabled" boolean) t)
-      (set-floating-point-modes :traps
-				'(:overflow
-				  :invalid
-				  :divide-by-zero
-				  ;; 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.
-				  #!-x86 :underflow))
+      ;; 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.
+      (set-floating-point-modes :traps '(:overflow :invalid :divide-by-zero))
+
       ;; Clear pseudo atomic in case this core wasn't compiled with
       ;; support.
       ;;
@@ -292,7 +298,7 @@ instead (which is another name for the same thing)."))
 #!+sb-show
 (defun hexstr (thing)
   (/noshow0 "entering HEXSTR")
-  (let ((addr (sb!kernel:get-lisp-obj-address thing))
+  (let ((addr (get-lisp-obj-address thing))
 	(str (make-string 10)))
     (/noshow0 "ADDR and STR calculated")
     (setf (char str 0) #\0