X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fhppa%2Finsts.lisp;h=d04c641d35451114f9960e296fcc525f8156e2e8;hb=1af3faa2b79125b774c2182cab841ed7ee555bed;hp=e07d742f8d9c7f298a1df74972abfe1e972a2c79;hpb=4ed3f0d08c3a57a6762018d9622f253ab9d0f2b6;p=sbcl.git

diff --git a/src/compiler/hppa/insts.lisp b/src/compiler/hppa/insts.lisp
index e07d742..d04c641 100644
--- a/src/compiler/hppa/insts.lisp
+++ b/src/compiler/hppa/insts.lisp
@@ -22,7 +22,7 @@
     (null null-offset)
     (zero zero-offset)
     (t
-     (assert (eq (sb-name (sc-sb (tn-sc tn))) 'registers))
+     (aver (eq (sb-name (sc-sb (tn-sc tn))) 'registers))
      (tn-offset tn))))
 
 (defun fp-reg-tn-encoding (tn)
@@ -398,10 +398,8 @@
     (cond (length-only
            (values 0 (1+ length) nil nil))
           (t
-           (sb!kernel:copy-from-system-area sap (* n-byte-bits (1+ offset))
-                                         vector (* n-word-bits
-                                                   vector-data-offset)
-                                         (* length n-byte-bits))
+           (sb!kernel:copy-ub8-from-system-area sap (1+ offset)
+                                                vector 0 length)
            (collect ((sc-offsets)
                      (lengths))
              (lengths 1)                ; the length byte
@@ -503,7 +501,7 @@
   (declare (type (or fixup (signed-byte 14))))
   (cond ((fixup-p disp)
 	 (note-fixup segment :load disp)
-	 (assert (or (null (fixup-offset disp)) (zerop (fixup-offset disp))))
+	 (aver (or (null (fixup-offset disp)) (zerop (fixup-offset disp))))
 	 0)
 	(t
 	 (dpb (ldb (byte 13 0) disp)
@@ -567,7 +565,7 @@
   (declare (type (or fixup (signed-byte 5)) disp))
   (cond ((fixup-p disp)
 	 (note-fixup segment :load-short disp)
-	 (assert (or (null (fixup-offset disp)) (zerop (fixup-offset disp))))
+	 (aver (or (null (fixup-offset disp)) (zerop (fixup-offset disp))))
 	 0)
 	(t
 	 (dpb (ldb (byte 4 0) disp)
@@ -649,7 +647,7 @@
   (declare (type (or fixup (signed-byte 21) (unsigned-byte 21)) value))
   (cond ((fixup-p value)
 	 (note-fixup segment :hi value)
-	 (assert (or (null (fixup-offset value)) (zerop (fixup-offset value))))
+	 (aver (or (null (fixup-offset value)) (zerop (fixup-offset value))))
 	 0)
 	(t
 	 (logior (ash (ldb (byte 5 2) value) 16)
@@ -692,7 +690,7 @@
   (declare (type (or fixup (signed-byte 17)) disp))
   (cond ((fixup-p disp)
 	 (note-fixup segment :branch disp)
-	 (assert (or (null (fixup-offset disp)) (zerop (fixup-offset disp))))
+	 (aver (or (null (fixup-offset disp)) (zerop (fixup-offset disp))))
 	 (values 0 0 0))
 	(t
 	 (values (ldb (byte 5 11) disp)
@@ -710,7 +708,7 @@
   (emit-back-patch segment 4
     #'(lambda (segment posn)
 	(let ((disp (label-relative-displacement target posn)))
-	  (assert (<= (- (ash 1 16)) disp (1- (ash 1 16))))
+	  (aver (<= (- (ash 1 16)) disp (1- (ash 1 16))))
 	  (multiple-value-bind
 	      (w1 w2 w)
 	      (decompose-branch-disp segment disp)
@@ -778,7 +776,7 @@
   (emit-back-patch segment 4
     #'(lambda (segment posn)
 	(let ((disp (label-relative-displacement target posn)))
-	  (assert (<= (- (ash 1 11)) disp (1- (ash 1 11))))
+	  (aver (<= (- (ash 1 11)) disp (1- (ash 1 11))))
 	  (let ((w1 (logior (ash (ldb (byte 10 0) disp) 1)
 			    (ldb (byte 1 10) disp)))
 		(w (ldb (byte 1 11) disp)))
@@ -1125,7 +1123,7 @@
        (result-encoding double-p)
        (fp-reg-tn-encoding result)
      (when side
-       (assert double-p)
+       (aver double-p)
        (setf double-p nil))
      (emit-fp-load/store segment (if double-p #x0B #x09) (reg-tn-encoding base)
 			 (reg-tn-encoding index) 0 (if scale 1 0) 0 0 0
@@ -1144,7 +1142,7 @@
        (value-encoding double-p)
        (fp-reg-tn-encoding value)
      (when side
-       (assert double-p)
+       (aver double-p)
        (setf double-p nil))
      (emit-fp-load/store segment (if double-p #x0B #x09) (reg-tn-encoding base)
 			 (reg-tn-encoding index) 0 (if scale 1 0) 0 0 1
@@ -1164,7 +1162,7 @@
        (result-encoding double-p)
        (fp-reg-tn-encoding result)
      (when side
-       (assert double-p)
+       (aver double-p)
        (setf double-p nil))
      (emit-fp-load/store segment (if double-p #x0B #x09) (reg-tn-encoding base)
 			 (short-disp-encoding segment disp) 0
@@ -1185,7 +1183,7 @@
        (value-encoding double-p)
        (fp-reg-tn-encoding value)
      (when side
-       (assert double-p)
+       (aver double-p)
        (setf double-p nil))
      (emit-fp-load/store segment (if double-p #x0B #x09) (reg-tn-encoding base)
 			 (short-disp-encoding segment disp) 0
@@ -1228,7 +1226,7 @@
      (multiple-value-bind
 	 (to-encoding to-double-p)
 	 (fp-reg-tn-encoding to)
-       (assert (eq from-double-p to-double-p))
+       (aver (eq from-double-p to-double-p))
        (emit-fp-class-0-inst segment #x0C from-encoding 0
 			     (+ 2 (or (position op funops)
 				      (error "Bogus FUNOP: ~S" op)))
@@ -1267,7 +1265,7 @@
      (multiple-value-bind
 	 (r2-encoding r2-double-p)
 	 (fp-reg-tn-encoding r2)
-       (assert (eq r1-double-p r2-double-p))
+       (aver (eq r1-double-p r2-double-p))
        (emit-fp-class-0-inst segment #x0C r1-encoding r2-encoding 0
 			     (if r1-double-p 1 0) 2 0 0 cond)))))
 
@@ -1300,11 +1298,11 @@
      (multiple-value-bind
 	 (r2-encoding r2-double-p)
 	 (fp-reg-tn-encoding r2)
-       (assert (eq r1-double-p r2-double-p))
+       (aver (eq r1-double-p r2-double-p))
        (multiple-value-bind
 	   (result-encoding result-double-p)
 	   (fp-reg-tn-encoding result)
-	 (assert (eq r1-double-p result-double-p))
+	 (aver (eq r1-double-p result-double-p))
 	 (emit-fp-class-0-inst segment #x0C r1-encoding r2-encoding
 			       (or (position op fbinops)
 				   (error "Bogus FBINOP: ~S" op))