X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-init.lisp;h=6d10a6a1246cf94cadcb32dd44424bd501a38db6;hb=4f7211e1d005696dcd29d8322fa531992ea8fed4;hp=acfccc0b120252cabecc1ddd55f21598e6337a3d;hpb=d7f6139a91d7d9b0667a597584ae306d958bb2f4;p=sbcl.git

diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp
index acfccc0..6d10a6a 100644
--- a/src/code/cold-init.lisp
+++ b/src/code/cold-init.lisp
@@ -85,8 +85,6 @@
 
   (/show0 "entering !COLD-INIT")
 
-  (%primitive print "//entering !COLD-INIT") ; REMOVEME
-
   ;; FIXME: It'd probably be cleaner to have most of the stuff here
   ;; handled by calls like !GC-COLD-INIT, !ERROR-COLD-INIT, and
   ;; !UNIX-COLD-INIT. And *TYPE-SYSTEM-INITIALIZED* could be changed to
@@ -107,8 +105,6 @@
   (setf *cold-init-complete-p* nil)
   (setf *type-system-initialized* nil)
 
-  (%primitive print "//done with SETFs") ; REMOVEME
-
   ;; Anyone might call RANDOM to initialize a hash value or something;
   ;; and there's nothing which needs to be initialized in order for
   ;; this to be initialized, so we initialize it right away.
@@ -139,8 +135,6 @@
   ;; functions are called in the same relative order as the toplevel
   ;; forms of the corresponding source files.
 
-  (%primitive print "//about to !POLICY-COLD-INIT-OR-RESANIFY") ; REMOVEME
-
   ;;(show-and-call !package-cold-init)
   (show-and-call !policy-cold-init-or-resanify)
   (/show0 "back from !POLICY-COLD-INIT-OR-RESANIFY")
@@ -160,7 +154,6 @@
 		 (/primitive-print hexstr)))
   (let (#!+sb-show (index-in-cold-toplevels 0))
     #!+sb-show (declare (type fixnum index-in-cold-toplevels))
-    (%primitive print "//about to DOLIST TOPLEVEL-THING") ; REMOVEME
 
     (dolist (toplevel-thing (prog1
 				(nreverse *!reversed-cold-toplevels*)
@@ -202,7 +195,6 @@
 	    (!cold-lose "bogus fixup code in *!REVERSED-COLD-TOPLEVELS*"))))
 	(t (!cold-lose "bogus function in *!REVERSED-COLD-TOPLEVELS*")))))
   (/show0 "done with loop over cold toplevel forms and fixups")
-  (%primitive print "//done with DOLIST TOPLEVEL-THING") ; REMOVEME
 
   ;; Set sane values again, so that the user sees sane values instead
   ;; of whatever is left over from the last DECLAIM/PROCLAIM.
@@ -231,7 +223,6 @@
 				     :invalid
 				     :divide-by-zero))
 
-  (%primitive print "//about to !CLASS-FINALIZE") ; REMOVEME
   (show-and-call !class-finalize)
 
   ;; The reader and printer are initialized very late, so that they
@@ -255,9 +246,8 @@
   ;; could be typed directly, with no parentheses, at the debug prompt
   ;; the way that e.g. F or BACKTRACE can be?)
 
-  (/show0 "done initializing")
+  (/show0 "done initializing, setting *COLD-INIT-COMPLETE-P*")
   (setf *cold-init-complete-p* t)
-  (%primitive print "//set *COLD-INIT-COMPLETE-P*") ; REMOVEME
 
   ;; The system is finally ready for GC.
   #!-gengc (setf *already-maybe-gcing* nil)
@@ -267,8 +257,6 @@
   (gc :full t)
   (/show0 "back from first GC")
 
-  (%primitive print "//back from first GC") ; REMOVEME
-
   ;; The show is on.
   (terpri)
   (/show0 "going into toplevel loop")
@@ -301,7 +289,7 @@ instead (which is another name for the same thing)."))
       (os-cold-init-or-reinit)
       (stream-reinit)
       (signal-cold-init-or-reinit)
-      (gc-cold-init-or-reinit)
+      (gc-reinit)
       (setf (sb!alien:extern-alien "internal_errors_enabled" boolean) t)
       (set-floating-point-modes :traps
 				'(:overflow
@@ -323,7 +311,7 @@ instead (which is another name for the same thing)."))
       ;; reason.. (Perhaps we should do it anyway in case someone
       ;; manages to save an image from within a pseudo-atomic-atomic
       ;; operation?)
-      #!+x86 (setf sb!impl::*pseudo-atomic-atomic* 0))
+      #!+x86 (setf *pseudo-atomic-atomic* 0))
     (gc-on)))
 
 ;;;; some support for any hapless wretches who end up debugging cold