gencgc: More precise conservatism for pointers to boxed pages.

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

diff --git a/src/compiler/ppc/debug.lisp b/src/compiler/ppc/debug.lisp
index cf5db5f..3c5815c 100644 (file)
--- a/src/compiler/ppc/debug.lisp
+++ b/src/compiler/ppc/debug.lisp
@@ -1,6 +1,14 @@
-;;;
-;;; Written by William Lott.
-;;; 
+;;;; PPC compiler support for the debugger
+
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; This software is derived from the CMU CL system, which was
+;;;; written at Carnegie Mellon University and released into the
+;;;; public domain. The software is in the public domain and is
+;;;; provided with absolutely no warranty. See the COPYING and CREDITS
+;;;; files for more information.
+
 (in-package "SB!VM")
 
 (define-vop (debug-cur-sp)
@@ -23,7 +31,7 @@
   (:translate sb!kernel:stack-ref)
   (:policy :fast-safe)
   (:args (sap :scs (sap-reg))
-        (offset :scs (any-reg)))
+         (offset :scs (any-reg)))
   (:arg-types system-area-pointer positive-fixnum)
   (:results (result :scs (descriptor-reg)))
   (:result-types *)
@@ -34,8 +42,8 @@
   (:translate sb!kernel:%set-stack-ref)
   (:policy :fast-safe)
   (:args (sap :scs (sap-reg))
-        (offset :scs (any-reg))
-        (value :scs (descriptor-reg) :target result))
+         (offset :scs (any-reg))
+         (value :scs (descriptor-reg) :target result))
   (:arg-types system-area-pointer positive-fixnum *)
   (:results (result :scs (descriptor-reg)))
   (:result-types *)
@@ -51,32 +59,32 @@
   (:variant-vars lowtag)
   (:generator 5
     (let ((bogus (gen-label))
-         (done (gen-label)))
+          (done (gen-label)))
       (loadw temp thing 0 lowtag)
-      (inst srwi temp temp sb!vm:n-widetag-bits)
+      (inst srwi temp temp n-widetag-bits)
       (inst cmpwi temp 0)
-      (inst slwi temp temp (1- (integer-length sb!vm:n-word-bytes)))
+      (inst slwi temp temp (1- (integer-length n-word-bytes)))
       (inst beq bogus)
-      (unless (= lowtag sb!vm:other-pointer-lowtag)
-       (inst addi temp temp (- lowtag sb!vm:other-pointer-lowtag)))
+      (unless (= lowtag other-pointer-lowtag)
+        (inst addi temp temp (- lowtag other-pointer-lowtag)))
       (inst sub code thing temp)
       (emit-label done)
       (assemble (*elsewhere*)
-       (emit-label bogus)
-       (move code null-tn)
-       (inst b done)))))
+        (emit-label bogus)
+        (move code null-tn)
+        (inst b done)))))
 
 (define-vop (code-from-lra code-from-mumble)
   (:translate sb!di::lra-code-header)
-  (:variant sb!vm:other-pointer-lowtag))
+  (:variant other-pointer-lowtag))
 
 (define-vop (code-from-fun code-from-mumble)
   (:translate sb!di::fun-code-header)
-  (:variant sb!vm:fun-pointer-lowtag))
+  (: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) :target result))
   (:arg-types unsigned-num)
   (:results (result :scs (descriptor-reg)))
@@ -101,4 +109,4 @@
   (:result-types positive-fixnum)
   (:generator 5
     (loadw res fun 0 fun-pointer-lowtag)
-    (inst srwi res res sb!vm:n-widetag-bits)))
+    (inst srwi res res n-widetag-bits)))