X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fhppa-vm.lisp;h=dee7b040b2a82a4c9d266b690ada668bf4cb6c0f;hb=672b2f6cb751566526c7f3bb3de6b7d8424760e2;hp=ebc0051c71fc7ff2005758282615d7c97839a0db;hpb=b062a0cffdc3e1706a67c487d2bc5e406c104893;p=sbcl.git

diff --git a/src/code/hppa-vm.lisp b/src/code/hppa-vm.lisp
index ebc0051..dee7b04 100644
--- 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)
 
 ;;;; FIXUP-CODE-OBJECT
 
@@ -20,30 +19,30 @@
     (error "Unaligned instruction?  offset=#x~X." offset))
   (sb!sys:without-gcing
    (let* ((sap (truly-the system-area-pointer
-			  (%primitive sb!kernel::code-instructions code)))
-	  (inst (sap-ref-32 sap offset)))
+                          (%primitive sb!kernel::code-instructions code)))
+          (inst (sap-ref-32 sap offset)))
      (setf (sap-ref-32 sap offset)
-	   (ecase kind
-	     (:load
-	      (logior (ash (ldb (byte 11 0) value) 1)
-		      (logand inst #xffffc000)))
-	     (:load-short
-	      (let ((low-bits (ldb (byte 11 0) value)))
-		(assert (<= 0 low-bits (1- (ash 1 4))))
-		(logior (ash low-bits 17)
-			(logand inst #xffe0ffff))))
-	     (:hi
-	      (logior (ash (ldb (byte 5 13) value) 16)
-		      (ash (ldb (byte 2 18) value) 14)
-		      (ash (ldb (byte 2 11) value) 12)
-		      (ash (ldb (byte 11 20) value) 1)
-		      (ldb (byte 1 31) value)
-		      (logand inst #xffe00000)))
-	     (:branch
-	      (let ((bits (ldb (byte 9 2) value)))
-		(assert (zerop (ldb (byte 2 0) value)))
-		(logior (ash bits 3)
-			(logand inst #xffe0e002)))))))))
+           (ecase kind
+             (:load
+              (logior (ash (ldb (byte 11 0) value) 1)
+                      (logand inst #xffffc000)))
+             (:load-short
+              (let ((low-bits (ldb (byte 11 0) value)))
+                (aver (<= 0 low-bits (1- (ash 1 4))))
+                (logior (ash low-bits 17)
+                        (logand inst #xffe0ffff))))
+             (:hi
+              (logior (ash (ldb (byte 5 13) value) 16)
+                      (ash (ldb (byte 2 18) value) 14)
+                      (ash (ldb (byte 2 11) value) 12)
+                      (ash (ldb (byte 11 20) value) 1)
+                      (ldb (byte 1 31) value)
+                      (logand inst #xffe00000)))
+             (:branch
+              (let ((bits (ldb (byte 9 2) value)))
+                (aver (zerop (ldb (byte 2 0) value)))
+                (logior (ash bits 3)
+                        (logand inst #xffe0e002)))))))))
 
 (define-alien-routine ("os_context_pc_addr" context-pc-addr) (* unsigned-int)
   (context (* os-context-t)))
@@ -80,24 +79,21 @@
 ;;;
 ;;; Given the sigcontext, extract the internal error arguments from the
 ;;; instruction stream.
-;;; 
+;;;
 (defun internal-error-args (context)
   (declare (type (alien (* os-context-t)) context))
   (let ((pc (context-pc context)))
     (declare (type system-area-pointer pc))
     (let* ((length (sap-ref-8 pc 4))
-	   (vector (make-array length :element-type '(unsigned-byte 8))))
+           (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))
+               (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)))))))
+             (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)))))))