(defmacro lisp-jump (function lip)
"Jump to the lisp function FUNCTION. LIP is an interior-reg temporary."
`(progn
- (inst lda ,lip (- (ash sb!vm:simple-fun-code-offset sb!vm:word-shift)
- sb!vm:fun-pointer-lowtag)
+ (inst lda ,lip (- (ash simple-fun-code-offset word-shift)
+ fun-pointer-lowtag)
,function)
(move ,function code-tn)
(inst jsr zero-tn ,lip 1)))
(:result-types ,el-type)
(:temporary (:sc non-descriptor-reg) temp)
(:temporary (:sc non-descriptor-reg) temp1)
- (:generator 5
+ (:generator 4
,@(ecase size
(:byte
(if signed
(:temporary (:sc non-descriptor-reg) temp2)
(:results (result :scs ,scs))
(:result-types ,el-type)
- (:generator 5
+ (:generator 4
,@(ecase size
(:byte
- `((inst lda temp (- (* ,offset n-word-bytes)
- (* index ,scale) ,lowtag)
+ `((inst lda temp (- (+ (* ,offset n-word-bytes)
+ (* index ,scale))
+ ,lowtag)
object)
- (inst ldq_u temp1 (- (* ,offset n-word-bytes)
- (* index ,scale) ,lowtag)
+ (inst ldq_u temp1 (- (+ (* ,offset n-word-bytes)
+ (* index ,scale))
+ ,lowtag)
object)
(inst insbl value temp temp2)
(inst mskbl temp1 temp temp1)
(inst bis temp1 temp2 temp1)
- (inst stq_u temp1 (- (* ,offset n-word-bytes)
- (* index ,scale) ,lowtag) object)))
+ (inst stq_u temp1 (- (+ (* ,offset n-word-bytes)
+ (* index ,scale))
+ ,lowtag) object)))
(:short
- `((inst lda temp (- (* ,offset n-word-bytes)
- (* index ,scale) ,lowtag)
+ `((inst lda temp (- (+ (* ,offset n-word-bytes)
+ (* index ,scale))
+ ,lowtag)
object)
- (inst ldq_u temp1 (- (* ,offset n-word-bytes)
- (* index ,scale) ,lowtag)
+ (inst ldq_u temp1 (- (+ (* ,offset n-word-bytes)
+ (* index ,scale))
+ ,lowtag)
object)
(inst mskwl temp1 temp temp1)
(inst inswl value temp temp2)
(inst bis temp1 temp2 temp)
- (inst stq_u temp (- (* ,offset n-word-bytes)
- (* index ,scale) ,lowtag) object))))
+ (inst stq_u temp (- (+ (* ,offset n-word-bytes)
+ (* index ,scale))
+ ,lowtag) object))))
(move value result))))))
(defmacro sb!sys::with-pinned-objects ((&rest objects) &body body)