X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Falpha-vm.lisp;h=fff421e895654b45c6c1be56d15d0801a742d000;hb=01044af1b8d69fc3899dc0417064c1512223223d;hp=1d7cf1153cbe4278545da43d6816aee01379907c;hpb=80304981972c91c1b3f3fca75f36dacf1fecf307;p=sbcl.git

diff --git a/src/code/alpha-vm.lisp b/src/code/alpha-vm.lisp
index 1d7cf11..fff421e 100644
--- a/src/code/alpha-vm.lisp
+++ b/src/code/alpha-vm.lisp
@@ -10,9 +10,6 @@
 ;;;; files for more information.
 
 (in-package "SB!VM")
-
-(defvar *number-of-signals* 64)
-(defvar *bits-per-word* 64)
 
 ;;; See x86-vm.lisp for a description of this.
 (define-alien-type os-context-t (struct os-context-t-struct))
@@ -22,16 +19,17 @@
 (defun machine-type ()
   "Return a string describing the type of the local machine."
   "Alpha")
-(defun machine-version ()
-  "Return a string describing the version of the local machine."
-  "Alpha")
+
+;;; support for CL:MACHINE-VERSION defined OAOO elsewhere
+(defun get-machine-version ()
+  nil)
 
 (defun fixup-code-object (code offset value kind)
   (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!kernel::code-instructions code))))
+			 (%primitive code-instructions code))))
      (ecase kind
        (:jmp-hint
 	(assert (zerop (ldb (byte 2 0) value)))
@@ -102,7 +100,7 @@
 
 ;;; 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"
+(define-alien-routine ("os_context_float_register_addr"
 		       context-float-register-addr)
   (* long)
   (context (* os-context-t))
@@ -115,27 +113,29 @@
   (setf (deref (context-float-register-addr context index))
         (coerce new format)))
 
+;;; This sets the software fp_control word, which is not the same
+;;; thing as the hardware fpcr.  We have to do this so that OS FPU
+;;; completion works properly
+
+;;; Note that this means we can't set rounding modes; we'd have to do
+;;; that separately.  That said, almost everybody seems to agree that
+;;; changing the rounding mode is rarely a good idea, because it upsets
+;;; libm functions.  So adding that is not a priority.  Sorry.
+;;; -dan 2001.02.06
+
+(define-alien-routine
+    ("arch_get_fp_control" floating-point-modes) (sb!alien:unsigned 64))
+
+(define-alien-routine
+    ("arch_set_fp_control" %floating-point-modes-setter) void (fp (sb!alien:unsigned 64)))
+
+(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.
-(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,
-  ;; this is stubified. It needs to be rewritten as an
-  ;; alien function.
-  (warn "stub CONTEXT-FLOATING-POINT-MODES")
-
-  ;; old code for Linux:
-  #+nil
-  (let ((cw (slot (deref (slot context 'fpstate) 0) 'cw))
-	(sw (slot (deref (slot context 'fpstate) 0) 'sw)))
-    ;;(format t "cw = ~4X~%sw = ~4X~%" cw sw)
-    ;; NOT TESTED -- Clear sticky bits to clear interrupt condition.
-    (setf (slot (deref (slot context 'fpstate) 0) 'sw) (logandc2 sw #x3f))
-    ;;(format t "new sw = ~X~%" (slot (deref (slot context 'fpstate) 0) 'sw))
-    ;; Simulate floating-point-modes VOP.
-    (logior (ash (logand sw #xffff) 16) (logxor (logand cw #xffff) #x3f)))
-
-  0)
+(define-alien-routine ("os_context_fp_control" context-floating-point-modes)
+    (sb!alien:unsigned 64) (context (* os-context-t)))
+
 
 ;;;; INTERNAL-ERROR-ARGS
 
@@ -161,27 +161,11 @@
                              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)))
         (collect ((sc-offsets))
                  (loop
                   (when (>= index length)
                     (return))
-                  (sc-offsets (sb!c::read-var-integer vector index)))
+                  (sc-offsets (sb!c:read-var-integer vector index)))
                  (values error-number (sc-offsets)))))))
-
-;;; The loader uses this to convert alien names to the form they
-;;; occure in the symbol table (for example, prepending an
-;;; underscore). 
-(defun extern-alien-name (name)
-  (declare (type simple-base-string name))
-  ;; On the Alpha we don't do anything.
-  name)
-
-;;;; Do whatever is necessary to make the given code component
-;;;; executable.
-;;;;
-;;;; XXX do we really not have to flush caches or something here? I
-;;;; need an architecture manual
-(defun sanctify-for-execution (component)
-  (declare (ignore component))
-  nil)
+