projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.33.20: MORE CONSTANTIFICATION
[sbcl.git]
/
src
/
compiler
/
mips
/
move.lisp
diff --git
a/src/compiler/mips/move.lisp
b/src/compiler/mips/move.lisp
index
b839199
..
ae0c33b
100644
(file)
--- a/
src/compiler/mips/move.lisp
+++ b/
src/compiler/mips/move.lisp
@@
-141,7
+141,7
@@
(:arg-types tagged-num)
(:note "fixnum untagging")
(:generator 1
(:arg-types tagged-num)
(:note "fixnum untagging")
(:generator 1
- (inst sra y x 2)))
+ (inst sra y x n-fixnum-tag-bits)))
;;;
(define-move-vop move-to-word/fixnum :move
(any-reg descriptor-reg) (signed-reg unsigned-reg))
;;;
(define-move-vop move-to-word/fixnum :move
(any-reg descriptor-reg) (signed-reg unsigned-reg))
@@
-152,7
+152,11
@@
(:results (y :scs (signed-reg unsigned-reg)))
(:note "constant load")
(:generator 1
(:results (y :scs (signed-reg unsigned-reg)))
(:note "constant load")
(:generator 1
- (inst li y (tn-value x))))
+ (cond ((sb!c::tn-leaf x)
+ (inst li y (tn-value x)))
+ (t
+ (loadw y code-tn (tn-offset x) other-pointer-lowtag)
+ (inst sra y y n-fixnum-tag-bits)))))
;;;
(define-move-vop move-to-word-c :move
(constant) (signed-reg unsigned-reg))
;;;
(define-move-vop move-to-word-c :move
(constant) (signed-reg unsigned-reg))
@@
-165,9
+169,9
@@
(:temporary (:scs (non-descriptor-reg)) temp)
(:generator 3
(let ((done (gen-label)))
(:temporary (:scs (non-descriptor-reg)) temp)
(:generator 3
(let ((done (gen-label)))
- (inst and temp x 3)
+ (inst and temp x fixnum-tag-mask)
(inst beq temp done)
(inst beq temp done)
- (inst sra y x 2)
+ (inst sra y x n-fixnum-tag-bits)
(loadw y x bignum-digits-offset other-pointer-lowtag)
(emit-label done))))
(loadw y x bignum-digits-offset other-pointer-lowtag)
(emit-label done))))
@@
-185,7
+189,7
@@
(:result-types tagged-num)
(:note "fixnum tagging")
(:generator 1
(:result-types tagged-num)
(:note "fixnum tagging")
(:generator 1
- (inst sll y x 2)))
+ (inst sll y x n-fixnum-tag-bits)))
;;;
(define-move-vop move-from-word/fixnum :move
(signed-reg unsigned-reg) (any-reg descriptor-reg))
;;;
(define-move-vop move-from-word/fixnum :move
(signed-reg unsigned-reg) (any-reg descriptor-reg))
@@
-203,11
+207,11
@@
(move x arg)
(let ((fixnum (gen-label))
(done (gen-label)))
(move x arg)
(let ((fixnum (gen-label))
(done (gen-label)))
- (inst sra temp x 29)
+ (inst sra temp x n-positive-fixnum-bits)
(inst beq temp fixnum)
(inst nor temp zero-tn)
(inst beq temp done)
(inst beq temp fixnum)
(inst nor temp zero-tn)
(inst beq temp done)
- (inst sll y x 2)
+ (inst sll y x n-fixnum-tag-bits)
(with-fixed-allocation
(y pa-flag temp bignum-widetag (1+ bignum-digits-offset) nil)
(with-fixed-allocation
(y pa-flag temp bignum-widetag (1+ bignum-digits-offset) nil)
@@
-216,7
+220,7
@@
(inst nop)
(emit-label fixnum)
(inst nop)
(emit-label fixnum)
- (inst sll y x 2)
+ (inst sll y x n-fixnum-tag-bits)
(emit-label done))))
;;;
(define-move-vop move-from-signed :move
(emit-label done))))
;;;
(define-move-vop move-from-signed :move
@@
-234,9
+238,9
@@
(:note "unsigned word to integer coercion")
(:generator 20
(move x arg)
(:note "unsigned word to integer coercion")
(:generator 20
(move x arg)
- (inst srl temp x 29)
+ (inst srl temp x n-positive-fixnum-bits)
(inst beq temp done)
(inst beq temp done)
- (inst sll y x 2)
+ (inst sll y x n-fixnum-tag-bits)
(pseudo-atomic
(pa-flag :extra (pad-data-block (+ bignum-digits-offset 2)))
(pseudo-atomic
(pa-flag :extra (pad-data-block (+ bignum-digits-offset 2)))