X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fx86-vm.lisp;h=6e17592566351425925e5289060ca6a3de5e009b;hb=86210c4e406c1b2ff10cc3bac0e71435867db48b;hp=d0e88ad3808113134288244868d531165791a46f;hpb=e33fb894f991b2926d8f3bace9058e4c0b2c3a37;p=sbcl.git diff --git a/src/code/x86-vm.lisp b/src/code/x86-vm.lisp index d0e88ad..6e17592 100644 --- a/src/code/x86-vm.lisp +++ b/src/code/x86-vm.lisp @@ -119,16 +119,16 @@ (setf (signed-sap-ref-32 sap offset) rel-val)))))) nil)) -;;; Add a code fixup to a code object generated by GENESIS. The fixup has -;;; already been applied, it's just a matter of placing the fixup in the code's -;;; fixup vector if necessary. +;;; Add a code fixup to a code object generated by GENESIS. The fixup +;;; has already been applied, it's just a matter of placing the fixup +;;; in the code's fixup vector if necessary. ;;; ;;; KLUDGE: I'd like a good explanation of why this has to be done at ;;; load time instead of in GENESIS. It's probably simple, I just haven't ;;; figured it out, or found it written down anywhere. -- WHN 19990908 #!+gencgc -(defun !do-load-time-code-fixup (code offset fixup kind) - (flet ((add-load-time-code-fixup (code offset) +(defun !envector-load-time-code-fixup (code offset fixup kind) + (flet ((frob (code offset) (let ((fixups (code-header-ref code code-constants-offset))) (cond ((typep fixups '(simple-array (unsigned-byte 32) (*))) (let ((new-fixups @@ -160,11 +160,11 @@ (:absolute ;; Record absolute fixups that point within the code object. (when (> code-end-addr (sap-ref-32 sap offset) obj-start-addr) - (add-load-time-code-fixup code offset))) + (frob code offset))) (:relative ;; Record relative fixups that point outside the code object. (when (or (< fixup obj-start-addr) (> fixup code-end-addr)) - (add-load-time-code-fixup code offset))))))) + (frob code offset))))))) ;;;; low-level signal context access functions ;;;; @@ -256,13 +256,13 @@ 0) -;;;; INTERNAL-ERROR-ARGUMENTS +;;;; INTERNAL-ERROR-ARGS ;;; Given a (POSIX) signal context, extract the internal error ;;; arguments from the instruction stream. -(defun internal-error-arguments (context) +(defun internal-error-args (context) (declare (type (alien (* os-context-t)) context)) - (/show0 "entering INTERNAL-ERROR-ARGUMENTS, CONTEXT=..") + (/show0 "entering INTERNAL-ERROR-ARGS, CONTEXT=..") (/hexstr context) (let ((pc (context-pc context))) (declare (type system-area-pointer pc))