X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fdebug.lisp;h=823ee8f39ee4e2a7db41672942403e386e05a59c;hb=37b1ed8e9b6faa84832b8251998b5d0eb1f6b307;hp=091a61c85acd176d69bca8cf9f4653b5f82ff9f4;hpb=adf0d51d2bde8b723276bacf94641df9aa5ae561;p=sbcl.git

diff --git a/src/compiler/x86/debug.lisp b/src/compiler/x86/debug.lisp
index 091a61c..823ee8f 100644
--- 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)
@@ -37,7 +34,7 @@
   (:translate stack-ref)
   (:policy :fast-safe)
   (:args (sap :scs (sap-reg) :to :eval)
-	 (offset :scs (any-reg) :target temp))
+         (offset :scs (any-reg) :target temp))
   (:arg-types system-area-pointer positive-fixnum)
   (:temporary (:sc unsigned-reg :from (:argument 1)) temp)
   (:results (result :scs (descriptor-reg)))
@@ -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 (frame-byte-offset 0) :index temp))))
 
 (define-vop (read-control-stack-c)
   (:translate stack-ref)
@@ -58,14 +55,14 @@
   (:result-types *)
   (:generator 5
     (inst mov result (make-ea :dword :base sap
-			      :disp (- (* (1+ index) word-bytes))))))
+                              :disp (frame-byte-offset index)))))
 
 (define-vop (write-control-stack)
   (:translate %set-stack-ref)
   (:policy :fast-safe)
   (:args (sap :scs (sap-reg) :to :eval)
-	 (offset :scs (any-reg) :target temp)
-	 (value :scs (descriptor-reg) :to :result :target result))
+         (offset :scs (any-reg) :target temp)
+         (value :scs (descriptor-reg) :to :result :target result))
   (:arg-types system-area-pointer positive-fixnum *)
   (:temporary (:sc unsigned-reg :from (:argument 1) :to :result) temp)
   (:results (result :scs (descriptor-reg)))
@@ -74,22 +71,22 @@
     (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 (frame-byte-offset 0) :index temp)
+          value)
     (move result value)))
 
 (define-vop (write-control-stack-c)
   (:translate %set-stack-ref)
   (:policy :fast-safe)
   (:args (sap :scs (sap-reg))
-	 (value :scs (descriptor-reg) :target result))
+         (value :scs (descriptor-reg) :target result))
   (:info index)
   (:arg-types system-area-pointer (:constant (signed-byte 30)) *)
   (:results (result :scs (descriptor-reg)))
   (:result-types *)
   (:generator 5
-    (inst mov (make-ea :dword :base sap
-		       :disp (- (* (1+ index) word-bytes)))
-	  value)
+    (inst mov (make-ea :dword :base sap :disp (frame-byte-offset index))
+          value)
     (move result value)))
 
 (define-vop (code-from-mumble)
@@ -100,37 +97,37 @@
   (:variant-vars lowtag)
   (:generator 5
     (let ((bogus (gen-label))
-	  (done (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)
       (assemble (*elsewhere*)
-	(emit-label bogus)
-	(inst mov code nil-value)
-	(inst jmp done)))))
+        (emit-label bogus)
+        (inst mov code nil-value)
+        (inst jmp done)))))
 
 (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)
+(define-vop (%make-lisp-obj)
   (:policy :fast-safe)
-  (:translate sb!di::make-lisp-obj)
+  (:translate %make-lisp-obj)
   (:args (value :scs (unsigned-reg unsigned-stack) :target result))
   (:arg-types unsigned-num)
   (:results (result :scs (descriptor-reg)
-		    :load-if (not (sc-is value unsigned-reg))
-		    ))
+                    :load-if (not (sc-is value unsigned-reg))
+                    ))
   (:generator 1
     (move result value)))
 
@@ -139,19 +136,19 @@
   (:translate sb!di::get-lisp-obj-address)
   (:args (thing :scs (descriptor-reg control-stack) :target result))
   (:results (result :scs (unsigned-reg)
-		    :load-if (not (and (sc-is thing descriptor-reg)
-				       (sc-is result unsigned-stack)))))
+                    :load-if (not (and (sc-is thing descriptor-reg)
+                                       (sc-is result unsigned-stack)))))
   (:result-types unsigned-num)
   (:generator 1
     (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)))