X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmips%2Fcall.lisp;h=b10e80e4f0aae193ef0abf3414b9ba243bc9eb11;hb=4aa0cca4568e48e15cb717ecd5993f0a020d42c5;hp=7b318e47f68211090583d1734b9ab71af9962deb;hpb=a18fd8dd0cc6172628ed3ac2e75129c72fe627eb;p=sbcl.git diff --git a/src/compiler/mips/call.lisp b/src/compiler/mips/call.lisp index 7b318e4..b10e80e 100644 --- a/src/compiler/mips/call.lisp +++ b/src/compiler/mips/call.lisp @@ -128,6 +128,23 @@ (when nfp (inst addu val nfp (bytes-needed-for-non-descriptor-stack-frame)))))) +;;; Accessing a slot from an earlier stack frame is definite hackery. +(define-vop (ancestor-frame-ref) + (:args (frame-pointer :scs (descriptor-reg)) + (variable-home-tn :load-if nil)) + (:results (value :scs (descriptor-reg any-reg))) + (:policy :fast-safe) + (:generator 4 + (aver (sc-is variable-home-tn control-stack)) + (loadw value frame-pointer (tn-offset variable-home-tn)))) +(define-vop (ancestor-frame-set) + (:args (frame-pointer :scs (descriptor-reg)) + (value :scs (descriptor-reg any-reg))) + (:results (variable-home-tn :load-if nil)) + (:policy :fast-safe) + (:generator 4 + (aver (sc-is variable-home-tn control-stack)) + (storew value frame-pointer (tn-offset variable-home-tn)))) (define-vop (xep-allocate-frame) (:info start-lab copy-more-arg-follows) @@ -137,7 +154,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 +384,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) @@ -405,6 +422,15 @@ default-value-8 nvals) (:temporary (:scs (non-descriptor-reg)) temp)) + +;;; This hook in the codegen pass lets us insert code before fall-thru entry +;;; points, local-call entry points, and tail-call entry points. The default +;;; does nothing. +(defun emit-block-header (start-label trampoline-label fall-thru-p alignp) + (declare (ignore fall-thru-p alignp)) + (when trampoline-label + (emit-label trampoline-label)) + (emit-label start-label)) ;;;; Local call with unknown values convention return: @@ -703,7 +729,7 @@ default-value-8 '((: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) @@ -783,14 +809,9 @@ default-value-8 (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 null, trap. - (inst beq stepping step-done-label) + (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. @@ -1150,9 +1171,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))) @@ -1174,7 +1192,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. @@ -1202,7 +1220,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) @@ -1251,7 +1269,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)) @@ -1291,19 +1309,14 @@ default-value-8 (: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 null, trap. - (inst beq stepping DONE) + (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 single-step-before-trap) + (inst break 0 single-step-before-trap) DONE))