projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.32.29: Add build flag :sb-xref-for-internals.
[sbcl.git]
/
src
/
compiler
/
mips
/
move.lisp
diff --git
a/src/compiler/mips/move.lisp
b/src/compiler/mips/move.lisp
index
da67e2b
..
5bb0c85
100644
(file)
--- a/
src/compiler/mips/move.lisp
+++ b/
src/compiler/mips/move.lisp
@@
-14,15
+14,15
@@
(load-symbol y val))
(character
(inst li y (logior (ash (char-code val) n-widetag-bits)
(load-symbol y val))
(character
(inst li y (logior (ash (char-code val) n-widetag-bits)
- base-char-widetag))))))
+ character-widetag))))))
(define-move-fun (load-number 1) (vop x y)
((zero immediate)
(signed-reg unsigned-reg))
(inst li y (tn-value x)))
(define-move-fun (load-number 1) (vop x y)
((zero immediate)
(signed-reg unsigned-reg))
(inst li y (tn-value x)))
-(define-move-fun (load-base-char 1) (vop x y)
- ((immediate) (base-char-reg))
+(define-move-fun (load-character 1) (vop x y)
+ ((immediate) (character-reg))
(inst li y (char-code (tn-value x))))
(define-move-fun (load-system-area-pointer 1) (vop x y)
(inst li y (char-code (tn-value x))))
(define-move-fun (load-system-area-pointer 1) (vop x y)
@@
-38,7
+38,7
@@
(load-stack-tn y x))
(define-move-fun (load-number-stack 5) (vop x y)
(load-stack-tn y x))
(define-move-fun (load-number-stack 5) (vop x y)
- ((base-char-stack) (base-char-reg)
+ ((character-stack) (character-reg)
(sap-stack) (sap-reg)
(signed-stack) (signed-reg)
(unsigned-stack) (unsigned-reg))
(sap-stack) (sap-reg)
(signed-stack) (signed-reg)
(unsigned-stack) (unsigned-reg))
@@
-50,7
+50,7
@@
(store-stack-tn y x))
(define-move-fun (store-number-stack 5) (vop x y)
(store-stack-tn y x))
(define-move-fun (store-number-stack 5) (vop x y)
- ((base-char-reg) (base-char-stack)
+ ((character-reg) (character-stack)
(sap-reg) (sap-stack)
(signed-reg) (signed-stack)
(unsigned-reg) (unsigned-stack))
(sap-reg) (sap-stack)
(signed-reg) (signed-stack)
(unsigned-reg) (unsigned-stack))
@@
-62,19
+62,19
@@
;;;
(define-vop (move)
(:args (x :target y
;;;
(define-vop (move)
(:args (x :target y
- :scs (any-reg descriptor-reg zero null)
- :load-if (not (location= x y))))
+ :scs (any-reg descriptor-reg zero null)
+ :load-if (not (location= x y))))
(:results (y :scs (any-reg descriptor-reg control-stack)
(:results (y :scs (any-reg descriptor-reg control-stack)
- :load-if (not (location= x y))))
+ :load-if (not (location= x y))))
(:effects)
(:affected)
(:generator 0
(unless (location= x y)
(sc-case y
(:effects)
(:affected)
(:generator 0
(unless (location= x y)
(sc-case y
- ((any-reg descriptor-reg)
- (inst move y x))
- (control-stack
- (store-stack-tn y x))))))
+ ((any-reg descriptor-reg)
+ (inst move y x))
+ (control-stack
+ (store-stack-tn y x))))))
(define-move-vop move :move
(any-reg descriptor-reg zero null)
(define-move-vop move :move
(any-reg descriptor-reg zero null)
@@
-91,9
+91,9
@@
;;;
(define-vop (move-arg)
(:args (x :target y
;;;
(define-vop (move-arg)
(:args (x :target y
- :scs (any-reg descriptor-reg null zero))
- (fp :scs (any-reg)
- :load-if (not (sc-is y any-reg descriptor-reg))))
+ :scs (any-reg descriptor-reg null zero))
+ (fp :scs (any-reg)
+ :load-if (not (sc-is y any-reg descriptor-reg))))
(:results (y))
(:generator 0
(sc-case y
(:results (y))
(:generator 0
(sc-case y
@@
-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))
@@
-202,19
+206,19
@@
(:generator 18
(move x arg)
(let ((fixnum (gen-label))
(:generator 18
(move x arg)
(let ((fixnum (gen-label))
- (done (gen-label)))
+ (done (gen-label)))
(inst sra temp x 29)
(inst beq temp fixnum)
(inst nor temp zero-tn)
(inst beq temp done)
(inst sll y x 2)
(inst sra temp x 29)
(inst beq temp fixnum)
(inst nor temp zero-tn)
(inst beq temp done)
(inst sll y x 2)
-
+
(with-fixed-allocation
(with-fixed-allocation
- (y pa-flag temp bignum-widetag (1+ bignum-digits-offset))
- (storew x y bignum-digits-offset other-pointer-lowtag))
+ (y pa-flag temp bignum-widetag (1+ bignum-digits-offset) nil)
+ (storew x y bignum-digits-offset other-pointer-lowtag))
(inst b done)
(inst nop)
(inst b done)
(inst nop)
-
+
(emit-label fixnum)
(inst sll y x 2)
(emit-label done))))
(emit-label fixnum)
(inst sll y x 2)
(emit-label done))))
@@
-237,9
+241,9
@@
(inst srl temp x 29)
(inst beq temp done)
(inst sll y x 2)
(inst srl temp x 29)
(inst beq temp done)
(inst sll y x 2)
-
+
(pseudo-atomic
(pseudo-atomic
- (pa-flag :extra (pad-data-block (+ bignum-digits-offset 2)))
+ (pa-flag :extra (pad-data-block (+ bignum-digits-offset 2)))
(inst or y alloc-tn other-pointer-lowtag)
(inst slt temp x zero-tn)
(inst sll temp n-widetag-bits)
(inst or y alloc-tn other-pointer-lowtag)
(inst slt temp x zero-tn)
(inst sll temp n-widetag-bits)
@@
-257,10
+261,10
@@
;;;
(define-vop (word-move)
(:args (x :target y
;;;
(define-vop (word-move)
(:args (x :target y
- :scs (signed-reg unsigned-reg)
- :load-if (not (location= x y))))
+ :scs (signed-reg unsigned-reg)
+ :load-if (not (location= x y))))
(:results (y :scs (signed-reg unsigned-reg)
(:results (y :scs (signed-reg unsigned-reg)
- :load-if (not (location= x y))))
+ :load-if (not (location= x y))))
(:effects)
(:affected)
(:note "word integer move")
(:effects)
(:affected)
(:note "word integer move")
@@
-275,9
+279,9
@@
;;;
(define-vop (move-word-arg)
(:args (x :target y
;;;
(define-vop (move-word-arg)
(:args (x :target y
- :scs (signed-reg unsigned-reg))
- (fp :scs (any-reg)
- :load-if (not (sc-is y sap-reg))))
+ :scs (signed-reg unsigned-reg))
+ (fp :scs (any-reg)
+ :load-if (not (sc-is y sap-reg))))
(:results (y))
(:note "word integer argument move")
(:generator 0
(:results (y))
(:note "word integer argument move")
(:generator 0