projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.9.0.16:
[sbcl.git]
/
src
/
compiler
/
x86-64
/
system.lisp
diff --git
a/src/compiler/x86-64/system.lisp
b/src/compiler/x86-64/system.lisp
index
c9f111d
..
1a8d665
100644
(file)
--- a/
src/compiler/x86-64/system.lisp
+++ b/
src/compiler/x86-64/system.lisp
@@
-35,25
+35,25
@@
(inst mov rax object)
(inst and al-tn lowtag-mask)
(inst cmp al-tn other-pointer-lowtag)
(inst mov rax object)
(inst and al-tn lowtag-mask)
(inst cmp al-tn other-pointer-lowtag)
- (inst jmp :e other-ptr)
+ (inst jmp :e OTHER-PTR)
(inst cmp al-tn fun-pointer-lowtag)
(inst cmp al-tn fun-pointer-lowtag)
- (inst jmp :e function-ptr)
+ (inst jmp :e FUNCTION-PTR)
;; Pick off structures and list pointers.
(inst test al-tn 1)
;; Pick off structures and list pointers.
(inst test al-tn 1)
- (inst jmp :ne done)
+ (inst jmp :ne DONE)
;; Pick off fixnums.
(inst and al-tn 7)
;; Pick off fixnums.
(inst and al-tn 7)
- (inst jmp :e done)
+ (inst jmp :e DONE)
;; must be an other immediate
(inst mov rax object)
;; must be an other immediate
(inst mov rax object)
- (inst jmp done)
+ (inst jmp DONE)
FUNCTION-PTR
(load-type al-tn object (- fun-pointer-lowtag))
FUNCTION-PTR
(load-type al-tn object (- fun-pointer-lowtag))
- (inst jmp done)
+ (inst jmp DONE)
OTHER-PTR
(load-type al-tn object (- other-pointer-lowtag))
OTHER-PTR
(load-type al-tn object (- other-pointer-lowtag))
@@
-121,7
+121,7
@@
:from (:argument 1) :to (:result 0)) eax)
(:generator 6
(move eax data)
:from (:argument 1) :to (:result 0)) eax)
(:generator 6
(move eax data)
- (inst shl eax (- n-widetag-bits 2))
+ (inst shl eax (- n-widetag-bits n-fixnum-tag-bits))
(inst mov al-tn (make-ea :byte :base x :disp (- other-pointer-lowtag)))
(storew eax x 0 other-pointer-lowtag)
(move res x)))
(inst mov al-tn (make-ea :byte :base x :disp (- other-pointer-lowtag)))
(storew eax x 0 other-pointer-lowtag)
(move res x)))
@@
-142,7
+142,7
@@
(:results (res :scs (any-reg descriptor-reg) :from (:argument 0)))
(:generator 2
(move res val)
(:results (res :scs (any-reg descriptor-reg) :from (:argument 0)))
(:generator 2
(move res val)
- (inst shl res (- n-widetag-bits 2))
+ (inst shl res (- n-widetag-bits n-fixnum-tag-bits))
(inst or res (sc-case type
(unsigned-reg type)
(immediate (tn-value type))))))
(inst or res (sc-case type
(unsigned-reg type)
(immediate (tn-value type))))))