projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.pre7.58:
[sbcl.git]
/
src
/
compiler
/
x86
/
move.lisp
diff --git
a/src/compiler/x86/move.lisp
b/src/compiler/x86/move.lisp
index
0286e9a
..
6308b3c
100644
(file)
--- a/
src/compiler/x86/move.lisp
+++ b/
src/compiler/x86/move.lisp
@@
-23,8
+23,8
@@
(symbol
(load-symbol y val))
(character
(symbol
(load-symbol y val))
(character
- (inst mov y (logior (ash (char-code val) type-bits)
- base-char-type))))))
+ (inst mov y (logior (ash (char-code val) n-widetag-bits)
+ base-char-widetag))))))
(define-move-function (load-number 1) (vop x y)
((immediate) (signed-reg unsigned-reg))
(define-move-function (load-number 1) (vop x y)
((immediate) (signed-reg unsigned-reg))
@@
-81,8
+81,8
@@
(symbol
(inst mov y (+ nil-value (static-symbol-offset val))))
(character
(symbol
(inst mov y (+ nil-value (static-symbol-offset val))))
(character
- (inst mov y (logior (ash (char-code val) type-bits)
- base-char-type)))))
+ (inst mov y (logior (ash (char-code val) n-widetag-bits)
+ base-char-widetag)))))
(move y x))))
(define-move-vop move :move
(move y x))))
(define-move-vop move :move
@@
-120,8
+120,8
@@
(symbol
(load-symbol y val))
(character
(symbol
(load-symbol y val))
(character
- (inst mov y (logior (ash (char-code val) type-bits)
- base-char-type)))))
+ (inst mov y (logior (ash (char-code val) n-widetag-bits)
+ base-char-widetag)))))
(move y x)))
((control-stack)
(if (sc-is x immediate)
(move y x)))
((control-stack)
(if (sc-is x immediate)
@@
-135,8
+135,8
@@
(storew (+ nil-value (static-symbol-offset val))
fp (tn-offset y)))
(character
(storew (+ nil-value (static-symbol-offset val))
fp (tn-offset y)))
(character
- (storew (logior (ash (char-code val) type-bits)
- base-char-type)
+ (storew (logior (ash (char-code val) n-widetag-bits)
+ base-char-widetag)
fp (tn-offset y))))
;; Lisp stack
(etypecase val
fp (tn-offset y))))
;; Lisp stack
(etypecase val
@@
-146,8
+146,8
@@
(storew (+ nil-value (static-symbol-offset val))
fp (- (1+ (tn-offset y)))))
(character
(storew (+ nil-value (static-symbol-offset val))
fp (- (1+ (tn-offset y)))))
(character
- (storew (logior (ash (char-code val) type-bits)
- base-char-type)
+ (storew (logior (ash (char-code val) n-widetag-bits)
+ base-char-widetag)
fp (- (1+ (tn-offset y))))))))
(if (= (tn-offset fp) esp-offset)
;; C-call
fp (- (1+ (tn-offset y))))))))
(if (= (tn-offset fp) esp-offset)
;; C-call
@@
-218,7
+218,7
@@
(move eax x)
(inst test al-tn 3)
(inst jmp :z fixnum)
(move eax x)
(inst test al-tn 3)
(inst jmp :z fixnum)
- (loadw y eax bignum-digits-offset other-pointer-type)
+ (loadw y eax bignum-digits-offset other-pointer-lowtag)
(inst jmp done)
FIXNUM
(inst sar eax 2)
(inst jmp done)
FIXNUM
(inst sar eax 2)
@@
-290,8
+290,9
@@
(inst jmp :o bignum)
(emit-label done)
;; KLUDGE: The sequence above leaves a DESCRIPTOR-REG Y in a
(inst jmp :o bignum)
(emit-label done)
;; KLUDGE: The sequence above leaves a DESCRIPTOR-REG Y in a
- ;; non-descriptor state for a while. Does that matter? Does it matter in
- ;; GENGC but not in GENCGC? Is this written down anywhere?
+ ;; non-descriptor state for a while. Does that matter? Does it
+ ;; matter in GENGC but not in GENCGC? Is this written down
+ ;; anywhere?
;; -- WHN 19990916
;;
;; Also, the sequence above seems rather twisty. Why not something
;; -- WHN 19990916
;;
;; Also, the sequence above seems rather twisty. Why not something
@@
-305,8
+306,8
@@
(assemble (*elsewhere*)
(emit-label bignum)
(with-fixed-allocation
(assemble (*elsewhere*)
(emit-label bignum)
(with-fixed-allocation
- (y bignum-type (+ bignum-digits-offset 1) node)
- (storew x y bignum-digits-offset other-pointer-type))
+ (y bignum-widetag (+ bignum-digits-offset 1) node)
+ (storew x y bignum-digits-offset other-pointer-lowtag))
(inst jmp done)))))
(define-move-vop move-from-signed :move
(signed-reg) (descriptor-reg))
(inst jmp done)))))
(define-move-vop move-from-signed :move
(signed-reg) (descriptor-reg))
@@
-362,21
+363,21
@@
;; always allocated and the header size is set to either one
;; or two words as appropriate.
(inst jmp :ns one-word-bignum)
;; always allocated and the header size is set to either one
;; or two words as appropriate.
(inst jmp :ns one-word-bignum)
- ;; Two word bignum.
+ ;; two word bignum
(inst mov y (logior (ash (1- (+ bignum-digits-offset 2))
(inst mov y (logior (ash (1- (+ bignum-digits-offset 2))
- sb!vm:type-bits)
- bignum-type))
+ sb!vm:n-widetag-bits)
+ bignum-widetag))
(inst jmp L1)
(emit-label one-word-bignum)
(inst mov y (logior (ash (1- (+ bignum-digits-offset 1))
(inst jmp L1)
(emit-label one-word-bignum)
(inst mov y (logior (ash (1- (+ bignum-digits-offset 1))
- sb!vm:type-bits)
- bignum-type))
+ sb!vm:n-widetag-bits)
+ bignum-widetag))
(emit-label L1)
(pseudo-atomic
(allocation alloc (pad-data-block (+ bignum-digits-offset 2)) node)
(storew y alloc)
(emit-label L1)
(pseudo-atomic
(allocation alloc (pad-data-block (+ bignum-digits-offset 2)) node)
(storew y alloc)
- (inst lea y (make-ea :byte :base alloc :disp other-pointer-type))
- (storew x y bignum-digits-offset other-pointer-type))
+ (inst lea y (make-ea :byte :base alloc :disp other-pointer-lowtag))
+ (storew x y bignum-digits-offset other-pointer-lowtag))
(inst jmp done)))))
(define-move-vop move-from-unsigned :move
(unsigned-reg) (descriptor-reg))
(inst jmp done)))))
(define-move-vop move-from-unsigned :move
(unsigned-reg) (descriptor-reg))