X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcold%2Fwarm.lisp;h=16a880cbef7e895b73764c359dcff8c5b4d0355f;hb=eadecfd6fd102f5c8eda32770153ceed2f9f3b70;hp=36430af9b0691ca9b0d195b6906db3ce7451fe2d;hpb=bcbbce86c47a1c530d488c7876a453100fcd933e;p=sbcl.git

diff --git a/src/cold/warm.lisp b/src/cold/warm.lisp
index 36430af..16a880c 100644
--- a/src/cold/warm.lisp
+++ b/src/cold/warm.lisp
@@ -13,6 +13,7 @@
 
 ;;;; general warm init compilation policy
 
+
 (proclaim '(optimize (compilation-speed 1)
 		     (debug #+sb-show 2 #-sb-show 1)
 		     (inhibit-warnings 2)
@@ -20,48 +21,6 @@
 		     (space 1)
 		     (speed 2)))
 
-;;;; KLUDGE: Compile and load files which really belong in cold load but are
-;;;; here for various unsound reasons. We handle them here, before the package
-;;;; hacking below, because they use the SB!FOO cold package name convention
-;;;; instead of the SB-FOO final package name convention (since they really
-;;;; do belong in cold load and will hopefully make it back there reasonably
-;;;; soon). -- WHN 19991207
-
-(dolist (stem '(;; FIXME: The assembly files here probably belong in
-		;; cold load instead of warm load. They ended up here
-		;; as a quick hack to work around the consequences of
-		;; my misunderstanding how ASSEMBLE-FILE works when I
-		;; wrote the cold build code. The cold build code
-		;; expects only one FASL filename per source file,
-		;; when it turns out we really need one FASL file for
-		;; ASSEMBLE-FILE output and another for COMPILE-FILE
-		;; output. It would probably be good to redo the cold
-		;; build code so that the COMPILE-FILE stuff generated
-		;; here can be loaded at the same time as the
-		;; ASSEMBLE-FILE stuff generated there.
-		"src/assembly/target/assem-rtns"
-		"src/assembly/target/array"
-		"src/assembly/target/arith"
-		"src/assembly/target/alloc"))
-  ;; KLUDGE: Cut-and-paste programming, the sign of a true professional.:-|
-  ;; (Hopefully this will go away as we move the files above into cold load.)
-  ;; -- WHN 19991214
-  (let ((fullname (concatenate 'string stem ".lisp")))
-    ;; (Now that we use byte compiler for interpretation, /SHOW
-    ;; doesn't get compiled properly until the src/assembly files have
-    ;; been loaded, so we use PRINT instead.)
-    #+sb-show (print "/about to compile src/assembly file")
-    #+sb-show (print fullname)
-    (multiple-value-bind
-	(compiled-truename compilation-warnings-p compilation-failure-p)
-	(compile-file fullname)
-      (declare (ignore compilation-warnings-p))
-      #+sb-show (print "/done compiling src/assembly file")
-      (if compilation-failure-p
-	  (error "COMPILE-FILE of ~S failed." fullname)
-	  (unless (load compiled-truename)
-	    (error "LOAD of ~S failed." compiled-truename))))))
-
 ;;;; package hacking
 
 ;;; Our cross-compilation host is out of the picture now, so we no
@@ -170,11 +129,12 @@
 		;; (arbitrary) linearization of the declared build
 		;; order dependencies from the old PCL defsys.lisp
 		;; dependency database.
-		"src/pcl/walk"
+		#+nil "src/pcl/walk" ; #+NIL = moved to build-order.lisp-expr
 		"src/pcl/early-low"
 		"src/pcl/macros"
                 "src/pcl/compiler-support"
 		"src/pcl/low"
+                "src/pcl/slot-name"
 		"src/pcl/defclass"
 		"src/pcl/defs"
 		"src/pcl/fngen"
@@ -186,7 +146,7 @@
 		"src/pcl/slots-boot"
 		"src/pcl/combin"
 		"src/pcl/dfun"
-		"src/pcl/fast-init"
+		"src/pcl/ctor"
 		"src/pcl/braid"
 		"src/pcl/dlisp3"
 		"src/pcl/generic-functions"
@@ -218,6 +178,7 @@
 		;; to warm init to reduce peak memory requirement in
 		;; cold init
 		"src/code/describe"
+                "src/code/describe-policy"
 		"src/code/inspect"
 		"src/code/profile"
 		"src/code/ntrace"
@@ -267,14 +228,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?
-
-;;;; resetting 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)))