X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Farray.lisp;h=504ef62cafcfc2a92a563c522507eadeab97b891;hb=b9519773faa7b3c98915eccb9cb1fd8a8270ee56;hp=2c6530c165bcd20fb4b28daa0710dd68d8264aa0;hpb=906ecd4ef2d10aca23e1081f03c13fe2f932ed89;p=sbcl.git diff --git a/src/compiler/x86-64/array.lisp b/src/compiler/x86-64/array.lisp index 2c6530c..504ef62 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 @@ -385,7 +393,7 @@ (:generator 5 (move dword-index index) (inst shr dword-index 1) - (inst movss (make-ea-for-float-ref object index offset 4) value) + (inst movss (make-ea-for-float-ref object dword-index offset 4) value) (unless (location= result value) (inst movss result value)))) @@ -706,7 +714,7 @@ (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) (index :scs (unsigned-reg) :to (:eval 0)) - (value :scs ,scs :target rax)) + (value :scs ,scs ,@(unless 8-bit-tns-p '(:target rax)))) (:info offset) (:arg-types ,ptype positive-fixnum (:constant (constant-displacement other-pointer-lowtag @@ -730,7 +738,7 @@ (:translate data-vector-set-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) - (value :scs ,scs :target rax)) + (value :scs ,scs ,@(unless 8-bit-tns-p '(:target rax)))) (:info index offset) (:arg-types ,ptype (:constant low-index) (:constant (constant-displacement other-pointer-lowtag @@ -945,6 +953,7 @@ unsigned-reg signed-reg) (define-data-vector-frobs simple-array-signed-byte-32 movsxd tagged-num signed-reg) + #!+sb-unicode (define-data-vector-frobs simple-character-string movzxd character character-reg))