0.9.2.47:

[sbcl.git] / src / compiler / x86 / debug.lisp

diff --git a/src/compiler/x86/debug.lisp b/src/compiler/x86/debug.lisp
index 091a61c..690843f 100644 (file)
--- a/src/compiler/x86/debug.lisp
+++ b/src/compiler/x86/debug.lisp
@@ -11,9 +11,6 @@
 
 (in-package "SB!VM")
 
-(file-comment
- "$Header$")
-
 (define-vop (debug-cur-sp)
   (:translate current-sp)
   (:policy :fast-safe)
@@ -46,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)
@@ -58,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)
@@ -74,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)
@@ -88,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)))
 
@@ -102,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)
@@ -117,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::function-code-header)
-  (:variant function-pointer-type))
+  (:translate sb!di::fun-code-header)
+  (:variant fun-pointer-lowtag))
 
 (define-vop (make-lisp-obj)
   (:policy :fast-safe)
@@ -146,12 +143,12 @@
     (move result thing)))
 
 
-(define-vop (function-word-offset)
+(define-vop (fun-word-offset)
   (:policy :fast-safe)
-  (:translate sb!di::function-word-offset)
+  (:translate sb!di::fun-word-offset)
   (:args (fun :scs (descriptor-reg)))
   (:results (res :scs (unsigned-reg)))
   (:result-types positive-fixnum)
   (:generator 5
-    (loadw res fun 0 function-pointer-type)
-    (inst shr res type-bits)))
+    (loadw res fun 0 fun-pointer-lowtag)
+    (inst shr res n-widetag-bits)))