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
/
array.lisp
diff --git
a/src/compiler/mips/array.lisp
b/src/compiler/mips/array.lisp
index
801172b
..
2f06dd4
100644
(file)
--- a/
src/compiler/mips/array.lisp
+++ b/
src/compiler/mips/array.lisp
@@
-18,18
+18,19
@@
(:args (type :scs (any-reg))
(rank :scs (any-reg)))
(:arg-types positive-fixnum positive-fixnum)
(:args (type :scs (any-reg))
(rank :scs (any-reg)))
(:arg-types positive-fixnum positive-fixnum)
- (:temporary (:scs (any-reg)) bytes)
- (:temporary (:scs (non-descriptor-reg)) header)
+ (:temporary (:scs (non-descriptor-reg)) bytes header)
(:temporary (:sc non-descriptor-reg :offset nl4-offset) pa-flag)
(:results (result :scs (descriptor-reg)))
(:generator 13
(:temporary (:sc non-descriptor-reg :offset nl4-offset) pa-flag)
(:results (result :scs (descriptor-reg)))
(:generator 13
- (inst addu bytes rank (+ (* array-dimensions-offset n-word-bytes)
+ (inst addu bytes rank (+ (* (1+ array-dimensions-offset) n-word-bytes)
lowtag-mask))
lowtag-mask))
- (inst li header (lognot lowtag-mask))
- (inst and bytes header)
+ (inst srl bytes n-lowtag-bits)
+ (inst sll bytes n-lowtag-bits)
(inst addu header rank (fixnumize (1- array-dimensions-offset)))
(inst sll header n-widetag-bits)
(inst addu header rank (fixnumize (1- array-dimensions-offset)))
(inst sll header n-widetag-bits)
- (inst or header header type)
+ (inst or header type)
+ ;; Remove the extraneous fixnum tag bits because TYPE and RANK
+ ;; were fixnums
(inst srl header n-fixnum-tag-bits)
(pseudo-atomic (pa-flag)
(inst or result alloc-tn other-pointer-lowtag)
(inst srl header n-fixnum-tag-bits)
(pseudo-atomic (pa-flag)
(inst or result alloc-tn other-pointer-lowtag)
@@
-72,7
+73,7
@@
(let ((error (generate-error-code vop invalid-array-index-error
array bound index)))
(inst sltu temp index bound)
(let ((error (generate-error-code vop invalid-array-index-error
array bound index)))
(inst sltu temp index bound)
- (inst beq temp zero-tn error)
+ (inst beq temp error)
(inst nop)
(move result index))))
\f
(inst nop)
(move result index))))
\f
@@
-144,7
+145,7
@@
(let* ((elements-per-word (floor n-word-bits bits))
(bit-shift (1- (integer-length elements-per-word))))
`(progn
(let* ((elements-per-word (floor n-word-bits bits))
(bit-shift (1- (integer-length elements-per-word))))
`(progn
- (define-vop (,(symbolicate 'DATA-VECTOR-REF/ type))
+ (define-vop (,(symbolicate "DATA-VECTOR-REF/" type))
(:note "inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
(:note "inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
@@
-170,7
+171,7
@@
(inst srl result temp)
(inst and result ,(1- (ash 1 bits)))
(inst sll value result n-fixnum-tag-bits)))
(inst srl result temp)
(inst and result ,(1- (ash 1 bits)))
(inst sll value result n-fixnum-tag-bits)))
- (define-vop (,(symbolicate 'DATA-VECTOR-REF-C/ type))
+ (define-vop (,(symbolicate "DATA-VECTOR-REF-C/" type))
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg)))
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg)))
@@
-195,7
+196,7
@@
(inst srl result (* extra ,bits)))
(unless (= extra ,(1- elements-per-word))
(inst and result ,(1- (ash 1 bits)))))))
(inst srl result (* extra ,bits)))
(unless (= extra ,(1- elements-per-word))
(inst and result ,(1- (ash 1 bits)))))))
- (define-vop (,(symbolicate 'DATA-VECTOR-SET/ type))
+ (define-vop (,(symbolicate "DATA-VECTOR-SET/" type))
(:note "inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
(:note "inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
@@
-244,7
+245,7
@@
(move result zero-tn))
(unsigned-reg
(move result value)))))
(move result zero-tn))
(unsigned-reg
(move result value)))))
- (define-vop (,(symbolicate 'DATA-VECTOR-SET-C/ type))
+ (define-vop (,(symbolicate "DATA-VECTOR-SET-C/" type))
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
@@
-512,10
+513,6
@@
\f
;;; These vops are useful for accessing the bits of a vector irrespective of
;;; what type of vector it is.
\f
;;; These vops are useful for accessing the bits of a vector irrespective of
;;; what type of vector it is.
-(define-full-reffer raw-bits * 0 other-pointer-lowtag (unsigned-reg) unsigned-num
- %raw-bits)
-(define-full-setter set-raw-bits * 0 other-pointer-lowtag (unsigned-reg)
- unsigned-num %set-raw-bits)
(define-full-reffer vector-raw-bits * vector-data-offset other-pointer-lowtag
(unsigned-reg) unsigned-num %vector-raw-bits)
(define-full-setter set-vector-raw-bits * vector-data-offset other-pointer-lowtag
(define-full-reffer vector-raw-bits * vector-data-offset other-pointer-lowtag
(unsigned-reg) unsigned-num %vector-raw-bits)
(define-full-setter set-vector-raw-bits * vector-data-offset other-pointer-lowtag