X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fppc%2Finsts.lisp;h=b31d85cccd0c63fb35f48e64e15ac121cc2877c0;hb=8a8568603cc7cacd188fe1cac18824a69bece6af;hp=26bad5ce22c136a100846823c60cf35167ec4200;hpb=5fbaded1c55f908a403e52b85bf16f85641c9453;p=sbcl.git

diff --git a/src/compiler/ppc/insts.lisp b/src/compiler/ppc/insts.lisp
index 26bad5c..b31d85c 100644
--- a/src/compiler/ppc/insts.lisp
+++ b/src/compiler/ppc/insts.lisp
@@ -232,10 +232,8 @@
     (cond (length-only
            (values 0 (1+ length) nil nil))
           (t
-           (sb!kernel:copy-from-system-area sap (* sb!vm:n-byte-bits (1+ offset))
-                                         vector (* sb!vm:n-word-bits
-                                                   sb!vm:vector-data-offset)
-                                         (* length sb!vm: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
@@ -281,12 +279,14 @@
 				     aa-bit lk-bit)))
 	       t)))
        #'(lambda (segment posn)
+	   (declare (ignore posn))
 	   (let ((bo (logxor 8 bo))) ;; invert the test
 	     (emit-b-form-inst segment 16 bo bi
 			       2 ; skip over next instruction
 			       0 0)
 	     (emit-back-patch segment 4
 			      #'(lambda (segment posn)
+				  (declare (ignore posn))
 				  (emit-i-form-branch segment target lk-p)))))
        ))))
 	     
@@ -623,23 +623,23 @@
   (declare (ignore inst))
   (flet ((nt (x) (if stream (sb!disassem:note x dstate))))
     (case (xinstr-data chunk dstate)
-      (#.sb!vm:error-trap
+      (#.error-trap
        (nt "Error trap")
        (sb!disassem:handle-break-args #'snarf-error-junk stream dstate))
-      (#.sb!vm:cerror-trap
+      (#.cerror-trap
        (nt "Cerror trap")
        (sb!disassem:handle-break-args #'snarf-error-junk stream dstate))
-      (#.sb!vm:object-not-list-trap
+      (#.object-not-list-trap
        (nt "Object not list trap"))
-      (#.sb!vm:breakpoint-trap
+      (#.breakpoint-trap
        (nt "Breakpoint trap"))
-      (#.sb!vm:pending-interrupt-trap
+      (#.pending-interrupt-trap
        (nt "Pending interrupt trap"))
-      (#.sb!vm:halt-trap
+      (#.halt-trap
        (nt "Halt trap"))
-      (#.sb!vm:fun-end-breakpoint-trap
+      (#.fun-end-breakpoint-trap
        (nt "Function end breakpoint trap"))
-      (#.sb!vm:object-not-instance-trap
+      (#.object-not-instance-trap
        (nt "Object not instance trap"))
     )))