(: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
- (inst addu bytes rank (+ (* array-dimensions-offset n-word-bytes)
+ (inst addu bytes rank (+ (* (1+ array-dimensions-offset) n-word-bytes)
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 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)
(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
(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)
(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)))
(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)
(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))