X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmips%2Fdebug.lisp;h=b04bb1bcbe6b72e93da8281f6dd0cd89d36a7a5b;hb=b83353d9f998e5c0e34604b5593df70c66d2c510;hp=7883ec1ba055ee98022be10eab6b9bbbddf0d31d;hpb=4ae1b794a5d6a90794468cf8017f5307f2c30dfe;p=sbcl.git

diff --git a/src/compiler/mips/debug.lisp b/src/compiler/mips/debug.lisp
index 7883ec1..b04bb1b 100644
--- a/src/compiler/mips/debug.lisp
+++ b/src/compiler/mips/debug.lisp
@@ -1,8 +1,19 @@
+;;;; MIPS 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)
-  (:translate current-sp)
+  (:translate sb!di::current-sp)
   (:policy :fast-safe)
   (:results (res :scs (sap-reg)))
   (:result-types system-area-pointer)
@@ -10,7 +21,7 @@
     (move res csp-tn)))
 
 (define-vop (debug-cur-fp)
-  (:translate current-fp)
+  (:translate sb!di::current-fp)
   (:policy :fast-safe)
   (:results (res :scs (sap-reg)))
   (:result-types system-area-pointer)
@@ -18,21 +29,21 @@
     (move res cfp-tn)))
 
 (define-vop (read-control-stack)
-  (:translate stack-ref)
+  (:translate sb!kernel:stack-ref)
   (:policy :fast-safe)
   (:args (object :scs (sap-reg) :target sap)
-	 (offset :scs (any-reg)))
+         (offset :scs (any-reg)))
   (:arg-types system-area-pointer positive-fixnum)
   (:temporary (:scs (sap-reg) :from :eval) sap)
   (:results (result :scs (descriptor-reg)))
   (:result-types *)
   (:generator 5
-    (inst add sap object offset)
+    (inst addu sap object offset)
     (inst lw result sap 0)
     (inst nop)))
 
 (define-vop (read-control-stack-c)
-  (:translate stack-ref)
+  (:translate sb!kernel:stack-ref)
   (:policy :fast-safe)
   (:args (object :scs (sap-reg)))
   (:info offset)
@@ -44,17 +55,17 @@
     (inst nop)))
 
 (define-vop (write-control-stack)
-  (:translate %set-stack-ref)
+  (:translate sb!kernel:%set-stack-ref)
   (:policy :fast-safe)
   (:args (object :scs (sap-reg) :target sap)
-	 (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 *)
   (:temporary (:scs (sap-reg) :from (:argument 1)) sap)
   (:generator 2
-    (inst add sap object offset)
+    (inst addu sap object offset)
     (inst sw value sap 0)
     (move result value)))
 
@@ -62,7 +73,7 @@
   (: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 offset)
   (:arg-types system-area-pointer (:constant (signed-byte 14)) *)
   (:results (result :scs (descriptor-reg)))
@@ -80,31 +91,31 @@
   (:variant-vars lowtag)
   (:generator 5
     (let ((bogus (gen-label))
-	  (done (gen-label)))
+          (done (gen-label)))
       (loadw temp thing 0 lowtag)
       (inst srl temp n-widetag-bits)
       (inst beq temp bogus)
       (inst sll temp (1- (integer-length n-word-bytes)))
       (unless (= lowtag other-pointer-lowtag)
-	(inst addu temp (- lowtag other-pointer-lowtag)))
+        (inst addu temp (- lowtag other-pointer-lowtag)))
       (inst subu code thing temp)
       (emit-label done)
       (assemble (*elsewhere*)
-	(emit-label bogus)
-	(inst b done)
-	(move code null-tn)))))
+        (emit-label bogus)
+        (inst b done)
+        (move code null-tn t)))))
 
 (define-vop (code-from-lra code-from-mumble)
-  (:translate lra-code-header)
+  (:translate sb!di::lra-code-header)
   (:variant other-pointer-lowtag))
 
 (define-vop (code-from-fun code-from-mumble)
-  (:translate fun-code-header)
+  (:translate sb!di::fun-code-header)
   (:variant fun-pointer-lowtag))
 
-(define-vop (make-lisp-obj)
+(define-vop (%make-lisp-obj)
   (:policy :fast-safe)
-  (:translate make-lisp-obj)
+  (:translate %make-lisp-obj)
   (:args (value :scs (unsigned-reg) :target result))
   (:arg-types unsigned-num)
   (:results (result :scs (descriptor-reg)))
@@ -113,7 +124,7 @@
 
 (define-vop (get-lisp-obj-address)
   (:policy :fast-safe)
-  (:translate get-lisp-obj-address)
+  (:translate sb!di::get-lisp-obj-address)
   (:args (thing :scs (descriptor-reg) :target result))
   (:results (result :scs (unsigned-reg)))
   (:result-types unsigned-num)
@@ -122,7 +133,7 @@
 
 (define-vop (fun-word-offset)
   (:policy :fast-safe)
-  (:translate fun-word-offset)
+  (:translate sb!di::fun-word-offset)
   (:args (fun :scs (descriptor-reg)))
   (:results (res :scs (unsigned-reg)))
   (:result-types positive-fixnum)