X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-init.lisp;h=e7429a2140d84ad107a3e0b8eb7b7ffdd4940625;hb=2db3b6b4cb740d5b6512459c223859f747807b09;hp=23906300d4df0581aec14e628bb078eec8039af5;hpb=5277a0cbf1a72243cad6808883a4847acefc8e6b;p=sbcl.git

diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp
index 2390630..e7429a2 100644
--- a/src/code/cold-init.lisp
+++ b/src/code/cold-init.lisp
@@ -22,8 +22,8 @@
 ;;; anything whose name matches a magic character pattern is
 ;;; uninterned.
 ;;;
-;;; FIXME: should also go through globaldb (and perhaps other tables)
-;;; blowing away associated entries
+;;; FIXME: Are there other tables that need to have entries removed?
+;;; What about symbols of the form DEF!FOO?
 (defun !unintern-init-only-stuff ()
   (do ((any-changes? nil nil))
       (nil)
@@ -35,6 +35,13 @@
 			 (string= name "*!" :end1 2 :end2 2)))
 	    (/show0 "uninterning cold-init-only symbol..")
 	    (/primitive-print name)
+	    ;; FIXME: Is this (FIRST (LAST *INFO-ENVIRONMENT*)) really
+	    ;; meant to be an idiom to use?  Is there a more obvious
+	    ;; name for this? [e.g. (GLOBAL-ENVIRONMENT)?]
+	    (do-info ((first (last *info-environment*))
+			    :name entry :class class :type type)
+	      (when (eq entry symbol)
+		(clear-info class type entry)))
 	    (unintern symbol package)
 	    (setf any-changes? t)))))
     (unless any-changes?
@@ -178,10 +185,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*")))))
@@ -204,15 +211,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)
 
@@ -278,18 +279,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.
       ;;
@@ -309,7 +304,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