((:raw :none)
(values
`((inst jal (make-fixup ',name :assembly-routine))
- (inst nop))
+ (inst nop))
`()))
(:full-call
(let ((temp (make-symbol "TEMP"))
- (nfp-save (make-symbol "NFP-SAVE"))
- (lra (make-symbol "LRA")))
+ (nfp-save (make-symbol "NFP-SAVE"))
+ (lra (make-symbol "LRA")))
(values
- `((let ((lra-label (gen-label))
- (cur-nfp (current-nfp-tn ,vop)))
- (when cur-nfp
- (store-stack-tn ,nfp-save cur-nfp))
- (inst compute-lra-from-code ,lra code-tn lra-label ,temp)
- (note-next-instruction ,vop :call-site)
- (inst j (make-fixup ',name :assembly-routine))
- (inst nop)
- (emit-return-pc lra-label)
- (note-this-location ,vop :single-value-return)
- (without-scheduling ()
- (move csp-tn ocfp-tn)
- (inst nop))
- (inst compute-code-from-lra code-tn code-tn
- lra-label ,temp)
- (when cur-nfp
- (load-stack-tn cur-nfp ,nfp-save))))
- `((:temporary (:scs (non-descriptor-reg) :from (:eval 0) :to (:eval 1))
- ,temp)
- (:temporary (:sc descriptor-reg :offset lra-offset
- :from (:eval 0) :to (:eval 1))
- ,lra)
- (:temporary (:scs (control-stack) :offset nfp-save-offset)
- ,nfp-save)
- (:save-p t)))))))
+ `((let ((lra-label (gen-label))
+ (cur-nfp (current-nfp-tn ,vop)))
+ (when cur-nfp
+ (store-stack-tn ,nfp-save cur-nfp))
+ (inst compute-lra-from-code ,lra code-tn lra-label ,temp)
+ (note-next-instruction ,vop :call-site)
+ (inst j (make-fixup ',name :assembly-routine))
+ (inst nop)
+ (without-scheduling ()
+ (emit-return-pc lra-label)
+ (note-this-location ,vop :single-value-return)
+ (inst move csp-tn ocfp-tn)
+ (inst nop))
+ (inst compute-code-from-lra code-tn code-tn
+ lra-label ,temp)
+ (when cur-nfp
+ (load-stack-tn cur-nfp ,nfp-save))))
+ `((:temporary (:scs (non-descriptor-reg) :from (:eval 0) :to (:eval 1))
+ ,temp)
+ (:temporary (:sc descriptor-reg :offset lra-offset
+ :from (:eval 0) :to (:eval 1))
+ ,lra)
+ (:temporary (:scs (control-stack) :offset nfp-save-offset)
+ ,nfp-save)
+ (:save-p t)))))))
(!def-vm-support-routine generate-return-sequence (style)
(ecase style
(inst nop)))
(:full-call
`((lisp-return (make-random-tn :kind :normal
- :sc (sc-or-lose
- 'descriptor-reg)
- :offset lra-offset)
- lip-tn :offset 2)))
+ :sc (sc-or-lose
+ 'descriptor-reg)
+ :offset lra-offset)
+ lip-tn :offset 2)))
(:none)))
(defun return-machine-address (scp)