(: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
,@(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)))
(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
'(if (> nargs register-arg-count)
(move cfp-tn new-fp)
(move cfp-tn csp-tn))))))
- ((nil))))))
+ ((nil)))))
+ (insert-step-instrumenting (callable-tn)
+ ;; Conditionally insert a conditional trap:
+ (when step-instrumenting
+ ;; Get the symbol-value of SB!IMPL::*STEPPING*
+ (load-symbol-value stepping sb!impl::*stepping*)
+ (inst cmp stepping null-tn)
+ ;; If it's not null, trap.
+ (inst b :eq step-done-label)
+ (inst nop)
+ ;; FIXME: this doesn't look right.
+ (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 unimp (logior single-step-around-trap
+ (ash (reg-tn-encoding callable-tn)
+ 5)))
+ (emit-label step-done-label))))
+
,@(if named
`((sc-case name
(loadw name-pass code-tn (tn-offset name)
other-pointer-lowtag)
(do-next-filler)))
+ (insert-step-instrumenting name-pass)
(loadw function name-pass fdefn-raw-addr-slot
other-pointer-lowtag)
(do-next-filler))
(do-next-filler)))
(loadw function lexenv closure-fun-slot
fun-pointer-lowtag)
- (do-next-filler)))
+ (do-next-filler)
+ (insert-step-instrumenting function)))
(loop
(if filler
(do-next-filler)
;;; 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)))
+ (load-symbol-value stepping sb!impl::*stepping*)
+ (inst cmp stepping null-tn)
+ (inst b :eq DONE)
+ (inst nop)
+ (note-this-location vop :step-before-vop)
+ (inst unimp single-step-before-trap)
+ DONE))