X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Ftarget-core.lisp;h=622bd23aa06111ea9959d973c9c2db5abf9fc1fd;hb=4af254de85367806d14ccafc4dfbe79a235b926d;hp=0ef862b30cdeb4b710a60b98ab7e5a3ff2030bcb;hpb=1a6def3955b715472eb2c75b15660912b9f90173;p=sbcl.git

diff --git a/src/compiler/generic/target-core.lisp b/src/compiler/generic/target-core.lisp
index 0ef862b..622bd23 100644
--- a/src/compiler/generic/target-core.lisp
+++ b/src/compiler/generic/target-core.lisp
@@ -17,29 +17,29 @@
 (in-package "SB!C")
 
 ;;; Make a function entry, filling in slots from the ENTRY-INFO.
-(defun make-function-entry (entry code-obj object)
-  (declare (type entry-info entry) (type core-object object))
-  (let ((offset (label-position (entry-info-offset entry))))
+(defun make-fun-entry (entry-info code-obj object)
+  (declare (type entry-info entry-info) (type core-object object))
+  (let ((offset (label-position (entry-info-offset entry-info))))
     (declare (type index offset))
     (unless (zerop (logand offset sb!vm:lowtag-mask))
       (error "Unaligned function object, offset = #X~X." offset))
-    (let ((res (%primitive compute-function code-obj offset)))
+    (let ((res (%primitive compute-fun code-obj offset)))
       (setf (%simple-fun-self res) res)
       (setf (%simple-fun-next res) (%code-entry-points code-obj))
       (setf (%code-entry-points code-obj) res)
-      (setf (%simple-fun-name res) (entry-info-name entry))
-      (setf (%simple-fun-arglist res) (entry-info-arguments entry))
-      (setf (%simple-fun-type res) (entry-info-type entry))
+      (setf (%simple-fun-name res) (entry-info-name entry-info))
+      (setf (%simple-fun-arglist res) (entry-info-arguments entry-info))
+      (setf (%simple-fun-type res) (entry-info-type entry-info))
 
-      (note-function entry res object))))
+      (note-fun entry-info res object))))
 
-;;; 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)
+;;; 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 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))
@@ -53,10 +53,8 @@
 	   (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.
+	    ;; dynamic space code, so we shoudl just rename the
+	    ;; allocate-dynamic-code-object vop and lose this #+ stuff
 	    #!+x86
 	    (%primitive allocate-dynamic-code-object box-num total-length)
 	    #!-x86
@@ -71,10 +69,10 @@
 	 (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-function-entry entry code-obj object))
+	(make-fun-entry entry code-obj object))
 
       (sb!vm:sanctify-for-execution code-obj)
 
@@ -101,8 +99,7 @@
 	    (list
 	     (ecase (car const)
 	       (:entry
-		(reference-core-function code-obj index
-					 (cdr const) object))
+		(reference-core-fun code-obj index (cdr const) object))
 	       (:fdefinition
 		(setf (code-header-ref code-obj index)
 		      (fdefinition-object (cdr const) t))))))))))