X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fmips-vm.lisp;h=df647ebbef68c1626ca75258317ace3b34d595ac;hb=HEAD;hp=d3dfa6c4b6eeb2981548e027571fec840deb020d;hpb=6ee1bc3f01760f7d95da156ff3863fe8fed491eb;p=sbcl.git diff --git a/src/code/mips-vm.lisp b/src/code/mips-vm.lisp index d3dfa6c..df647eb 100644 --- a/src/code/mips-vm.lisp +++ b/src/code/mips-vm.lisp @@ -4,19 +4,14 @@ (define-alien-type os-context-t (struct os-context-t-struct)) +(define-alien-type os-context-register-t unsigned-long-long) -;;;; MACHINE-TYPE and MACHINE-VERSION +;;;; MACHINE-TYPE (defun machine-type () "Returns a string describing the type of the local machine." "MIPS") - -;;; support for CL:MACHINE-VERSION defined OAOO elsewhere -(defun get-machine-version () - #!+little-endian "little-endian" - #!-little-endian "big-endian") - ;;;; FIXUP-CODE-OBJECT @@ -25,55 +20,49 @@ (unless (zerop (rem offset n-word-bytes)) (error "Unaligned instruction? offset=#x~X." offset)) (sb!sys:without-gcing - (let ((sap (truly-the system-area-pointer - (%primitive sb!c::code-instructions code)))) + (let ((sap (%primitive sb!c::code-instructions code))) (ecase kind (:jump (aver (zerop (ash value -28))) (setf (ldb (byte 26 0) (sap-ref-32 sap offset)) (ash value -2))) (:lui - (setf (sap-ref-16 sap - #!+little-endian offset - #!-little-endian (+ offset 2)) - (+ (ash value -16) - (if (logbitp 15 value) 1 0)))) + (setf (ldb (byte 16 0) (sap-ref-32 sap offset)) + (ash (1+ (ash value -15)) -1))) (:addi - (setf (sap-ref-16 sap - #!+little-endian offset - #!-little-endian (+ offset 2)) + (setf (ldb (byte 16 0) (sap-ref-32 sap offset)) (ldb (byte 16 0) value))))))) (define-alien-routine ("os_context_pc_addr" context-pc-addr) - (* unsigned-long-long) - (context (* os-context-t))) + (* os-context-register-t) + (context (* os-context-t) :in)) (defun context-pc (context) (declare (type (alien (* os-context-t)) context)) (int-sap (deref (context-pc-addr context)))) (define-alien-routine ("os_context_register_addr" context-register-addr) - (* unsigned-long-long) - (context (* os-context-t)) - (index int)) + (* os-context-register-t) + (context (* os-context-t) :in) + (index int :in)) (define-alien-routine ("os_context_bd_cause" context-bd-cause-int) unsigned-int - (context (* os-context-t))) + (context (* os-context-t) :in)) ;;; 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)) (let ((addr (context-register-addr context index))) - (declare (type (alien (* unsigned-long-long)) addr)) + (declare (type (alien (* os-context-register-t)) addr)) (deref addr))) (defun %set-context-register (context index new) (declare (type (alien (* os-context-t)) context)) (let ((addr (context-register-addr context index))) - (declare (type (alien (* unsigned-long-long)) addr)) + (declare (type (alien (* os-context-register-t)) addr)) (setf (deref addr) new))) ;;; This is like CONTEXT-REGISTER, but returns the value of a float @@ -82,35 +71,46 @@ ;;; FIXME: Whether COERCE actually knows how to make a float out of a ;;; long is another question. This stuff still needs testing. (define-alien-routine ("os_context_fpregister_addr" context-float-register-addr) - (* unsigned-long-long) - (context (* os-context-t)) - (index int)) + (* os-context-register-t) + (context (* os-context-t) :in) + (index int :in)) (defun context-float-register (context index format) (declare (type (alien (* os-context-t)) context)) (let ((addr (context-float-register-addr context index))) - (declare (type (alien (* unsigned-long-long)) addr)) + (declare (type (alien (* os-context-register-t)) addr)) (coerce (deref addr) format))) (defun %set-context-float-register (context index format new) (declare (type (alien (* os-context-t)) context)) (let ((addr (context-float-register-addr context index))) - (declare (type (alien (* unsigned-long-long)) addr)) + (declare (type (alien (* os-context-register-t)) addr)) (setf (deref addr) (coerce new format)))) +(define-alien-routine + ("arch_get_fp_control" floating-point-modes) unsigned-int) + +(define-alien-routine + ("arch_set_fp_control" %floating-point-modes-setter) void (fp unsigned-int :in)) + +(defun (setf floating-point-modes) (val) (%floating-point-modes-setter val)) + ;;; Given a signal context, return the floating point modes word in ;;; the same format as returned by FLOATING-POINT-MODES. (define-alien-routine ("os_context_fp_control" context-floating-point-modes) unsigned-int - (context (* os-context-t))) + (context (* os-context-t) :in)) ;;;; Internal-error-arguments. ;;; INTERNAL-ERROR-ARGUMENTS -- interface. ;;; ;;; Given the sigcontext, extract the internal error arguments from the -;;; instruction stream. -;;; +;;; instruction stream. This is e.g. +;;; 4 23 254 206 1 0 0 0 +;;; | ~~~~~~~~~~~~~~~~~~~~~~~~~ +;;; length data (everything is an octet) +;;; (pc + 4) (defun internal-error-args (context) (declare (type (alien (* os-context-t)) context)) (/show0 "entering INTERNAL-ERROR-ARGS, CONTEXT=..") @@ -118,23 +118,8 @@ (let ((pc (context-pc context)) (cause (context-bd-cause-int context))) (declare (type system-area-pointer pc)) - ;; KLUDGE: This exposure of the branch delay mechanism hurts. - (when (logbitp 31 cause) - (setf pc (sap+ pc 4))) - (args-for-unimp-inst pc))) - -(defun args-for-unimp-inst (pc) - (declare (type system-area-pointer pc)) - (let* ((length (sap-ref-8 pc 4)) - (vector (make-array length :element-type '(unsigned-byte 8)))) - (declare (type (unsigned-byte 8) length) - (type (simple-array (unsigned-byte 8) (*)) vector)) - (copy-ub8-from-system-area pc 5 vector 0 length) - (let* ((index 0) - (error-number (sb!c:read-var-integer vector index))) - (collect ((sc-offsets)) - (loop - (when (>= index length) - (return)) - (sc-offsets (sb!c:read-var-integer vector index))) - (values error-number (sc-offsets)))))) + (multiple-value-bind (error-number length sc-offsets) + ;; KLUDGE: This exposure of the branch delay mechanism hurts. + (snarf-error-junk pc (if (logbitp 31 cause) 8 4)) + (declare (ignore length)) + (values error-number sc-offsets))))