projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
handle non-standard slot allocations when updating classes
[sbcl.git]
/
src
/
compiler
/
mips
/
system.lisp
diff --git
a/src/compiler/mips/system.lisp
b/src/compiler/mips/system.lisp
index
b31d80d
..
dcf7aba
100644
(file)
--- a/
src/compiler/mips/system.lisp
+++ b/
src/compiler/mips/system.lisp
@@
-39,7
+39,7
@@
(inst beq ndescr function-ptr)
;; Pick off fixnums.
(inst beq ndescr function-ptr)
;; Pick off fixnums.
- (inst and result object 3)
+ (inst and result object fixnum-tag-mask)
(inst beq result done)
;; Pick off structure and list pointers.
(inst beq result done)
;; Pick off structure and list pointers.
@@
-122,7
+122,7
@@
(inst and t1 widetag-mask)
(sc-case data
(any-reg
(inst and t1 widetag-mask)
(sc-case data
(any-reg
- (inst sll t2 data (- n-widetag-bits 2))
+ (inst sll t2 data (- n-widetag-bits n-fixnum-tag-bits))
(inst or t1 t2))
(immediate
(inst or t1 (ash (tn-value data) n-widetag-bits)))
(inst or t1 t2))
(immediate
(inst or t1 (ash (tn-value data) n-widetag-bits)))
@@
-130,13
+130,14
@@
(storew t1 x 0 other-pointer-lowtag)
(move res x)))
(storew t1 x 0 other-pointer-lowtag)
(move res x)))
-(define-vop (make-fixnum)
+(define-vop (pointer-hash)
+ (:translate pointer-hash)
(:args (ptr :scs (any-reg descriptor-reg)))
(:results (res :scs (any-reg descriptor-reg)))
(:args (ptr :scs (any-reg descriptor-reg)))
(: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.
+ ;; FIXME: It would be better if this would mask the lowtag,
+ ;; and shift the result into a positive fixnum like on x86.
(inst sll res ptr 3)
(inst srl res res 1)))
(inst sll res ptr 3)
(inst srl res res 1)))
@@
-152,8
+153,8
@@
(inst sll temp val n-widetag-bits)
(inst or res temp (tn-value type)))
(t
(inst sll temp val n-widetag-bits)
(inst or res temp (tn-value type)))
(t
- (inst sra temp type 2)
- (inst sll res val (- n-widetag-bits 2))
+ (inst sra temp type n-fixnum-tag-bits)
+ (inst sll res val (- n-widetag-bits n-fixnum-tag-bits))
(inst or res res temp)))))
\f
(inst or res res temp)))))
\f
@@
-244,3
+245,9
@@
(inst nop)
(inst addu count 1)
(inst sw count count-vector offset))))
(inst nop)
(inst addu count 1)
(inst sw count count-vector offset))))
+
+;;;; Dummy definition for a spin-loop hint VOP
+(define-vop (spin-loop-hint)
+ (:translate spin-loop-hint)
+ (:policy :fast-safe)
+ (:generator 0))