X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcold%2Fwarm.lisp;h=91bd152125da8b4c7bad6131e6e59d65fd278475;hb=3eb39e017e52b5d704e7d33405c873af52a533fd;hp=9997616fc8bd8b19fcf903c68e304451b0a51143;hpb=68fd2d2dd6f265669a8957accd8a33e62786a97e;p=sbcl.git

diff --git a/src/cold/warm.lisp b/src/cold/warm.lisp
index 9997616..91bd152 100644
--- a/src/cold/warm.lisp
+++ b/src/cold/warm.lisp
@@ -13,24 +13,11 @@
 
 ;;;; general warm init compilation policy
 
-;;; Without generational GC, GC gets really slow unless we collect in
-;;; large chunks. For small chunks, efficiency tends to grow roughly
-;;; linearly with chunk size. Later we hit diminishing returns as we
-;;; approach the total amount of RAM we use, or we can even get into
-;;; performance trouble by clobbering cache and VM systems too hard.
-;;; But modern machines tend to think of 20 Mb as a moderate amount of
-;;; memory, and it's of the same order of magnitude as the amount of
-;;; RAM we need for the build, so it seems like a plausible chunk size.
-#-gencgc
-(progn
-  (sb!ext:gc-off)
-  (setf (sb!ext:bytes-consed-between-gcs) (* 20 (expt 10 6)))
-  (sb!ext:gc-on))
 
 (proclaim '(optimize (compilation-speed 1)
 		     (debug #+sb-show 2 #-sb-show 1)
 		     (inhibit-warnings 2)
-		     (safety 1)
+		     (safety 2)
 		     (space 1)
 		     (speed 2)))
 
@@ -78,17 +65,19 @@
 
 ;;;; package hacking
 
-;;; Our cross-compilation host is out of the picture now, so we no longer need
-;;; to worry about collisions between our package names and cross-compilation
-;;; host package names, so now is a good time to rename any package with a
-;;; bootstrap-only name SB!FOO to its permanent name SB-FOO.
+;;; Our cross-compilation host is out of the picture now, so we no
+;;; longer need to worry about collisions between our package names
+;;; and cross-compilation host package names, so now is a good time to
+;;; rename any package with a bootstrap-only name SB!FOO to its
+;;; permanent name SB-FOO.
 ;;;
-;;; (In principle it might be tidier to do this when dumping the cold image in
-;;; genesis, but in practice the logic might be a little messier because
-;;; genesis dumps both symbols and packages, and we'd need to make that dumped
-;;; symbols were renamed in the same way as dumped packages. Or we could do it
-;;; in cold init, but it's easier to experiment with and debug things here in
-;;; warm init than in cold init, so we do it here instead.)
+;;; (In principle it might be tidier to do this when dumping the cold
+;;; image in genesis, but in practice the logic might be a little
+;;; messier because genesis dumps both symbols and packages, and we'd
+;;; need to make sure that dumped symbols were renamed in the same way
+;;; as dumped packages. Or we could do it in cold init, but it's
+;;; easier to experiment with and debug things here in warm init than
+;;; in cold init, so we do it here instead.)
 (let ((boot-prefix "SB!")
       (perm-prefix "SB-"))
   (dolist (package (list-all-packages))
@@ -179,16 +168,15 @@
 (dolist (stem '(;; CLOS, derived from the PCL reference implementation
 		;;
 		;; This PCL build order is based on a particular
-		;; linearization of the declared build order
-		;; dependencies from the old PCL defsys.lisp
+		;; (arbitrary) linearization of the declared build
+		;; order dependencies from the old PCL defsys.lisp
 		;; dependency database.
 		"src/pcl/walk"
-                ;; "src/pcl/iterate" removed 2001-12-20 njf
 		"src/pcl/early-low"
 		"src/pcl/macros"
                 "src/pcl/compiler-support"
 		"src/pcl/low"
-		;; "src/pcl/fin" merged into "src/pcl/low" in 0.6.11.43
+                "src/pcl/slot-name"
 		"src/pcl/defclass"
 		"src/pcl/defs"
 		"src/pcl/fngen"
@@ -281,14 +269,3 @@
 ;;; through the cold boot process. They need to be set somewhere. Maybe the
 ;;; easiest thing to do is to read them out of package-data-list.lisp-expr
 ;;; now?
-
-;;;; restoring compilation policy to neutral values in preparation for
-;;;; SAVE-LISP-AND-DIE as final SBCL core
-
-(sb-int:/show "setting compilation policy to neutral values")
-(proclaim '(optimize (compilation-speed 1)
-		     (debug 1)
-		     (inhibit-warnings 1)
-		     (safety 1)
-		     (space 1)
-		     (speed 1)))