X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fx86-vm.lisp;h=833460cff9f2483d6d518ada5ee25cee74772bbe;hb=2db3b6b4cb740d5b6512459c223859f747807b09;hp=affa75b0afb2a15efc565bbc5fc85a518c2ebc79;hpb=08307967c71c580058a503d46aa087cfefcf8c69;p=sbcl.git diff --git a/src/code/x86-vm.lisp b/src/code/x86-vm.lisp index affa75b..833460c 100644 --- a/src/code/x86-vm.lisp +++ b/src/code/x86-vm.lisp @@ -235,6 +235,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 +256,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)) @@ -279,7 +285,7 @@ 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 @@ -287,18 +293,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 () @@ -310,8 +310,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