projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.15.27: nicer lambda-lists for GCD and LCM
[sbcl.git]
/
src
/
compiler
/
x86
/
system.lisp
diff --git
a/src/compiler/x86/system.lisp
b/src/compiler/x86/system.lisp
index
44b1df4
..
597e3c2
100644
(file)
--- a/
src/compiler/x86/system.lisp
+++ b/
src/compiler/x86/system.lisp
@@
-124,14
+124,16
@@
(storew eax x 0 other-pointer-lowtag)
(move res x)))
\f
(storew eax x 0 other-pointer-lowtag)
(move res x)))
\f
-(define-vop (make-fixnum)
+(define-vop (pointer-hash)
+ (:translate pointer-hash)
(:args (ptr :scs (any-reg descriptor-reg) :target res))
(:results (res :scs (any-reg descriptor-reg)))
(:args (ptr :scs (any-reg descriptor-reg) :target res))
(:results (res :scs (any-reg descriptor-reg)))
+ (:policy :fast-safe)
(:generator 1
(:generator 1
- ;; Some code (the hash table code) depends on this returning a
- ;; positive number so make sure it does.
(move res ptr)
(move res ptr)
- (inst shl res 3)
+ ;; Mask the lowtag, and shift the whole address into a positive
+ ;; fixnum.
+ (inst and res (lognot lowtag-mask))
(inst shr res 1)))
(define-vop (make-other-immediate-type)
(inst shr res 1)))
(define-vop (make-other-immediate-type)
@@
-289,6
+291,4
@@
(:args (count-vector :scs (descriptor-reg)))
(:info index)
(:generator 0
(:args (count-vector :scs (descriptor-reg)))
(:info index)
(:generator 0
- (inst inc (make-ea-for-object-slot count-vector
- (+ vector-data-offset index)
- other-pointer-lowtag))))
+ (inst inc (make-ea-for-vector-data count-vector :offset index))))