X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Ftarget-disassem.lisp;h=3b0a14a08fc531f8a9cfdefb611fd572a2b3b221;hb=545fa4548b327804cf78afe38a2ecd94ced86162;hp=56b59241d972260d7203af3ade94ca42d069d82a;hpb=f143939b1dbaf38ebd4f92c851fbc4ecddf37af1;p=sbcl.git

diff --git a/src/compiler/target-disassem.lisp b/src/compiler/target-disassem.lisp
index 56b5924..3b0a14a 100644
--- a/src/compiler/target-disassem.lisp
+++ b/src/compiler/target-disassem.lisp
@@ -351,7 +351,7 @@
 
 (defun fun-address (function)
   (declare (type compiled-function function))
-  (- (sb!kernel:get-lisp-obj-address function) sb!vm:fun-pointer-type))
+  (- (sb!kernel:get-lisp-obj-address function) sb!vm:fun-pointer-lowtag))
 
 ;;; the offset of FUNCTION from the start of its code-component's
 ;;; instruction area
@@ -429,7 +429,7 @@
 				      (dstate-cur-offs dstate)
 				      (+ (dstate-cur-offs dstate)
 					 (1- lra-size))))
-		sb!vm:return-pc-header-type))
+		sb!vm:return-pc-header-widetag))
     (unless (null stream)
       (princ '.lra stream))
     (incf (dstate-next-offs dstate) lra-size))
@@ -817,7 +817,7 @@
 		      (+ (ash word sb!vm:byte-bits) byte)
 		      (+ word (ash byte bit-shift))))
 	    (incf bit-shift sb!vm:byte-bits)))
-	(format stream "#X~V,'0X" (ash sb!vm:word-bits -2) word)))))
+	(format stream "#X~V,'0X" (ash sb!vm:n-word-bits -2) word)))))
 
 (defvar *default-dstate-hooks* (list #'lra-hook))
 
@@ -1752,7 +1752,7 @@
 	       (maybe-symbol-addr (- address slot-offset))
 	       (maybe-symbol
 		(sb!kernel:make-lisp-obj
-		 (+ maybe-symbol-addr sb!vm:other-pointer-type))))
+		 (+ maybe-symbol-addr sb!vm:other-pointer-lowtag))))
 	  (when (symbolp maybe-symbol)
 	    (return (values maybe-symbol (cdr field))))))))
 
@@ -1783,7 +1783,7 @@
 	(values
 	 (sb!kernel:code-header-ref code
 				    (ash (+ byte-offset
-					    sb!vm:other-pointer-type)
+					    sb!vm:other-pointer-lowtag)
 					 (- sb!vm:word-shift)))
 	 t)
 	(values nil nil))))
@@ -1797,7 +1797,7 @@
     (let ((code-size (ash (sb!kernel:get-header-data code) sb!vm:word-shift)))
       (sb!sys:without-gcing
        (let ((code-addr (- (sb!kernel:get-lisp-obj-address code)
-			   sb!vm:other-pointer-type)))
+			   sb!vm:other-pointer-lowtag)))
 	 (if (or (< addr code-addr) (>= addr (+ code-addr code-size)))
            (values nil nil)
            (values (sb!kernel:code-header-ref