X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fcompiler%2Fmips%2Fcall.lisp;h=578da61c2665363589d12ea9a3dfd793852f10e5;hb=8300ad91427194d13f5693ca07993bd5437d660e;hp=5b7d43db69542b70d3a6e15cef6dee021081e526;hpb=d83c8a160b4215cfc5379dd4fb70c9589a428ae0;p=sbcl.git diff --git a/src/compiler/mips/call.lisp b/src/compiler/mips/call.lisp index 5b7d43d..578da61 100644 --- a/src/compiler/mips/call.lisp +++ b/src/compiler/mips/call.lisp @@ -53,6 +53,7 @@ (make-wired-tn *fixnum-primitive-type* control-stack-arg-scn ocfp-save-offset))) + (!def-vm-support-routine make-return-pc-save-location (env) (let ((ptype *backend-t-primitive-type*)) (specify-save-tn @@ -267,7 +268,7 @@ default-value-8 ;; gets confused. (without-scheduling () (note-this-location vop :single-value-return) - (inst move csp-tn ocfp-tn) + (move csp-tn ocfp-tn t) (inst nop)) (when lra-label (inst compute-code-from-lra code-tn code-tn lra-label temp))) @@ -322,13 +323,15 @@ default-value-8 (aver defaults) (assemble (*elsewhere*) (emit-label default-stack-vals) + (trace-table-entry trace-table-fun-prologue) (do ((remaining defaults (cdr remaining))) ((null remaining)) (let ((def (car remaining))) (emit-label (car def)) (when (null (cdr remaining)) (inst b defaulting-done)) - (store-stack-tn (cdr def) null-tn))))))) + (store-stack-tn (cdr def) null-tn))) + (trace-table-entry trace-table-normal))))) (when lra-label (inst compute-code-from-lra code-tn code-tn lra-label temp)))) @@ -478,6 +481,7 @@ default-value-8 (:ignore args save) (:vop-var vop) (:temporary (:sc control-stack :offset nfp-save-offset) nfp-save) + (:temporary (:scs (non-descriptor-reg)) temp) (:generator 20 (let ((label (gen-label)) (cur-nfp (current-nfp-tn vop))) @@ -648,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))) @@ -692,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))) @@ -706,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 @@ -771,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 @@ -785,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)) @@ -804,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)))) @@ -944,19 +982,26 @@ default-value-8 (when cur-nfp (inst addu nsp-tn cur-nfp (bytes-needed-for-non-descriptor-stack-frame)))) - ;; Establish the values pointer and values count. - (move val-ptr cfp-tn) - (inst li nargs (fixnumize nvals)) - ;; restore the frame pointer and clear as much of the control - ;; stack as possible. - (move cfp-tn ocfp) - (inst addu csp-tn val-ptr (* nvals n-word-bytes)) - ;; pre-default any argument register that need it. - (when (< nvals register-arg-count) - (dolist (reg (subseq (list a0 a1 a2 a3 a4 a5) nvals)) - (move reg null-tn))) - ;; And away we go. - (lisp-return return-pc lip) + (cond ((= nvals 1) + ;; Clear the control stack, and restore the frame pointer. + (move csp-tn cfp-tn) + (move cfp-tn ocfp) + ;; Out of here. + (lisp-return return-pc lip :offset 2)) + (t + ;; Establish the values pointer and values count. + (move val-ptr cfp-tn) + (inst li nargs (fixnumize nvals)) + ;; restore the frame pointer and clear as much of the control + ;; stack as possible. + (move cfp-tn ocfp) + (inst addu csp-tn val-ptr (* nvals n-word-bytes)) + ;; pre-default any argument register that need it. + (when (< nvals register-arg-count) + (dolist (reg (subseq (list a0 a1 a2 a3 a4 a5) nvals)) + (move reg null-tn))) + ;; And away we go. + (lisp-return return-pc lip))) (trace-table-entry trace-table-normal))) ;;; Do unknown-values return of an arbitrary number of values (passed on the @@ -1099,14 +1144,15 @@ default-value-8 (emit-label done)))) -;;; More args are stored consequtively on the stack, starting immediately at -;;; the context pointer. The context pointer is not typed, so the lowtag is 0. -;;; +;;; More args are stored consecutively on the stack, starting +;;; immediately at the context pointer. The context pointer is not +;;; typed, so the lowtag is 0. (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))) @@ -1118,10 +1164,13 @@ default-value-8 (:results (result :scs (descriptor-reg))) (:translate %listify-rest-args) (:policy :safe) + (:node-var node) (:generator 20 - (let ((enter (gen-label)) - (loop (gen-label)) - (done (gen-label))) + (let* ((enter (gen-label)) + (loop (gen-label)) + (done (gen-label)) + (dx-p (node-stack-allocate-p node)) + (alloc-area-tn (if dx-p csp-tn alloc-tn))) (move context context-arg) (move count count-arg) ;; Check to see if there are any arguments. @@ -1130,12 +1179,16 @@ default-value-8 ;; We need to do this atomically. (pseudo-atomic (pa-flag) + (when dx-p + (align-csp temp)) ;; Allocate a cons (2 words) for each item. - (inst or result alloc-tn list-pointer-lowtag) + (inst srl result alloc-area-tn n-lowtag-bits) + (inst sll result n-lowtag-bits) + (inst or result list-pointer-lowtag) (move dst result) (inst sll temp count 1) (inst b enter) - (inst addu alloc-tn alloc-tn temp) + (inst addu alloc-area-tn temp) ;; Store the current cons in the cdr of the previous cons. (emit-label loop) @@ -1145,7 +1198,7 @@ default-value-8 (emit-label enter) ;; Grab one value. (loadw temp context) - (inst addu context context n-word-bytes) + (inst addu context n-word-bytes) ;; Dec count, and if != zero, go back for more. (inst addu count count (fixnumize -1)) @@ -1230,3 +1283,27 @@ 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 + ;; 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))