X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Farray.lisp;h=bf50ef848bc7e287c8286b696dcd40f5a6d1e3a2;hb=d25e3478acccec70402ff32554669a982be8e281;hp=8d2a8c18201c52d4a81af6616bd99ea99751da94;hpb=dd5b34f093f3f3a1a5ec30831afd16d8619b9d04;p=sbcl.git diff --git a/src/compiler/x86-64/array.lisp b/src/compiler/x86-64/array.lisp index 8d2a8c1..bf50ef8 100644 --- a/src/compiler/x86-64/array.lisp +++ b/src/compiler/x86-64/array.lisp @@ -117,7 +117,7 @@ (:vop-var vop) (:save-p :compute-only) (:generator 5 - (let ((error (generate-error-code vop invalid-array-index-error + (let ((error (generate-error-code vop 'invalid-array-index-error array bound index)) (index (if (sc-is index immediate) (fixnumize (tn-value index)) @@ -157,10 +157,10 @@ (def-full-data-vector-frobs simple-array-unsigned-byte-63 unsigned-num unsigned-reg)) -(define-full-compare-and-swap simple-vector-compare-and-swap - simple-vector vector-data-offset other-pointer-lowtag - (descriptor-reg any-reg) * - %simple-vector-compare-and-swap) +(define-full-compare-and-swap %compare-and-swap-svref simple-vector + vector-data-offset other-pointer-lowtag + (descriptor-reg any-reg) * + %compare-and-swap-svref) ;;;; integer vectors whose elements are smaller than a byte, i.e., ;;;; bit, 2-bit, and 4-bit vectors @@ -169,17 +169,19 @@ (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-with-offset/ type)) (:note "inline array access") - (:translate data-vector-ref) + (:translate data-vector-ref-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) (index :scs (unsigned-reg))) - (:arg-types ,type positive-fixnum) + (:info offset) + (:arg-types ,type positive-fixnum (:constant (integer 0 0))) (:results (result :scs (unsigned-reg) :from (:argument 0))) (:result-types positive-fixnum) (:temporary (:sc unsigned-reg :offset ecx-offset) ecx) (:generator 20 + (aver (zerop offset)) (move ecx index) (inst shr ecx ,bit-shift) (inst mov result @@ -197,15 +199,16 @@ (inst shl ecx ,(1- (integer-length bits))))) (inst shr result :cl) (inst and result ,(1- (ash 1 bits))))) - (define-vop (,(symbolicate 'data-vector-ref-c/ type)) - (:translate data-vector-ref) + (define-vop (,(symbolicate 'data-vector-ref-c-with-offset/ type)) + (:translate data-vector-ref-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg))) - (:arg-types ,type (:constant low-index)) - (:info index) + (:arg-types ,type (:constant low-index) (:constant (integer 0 0))) + (:info index offset) (:results (result :scs (unsigned-reg))) (:result-types positive-fixnum) (:generator 15 + (aver (zerop offset)) (multiple-value-bind (word extra) (floor index ,elements-per-word) (loadw result object (+ word vector-data-offset) other-pointer-lowtag) @@ -213,20 +216,23 @@ (inst shr 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-with-offset/ type)) (:note "inline array store") - (:translate data-vector-set) + (:translate data-vector-set-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) (index :scs (unsigned-reg) :target ecx) (value :scs (unsigned-reg immediate) :target result)) - (:arg-types ,type positive-fixnum positive-fixnum) + (:info offset) + (:arg-types ,type positive-fixnum (:constant (integer 0 0)) + positive-fixnum) (:results (result :scs (unsigned-reg))) (:result-types positive-fixnum) (:temporary (:sc unsigned-reg) word-index) (:temporary (:sc unsigned-reg) old) (:temporary (:sc unsigned-reg :offset ecx-offset) ecx) (:generator 25 + (aver (zerop offset)) (move word-index index) (inst shr word-index ,bit-shift) (inst mov old @@ -264,18 +270,20 @@ (inst mov result (tn-value value))) (unsigned-reg (move result value))))) - (define-vop (,(symbolicate 'data-vector-set-c/ type)) - (:translate data-vector-set) + (define-vop (,(symbolicate 'data-vector-set-c-with-offset/ type)) + (:translate data-vector-set-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) (value :scs (unsigned-reg immediate) :target result)) - (:arg-types ,type (:constant low-index) positive-fixnum) + (:arg-types ,type (:constant low-index) + (:constant (integer 0 0)) positive-fixnum) (:temporary (:sc unsigned-reg) mask-tn) - (:info index) + (:info index offset) (:results (result :scs (unsigned-reg))) (:result-types positive-fixnum) (:temporary (:sc unsigned-reg :to (:result 0)) old) (:generator 20 + (aver (zerop offset)) (multiple-value-bind (word extra) (floor index ,elements-per-word) (inst mov old (make-ea :qword :base object @@ -335,7 +343,7 @@ complex-offset) other-pointer-lowtag)))))) -(define-vop (data-vector-ref/simple-array-single-float) +(define-vop (data-vector-ref-with-offset/simple-array-single-float) (:note "inline array access") (:translate data-vector-ref-with-offset) (:policy :fast-safe) @@ -353,7 +361,7 @@ (inst shr dword-index 1) (inst movss value (make-ea-for-float-ref object dword-index offset 4)))) -(define-vop (data-vector-ref-c/simple-array-single-float) +(define-vop (data-vector-ref-c-with-offset/simple-array-single-float) (:note "inline array access") (:translate data-vector-ref-with-offset) (:policy :fast-safe) @@ -367,7 +375,7 @@ (:generator 4 (inst movss value (make-ea-for-float-ref object index offset 4)))) -(define-vop (data-vector-set/simple-array-single-float) +(define-vop (data-vector-set-with-offset/simple-array-single-float) (:note "inline array store") (:translate data-vector-set-with-offset) (:policy :fast-safe) @@ -389,7 +397,7 @@ (unless (location= result value) (inst movss result value)))) -(define-vop (data-vector-set-c/simple-array-single-float) +(define-vop (data-vector-set-c-with-offset/simple-array-single-float) (:note "inline array store") (:translate data-vector-set-with-offset) (:policy :fast-safe) @@ -407,7 +415,7 @@ (unless (location= result value) (inst movss result value)))) -(define-vop (data-vector-ref/simple-array-double-float) +(define-vop (data-vector-ref-with-offset/simple-array-double-float) (:note "inline array access") (:translate data-vector-ref-with-offset) (:policy :fast-safe) @@ -436,7 +444,7 @@ (:generator 6 (inst movsd value (make-ea-for-float-ref object index offset 8)))) -(define-vop (data-vector-set/simple-array-double-float) +(define-vop (data-vector-set-with-offset/simple-array-double-float) (:note "inline array store") (:translate data-vector-set-with-offset) (:policy :fast-safe) @@ -455,7 +463,7 @@ (unless (location= result value) (inst movsd result value)))) -(define-vop (data-vector-set-c/simple-array-double-float) +(define-vop (data-vector-set-c-with-offset/simple-array-double-float) (:note "inline array store") (:translate data-vector-set-with-offset) (:policy :fast-safe) @@ -476,7 +484,7 @@ ;;; complex float variants -(define-vop (data-vector-ref/simple-array-complex-single-float) +(define-vop (data-vector-ref-with-offset/simple-array-complex-single-float) (:note "inline array access") (:translate data-vector-ref-with-offset) (:policy :fast-safe) @@ -495,7 +503,7 @@ (inst movss imag-tn (make-ea-for-float-ref object index offset 8 :complex-offset 4))))) -(define-vop (data-vector-ref-c/simple-array-complex-single-float) +(define-vop (data-vector-ref-c-with-offset/simple-array-complex-single-float) (:note "inline array access") (:translate data-vector-ref-with-offset) (:policy :fast-safe) @@ -513,7 +521,7 @@ (inst movss imag-tn (make-ea-for-float-ref object index offset 8 :complex-offset 4))))) -(define-vop (data-vector-set/simple-array-complex-single-float) +(define-vop (data-vector-set-with-offset/simple-array-complex-single-float) (:note "inline array store") (:translate data-vector-set-with-offset) (:policy :fast-safe) @@ -541,7 +549,7 @@ (unless (location= value-imag result-imag) (inst movss result-imag value-imag))))) -(define-vop (data-vector-set-c/simple-array-complex-single-float) +(define-vop (data-vector-set-c-with-offset/simple-array-complex-single-float) (:note "inline array store") (:translate data-vector-set-with-offset) (:policy :fast-safe) @@ -568,7 +576,7 @@ (unless (location= value-imag result-imag) (inst movss result-imag value-imag))))) -(define-vop (data-vector-ref/simple-array-complex-double-float) +(define-vop (data-vector-ref-with-offset/simple-array-complex-double-float) (:note "inline array access") (:translate data-vector-ref-with-offset) (:policy :fast-safe) @@ -587,7 +595,7 @@ (inst movsd imag-tn (make-ea-for-float-ref object index offset 16 :scale 2 :complex-offset 8))))) -(define-vop (data-vector-ref-c/simple-array-complex-double-float) +(define-vop (data-vector-ref-c-with-offset/simple-array-complex-double-float) (:note "inline array access") (:translate data-vector-ref-with-offset) (:policy :fast-safe) @@ -605,7 +613,7 @@ (inst movsd imag-tn (make-ea-for-float-ref object index offset 16 :scale 2 :complex-offset 8))))) -(define-vop (data-vector-set/simple-array-complex-double-float) +(define-vop (data-vector-set-with-offset/simple-array-complex-double-float) (:note "inline array store") (:translate data-vector-set-with-offset) (:policy :fast-safe) @@ -634,7 +642,7 @@ (unless (location= value-imag result-imag) (inst movsd result-imag value-imag))))) -(define-vop (data-vector-set-c/simple-array-complex-double-float) +(define-vop (data-vector-set-c-with-offset/simple-array-complex-double-float) (:note "inline array store") (:translate data-vector-set-with-offset) (:policy :fast-safe) @@ -668,7 +676,7 @@ (macrolet ((define-data-vector-frobs (ptype mov-inst type 8-bit-tns-p &rest scs) `(progn - (define-vop (,(symbolicate "DATA-VECTOR-REF/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-REF-WITH-OFFSET/" ptype)) (:translate data-vector-ref-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) @@ -685,7 +693,7 @@ :disp (- (+ (* vector-data-offset n-word-bytes) offset) other-pointer-lowtag))))) - (define-vop (,(symbolicate "DATA-VECTOR-REF-C/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-REF-C-WITH-OFFSET/" ptype)) (:translate data-vector-ref-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg))) @@ -701,7 +709,7 @@ :disp (- (+ (* vector-data-offset n-word-bytes) index offset) other-pointer-lowtag))))) - (define-vop (,(symbolicate "DATA-VECTOR-SET/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-SET-WITH-OFFSET/" ptype)) (:translate data-vector-set-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) @@ -726,7 +734,7 @@ other-pointer-lowtag)) ,(if 8-bit-tns-p 'value 'al-tn)) (move result ,(if 8-bit-tns-p 'value 'rax)))) - (define-vop (,(symbolicate "DATA-VECTOR-SET-C/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-SET-C-WITH-OFFSET/" ptype)) (:translate data-vector-set-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) @@ -764,7 +772,7 @@ ;;; unsigned-byte-16 (macrolet ((define-data-vector-frobs (ptype mov-inst type &rest scs) `(progn - (define-vop (,(symbolicate "DATA-VECTOR-REF/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-REF-WITH-OFFSET/" ptype)) (:translate data-vector-ref-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) @@ -781,7 +789,7 @@ :disp (- (+ (* vector-data-offset n-word-bytes) (* offset 2)) other-pointer-lowtag))))) - (define-vop (,(symbolicate "DATA-VECTOR-REF-C/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-REF-C-WITH-OFFSET/" ptype)) (:translate data-vector-ref-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg))) @@ -798,7 +806,7 @@ (* 2 index) (* 2 offset)) other-pointer-lowtag))))) - (define-vop (,(symbolicate "DATA-VECTOR-SET/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-SET-WITH-OFFSET/" ptype)) (:translate data-vector-set-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) @@ -823,7 +831,7 @@ ax-tn) (move result eax))) - (define-vop (,(symbolicate "DATA-VECTOR-SET-C/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-SET-C-WITH-OFFSET/" ptype)) (:translate data-vector-set-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) @@ -856,7 +864,7 @@ (macrolet ((define-data-vector-frobs (ptype mov-inst type &rest scs) `(progn - (define-vop (,(symbolicate "DATA-VECTOR-REF/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-REF-WITH-OFFSET/" ptype)) (:translate data-vector-ref-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) @@ -873,7 +881,7 @@ :disp (- (+ (* vector-data-offset n-word-bytes) (* offset 4)) other-pointer-lowtag))))) - (define-vop (,(symbolicate "DATA-VECTOR-REF-C/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-REF-C-WITH-OFFSET/" ptype)) (:translate data-vector-ref-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg))) @@ -890,7 +898,7 @@ (* 4 index) (* 4 offset)) other-pointer-lowtag))))) - (define-vop (,(symbolicate "DATA-VECTOR-SET/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-SET-WITH-OFFSET/" ptype)) (:translate data-vector-set-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) @@ -915,7 +923,7 @@ eax-tn) (move result rax))) - (define-vop (,(symbolicate "DATA-VECTOR-SET-C/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-SET-C-WITH-OFFSET/" ptype)) (:translate data-vector-set-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) @@ -952,10 +960,6 @@ ;;; 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