(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-fun 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)
+(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))
(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))
(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)
(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))))))))))