projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.13.47:
[sbcl.git]
/
src
/
compiler
/
alpha
/
array.lisp
diff --git
a/src/compiler/alpha/array.lisp
b/src/compiler/alpha/array.lisp
index
9b85f33
..
67ecea0
100644
(file)
--- a/
src/compiler/alpha/array.lisp
+++ b/
src/compiler/alpha/array.lisp
@@
-31,7
+31,7
@@
(inst addq rank (fixnumize (1- array-dimensions-offset)) header)
(inst sll header n-widetag-bits header)
(inst bis header type header)
(inst addq rank (fixnumize (1- array-dimensions-offset)) header)
(inst sll header n-widetag-bits header)
(inst bis header type header)
- (inst srl header 2 header)
+ (inst srl header n-fixnum-tag-bits header)
(pseudo-atomic ()
(inst bis alloc-tn other-pointer-lowtag result)
(storew header result 0 other-pointer-lowtag)
(pseudo-atomic ()
(inst bis alloc-tn other-pointer-lowtag result)
(storew header result 0 other-pointer-lowtag)
@@
-40,25
+40,16
@@
\f
;;;; additional accessors and setters for the array header
\f
;;;; additional accessors and setters for the array header
-
-(defknown sb!impl::%array-dimension (t index) index
- (flushable))
-(defknown sb!impl::%set-array-dimension (t index index) index
- ())
-
(define-full-reffer %array-dimension *
array-dimensions-offset other-pointer-lowtag
(define-full-reffer %array-dimension *
array-dimensions-offset other-pointer-lowtag
- (any-reg) positive-fixnum sb!impl::%array-dimension)
+ (any-reg) positive-fixnum sb!kernel:%array-dimension)
(define-full-setter %set-array-dimension *
array-dimensions-offset other-pointer-lowtag
(define-full-setter %set-array-dimension *
array-dimensions-offset other-pointer-lowtag
- (any-reg) positive-fixnum sb!impl::%set-array-dimension #!+gengc nil)
-
-
-(defknown sb!impl::%array-rank (t) index (flushable))
+ (any-reg) positive-fixnum sb!kernel:%set-array-dimension #!+gengc nil)
(define-vop (array-rank-vop)
(define-vop (array-rank-vop)
- (:translate sb!impl::%array-rank)
+ (:translate sb!kernel:%array-rank)
(:policy :fast-safe)
(:args (x :scs (descriptor-reg)))
(:temporary (:scs (non-descriptor-reg)) temp)
(:policy :fast-safe)
(:args (x :scs (descriptor-reg)))
(:temporary (:scs (non-descriptor-reg)) temp)
@@
-67,9
+58,7
@@
(loadw temp x 0 other-pointer-lowtag)
(inst sra temp n-widetag-bits temp)
(inst subq temp (1- array-dimensions-offset) temp)
(loadw temp x 0 other-pointer-lowtag)
(inst sra temp n-widetag-bits temp)
(inst subq temp (1- array-dimensions-offset) temp)
- (inst sll temp 2 res)))
-
-
+ (inst sll temp n-fixnum-tag-bits res)))
\f
;;;; bounds checking routine
\f
;;;; bounds checking routine
@@
-139,7
+128,7
@@
temp result)
(:generator 20
(inst srl index ,bit-shift temp)
temp result)
(:generator 20
(inst srl index ,bit-shift temp)
- (inst sll temp 2 temp)
+ (inst sll temp n-fixnum-tag-bits temp)
(inst addq object temp lip)
(inst ldl result
(- (* vector-data-offset n-word-bytes)
(inst addq object temp lip)
(inst ldl result
(- (* vector-data-offset n-word-bytes)
@@
-151,7
+140,7
@@
,(1- (integer-length bits)) temp)))
(inst srl result temp result)
(inst and result ,(1- (ash 1 bits)) result)
,(1- (integer-length bits)) temp)))
(inst srl result temp result)
(inst and result ,(1- (ash 1 bits)) result)
- (inst sll result 2 value)))
+ (inst sll result n-fixnum-tag-bits value)))
(define-vop (,(symbolicate 'data-vector-ref-c/ type))
(:translate data-vector-ref)
(:policy :fast-safe)
(define-vop (,(symbolicate 'data-vector-ref-c/ type))
(:translate data-vector-ref)
(:policy :fast-safe)
@@
-195,7
+184,7
@@
:from (:argument 1)) shift)
(:generator 25
(inst srl index ,bit-shift temp)
:from (:argument 1)) shift)
(:generator 25
(inst srl index ,bit-shift temp)
- (inst sll temp 2 temp)
+ (inst sll temp n-fixnum-tag-bits temp)
(inst addq object temp lip)
(inst ldl old
(- (* vector-data-offset n-word-bytes)
(inst addq object temp lip)
(inst ldl old
(- (* vector-data-offset n-word-bytes)
@@
-259,11
+248,11
@@
(:generator 20
(multiple-value-bind (word extra)
(floor index ,elements-per-word)
(:generator 20
(multiple-value-bind (word extra)
(floor index ,elements-per-word)
- (inst ldl object
+ (inst ldl old
(- (* (+ word vector-data-offset)
n-word-bytes)
other-pointer-lowtag)
(- (* (+ word vector-data-offset)
n-word-bytes)
other-pointer-lowtag)
- old)
+ object)
(unless (and (sc-is value immediate)
(= (tn-value value)
,(1- (ash 1 bits))))
(unless (and (sc-is value immediate)
(= (tn-value value)
,(1- (ash 1 bits))))
@@
-314,12
+303,18
@@
(def-partial-data-vector-frobs simple-base-string base-char :byte nil
base-char-reg)
(def-partial-data-vector-frobs simple-base-string base-char :byte nil
base-char-reg)
+ (def-partial-data-vector-frobs simple-array-unsigned-byte-7 positive-fixnum
+ :byte nil unsigned-reg signed-reg)
(def-partial-data-vector-frobs simple-array-unsigned-byte-8 positive-fixnum
:byte nil unsigned-reg signed-reg)
(def-partial-data-vector-frobs simple-array-unsigned-byte-8 positive-fixnum
:byte nil unsigned-reg signed-reg)
+ (def-partial-data-vector-frobs simple-array-unsigned-byte-15 positive-fixnum
+ :short nil unsigned-reg signed-reg)
(def-partial-data-vector-frobs simple-array-unsigned-byte-16 positive-fixnum
:short nil unsigned-reg signed-reg)
(def-partial-data-vector-frobs simple-array-unsigned-byte-16 positive-fixnum
:short nil unsigned-reg signed-reg)
+ (def-full-data-vector-frobs simple-array-unsigned-byte-31 unsigned-num
+ unsigned-reg)
(def-full-data-vector-frobs simple-array-unsigned-byte-32 unsigned-num
unsigned-reg)
(def-full-data-vector-frobs simple-array-unsigned-byte-32 unsigned-num
unsigned-reg)
@@
-329,6
+324,7
@@
(def-partial-data-vector-frobs simple-array-signed-byte-16 tagged-num
:short t signed-reg)
(def-partial-data-vector-frobs simple-array-signed-byte-16 tagged-num
:short t signed-reg)
+ (def-full-data-vector-frobs simple-array-unsigned-byte-29 positive-fixnum any-reg)
(def-full-data-vector-frobs simple-array-signed-byte-30 tagged-num any-reg)
(def-full-data-vector-frobs simple-array-signed-byte-32 signed-num
(def-full-data-vector-frobs simple-array-signed-byte-30 tagged-num any-reg)
(def-full-data-vector-frobs simple-array-signed-byte-32 signed-num