X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fx86-vm.lisp;h=73cb5ebbb76fe2f5f95e50616f4c93e9ff30519a;hb=bee53328c93be3433477821131ab805557476c8b;hp=bd08c4a258f252d07a570b4b2c09e3dca962d7a2;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git diff --git a/src/code/x86-vm.lisp b/src/code/x86-vm.lisp index bd08c4a..73cb5eb 100644 --- a/src/code/x86-vm.lisp +++ b/src/code/x86-vm.lisp @@ -10,9 +10,6 @@ ;;;; files for more information. (in-package "SB!VM") - -(file-comment - "$Header$") ;;;; OS-CONTEXT-T @@ -63,30 +60,30 @@ (defun fixup-code-object (code offset fixup kind) (declare (type index offset)) (flet ((add-fixup (code offset) - ;; Although this could check for and ignore fixups for code - ;; objects in the read-only and static spaces, this should - ;; only be the case when *enable-dynamic-space-code* is - ;; True. - (when sb!impl::*enable-dynamic-space-code* - (incf *num-fixups*) - (let ((fixups (code-header-ref code code-constants-offset))) - (cond ((typep fixups '(simple-array (unsigned-byte 32) (*))) - (let ((new-fixups - (adjust-array fixups (1+ (length fixups)) - :element-type '(unsigned-byte 32)))) - (setf (aref new-fixups (length fixups)) offset) - (setf (code-header-ref code code-constants-offset) - new-fixups))) - (t - (unless (or (eq (get-type fixups) - sb!vm:unbound-marker-type) - (zerop fixups)) - (format t "** Init. code FU = ~S~%" fixups)) ; FIXME + ;; (We check for and ignore fixups for code objects in the + ;; read-only and static spaces. (In the old CMU CL code + ;; this check was conditional on *ENABLE-DYNAMIC-SPACE-CODE*, + ;; but in SBCL relocatable dynamic space code is always in + ;; use, so we always do the check.) + (incf *num-fixups*) + (let ((fixups (code-header-ref code code-constants-offset))) + (cond ((typep fixups '(simple-array (unsigned-byte 32) (*))) + (let ((new-fixups + (adjust-array fixups (1+ (length fixups)) + :element-type '(unsigned-byte 32)))) + (setf (aref new-fixups (length fixups)) offset) (setf (code-header-ref code code-constants-offset) - (make-specializable-array - 1 - :element-type '(unsigned-byte 32) - :initial-element offset)))))))) + new-fixups))) + (t + (unless (or (eq (get-type fixups) + sb!vm:unbound-marker-type) + (zerop fixups)) + (format t "** Init. code FU = ~S~%" fixups)) ; FIXME + (setf (code-header-ref code code-constants-offset) + (make-specializable-array + 1 + :element-type '(unsigned-byte 32) + :initial-element offset))))))) (sb!sys:without-gcing (let* ((sap (truly-the system-area-pointer (sb!kernel:code-instructions code))) @@ -130,7 +127,7 @@ ;;; 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) +(defun !do-load-time-code-fixup (code offset fixup kind) (flet ((add-load-time-code-fixup (code offset) (let ((fixups (code-header-ref code sb!vm:code-constants-offset))) (cond ((typep fixups '(simple-array (unsigned-byte 32) (*))) @@ -141,12 +138,10 @@ (setf (code-header-ref code sb!vm:code-constants-offset) new-fixups))) (t - ;; FIXME: This doesn't look like production code, and - ;; should be a fatal error, not just a print. (unless (or (eq (get-type fixups) sb!vm:unbound-marker-type) (zerop fixups)) - (%primitive print "** Init. code FU")) + (sb!impl::!cold-lose "Argh! can't process fixup")) (setf (code-header-ref code sb!vm:code-constants-offset) (make-specializable-array 1 @@ -188,40 +183,52 @@ ;;;; and internal error handling) the extra runtime cost should be ;;;; negligible. -(def-alien-routine ("os_context_pc_addr" context-pc-addr) (* int) +(def-alien-routine ("os_context_pc_addr" context-pc-addr) (* unsigned-int) + ;; (Note: Just as in CONTEXT-REGISTER-ADDR, we intentionally use an + ;; 'unsigned *' interpretation for the 32-bit word passed to us by + ;; the C code, even though the C code may think it's an 'int *'.) (context (* os-context-t))) (defun context-pc (context) (declare (type (alien (* os-context-t)) context)) (int-sap (deref (context-pc-addr context)))) -(def-alien-routine ("os_context_register_addr" context-register-addr) (* int) +(def-alien-routine ("os_context_register_addr" context-register-addr) + (* unsigned-int) + ;; (Note the mismatch here between the 'int *' value that the C code + ;; may think it's giving us and the 'unsigned *' value that we + ;; receive. It's intentional: the C header files may think of + ;; register values as signed, but the CMU CL code tends to think of + ;; register values as unsigned, and might get bewildered if we ask + ;; it to work with signed values.) (context (* os-context-t)) (index int)) +;;; FIXME: Should this and CONTEXT-PC be INLINE to reduce consing? +;;; (Are they used in anything time-critical, or just the debugger?) (defun context-register (context index) (declare (type (alien (* os-context-t)) context)) (deref (context-register-addr context index))) (defun %set-context-register (context index new) - (declare (type (alien (* os-context-t)) context)) - (setf (deref (context-register-addr context index)) - new)) +(declare (type (alien (* os-context-t)) context)) +(setf (deref (context-register-addr context index)) + new)) -;;; Like CONTEXT-REGISTER, but returns the value of a float register. -;;; FORMAT is the type of float to return. +;;; This is like CONTEXT-REGISTER, but returns the value of a float +;;; register. FORMAT is the type of float to return. ;;; ;;; As of sbcl-0.6.7, there is no working code which calls this code, ;;; so it's stubbed out. Someday, in order to make the debugger work ;;; better, it may be necessary to unstubify it. (defun context-float-register (context index format) - (declare (ignore context index format)) + (declare (ignore context index)) (warn "stub CONTEXT-FLOAT-REGISTER") - (coerce 0.0 'format)) + (coerce 0.0 format)) (defun %set-context-float-register (context index format new-value) - (declare (ignore context index format)) + (declare (ignore context index)) (warn "stub %SET-CONTEXT-FLOAT-REGISTER") - (coerce new-value 'format)) + (coerce new-value format)) ;;; Given a signal context, return the floating point modes word in ;;; the same format as returned by FLOATING-POINT-MODES. @@ -230,6 +237,7 @@ ;; POSIXness and (at the Lisp level) opaque signal contexts, ;; this is stubified. It needs to be rewritten as an ;; alien function. + (declare (ignore context)) ; stub! (warn "stub CONTEXT-FLOATING-POINT-MODES") ;; old code for Linux: @@ -251,26 +259,35 @@ ;;; arguments from the instruction stream. (defun internal-error-arguments (context) (declare (type (alien (* os-context-t)) context)) + (/show0 "entering INTERNAL-ERROR-ARGUMENTS, CONTEXT=..") + (/hexstr context) (let ((pc (context-pc context))) (declare (type system-area-pointer pc)) ;; using INT3 the pc is .. INT3 code length bytes... (let* ((length (sap-ref-8 pc 1)) - (vector (make-specializable-array - length - :element-type '(unsigned-byte 8)))) + (vector (make-array length :element-type '(unsigned-byte 8)))) (declare (type (unsigned-byte 8) length) (type (simple-array (unsigned-byte 8) (*)) vector)) + (/show0 "LENGTH,VECTOR,ERROR-NUMBER=..") + (/hexstr length) + (/hexstr vector) (copy-from-system-area pc (* sb!vm:byte-bits 2) vector (* sb!vm:word-bits sb!vm:vector-data-offset) (* length sb!vm:byte-bits)) (let* ((index 0) (error-number (sb!c::read-var-integer vector index))) + (/hexstr error-number) (collect ((sc-offsets)) (loop + (/show0 "INDEX=..") + (/hexstr index) (when (>= index length) (return)) - (sc-offsets (sb!c::read-var-integer vector index))) + (let ((sc-offset (sb!c::read-var-integer vector index))) + (/show0 "SC-OFFSET=..") + (/hexstr sc-offset) + (sc-offsets sc-offset))) (values error-number (sc-offsets))))))) ;;; Do whatever is necessary to make the given code component @@ -279,18 +296,17 @@ (declare (ignore component)) nil) -;;; FLOAT-WAIT -;;; ;;; This is used in error.lisp to insure that floating-point exceptions ;;; are properly trapped. The compiler translates this to a VOP. (defun float-wait () (float-wait)) -;;; FLOAT CONSTANTS +;;; float constants ;;; -;;; These are used by the FP MOVE-FROM-{SINGLE|DOUBLE} VOPs rather than the -;;; i387 load constant instructions to avoid consing in some cases. Note these -;;; are initialized by GENESIS as they are needed early. +;;; These are used by the FP MOVE-FROM-{SINGLE|DOUBLE} VOPs rather +;;; than the i387 load constant instructions to avoid consing in some +;;; cases. Note these are initialized by GENESIS as they are needed +;;; early. (defvar *fp-constant-0s0*) (defvar *fp-constant-1s0*) (defvar *fp-constant-0d0*) @@ -304,10 +320,6 @@ (defvar *fp-constant-lg2*) (defvar *fp-constant-ln2*) -;;; Enable/disable scavenging of the read-only space. -(defvar *scavenge-read-only-space* nil) -;;; FIXME: should be *SCAVENGE-READ-ONLY-SPACE-P* - ;;; The current alien stack pointer; saved/restored for non-local exits. (defvar *alien-stack*)