X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmips%2Fcall.lisp;h=439541f2c84d0204e44f982578f8d1a5a8657685;hb=b66385e2031fc2cac17dd129df0af400beb48a22;hp=8cb79e278733f33e21a07cbb97d89ad25793e23a;hpb=52cfe54802db8736f1f4e2b67764c43bba9b78b3;p=sbcl.git diff --git a/src/compiler/mips/call.lisp b/src/compiler/mips/call.lisp index 8cb79e2..439541f 100644 --- a/src/compiler/mips/call.lisp +++ b/src/compiler/mips/call.lisp @@ -35,7 +35,7 @@ (make-restricted-tn *backend-t-primitive-type* register-arg-scn))) ;;; This is similar to MAKE-RETURN-PC-PASSING-LOCATION, but makes a -;;; location to pass Old-FP in. This is (obviously) wired in the +;;; location to pass OLD-FP in. This is (obviously) wired in the ;;; standard convention, but is totally unrestricted in non-standard ;;; conventions, since we can always fetch it off of the stack using ;;; the arg pointer. @@ -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 @@ -140,14 +141,14 @@ (trace-table-entry trace-table-fun-prologue) (emit-label start-lab) ;; Allocate function header. - (inst fun-header-word) + (inst simple-fun-header-word) (dotimes (i (1- simple-fun-code-offset)) (inst word 0)) ;; The start of the actual code. ;; Compute CODE from the address of this entry point. (let ((entry-point (gen-label))) (emit-label entry-point) - (inst compute-code-from-fn code-tn lip-tn entry-point temp) + (inst compute-code-from-lip code-tn lip-tn entry-point temp) ;; ### We should also save it on the stack so that the garbage collector ;; won't forget about us if we call anyone else. ) @@ -208,7 +209,7 @@ ;;; In the general case, we have to do three things: ;;; -- Default unsupplied register values. This need only be done when a ;;; single value is returned, since register values are defaulted by the -;;; called in the non-single case. +;;; callee in the non-single case. ;;; -- Default unsupplied stack values. This needs to be done whenever there ;;; are stack values. ;;; -- Reset SP. This must be done whenever other than 1 value is returned, @@ -240,7 +241,7 @@ regs-defaulted ... defaulting-done - move sp ocfp ; Reset SP. + move csp ocfp ; Reset SP. @@ -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))) @@ -284,7 +285,7 @@ default-value-8 (inst addu temp nargs-tn (fixnumize (- register-arg-count))) (move csp-tn ocfp-tn t))) - ;; Do the single value calse. + ;; Do the single value case. (do ((i 1 (1+ i)) (val (tn-ref-across values) (tn-ref-across val))) ((= i (min nvals register-arg-count))) @@ -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)))) @@ -365,23 +368,25 @@ 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) - (storew (first register-arg-tns) csp-tn -1) + (storew (first *register-arg-tns*) csp-tn -1) (inst addu start csp-tn -4) (inst li count (fixnumize 1)) (emit-label done) (assemble (*elsewhere*) + (trace-table-entry trace-table-fun-prologue) (emit-label variable-values) (when lra-label (inst compute-code-from-lra code-tn code-tn lra-label temp)) - (do ((arg register-arg-tns (rest arg)) + (do ((arg *register-arg-tns* (rest arg)) (i 0 (1+ i))) ((null arg)) (storew (first arg) args i)) (move start args) (inst b done) - (move count nargs t))) + (move count nargs t) + (trace-table-entry trace-table-normal))) (values)) @@ -476,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))) @@ -646,10 +652,14 @@ 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))) + ,@(unless variable '(args)) + ;; Step instrumentation for full calls not implemented yet. + ;; See the PPC backend for an example. + step-instrumenting) (:temporary (:sc descriptor-reg :offset ocfp-offset @@ -942,19 +952,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 @@ -1091,20 +1108,21 @@ default-value-8 ;; Is this the last one? (inst beq count done) ;; Store it relative to the pointer saved at the start. - (storew (nth i register-arg-tns) result (- i fixed)) + (storew (nth i *register-arg-tns*) result (- i fixed)) ;; Decrement count. (inst subu count (fixnumize 1)))) (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))) @@ -1116,10 +1134,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. @@ -1128,12 +1149,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) @@ -1143,7 +1168,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)) @@ -1228,3 +1253,12 @@ 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) + (:policy :fast-safe) + (:vop-var vop) + (:generator 3 + ;; Stub! See the PPC backend for an example. + (note-this-location vop :step-before-vop)))