X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Falpha-vm.lisp;h=b1f55cf0cce2df82bc6313920390acd0b6e66b59;hb=dc33d6a6b84f8338e603759cec8e25da29055d50;hp=fe440d0bae7b9cd878fcab53960cfbf538e6f52b;hpb=c94a9f9d1be535ce5df6127cce722d3edd9a6345;p=sbcl.git

diff --git a/src/code/alpha-vm.lisp b/src/code/alpha-vm.lisp
index fe440d0..b1f55cf 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,9 +19,10 @@
 (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))
@@ -34,7 +32,7 @@
 			 (%primitive code-instructions code))))
      (ecase kind
        (:jmp-hint
-	(assert (zerop (ldb (byte 2 0) value)))
+	(aver (zerop (ldb (byte 2 0) value)))
 	#+nil
 	(setf (sap-ref-16 sap offset)
 	      (logior (sap-ref-16 sap offset)
@@ -159,15 +157,13 @@
            (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 (* n-byte-bits 5)
-                             vector (* n-word-bits vector-data-offset)
-                             (* length n-byte-bits))
+      (copy-ub8-from-system-area pc 5 vector 0 length)
       (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)))))))