X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Ftarget-core.lisp;h=dcc4a97811cdca389dc7f8e2cf7ba76b73eb8ebc;hb=f9d6d21a7f54638292214ceb9886edc03b99d545;hp=b09a66f28705f1f18463736f859858c0cefa49ba;hpb=dec94b039e8ec90baf21463df839a6181de606f6;p=sbcl.git

diff --git a/src/compiler/generic/target-core.lisp b/src/compiler/generic/target-core.lisp
index b09a66f..dcc4a97 100644
--- a/src/compiler/generic/target-core.lisp
+++ b/src/compiler/generic/target-core.lisp
@@ -24,17 +24,17 @@
     (unless (zerop (logand offset sb!vm:lowtag-mask))
       (error "Unaligned function object, offset = #X~X." offset))
     (let ((res (%primitive compute-function code-obj offset)))
-      (setf (%function-self res) res)
-      (setf (%function-next res) (%code-entry-points code-obj))
+      (setf (%simple-fun-self res) res)
+      (setf (%simple-fun-next res) (%code-entry-points code-obj))
       (setf (%code-entry-points code-obj) res)
-      (setf (%function-name res) (entry-info-name entry))
-      (setf (%function-arglist res) (entry-info-arguments entry))
-      (setf (%function-type res) (entry-info-type entry))
+      (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))
 
       (note-function entry res object))))
 
-;;; Dump a component to core. We pass in the assembler fixups, code vector
-;;; and node info.
+;;; 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)
   (declare (type component component)
 	   (type sb!assem:segment segment)
@@ -47,7 +47,8 @@
 	   (trace-table (pack-trace-table trace-table))
 	   (trace-table-len (length trace-table))
 	   (trace-table-bits (* trace-table-len tt-bits-per-entry))
-	   (total-length (+ length (ceiling trace-table-bits sb!vm:byte-bits)))
+	   (total-length (+ length
+			    (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
@@ -81,9 +82,10 @@
 	(push info (core-object-debug-info object))
 	(setf (%code-debug-info code-obj) info))
 
-      (setf (code-header-ref code-obj sb!vm:code-trace-table-offset-slot) length)
+      (setf (code-header-ref code-obj sb!vm:code-trace-table-offset-slot)
+	    length)
       (copy-to-system-area trace-table
-			   (* sb!vm:vector-data-offset sb!vm:word-bits)
+			   (* sb!vm:vector-data-offset sb!vm:n-word-bits)
 			   fill-ptr
 			   0
 			   trace-table-bits)