X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fmips%2Fcall.lisp;h=578da61c2665363589d12ea9a3dfd793852f10e5;hb=9998e72f95991aeefd8191bfaf206cd305873f5d;hp=439541f2c84d0204e44f982578f8d1a5a8657685;hpb=b66385e2031fc2cac17dd129df0af400beb48a22;p=sbcl.git

diff --git a/src/compiler/mips/call.lisp b/src/compiler/mips/call.lisp
index 439541f..578da61 100644
--- a/src/compiler/mips/call.lisp
+++ b/src/compiler/mips/call.lisp
@@ -656,10 +656,7 @@ default-value-8
             step-instrumenting)
 
      (:ignore ,@(unless (or variable (eq return :tail)) '(arg-locs))
-              ,@(unless variable '(args))
-              ;; Step instrumentation for full calls not implemented yet.
-              ;; See the PPC backend for an example.
-              step-instrumenting)
+              ,@(unless variable '(args)))
 
      (:temporary (:sc descriptor-reg
                   :offset ocfp-offset
@@ -700,6 +697,8 @@ default-value-8
      ,@(when (eq return :fixed)
          '((:temporary (:scs (descriptor-reg) :from :eval) move-temp)))
 
+     (:temporary (:scs (descriptor-reg) :to :eval) stepping)
+
      ,@(unless (eq return :tail)
          '((:temporary (:scs (non-descriptor-reg)) temp)
            (:temporary (:sc control-stack :offset nfp-save-offset) nfp-save)))
@@ -714,6 +713,7 @@ default-value-8
        (let* ((cur-nfp (current-nfp-tn vop))
               ,@(unless (eq return :tail)
                   '((lra-label (gen-label))))
+              (step-done-label (gen-label))
               (filler
                (remove nil
                        (list :load-nargs
@@ -779,7 +779,29 @@ default-value-8
                                          (move cfp-tn csp-tn)))
                                (trace-table-entry trace-table-call-site))))
                       ((nil)
-                       (inst nop))))))
+                       (inst nop)))))
+                (insert-step-instrumenting (callable-tn)
+                  ;; Conditionally insert a conditional trap:
+                  (when step-instrumenting
+                    ;; Get the symbol-value of SB!IMPL::*STEPPING*
+                    (inst lw stepping null-tn
+                          (- (+ symbol-value-slot
+                                (truncate (static-symbol-offset 'sb!impl::*stepping*)
+                                          n-word-bytes))
+                             other-pointer-lowtag))
+                    ;; If it's not NIL, trap.
+                    (inst beq stepping null-tn step-done-label)
+                    (inst nop)
+                    ;; CONTEXT-PC will be pointing here when the
+                    ;; interrupt is handled, not after the BREAK.
+                    (note-this-location vop :step-before-vop)
+                    ;; Construct a trap code with the low bits from
+                    ;; SINGLE-STEP-AROUND-TRAP and the high bits from
+                    ;; the register number of CALLABLE-TN.
+                    (inst break 0 (logior single-step-around-trap
+                                          (ash (reg-tn-encoding callable-tn)
+                                               5)))
+                    (emit-label step-done-label))))
 
            ,@(if named
                  `((sc-case name
@@ -793,6 +815,10 @@ default-value-8
                             (- (ash (tn-offset name) word-shift)
                                other-pointer-lowtag))
                       (do-next-filler)))
+                   ;; The step instrumenting must be done after
+                   ;; FUNCTION is loaded, but before ENTRY-POINT is
+                   ;; calculated.
+                   (insert-step-instrumenting name-pass)
                    (inst lw entry-point name-pass
                          (- (ash fdefn-raw-addr-slot word-shift)
                             other-pointer-lowtag))
@@ -812,6 +838,10 @@ default-value-8
                          (- (ash closure-fun-slot word-shift)
                             fun-pointer-lowtag))
                    (do-next-filler)
+                   ;; The step instrumenting must be done before
+                   ;; after FUNCTION is loaded, but before ENTRY-POINT
+                   ;; is calculated.
+                   (insert-step-instrumenting function)
                    (inst addu entry-point function
                          (- (ash simple-fun-code-offset word-shift)
                             fun-pointer-lowtag))))
@@ -1257,8 +1287,23 @@ default-value-8
 ;;; Single-stepping
 
 (define-vop (step-instrument-before-vop)
+  (:temporary (:scs (descriptor-reg)) stepping)
   (:policy :fast-safe)
   (:vop-var vop)
   (:generator 3
-    ;; Stub! See the PPC backend for an example.
-    (note-this-location vop :step-before-vop)))
+    ;; Get the symbol-value of SB!IMPL::*STEPPING*
+    (inst lw stepping null-tn
+          (- (+ symbol-value-slot
+                (truncate (static-symbol-offset 'sb!impl::*stepping*)
+                          n-word-bytes))
+             other-pointer-lowtag))
+    ;; If it's not NIL, trap.
+    (inst beq stepping null-tn DONE)
+    (inst nop)
+    ;; CONTEXT-PC will be pointing here when the interrupt is handled,
+    ;; not after the BREAK.
+    (note-this-location vop :step-before-vop)
+    ;; CALLEE-REGISTER-OFFSET isn't needed for before-traps, so we
+    ;; can just use a bare SINGLE-STEP-BEFORE-TRAP as the code.
+    (inst break 0 single-step-before-trap)
+    DONE))