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

diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp
index 2390630..260ae43 100644
--- a/src/code/cold-init.lisp
+++ b/src/code/cold-init.lisp
@@ -178,10 +178,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*")))))
@@ -210,7 +210,7 @@
   ;; Barlow's Alpha patches suppress it for Alpha. Why the difference?
   #!+alpha
   (set-floating-point-modes :traps '(:overflow
-				     #!-x86 :underflow
+				     #!+alpha :underflow
 				     :invalid
 				     :divide-by-zero))
 
@@ -289,7 +289,7 @@ instead (which is another name for the same thing)."))
 				  ;; disabled by default. Joe User can
 				  ;; explicitly enable them if
 				  ;; desired.
-				  #!-x86 :underflow))
+				  #!+alpha :underflow))
       ;; Clear pseudo atomic in case this core wasn't compiled with
       ;; support.
       ;;
@@ -309,7 +309,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