0.pre7.55:

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

diff --git a/src/compiler/x86/debug.lisp b/src/compiler/x86/debug.lisp
index 5e663f7..e3c405b 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)
@@ -112,7 +109,7 @@
       (emit-label done)
       (assemble (*elsewhere*)
        (emit-label bogus)
-       (inst mov code *nil-value*)
+       (inst mov code nil-value)
        (inst jmp done)))))
 
 (define-vop (code-from-lra code-from-mumble)
@@ -120,8 +117,8 @@
   (:variant other-pointer-type))
 
 (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-type))
 
 (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)
+    (loadw res fun 0 fun-pointer-type)
     (inst shr res type-bits)))