X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Farray.lisp;h=f365216b10fa76df37934d1586dbb47f80ae9246;hb=74f749f68b1163d43ec96d63d00144d2b146deab;hp=9c15b4cfce5073fdb3e9b40caa14084f781c8879;hpb=c6faeccbeb96d7e40c3b761a3e04dd998f814f8e;p=sbcl.git diff --git a/src/compiler/x86-64/array.lisp b/src/compiler/x86-64/array.lisp index 9c15b4c..f365216 100644 --- a/src/compiler/x86-64/array.lisp +++ b/src/compiler/x86-64/array.lisp @@ -610,93 +610,13 @@ -;;; unsigned-byte-8 -(macrolet ((define-data-vector-frobs (ptype mov-inst type &rest scs) - `(progn - (define-vop (,(symbolicate "DATA-VECTOR-REF-WITH-OFFSET/" ptype)) - (:translate data-vector-ref-with-offset) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg)) - (index :scs (unsigned-reg))) - (:info offset) - (:arg-types ,ptype positive-fixnum - (:constant (constant-displacement other-pointer-lowtag - 1 vector-data-offset))) - (:results (value :scs ,scs)) - (:result-types ,type) - (:generator 5 - (inst ,mov-inst value - (make-ea :byte :base object :index index :scale 1 - :disp (- (+ (* vector-data-offset n-word-bytes) - offset) - other-pointer-lowtag))))) - (define-vop (,(symbolicate "DATA-VECTOR-REF-C-WITH-OFFSET/" ptype)) - (:translate data-vector-ref-with-offset) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg))) - (:info index offset) - (:arg-types ,ptype (:constant low-index) - (:constant (constant-displacement other-pointer-lowtag - 1 vector-data-offset))) - (:results (value :scs ,scs)) - (:result-types ,type) - (:generator 4 - (inst ,mov-inst value - (make-ea :byte :base object - :disp (- (+ (* vector-data-offset n-word-bytes) - index offset) - other-pointer-lowtag))))) - (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)) - (index :scs (unsigned-reg) :to (:eval 0)) - (value :scs ,scs :target result)) - (:info offset) - (:arg-types ,ptype positive-fixnum - (:constant (constant-displacement other-pointer-lowtag - 1 vector-data-offset)) - ,type) - (:results (result :scs ,scs)) - (:result-types ,type) - (:generator 5 - (inst mov (make-ea :byte :base object :index index :scale 1 - :disp (- (+ (* vector-data-offset n-word-bytes) - offset) - other-pointer-lowtag)) - (reg-in-size value :byte)) - (move result value))) - (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)) - (value :scs ,scs :target result)) - (:info index offset) - (:arg-types ,ptype (:constant low-index) - (:constant (constant-displacement other-pointer-lowtag - 1 vector-data-offset)) - ,type) - (:results (result :scs ,scs)) - (:result-types ,type) - (:generator 4 - (inst mov (make-ea :byte :base object - :disp (- (+ (* vector-data-offset n-word-bytes) - index offset) - other-pointer-lowtag)) - (reg-in-size value :byte)) - (move result value)))))) - (define-data-vector-frobs simple-array-unsigned-byte-7 movzx positive-fixnum - unsigned-reg signed-reg) - (define-data-vector-frobs simple-array-unsigned-byte-8 movzx positive-fixnum - unsigned-reg signed-reg) - (define-data-vector-frobs simple-array-signed-byte-8 movsx tagged-num - signed-reg) - (define-data-vector-frobs simple-base-string - #!+sb-unicode movzx #!-sb-unicode mov - character character-reg)) - -;;; unsigned-byte-16 -(macrolet ((define-data-vector-frobs (ptype mov-inst type &rest scs) +;;; {un,}signed-byte-{8,16,32} and characters +(macrolet ((define-data-vector-frobs (ptype mov-inst operand-size + type &rest scs) + (let ((n-bytes (ecase operand-size + (:byte 1) + (:word 2) + (:dword 4)))) `(progn (define-vop (,(symbolicate "DATA-VECTOR-REF-WITH-OFFSET/" ptype)) (:translate data-vector-ref-with-offset) @@ -706,14 +626,14 @@ (:info offset) (:arg-types ,ptype positive-fixnum (:constant (constant-displacement other-pointer-lowtag - 2 vector-data-offset))) + ,n-bytes vector-data-offset))) (:results (value :scs ,scs)) (:result-types ,type) (:generator 5 (inst ,mov-inst value - (make-ea :word :base object :index index :scale 2 + (make-ea ,operand-size :base object :index index :scale ,n-bytes :disp (- (+ (* vector-data-offset n-word-bytes) - (* offset 2)) + (* offset ,n-bytes)) other-pointer-lowtag))))) (define-vop (,(symbolicate "DATA-VECTOR-REF-C-WITH-OFFSET/" ptype)) (:translate data-vector-ref-with-offset) @@ -722,15 +642,15 @@ (:info index offset) (:arg-types ,ptype (:constant low-index) (:constant (constant-displacement other-pointer-lowtag - 2 vector-data-offset))) + ,n-bytes vector-data-offset))) (:results (value :scs ,scs)) (:result-types ,type) (:generator 4 (inst ,mov-inst value - (make-ea :word :base object + (make-ea ,operand-size :base object :disp (- (+ (* vector-data-offset n-word-bytes) - (* 2 index) - (* 2 offset)) + (* ,n-bytes index) + (* ,n-bytes offset)) other-pointer-lowtag))))) (define-vop (,(symbolicate "DATA-VECTOR-SET-WITH-OFFSET/" ptype)) (:translate data-vector-set-with-offset) @@ -741,16 +661,16 @@ (:info offset) (:arg-types ,ptype positive-fixnum (:constant (constant-displacement other-pointer-lowtag - 2 vector-data-offset)) + ,n-bytes vector-data-offset)) ,type) (:results (result :scs ,scs)) (:result-types ,type) (:generator 5 - (inst mov (make-ea :word :base object :index index :scale 2 + (inst mov (make-ea ,operand-size :base object :index index :scale ,n-bytes :disp (- (+ (* vector-data-offset n-word-bytes) - (* offset 2)) + (* offset ,n-bytes)) other-pointer-lowtag)) - (reg-in-size value :word)) + (reg-in-size value ,operand-size)) (move result value))) (define-vop (,(symbolicate "DATA-VECTOR-SET-C-WITH-OFFSET/" ptype)) @@ -761,111 +681,42 @@ (:info index offset) (:arg-types ,ptype (:constant low-index) (:constant (constant-displacement other-pointer-lowtag - 2 vector-data-offset)) + ,n-bytes vector-data-offset)) ,type) (:results (result :scs ,scs)) (:result-types ,type) (:generator 4 - (inst mov (make-ea :word :base object + (inst mov (make-ea ,operand-size :base object :disp (- (+ (* vector-data-offset n-word-bytes) - (* 2 index) - (* 2 offset)) + (* ,n-bytes index) + (* ,n-bytes offset)) other-pointer-lowtag)) - (reg-in-size value :word)) - (move result value)))))) - (define-data-vector-frobs simple-array-unsigned-byte-15 movzx positive-fixnum - unsigned-reg signed-reg) - (define-data-vector-frobs simple-array-unsigned-byte-16 movzx positive-fixnum - unsigned-reg signed-reg) - (define-data-vector-frobs simple-array-signed-byte-16 movsx tagged-num - signed-reg)) - -(macrolet ((define-data-vector-frobs (ptype mov-inst type &rest scs) - `(progn - (define-vop (,(symbolicate "DATA-VECTOR-REF-WITH-OFFSET/" ptype)) - (:translate data-vector-ref-with-offset) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg)) - (index :scs (unsigned-reg))) - (:info offset) - (:arg-types ,ptype positive-fixnum - (:constant (constant-displacement other-pointer-lowtag - 4 vector-data-offset))) - (:results (value :scs ,scs)) - (:result-types ,type) - (:generator 5 - (inst ,mov-inst value - (make-ea :dword :base object :index index :scale 4 - :disp (- (+ (* vector-data-offset n-word-bytes) - (* offset 4)) - other-pointer-lowtag))))) - (define-vop (,(symbolicate "DATA-VECTOR-REF-C-WITH-OFFSET/" ptype)) - (:translate data-vector-ref-with-offset) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg))) - (:info index offset) - (:arg-types ,ptype (:constant low-index) - (:constant (constant-displacement other-pointer-lowtag - 4 vector-data-offset))) - (:results (value :scs ,scs)) - (:result-types ,type) - (:generator 4 - (inst ,mov-inst value - (make-ea :dword :base object - :disp (- (+ (* vector-data-offset n-word-bytes) - (* 4 index) - (* 4 offset)) - other-pointer-lowtag))))) - (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)) - (index :scs (unsigned-reg) :to (:eval 0)) - (value :scs ,scs :target result)) - (:info offset) - (:arg-types ,ptype positive-fixnum - (:constant (constant-displacement other-pointer-lowtag - 4 vector-data-offset)) - ,type) - (:results (result :scs ,scs)) - (:result-types ,type) - (:generator 5 - (inst mov (make-ea :dword :base object :index index :scale 4 - :disp (- (+ (* vector-data-offset n-word-bytes) - (* offset 4)) - other-pointer-lowtag)) - (reg-in-size value :dword)) - (move result value))) - - (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)) - (value :scs ,scs :target result)) - (:info index offset) - (:arg-types ,ptype (:constant low-index) - (:constant (constant-displacement other-pointer-lowtag - 4 vector-data-offset)) - ,type) - (:results (result :scs ,scs)) - (:result-types ,type) - (:generator 4 - (inst mov (make-ea :dword :base object - :disp (- (+ (* vector-data-offset n-word-bytes) - (* 4 index) - (* 4 offset)) - other-pointer-lowtag)) - (reg-in-size value :dword)) - (move result value)))))) - (define-data-vector-frobs simple-array-unsigned-byte-32 movzxd positive-fixnum - unsigned-reg signed-reg) - (define-data-vector-frobs simple-array-unsigned-byte-31 movzxd positive-fixnum - unsigned-reg signed-reg) - (define-data-vector-frobs simple-array-signed-byte-32 movsxd tagged-num - signed-reg) + (reg-in-size value ,operand-size)) + (move result value))))))) + (define-data-vector-frobs simple-array-unsigned-byte-7 movzx :byte + positive-fixnum unsigned-reg signed-reg) + (define-data-vector-frobs simple-array-unsigned-byte-8 movzx :byte + positive-fixnum unsigned-reg signed-reg) + (define-data-vector-frobs simple-array-signed-byte-8 movsx :byte + tagged-num signed-reg) + (define-data-vector-frobs simple-base-string + #!+sb-unicode movzx #!-sb-unicode mov :byte + character character-reg) + (define-data-vector-frobs simple-array-unsigned-byte-15 movzx :word + positive-fixnum unsigned-reg signed-reg) + (define-data-vector-frobs simple-array-unsigned-byte-16 movzx :word + positive-fixnum unsigned-reg signed-reg) + (define-data-vector-frobs simple-array-signed-byte-16 movsx :word + tagged-num signed-reg) + (define-data-vector-frobs simple-array-unsigned-byte-32 movzxd :dword + positive-fixnum unsigned-reg signed-reg) + (define-data-vector-frobs simple-array-unsigned-byte-31 movzxd :dword + positive-fixnum unsigned-reg signed-reg) + (define-data-vector-frobs simple-array-signed-byte-32 movsxd :dword + tagged-num signed-reg) #!+sb-unicode - (define-data-vector-frobs simple-character-string movzxd character - character-reg)) + (define-data-vector-frobs simple-character-string movzxd :dword + character character-reg)) ;;; These vops are useful for accessing the bits of a vector @@ -879,3 +730,22 @@ (define-vop (get-vector-subtype get-header-data)) (define-vop (set-vector-subtype set-header-data)) + +;;;; ATOMIC-INCF for arrays + +(define-vop (array-atomic-incf/word) + (:translate %array-atomic-incf/word) + (:policy :fast-safe) + (:args (array :scs (descriptor-reg)) + (index :scs (any-reg)) + (diff :scs (unsigned-reg) :target result)) + (:arg-types * positive-fixnum unsigned-num) + (:results (result :scs (unsigned-reg))) + (:result-types unsigned-num) + (:generator 4 + (inst xadd (make-ea :qword :base array + :scale 1 :index index + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag)) + diff :lock) + (move result diff)))