X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fx86-vm.lisp;h=0b15e821eafba503d2e997d4bec7a0e49bc57ab9;hb=98a76d4426660876dec6649b1e228d2e5b47f579;hp=e6fd45f72a829488132c2733e5fb1372163391a3;hpb=dec94b039e8ec90baf21463df839a6181de606f6;p=sbcl.git diff --git a/src/code/x86-vm.lisp b/src/code/x86-vm.lisp index e6fd45f..0b15e82 100644 --- a/src/code/x86-vm.lisp +++ b/src/code/x86-vm.lisp @@ -32,18 +32,18 @@ ;;; FIXME: Since SBCL, unlike CMU CL, uses this as an opaque type, ;;; it's no longer architecture-dependent, and probably belongs in ;;; some other package, perhaps SB-KERNEL. -(def-alien-type os-context-t (struct os-context-t-struct)) +(define-alien-type os-context-t (struct os-context-t-struct)) ;;;; MACHINE-TYPE and MACHINE-VERSION (defun machine-type () #!+sb-doc - "Returns a string describing the type of the local machine." + "Return a string describing the type of the local machine." "X86") (defun machine-version () #!+sb-doc - "Returns a string describing the version of the local machine." + "Return a string describing the version of the local machine." "X86") ;;;; :CODE-OBJECT fixups @@ -75,8 +75,8 @@ (setf (code-header-ref code code-constants-offset) new-fixups))) (t - (unless (or (eq (get-type fixups) - sb!vm:unbound-marker-type) + (unless (or (eq (widetag-of fixups) + unbound-marker-widetag) (zerop fixups)) (format t "** Init. code FU = ~S~%" fixups)) ; FIXME (setf (code-header-ref code code-constants-offset) @@ -89,11 +89,12 @@ (sb!kernel:code-instructions code))) (obj-start-addr (logand (sb!kernel:get-lisp-obj-address code) #xfffffff8)) - #+nil (const-start-addr (+ obj-start-addr (* 5 4))) + ;; FIXME: what is this 5? + #+nil (const-start-addr (+ obj-start-addr (* 5 n-word-bytes))) (code-start-addr (sb!sys:sap-int (sb!kernel:code-instructions code))) (ncode-words (sb!kernel:code-header-ref code 1)) - (code-end-addr (+ code-start-addr (* ncode-words 4)))) + (code-end-addr (+ code-start-addr (* ncode-words n-word-bytes)))) (unless (member kind '(:absolute :relative)) (error "Unknown code-object-fixup kind ~S." kind)) (ecase kind @@ -113,36 +114,36 @@ (add-fixup code offset)) ;; Replace word with value to add to that loc to get there. (let* ((loc-sap (+ (sap-int sap) offset)) - (rel-val (- fixup loc-sap 4))) + (rel-val (- fixup loc-sap n-word-bytes))) (declare (type (unsigned-byte 32) loc-sap) (type (signed-byte 32) rel-val)) (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) - (let ((fixups (code-header-ref code sb!vm:code-constants-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 (adjust-array fixups (1+ (length fixups)) :element-type '(unsigned-byte 32)))) (setf (aref new-fixups (length fixups)) offset) - (setf (code-header-ref code sb!vm:code-constants-offset) + (setf (code-header-ref code code-constants-offset) new-fixups))) (t - (unless (or (eq (get-type fixups) - sb!vm:unbound-marker-type) + (unless (or (eq (widetag-of fixups) + unbound-marker-widetag) (zerop fixups)) (sb!impl::!cold-lose "Argh! can't process fixup")) - (setf (code-header-ref code sb!vm:code-constants-offset) + (setf (code-header-ref code code-constants-offset) (make-specializable-array 1 :element-type '(unsigned-byte 32) @@ -155,16 +156,16 @@ (code-start-addr (sb!sys:sap-int (sb!kernel:code-instructions code))) (ncode-words (sb!kernel:code-header-ref code 1)) - (code-end-addr (+ code-start-addr (* ncode-words 4)))) + (code-end-addr (+ code-start-addr (* ncode-words n-word-bytes)))) (ecase kind (: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 ;;;; @@ -183,7 +184,7 @@ ;;;; and internal error handling) the extra runtime cost should be ;;;; negligible. -(def-alien-routine ("os_context_pc_addr" context-pc-addr) (* unsigned-int) +(define-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 *'.) @@ -195,7 +196,7 @@ (declare (type (alien (* unsigned-int)) addr)) (int-sap (deref addr)))) -(def-alien-routine ("os_context_register_addr" context-register-addr) +(define-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 @@ -235,6 +236,7 @@ ;;; Given a signal context, return the floating point modes word in ;;; the same format as returned by FLOATING-POINT-MODES. +#!-linux (defun context-floating-point-modes (context) ;; FIXME: As of sbcl-0.6.7 and the big rewrite of signal handling for ;; POSIXness and (at the Lisp level) opaque signal contexts, @@ -255,14 +257,19 @@ (logior (ash (logand sw #xffff) 16) (logxor (logand cw #xffff) #x3f))) 0) + +#!+linux +(define-alien-routine ("os_context_fp_control" context-floating-point-modes) + (sb!alien:unsigned 32) + (context (* os-context-t))) -;;;; 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)) @@ -275,12 +282,11 @@ (/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)) + (copy-from-system-area pc (* n-byte-bits 2) + vector (* n-word-bits vector-data-offset) + (* length n-byte-bits)) (let* ((index 0) - (error-number (sb!c::read-var-integer vector index))) + (error-number (sb!c:read-var-integer vector index))) (/hexstr error-number) (collect ((sc-offsets)) (loop @@ -288,18 +294,12 @@ (/hexstr index) (when (>= index length) (return)) - (let ((sc-offset (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 -;;; executable. (This is a no-op on the x86.) -(defun sanctify-for-execution (component) - (declare (ignore component)) - nil) - ;;; 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 () @@ -311,8 +311,8 @@ ;;; 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-0f0*) +(defvar *fp-constant-1f0*) (defvar *fp-constant-0d0*) (defvar *fp-constant-1d0*) ;;; the long-float constants @@ -327,14 +327,6 @@ ;;; the current alien stack pointer; saved/restored for non-local exits (defvar *alien-stack*) -(defun sb!kernel::%instance-set-conditional (object slot test-value new-value) - (declare (type instance object) - (type index slot)) - #!+sb-doc - "Atomically compare object's slot value to test-value and if EQ store - new-value in the slot. The original value of the slot is returned." - (sb!kernel::%instance-set-conditional object slot test-value new-value)) - ;;; Support for the MT19937 random number generator. The update ;;; function is implemented as an assembly routine. This definition is ;;; transformed to a call to the assembly routine allowing its use in