X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fdisassem.lisp;h=5332dea0b7a690776396e191d202a5ef1518285b;hb=80f222325e1f677e5cf8de01c6990906fa47f65d;hp=5dbf562ce4c2ddb90ac9d44b8c848d76120a50fa;hpb=e1ba5a0d68ff8d4c8e688cd6a951aea1d56b1b61;p=sbcl.git

diff --git a/src/compiler/disassem.lisp b/src/compiler/disassem.lisp
index 5dbf562..5332dea 100644
--- a/src/compiler/disassem.lisp
+++ b/src/compiler/disassem.lisp
@@ -19,7 +19,7 @@
 (deftype alignment () '(integer 0 64))
 (deftype offset () '(signed-byte 24))
 (deftype address () '(unsigned-byte 32))
-(deftype length () '(unsigned-byte 24))
+(deftype disassem-length () '(unsigned-byte 24))
 (deftype column () '(integer 0 1000))
 
 (def!constant max-filtered-value-index 32)
@@ -232,7 +232,7 @@
   (mask dchunk-zero :type dchunk)       ; bits in the inst that are constant
   (id dchunk-zero :type dchunk)         ; value of those constant bits
 
-  (length 0 :type length)               ; in bytes
+  (length 0 :type disassem-length)               ; in bytes
 
   (print-name nil :type symbol)
 
@@ -322,7 +322,7 @@
   (name nil)
   (args nil :type list)
 
-  (length 0 :type length)               ; in bytes
+  (length 0 :type disassem-length)               ; in bytes
 
   (default-printer nil :type list))
 
@@ -347,6 +347,7 @@
 	   (let* ((old-arg (car this-arg-temps))
 		  (new-arg (find (arg-name old-arg) args :key #'arg-name)))
 	     (and new-arg
+                  (= (arg-position old-arg) (arg-position new-arg))
 		  (every (lambda (this-kind-temps)
 			   (funcall (find-arg-form-checker
 				     (car this-kind-temps))
@@ -946,7 +947,7 @@
 		    (let ((form (maybe-listify adjusted-forms)))
 		      (if (and (not (eq use-label t))
 			       (not (atom adjusted-forms))
-			       (/= (Length adjusted-forms) 1))
+			       (/= (length adjusted-forms) 1))
 			  (pd-error
 			   "cannot label a multiple-field argument ~
                               unless using a function: ~S" arg)
@@ -1217,6 +1218,7 @@
       (cons car cdr)))
 
 (defun sharing-mapcar (fun list)
+  (declare (type function fun))
   #!+sb-doc
   "A simple (one list arg) mapcar that avoids consing up a new list
   as long as the results of calling FUN on the elements of LIST are
@@ -1511,11 +1513,11 @@
 (declaim (maybe-inline sign-extend aligned-p align tab tab0))
 
 (defun bytes-to-bits (bytes)
-  (declare (type length bytes))
+  (declare (type disassem-length bytes))
   (* bytes sb!vm:n-byte-bits))
 
 (defun bits-to-bytes (bits)
-  (declare (type length bits))
+  (declare (type disassem-length bits))
   (multiple-value-bind (bytes rbits)
       (truncate bits sb!vm:n-byte-bits)
     (when (not (zerop rbits))