X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmips%2Fcall.lisp;h=38f1528186f823f8610cf400553fcb2e28e9932e;hb=49e8403800426f37a54d9b87353a31af36e7af40;hp=8035520917b52f10a9cbaac1c8109e75a5c86d61;hpb=656f994cdddc89af3a99c8af266816b09879df4a;p=sbcl.git diff --git a/src/compiler/mips/call.lisp b/src/compiler/mips/call.lisp index 8035520..38f1528 100644 --- a/src/compiler/mips/call.lisp +++ b/src/compiler/mips/call.lisp @@ -137,7 +137,7 @@ (:generator 1 ;; Make sure the function is aligned, and drop a label pointing to this ;; function header. - (align n-lowtag-bits) + (emit-alignment n-lowtag-bits) (trace-table-entry trace-table-fun-prologue) (emit-label start-lab) ;; Allocate function header. @@ -367,9 +367,9 @@ default-value-8 (when lra-label (inst compute-code-from-lra code-tn code-tn lra-label temp)) - (inst addu csp-tn csp-tn 4) + (inst addu csp-tn csp-tn n-word-bytes) (storew (first *register-arg-tns*) csp-tn -1) - (inst addu start csp-tn -4) + (inst addu start csp-tn (- n-word-bytes)) (inst li count (fixnumize 1)) (emit-label done) @@ -652,7 +652,8 @@ default-value-8 (:vop-var vop) (:info ,@(unless (or variable (eq return :tail)) '(arg-locs)) ,@(unless variable '(nargs)) - ,@(when (eq return :fixed) '(nvals))) + ,@(when (eq return :fixed) '(nvals)) + step-instrumenting) (:ignore ,@(unless (or variable (eq return :tail)) '(arg-locs)) ,@(unless variable '(args))) @@ -696,11 +697,13 @@ 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))) - (:temporary (:sc interior-reg :offset lip-offset) entry-point) + (:temporary (:sc interior-reg) entry-point) (:generator ,(+ (if named 5 0) (if variable 19 1) @@ -710,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 @@ -775,7 +779,24 @@ 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 + (load-symbol-value stepping sb!impl::*stepping*) + ;; 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 @@ -789,6 +810,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)) @@ -808,6 +833,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)))) @@ -1116,9 +1145,6 @@ default-value-8 (define-full-reffer more-arg * 0 0 (descriptor-reg any-reg) * %more-arg) ;;; Turn more arg (context, count) into a list. -(defoptimizer (%listify-rest-args stack-allocate-result) ((&rest args)) - t) - (define-vop (listify-rest-args) (:args (context-arg :target context :scs (descriptor-reg)) (count-arg :target count :scs (any-reg))) @@ -1140,7 +1166,7 @@ default-value-8 (move context context-arg) (move count count-arg) ;; Check to see if there are any arguments. - (inst beq count zero-tn done) + (inst beq count done) (move result null-tn t) ;; We need to do this atomically. @@ -1168,7 +1194,7 @@ default-value-8 ;; Dec count, and if != zero, go back for more. (inst addu count count (fixnumize -1)) - (inst bne count zero-tn loop) + (inst bne count loop) ;; Store the value in the car (in delay slot) (storew temp dst 0 list-pointer-lowtag) @@ -1217,7 +1243,7 @@ default-value-8 (let ((err-lab (generate-error-code vop invalid-arg-count-error nargs))) (cond ((zerop count) - (inst bne nargs zero-tn err-lab) + (inst bne nargs err-lab) (inst nop)) (t (inst li temp (fixnumize count)) @@ -1249,3 +1275,22 @@ default-value-8 (frob unknown-key-arg-error unknown-key-arg-error sb!c::%unknown-key-arg-error key) (frob nil-fun-returned-error nil-fun-returned-error nil fun)) + +;;; Single-stepping + +(define-vop (step-instrument-before-vop) + (:temporary (:scs (descriptor-reg)) stepping) + (:policy :fast-safe) + (:vop-var vop) + (:generator 3 + (load-symbol-value stepping sb!impl::*stepping*) + ;; 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))