0.pre7.76:

[sbcl.git] / src / code / alpha-vm.lisp

diff --git a/src/code/alpha-vm.lisp b/src/code/alpha-vm.lisp
index b309cf8..6741975 100644 (file)
--- a/src/code/alpha-vm.lisp
+++ b/src/code/alpha-vm.lisp
@@ -27,7 +27,7 @@
   "Alpha")
 \f
 (defun fixup-code-object (code offset value kind)
-  (unless (zerop (rem offset word-bytes))
+  (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
@@ -87,12 +87,14 @@
 ;;; (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)))
+  (deref (the (alien (* unsigned-long))
+          (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 (the (alien (* unsigned-long))
+                (context-register-addr context index)))
+       new))
 
 ;;; This is like CONTEXT-REGISTER, but returns the value of a float
 ;;; register. FORMAT is the type of float to return.
@@ -145,7 +147,6 @@
 ;;; to replicate)
 (defun internal-error-arguments (context)
   (declare (type (alien (* os-context-t)) context))
-  (sb!int::/show0 "entering INTERNAL-ERROR-ARGUMENTS")
   (let ((pc (context-pc context)))
     (declare (type system-area-pointer pc))
     ;; pc is a SAP pointing at - or actually, shortly after -
@@ -154,10 +155,9 @@
            (vector (make-array length :element-type '(unsigned-byte 8))))
       (declare (type (unsigned-byte 8) length)
                (type (simple-array (unsigned-byte 8) (*)) vector))
-      (copy-from-system-area pc (* sb!vm:byte-bits 5)
-                             vector (* sb!vm:word-bits
-                                       sb!vm:vector-data-offset)
-                             (* length sb!vm:byte-bits))
+      (copy-from-system-area pc (* n-byte-bits 5)
+                             vector (* n-word-bits vector-data-offset)
+                             (* length n-byte-bits))
       (let* ((index 0)
              (error-number (sb!c::read-var-integer vector index)))
         (collect ((sc-offsets))
@@ -169,9 +169,10 @@
 \f
 ;;; The loader uses this to convert alien names to the form they
 ;;; occure in the symbol table (for example, prepending an
-;;; underscore). On the Alpha we don't do anything.
+;;; underscore). 
 (defun extern-alien-name (name)
   (declare (type simple-base-string name))
+  ;; On the Alpha we don't do anything.
   name)
 \f
 ;;;; Do whatever is necessary to make the given code component