X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Ftarget-core.lisp;h=4168eba6cd4ea647b88a595e861914dd0c7dc70f;hb=ca267caa3bdb897a93a1e69ae7300ba3ba5d391f;hp=025e376bb6be5cd05f687309065887c545c9cc89;hpb=29a9ccc860532b32c566aec095f570e999a9c52c;p=sbcl.git

diff --git a/src/compiler/generic/target-core.lisp b/src/compiler/generic/target-core.lisp
index 025e376..4168eba 100644
--- a/src/compiler/generic/target-core.lisp
+++ b/src/compiler/generic/target-core.lisp
@@ -35,11 +35,11 @@
 
 ;;; Dump a component to core. We pass in the assembler fixups, code
 ;;; vector and node info.
-(defun make-core-component (component segment length trace-table fixups object)
+(defun make-core-component (component segment length trace-table fixup-notes object)
   (declare (type component component)
 	   (type sb!assem:segment segment)
 	   (type index length)
-	   (list trace-table fixups)
+	   (list trace-table fixup-notes)
 	   (type core-object object))
   (without-gcing
     (let* ((2comp (component-info component))
@@ -51,15 +51,6 @@
 			    (ceiling trace-table-bits sb!vm:n-byte-bits)))
 	   (box-num (- (length constants) sb!vm:code-trace-table-offset-slot))
 	   (code-obj
-	    ;; FIXME: In CMU CL the X86 behavior here depended on
-	    ;; *ENABLE-DYNAMIC-SPACE-CODE*, but in SBCL we always use
-	    ;; dynamic space code, so we could make
-	    ;; ALLOCATE-DYNAMIC-CODE-OBJECT more parallel with
-	    ;; ALLOCATE-CODE-OBJECT and remove this confusing
-	    ;; read-macro conditionalization.
-	    #!+x86
-	    (%primitive allocate-dynamic-code-object box-num total-length)
-	    #!-x86
 	    (%primitive allocate-code-object box-num total-length))
 	   (fill-ptr (code-instructions code-obj)))
       (declare (type index box-num total-length))
@@ -71,7 +62,7 @@
 	 (copy-byte-vector-to-system-area v fill-ptr)
 	 (setf fill-ptr (sap+ fill-ptr (length v)))))
 
-      (do-core-fixups code-obj fixups)
+      (do-core-fixups code-obj fixup-notes)
 
       (dolist (entry (ir2-component-entries 2comp))
 	(make-fun-entry entry code-obj object))