X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fx86%2Fdebug.lisp;h=823ee8f39ee4e2a7db41672942403e386e05a59c;hb=74cf7a4d01664fbf72a662ba093ad67ca243b524;hp=4a8f0ec223e3458269e36b9c8d696c0ce07d68c2;hpb=0d871fd7a98fc4af92a8b942a1154761466ad8c9;p=sbcl.git

diff --git a/src/compiler/x86/debug.lisp b/src/compiler/x86/debug.lisp
index 4a8f0ec..823ee8f 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 (- n-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)
@@ -55,7 +55,7 @@
   (:result-types *)
   (:generator 5
     (inst mov result (make-ea :dword :base sap
-                              :disp (- (* (1+ index) n-word-bytes))))))
+                              :disp (frame-byte-offset index)))))
 
 (define-vop (write-control-stack)
   (:translate %set-stack-ref)
@@ -71,7 +71,8 @@
     (move temp offset)
     (inst neg temp)
     (inst mov
-          (make-ea :dword :base sap :disp (- n-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)
@@ -84,8 +85,7 @@
   (:results (result :scs (descriptor-reg)))
   (:result-types *)
   (:generator 5
-    (inst mov (make-ea :dword :base sap
-                       :disp (- (* (1+ index) n-word-bytes)))
+    (inst mov (make-ea :dword :base sap :disp (frame-byte-offset index))
           value)
     (move result value)))
 
@@ -120,9 +120,9 @@
   (: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)