X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fdebug.lisp;h=690843feff73f68d9bf7b9993e9c906309063ab5;hb=bffa99d35c7d50ac46b9eb7dbe25d1ab1a0e6145;hp=e3c405bfeac2d4bee0bcc00c8381faff6109ca44;hpb=f143939b1dbaf38ebd4f92c851fbc4ecddf37af1;p=sbcl.git

diff --git a/src/compiler/x86/debug.lisp b/src/compiler/x86/debug.lisp
index e3c405b..690843f 100644
--- a/src/compiler/x86/debug.lisp
+++ b/src/compiler/x86/debug.lisp
@@ -43,7 +43,7 @@
     (move temp offset)
     (inst neg temp)
     (inst mov result
-	  (make-ea :dword :base sap :disp (- word-bytes) :index temp))))
+	  (make-ea :dword :base sap :disp (- n-word-bytes) :index temp))))
 
 (define-vop (read-control-stack-c)
   (:translate stack-ref)
@@ -55,7 +55,7 @@
   (:result-types *)
   (:generator 5
     (inst mov result (make-ea :dword :base sap
-			      :disp (- (* (1+ index) word-bytes))))))
+			      :disp (- (* (1+ index) n-word-bytes))))))
 
 (define-vop (write-control-stack)
   (:translate %set-stack-ref)
@@ -71,7 +71,7 @@
     (move temp offset)
     (inst neg temp)
     (inst mov
-	  (make-ea :dword :base sap :disp (- word-bytes) :index temp) value)
+	  (make-ea :dword :base sap :disp (- n-word-bytes) :index temp) value)
     (move result value)))
 
 (define-vop (write-control-stack-c)
@@ -85,7 +85,7 @@
   (:result-types *)
   (:generator 5
     (inst mov (make-ea :dword :base sap
-		       :disp (- (* (1+ index) word-bytes)))
+		       :disp (- (* (1+ index) n-word-bytes)))
 	  value)
     (move result value)))
 
@@ -99,11 +99,11 @@
     (let ((bogus (gen-label))
 	  (done (gen-label)))
       (loadw temp thing 0 lowtag)
-      (inst shr temp type-bits)
+      (inst shr temp n-widetag-bits)
       (inst jmp :z bogus)
-      (inst shl temp (1- (integer-length word-bytes)))
-      (unless (= lowtag other-pointer-type)
-	(inst add temp (- lowtag other-pointer-type)))
+      (inst shl temp (1- (integer-length n-word-bytes)))
+      (unless (= lowtag other-pointer-lowtag)
+	(inst add temp (- lowtag other-pointer-lowtag)))
       (move code thing)
       (inst sub code temp)
       (emit-label done)
@@ -114,11 +114,11 @@
 
 (define-vop (code-from-lra code-from-mumble)
   (:translate sb!di::lra-code-header)
-  (:variant other-pointer-type))
+  (:variant other-pointer-lowtag))
 
 (define-vop (code-from-function code-from-mumble)
   (:translate sb!di::fun-code-header)
-  (:variant fun-pointer-type))
+  (:variant fun-pointer-lowtag))
 
 (define-vop (make-lisp-obj)
   (:policy :fast-safe)
@@ -150,5 +150,5 @@
   (:results (res :scs (unsigned-reg)))
   (:result-types positive-fixnum)
   (:generator 5
-    (loadw res fun 0 fun-pointer-type)
-    (inst shr res type-bits)))
+    (loadw res fun 0 fun-pointer-lowtag)
+    (inst shr res n-widetag-bits)))