0.9.1.60:

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

diff --git a/src/code/hppa-vm.lisp b/src/code/hppa-vm.lisp
index ebc0051..9f30c9a 100644 (file)
--- a/src/code/hppa-vm.lisp
+++ b/src/code/hppa-vm.lisp
@@ -8,10 +8,9 @@
   "Returns a string describing the type of the local machine."
   "HPPA")
 
-(defun machine-version ()
-  "Returns a string describing the version of the local machine."
-  "HPPA")
-
+;;; support for CL:MACHINE-VERSION defined OAOO elsewhere
+(defun get-machine-version ()
+  nil)
 \f
 ;;;; FIXUP-CODE-OBJECT
 
@@ -29,7 +28,7 @@
                      (logand inst #xffffc000)))
             (:load-short
              (let ((low-bits (ldb (byte 11 0) value)))
-               (assert (<= 0 low-bits (1- (ash 1 4))))
+               (aver (<= 0 low-bits (1- (ash 1 4))))
                (logior (ash low-bits 17)
                        (logand inst #xffe0ffff))))
             (:hi
@@ -41,7 +40,7 @@
                      (logand inst #xffe00000)))
             (:branch
              (let ((bits (ldb (byte 9 2) value)))
-               (assert (zerop (ldb (byte 2 0) value)))
+               (aver (zerop (ldb (byte 2 0) value)))
                (logior (ash bits 3)
                        (logand inst #xffe0e002)))))))))
 \f
@@ -89,10 +88,7 @@
           (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)))
        (collect ((sc-offsets))