X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Farray.lisp;h=7b5ee7a70138597d3501742751005a5b2ff94e84;hb=085501b44cc1cbdd9e260139d30b383372ddd1b8;hp=e2d4ef6fdbf688940eaf7f5d55a577ff4ced28d3;hpb=338732358d49ab202fe55c3581294597d63aec6b;p=sbcl.git diff --git a/src/compiler/x86-64/array.lisp b/src/compiler/x86-64/array.lisp index e2d4ef6..7b5ee7a 100644 --- a/src/compiler/x86-64/array.lisp +++ b/src/compiler/x86-64/array.lisp @@ -22,7 +22,7 @@ (:translate make-array-header) (:policy :fast-safe) (:args (type :scs (any-reg)) - (rank :scs (any-reg))) + (rank :scs (any-reg))) (:arg-types positive-fixnum positive-fixnum) (:temporary (:sc any-reg :to :eval) bytes) (:temporary (:sc any-reg :to :result) header) @@ -30,12 +30,12 @@ (:node-var node) (:generator 13 (inst lea bytes - (make-ea :qword :base rank - :disp (+ (* (1+ array-dimensions-offset) n-word-bytes) - lowtag-mask))) + (make-ea :qword :base rank + :disp (+ (* (1+ array-dimensions-offset) n-word-bytes) + lowtag-mask))) (inst and bytes (lognot lowtag-mask)) (inst lea header (make-ea :qword :base rank - :disp (fixnumize (1- array-dimensions-offset)))) + :disp (fixnumize (1- array-dimensions-offset)))) (inst shl header n-widetag-bits) (inst or header type) (inst shr header (1- n-lowtag-bits)) @@ -109,8 +109,8 @@ (:translate %check-bound) (:policy :fast-safe) (:args (array :scs (descriptor-reg)) - (bound :scs (any-reg descriptor-reg)) - (index :scs (any-reg descriptor-reg) :target result)) + (bound :scs (any-reg descriptor-reg)) + (index :scs (any-reg descriptor-reg) :target result)) ; (:arg-types * positive-fixnum tagged-num) (:results (result :scs (any-reg descriptor-reg))) ; (:result-types positive-fixnum) @@ -118,17 +118,17 @@ (:save-p :compute-only) (:generator 5 (let ((error (generate-error-code vop invalid-array-index-error - array bound index)) - (index (if (sc-is index immediate) - (fixnumize (tn-value index)) - index))) + array bound index)) + (index (if (sc-is index immediate) + (fixnumize (tn-value index)) + index))) (inst cmp bound index) ;; We use below-or-equal even though it's an unsigned test, ;; because negative indexes appear as large unsigned numbers. ;; Therefore, we get the <0 and >=bound test all rolled into one. (inst jmp :be error) (unless (and (tn-p index) (location= result index)) - (inst mov result index))))) + (inst mov result index))))) ;;;; accessors/setters @@ -136,14 +136,14 @@ ;;; whose elements are represented in integer registers and are built ;;; out of 8, 16, or 32 bit elements. (macrolet ((def-full-data-vector-frobs (type element-type &rest scs) - `(progn - (define-full-reffer ,(symbolicate "DATA-VECTOR-REF/" type) - ,type vector-data-offset other-pointer-lowtag ,scs - ,element-type data-vector-ref) - (define-full-setter ,(symbolicate "DATA-VECTOR-SET/" type) - ,type vector-data-offset other-pointer-lowtag ,scs - ,element-type data-vector-set))) - ) + `(progn + (define-full-reffer ,(symbolicate "DATA-VECTOR-REF/" type) + ,type vector-data-offset other-pointer-lowtag ,scs + ,element-type data-vector-ref) + (define-full-setter ,(symbolicate "DATA-VECTOR-SET/" type) + ,type vector-data-offset other-pointer-lowtag ,scs + ,element-type data-vector-set))) + ) (def-full-data-vector-frobs simple-vector * descriptor-reg any-reg) (def-full-data-vector-frobs simple-array-unsigned-byte-64 unsigned-num unsigned-reg) @@ -159,141 +159,153 @@ ;;;; bit, 2-bit, and 4-bit vectors (macrolet ((def-small-data-vector-frobs (type bits) - (let* ((elements-per-word (floor n-word-bits bits)) - (bit-shift (1- (integer-length elements-per-word)))) + (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)) - (:note "inline array access") - (:translate data-vector-ref) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg)) - (index :scs (unsigned-reg))) - (:arg-types ,type positive-fixnum) - (:results (result :scs (unsigned-reg) :from (:argument 0))) - (:result-types positive-fixnum) - (:temporary (:sc unsigned-reg :offset ecx-offset) ecx) - (:generator 20 - (move ecx index) - (inst shr ecx ,bit-shift) - (inst mov result - (make-ea :qword :base object :index ecx :scale n-word-bytes - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag))) - (move ecx index) - (inst and ecx ,(1- elements-per-word)) - ,@(unless (= bits 1) - `((inst shl ecx ,(1- (integer-length bits))))) - (inst shr result :cl) - (inst and result ,(1- (ash 1 bits))))) + (:note "inline array access") + (:translate data-vector-ref) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg)) + (index :scs (unsigned-reg))) + (:arg-types ,type positive-fixnum) + (:results (result :scs (unsigned-reg) :from (:argument 0))) + (:result-types positive-fixnum) + (:temporary (:sc unsigned-reg :offset ecx-offset) ecx) + (:generator 20 + (move ecx index) + (inst shr ecx ,bit-shift) + (inst mov result + (make-ea :qword :base object :index ecx :scale n-word-bytes + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag))) + (move ecx index) + ;; We used to mask ECX for all values of BITS, but since + ;; Intel's documentation says that the chip will mask shift + ;; and rotate counts by 63 automatically, we can safely move + ;; the masking operation under the protection of this UNLESS + ;; in the bit-vector case. --njf, 2006-07-14 + ,@(unless (= bits 1) + `((inst and ecx ,(1- elements-per-word)) + (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) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg))) - (:arg-types ,type (:constant low-index)) - (:info index) - (:results (result :scs (unsigned-reg))) - (:result-types positive-fixnum) - (:generator 15 - (multiple-value-bind (word extra) (floor index ,elements-per-word) - (loadw result object (+ word vector-data-offset) - other-pointer-lowtag) - (unless (zerop extra) - (inst shr result (* extra ,bits))) - (unless (= extra ,(1- elements-per-word)) - (inst and result ,(1- (ash 1 bits))))))) + (:translate data-vector-ref) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg))) + (:arg-types ,type (:constant low-index)) + (:info index) + (:results (result :scs (unsigned-reg))) + (:result-types positive-fixnum) + (:generator 15 + (multiple-value-bind (word extra) (floor index ,elements-per-word) + (loadw result object (+ word vector-data-offset) + other-pointer-lowtag) + (unless (zerop extra) + (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)) - (:note "inline array store") - (:translate data-vector-set) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg) :target ptr) - (index :scs (unsigned-reg) :target ecx) - (value :scs (unsigned-reg immediate) :target result)) - (:arg-types ,type positive-fixnum positive-fixnum) - (:results (result :scs (unsigned-reg))) - (:result-types positive-fixnum) - (:temporary (:sc unsigned-reg) word-index) - (:temporary (:sc unsigned-reg :from (:argument 0)) ptr old) - (:temporary (:sc unsigned-reg :offset ecx-offset :from (:argument 1)) - ecx) - (:generator 25 - (move word-index index) - (inst shr word-index ,bit-shift) - (inst lea ptr - (make-ea :qword :base object :index word-index - :scale n-word-bytes - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag))) - (loadw old ptr) - (move ecx index) - (inst and ecx ,(1- elements-per-word)) - ,@(unless (= bits 1) - `((inst shl ecx ,(1- (integer-length bits))))) - (inst ror old :cl) - (unless (and (sc-is value immediate) - (= (tn-value value) ,(1- (ash 1 bits)))) - (inst and old ,(lognot (1- (ash 1 bits))))) - (sc-case value - (immediate - (unless (zerop (tn-value value)) - (inst or old (logand (tn-value value) ,(1- (ash 1 bits)))))) - (unsigned-reg - (inst or old value))) - (inst rol old :cl) - (storew old ptr) - (sc-case value - (immediate - (inst mov result (tn-value value))) - (unsigned-reg - (move result value))))) + (:note "inline array store") + (:translate data-vector-set) + (: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) + (: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 + (move word-index index) + (inst shr word-index ,bit-shift) + (inst mov old + (make-ea :qword :base object :index word-index + :scale n-word-bytes + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag))) + (move ecx index) + ;; We used to mask ECX for all values of BITS, but since + ;; Intel's documentation says that the chip will mask shift + ;; and rotate counts by 63 automatically, we can safely move + ;; the masking operation under the protection of this UNLESS + ;; in the bit-vector case. --njf, 2006-07-14 + ,@(unless (= bits 1) + `((inst and ecx ,(1- elements-per-word)) + (inst shl ecx ,(1- (integer-length bits))))) + (inst ror old :cl) + (unless (and (sc-is value immediate) + (= (tn-value value) ,(1- (ash 1 bits)))) + (inst and old ,(lognot (1- (ash 1 bits))))) + (sc-case value + (immediate + (unless (zerop (tn-value value)) + (inst or old (logand (tn-value value) ,(1- (ash 1 bits)))))) + (unsigned-reg + (inst or old value))) + (inst rol old :cl) + (inst mov (make-ea :qword :base object :index word-index + :scale n-word-bytes + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag)) + old) + (sc-case value + (immediate + (inst mov result (tn-value value))) + (unsigned-reg + (move result value))))) (define-vop (,(symbolicate 'data-vector-set-c/ type)) - (:translate data-vector-set) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg)) - (value :scs (unsigned-reg immediate) :target result)) - (:arg-types ,type (:constant low-index) positive-fixnum) - (:temporary (:sc unsigned-reg) mask-tn) - (:info index) - (:results (result :scs (unsigned-reg))) - (:result-types positive-fixnum) - (:temporary (:sc unsigned-reg :to (:result 0)) old) - (:generator 20 - (multiple-value-bind (word extra) (floor index ,elements-per-word) - (inst mov old - (make-ea :qword :base object - :disp (- (* (+ word vector-data-offset) - n-word-bytes) - other-pointer-lowtag))) - (sc-case value - (immediate - (let* ((value (tn-value value)) - (mask ,(1- (ash 1 bits))) - (shift (* extra ,bits))) - (unless (= value mask) - (inst mov mask-tn (ldb (byte 64 0) - (lognot (ash mask shift)))) - (inst and old mask-tn)) - (unless (zerop value) - (inst mov mask-tn (ash value shift)) - (inst or old mask-tn)))) - (unsigned-reg - (let ((shift (* extra ,bits))) - (unless (zerop shift) - (inst ror old shift)) - (inst mov mask-tn (lognot ,(1- (ash 1 bits)))) + (:translate data-vector-set) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg)) + (value :scs (unsigned-reg immediate) :target result)) + (:arg-types ,type (:constant low-index) positive-fixnum) + (:temporary (:sc unsigned-reg) mask-tn) + (:info index) + (:results (result :scs (unsigned-reg))) + (:result-types positive-fixnum) + (:temporary (:sc unsigned-reg :to (:result 0)) old) + (:generator 20 + (multiple-value-bind (word extra) (floor index ,elements-per-word) + (inst mov old + (make-ea :qword :base object + :disp (- (* (+ word vector-data-offset) + n-word-bytes) + other-pointer-lowtag))) + (sc-case value + (immediate + (let* ((value (tn-value value)) + (mask ,(1- (ash 1 bits))) + (shift (* extra ,bits))) + (unless (= value mask) + (inst mov mask-tn (ldb (byte 64 0) + (lognot (ash mask shift)))) + (inst and old mask-tn)) + (unless (zerop value) + (inst mov mask-tn (ash value shift)) + (inst or old mask-tn)))) + (unsigned-reg + (let ((shift (* extra ,bits))) + (unless (zerop shift) + (inst ror old shift)) + (inst mov mask-tn (lognot ,(1- (ash 1 bits)))) (inst and old mask-tn) (inst or old value) - (unless (zerop shift) + (unless (zerop shift) (inst rol old shift))))) - (inst mov (make-ea :qword :base object - :disp (- (* (+ word vector-data-offset) - n-word-bytes) - other-pointer-lowtag)) - old) - (sc-case value - (immediate - (inst mov result (tn-value value))) - (unsigned-reg - (move result value)))))))))) + (inst mov (make-ea :qword :base object + :disp (- (* (+ word vector-data-offset) + n-word-bytes) + other-pointer-lowtag)) + old) + (sc-case value + (immediate + (inst mov result (tn-value value))) + (unsigned-reg + (move result value)))))))))) (def-small-data-vector-frobs simple-bit-vector 1) (def-small-data-vector-frobs simple-array-unsigned-byte-2 2) (def-small-data-vector-frobs simple-array-unsigned-byte-4 4)) @@ -304,7 +316,7 @@ (:translate data-vector-ref) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg))) + (index :scs (any-reg))) (:arg-types simple-array-single-float positive-fixnum) (:temporary (:sc unsigned-reg) dword-index) (:results (value :scs (single-reg))) @@ -313,9 +325,9 @@ (move dword-index index) (inst shr dword-index 1) (inst movss value (make-ea :dword :base object :index dword-index - :disp (- (* vector-data-offset - n-word-bytes) - other-pointer-lowtag))))) + :disp (- (* vector-data-offset + n-word-bytes) + other-pointer-lowtag))))) (define-vop (data-vector-ref-c/simple-array-single-float) (:note "inline array access") @@ -328,18 +340,18 @@ (:result-types single-float) (:generator 4 (inst movss value (make-ea :dword :base object - :disp (- (+ (* vector-data-offset - n-word-bytes) - (* 4 index)) - other-pointer-lowtag))))) + :disp (- (+ (* vector-data-offset + n-word-bytes) + (* 4 index)) + other-pointer-lowtag))))) (define-vop (data-vector-set/simple-array-single-float) (:note "inline array store") (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg)) - (value :scs (single-reg) :target result)) + (index :scs (any-reg)) + (value :scs (single-reg) :target result)) (:arg-types simple-array-single-float positive-fixnum single-float) (:temporary (:sc unsigned-reg) dword-index) (:results (result :scs (single-reg))) @@ -348,10 +360,10 @@ (move dword-index index) (inst shr dword-index 1) (inst movss (make-ea :dword :base object :index dword-index - :disp (- (* vector-data-offset - n-word-bytes) - other-pointer-lowtag)) - value) + :disp (- (* vector-data-offset + n-word-bytes) + other-pointer-lowtag)) + value) (unless (location= result value) (inst movss result value)))) @@ -360,19 +372,19 @@ (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (value :scs (single-reg) :target result)) + (value :scs (single-reg) :target result)) (:info index) (:arg-types simple-array-single-float (:constant low-index) - single-float) + single-float) (:results (result :scs (single-reg))) (:result-types single-float) (:generator 4 (inst movss (make-ea :dword :base object - :disp (- (+ (* vector-data-offset - n-word-bytes) - (* 4 index)) - other-pointer-lowtag)) - value) + :disp (- (+ (* vector-data-offset + n-word-bytes) + (* 4 index)) + other-pointer-lowtag)) + value) (unless (location= result value) (inst movss result value)))) @@ -381,15 +393,15 @@ (:translate data-vector-ref) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg))) + (index :scs (any-reg))) (:arg-types simple-array-double-float positive-fixnum) (:results (value :scs (double-reg))) (:result-types double-float) (:generator 7 (inst movsd value (make-ea :qword :base object :index index :scale 1 - :disp (- (* vector-data-offset - n-word-bytes) - other-pointer-lowtag))))) + :disp (- (* vector-data-offset + n-word-bytes) + other-pointer-lowtag))))) (define-vop (data-vector-ref-c/simple-array-double-float) (:note "inline array access") @@ -402,27 +414,27 @@ (:result-types double-float) (:generator 6 (inst movsd value (make-ea :qword :base object - :disp (- (+ (* vector-data-offset - n-word-bytes) - (* 8 index)) - other-pointer-lowtag))))) + :disp (- (+ (* vector-data-offset + n-word-bytes) + (* 8 index)) + other-pointer-lowtag))))) (define-vop (data-vector-set/simple-array-double-float) (:note "inline array store") (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg)) - (value :scs (double-reg) :target result)) + (index :scs (any-reg)) + (value :scs (double-reg) :target result)) (:arg-types simple-array-double-float positive-fixnum double-float) (:results (result :scs (double-reg))) (:result-types double-float) (:generator 20 (inst movsd (make-ea :qword :base object :index index :scale 1 - :disp (- (* vector-data-offset - n-word-bytes) - other-pointer-lowtag)) - value) + :disp (- (* vector-data-offset + n-word-bytes) + other-pointer-lowtag)) + value) (unless (location= result value) (inst movsd result value)))) @@ -431,19 +443,19 @@ (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (value :scs (double-reg) :target result)) + (value :scs (double-reg) :target result)) (:info index) (:arg-types simple-array-double-float (:constant low-index) - double-float) + double-float) (:results (result :scs (double-reg))) (:result-types double-float) (:generator 19 (inst movsd (make-ea :qword :base object - :disp (- (+ (* vector-data-offset - n-word-bytes) - (* 8 index)) - other-pointer-lowtag)) - value) + :disp (- (+ (* vector-data-offset + n-word-bytes) + (* 8 index)) + other-pointer-lowtag)) + value) (unless (location= result value) (inst movsd result value)))) @@ -455,22 +467,22 @@ (:translate data-vector-ref) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg))) + (index :scs (any-reg))) (:arg-types simple-array-complex-single-float positive-fixnum) (:results (value :scs (complex-single-reg))) (:result-types complex-single-float) (:generator 5 (let ((real-tn (complex-single-reg-real-tn value))) (inst movss real-tn (make-ea :dword :base object :index index - :disp (- (* vector-data-offset - n-word-bytes) - other-pointer-lowtag)))) + :disp (- (* vector-data-offset + n-word-bytes) + other-pointer-lowtag)))) (let ((imag-tn (complex-single-reg-imag-tn value))) (inst movss imag-tn (make-ea :dword :base object :index index - :disp (- (+ (* vector-data-offset - n-word-bytes) - 4) - other-pointer-lowtag)))))) + :disp (- (+ (* vector-data-offset + n-word-bytes) + 4) + other-pointer-lowtag)))))) (define-vop (data-vector-ref-c/simple-array-complex-single-float) (:note "inline array access") @@ -484,103 +496,103 @@ (:generator 4 (let ((real-tn (complex-single-reg-real-tn value))) (inst movss real-tn (make-ea :dword :base object - :disp (- (+ (* vector-data-offset - n-word-bytes) - (* 8 index)) - other-pointer-lowtag)))) + :disp (- (+ (* vector-data-offset + n-word-bytes) + (* 8 index)) + other-pointer-lowtag)))) (let ((imag-tn (complex-single-reg-imag-tn value))) (inst movss imag-tn (make-ea :dword :base object - :disp (- (+ (* vector-data-offset - n-word-bytes) - (* 8 index) 4) - other-pointer-lowtag)))))) + :disp (- (+ (* vector-data-offset + n-word-bytes) + (* 8 index) 4) + other-pointer-lowtag)))))) (define-vop (data-vector-set/simple-array-complex-single-float) (:note "inline array store") (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg)) - (value :scs (complex-single-reg) :target result)) + (index :scs (any-reg)) + (value :scs (complex-single-reg) :target result)) (:arg-types simple-array-complex-single-float positive-fixnum - complex-single-float) + complex-single-float) (:results (result :scs (complex-single-reg))) (:result-types complex-single-float) (:generator 5 (let ((value-real (complex-single-reg-real-tn value)) - (result-real (complex-single-reg-real-tn result))) + (result-real (complex-single-reg-real-tn result))) (inst movss (make-ea :dword :base object :index index - :disp (- (* vector-data-offset - n-word-bytes) - other-pointer-lowtag)) - value-real) + :disp (- (* vector-data-offset + n-word-bytes) + other-pointer-lowtag)) + value-real) (unless (location= value-real result-real) - (inst movss result-real value-real))) + (inst movss result-real value-real))) (let ((value-imag (complex-single-reg-imag-tn value)) - (result-imag (complex-single-reg-imag-tn result))) + (result-imag (complex-single-reg-imag-tn result))) (inst movss (make-ea :dword :base object :index index - :disp (- (+ (* vector-data-offset - n-word-bytes) - 4) - other-pointer-lowtag)) - value-imag) + :disp (- (+ (* vector-data-offset + n-word-bytes) + 4) + other-pointer-lowtag)) + value-imag) (unless (location= value-imag result-imag) - (inst movss result-imag value-imag))))) + (inst movss result-imag value-imag))))) (define-vop (data-vector-set-c/simple-array-complex-single-float) (:note "inline array store") (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (value :scs (complex-single-reg) :target result)) + (value :scs (complex-single-reg) :target result)) (:info index) (:arg-types simple-array-complex-single-float (:constant low-index) - complex-single-float) + complex-single-float) (:results (result :scs (complex-single-reg))) (:result-types complex-single-float) (:generator 4 (let ((value-real (complex-single-reg-real-tn value)) - (result-real (complex-single-reg-real-tn result))) + (result-real (complex-single-reg-real-tn result))) (inst movss (make-ea :dword :base object - :disp (- (+ (* vector-data-offset - n-word-bytes) - (* 8 index)) - other-pointer-lowtag)) - value-real) + :disp (- (+ (* vector-data-offset + n-word-bytes) + (* 8 index)) + other-pointer-lowtag)) + value-real) (unless (location= value-real result-real) - (inst movss result-real value-real))) + (inst movss result-real value-real))) (let ((value-imag (complex-single-reg-imag-tn value)) - (result-imag (complex-single-reg-imag-tn result))) + (result-imag (complex-single-reg-imag-tn result))) (inst movss (make-ea :dword :base object - :disp (- (+ (* vector-data-offset - n-word-bytes) - (* 8 index) 4) - other-pointer-lowtag)) - value-imag) + :disp (- (+ (* vector-data-offset + n-word-bytes) + (* 8 index) 4) + other-pointer-lowtag)) + value-imag) (unless (location= value-imag result-imag) - (inst movss result-imag value-imag))))) + (inst movss result-imag value-imag))))) (define-vop (data-vector-ref/simple-array-complex-double-float) (:note "inline array access") (:translate data-vector-ref) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg))) + (index :scs (any-reg))) (:arg-types simple-array-complex-double-float positive-fixnum) (:results (value :scs (complex-double-reg))) (:result-types complex-double-float) (:generator 7 (let ((real-tn (complex-double-reg-real-tn value))) (inst movsd real-tn (make-ea :dword :base object :index index :scale 2 - :disp (- (* vector-data-offset - n-word-bytes) - other-pointer-lowtag)))) + :disp (- (* vector-data-offset + n-word-bytes) + other-pointer-lowtag)))) (let ((imag-tn (complex-double-reg-imag-tn value))) (inst movsd imag-tn (make-ea :dword :base object :index index :scale 2 - :disp (- (+ (* vector-data-offset - n-word-bytes) - 8) - other-pointer-lowtag)))))) + :disp (- (+ (* vector-data-offset + n-word-bytes) + 8) + other-pointer-lowtag)))))) (define-vop (data-vector-ref-c/simple-array-complex-double-float) (:note "inline array access") @@ -593,82 +605,82 @@ (:result-types complex-double-float) (:generator 6 (let ((real-tn (complex-double-reg-real-tn value))) - (inst movsd real-tn (make-ea :qword :base object - :disp (- (+ (* vector-data-offset - n-word-bytes) - (* 16 index)) - other-pointer-lowtag)))) + (inst movsd real-tn (make-ea :qword :base object + :disp (- (+ (* vector-data-offset + n-word-bytes) + (* 16 index)) + other-pointer-lowtag)))) (let ((imag-tn (complex-double-reg-imag-tn value))) (inst movsd imag-tn (make-ea :qword :base object - :disp (- (+ (* vector-data-offset - n-word-bytes) - (* 16 index) 8) - other-pointer-lowtag)))))) + :disp (- (+ (* vector-data-offset + n-word-bytes) + (* 16 index) 8) + other-pointer-lowtag)))))) (define-vop (data-vector-set/simple-array-complex-double-float) (:note "inline array store") (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (any-reg)) - (value :scs (complex-double-reg) :target result)) + (index :scs (any-reg)) + (value :scs (complex-double-reg) :target result)) (:arg-types simple-array-complex-double-float positive-fixnum - complex-double-float) + complex-double-float) (:results (result :scs (complex-double-reg))) (:result-types complex-double-float) (:generator 20 (let ((value-real (complex-double-reg-real-tn value)) - (result-real (complex-double-reg-real-tn result))) + (result-real (complex-double-reg-real-tn result))) (inst movsd (make-ea :qword :base object :index index :scale 2 - :disp (- (* vector-data-offset - n-word-bytes) - other-pointer-lowtag)) - value-real) + :disp (- (* vector-data-offset + n-word-bytes) + other-pointer-lowtag)) + value-real) (unless (location= value-real result-real) - (inst movsd result-real value-real))) + (inst movsd result-real value-real))) (let ((value-imag (complex-double-reg-imag-tn value)) - (result-imag (complex-double-reg-imag-tn result))) + (result-imag (complex-double-reg-imag-tn result))) (inst movsd (make-ea :qword :base object :index index :scale 2 - :disp (- (+ (* vector-data-offset - n-word-bytes) - 8) - other-pointer-lowtag)) - value-imag) + :disp (- (+ (* vector-data-offset + n-word-bytes) + 8) + other-pointer-lowtag)) + value-imag) (unless (location= value-imag result-imag) - (inst movsd result-imag value-imag))))) + (inst movsd result-imag value-imag))))) (define-vop (data-vector-set-c/simple-array-complex-double-float) (:note "inline array store") (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (value :scs (complex-double-reg) :target result)) + (value :scs (complex-double-reg) :target result)) (:info index) (:arg-types simple-array-complex-double-float (:constant low-index) - complex-double-float) + complex-double-float) (:results (result :scs (complex-double-reg))) (:result-types complex-double-float) (:generator 19 (let ((value-real (complex-double-reg-real-tn value)) - (result-real (complex-double-reg-real-tn result))) + (result-real (complex-double-reg-real-tn result))) (inst movsd (make-ea :qword :base object - :disp (- (+ (* vector-data-offset - n-word-bytes) - (* 16 index)) - other-pointer-lowtag)) - value-real) + :disp (- (+ (* vector-data-offset + n-word-bytes) + (* 16 index)) + other-pointer-lowtag)) + value-real) (unless (location= value-real result-real) - (inst movsd result-real value-real))) + (inst movsd result-real value-real))) (let ((value-imag (complex-double-reg-imag-tn value)) - (result-imag (complex-double-reg-imag-tn result))) + (result-imag (complex-double-reg-imag-tn result))) (inst movsd (make-ea :qword :base object - :disp (- (+ (* vector-data-offset - n-word-bytes) - (* 16 index) 8) - other-pointer-lowtag)) - value-imag) + :disp (- (+ (* vector-data-offset + n-word-bytes) + (* 16 index) 8) + other-pointer-lowtag)) + value-imag) (unless (location= value-imag result-imag) - (inst movsd result-imag value-imag))))) + (inst movsd result-imag value-imag))))) @@ -684,10 +696,10 @@ (:results (value :scs (unsigned-reg signed-reg))) (:result-types positive-fixnum) (:generator 5 - (inst movzx value - (make-ea :byte :base object :index index :scale 1 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag))))) + (inst movzx value + (make-ea :byte :base object :index index :scale 1 + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag))))) (define-vop (,(symbolicate "DATA-VECTOR-REF-C/" ptype)) (:translate data-vector-ref) (:policy :fast-safe) @@ -697,49 +709,49 @@ (:results (value :scs (unsigned-reg signed-reg))) (:result-types positive-fixnum) (:generator 4 - (inst movzx value - (make-ea :byte :base object - :disp (- (+ (* vector-data-offset n-word-bytes) index) - other-pointer-lowtag))))) + (inst movzx value + (make-ea :byte :base object + :disp (- (+ (* vector-data-offset n-word-bytes) index) + other-pointer-lowtag))))) (define-vop (,(symbolicate "DATA-VECTOR-SET/" ptype)) (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) - (index :scs (unsigned-reg) :to (:eval 0)) - (value :scs (unsigned-reg signed-reg) :target eax)) + (index :scs (unsigned-reg) :to (:eval 0)) + (value :scs (unsigned-reg signed-reg) :target eax)) (:arg-types ,ptype positive-fixnum positive-fixnum) (:temporary (:sc unsigned-reg :offset eax-offset :target result - :from (:argument 2) :to (:result 0)) - eax) + :from (:argument 2) :to (:result 0)) + eax) (:results (result :scs (unsigned-reg signed-reg))) (:result-types positive-fixnum) (:generator 5 - (move eax value) - (inst mov (make-ea :byte :base object :index index :scale 1 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag)) - al-tn) - (move result eax))) + (move eax value) + (inst mov (make-ea :byte :base object :index index :scale 1 + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag)) + al-tn) + (move result eax))) (define-vop (,(symbolicate "DATA-VECTOR-SET-C/" ptype)) (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) - (value :scs (unsigned-reg signed-reg) :target eax)) + (value :scs (unsigned-reg signed-reg) :target eax)) (:info index) (:arg-types ,ptype (:constant low-index) - positive-fixnum) + positive-fixnum) (:temporary (:sc unsigned-reg :offset eax-offset :target result - :from (:argument 1) :to (:result 0)) - eax) + :from (:argument 1) :to (:result 0)) + eax) (:results (result :scs (unsigned-reg signed-reg))) (:result-types positive-fixnum) (:generator 4 - (move eax value) - (inst mov (make-ea :byte :base object - :disp (- (+ (* vector-data-offset n-word-bytes) index) - other-pointer-lowtag)) - al-tn) - (move result eax)))))) + (move eax value) + (inst mov (make-ea :byte :base object + :disp (- (+ (* vector-data-offset n-word-bytes) index) + other-pointer-lowtag)) + al-tn) + (move result eax)))))) (define-data-vector-frobs simple-array-unsigned-byte-7) (define-data-vector-frobs simple-array-unsigned-byte-8)) @@ -747,145 +759,145 @@ (macrolet ((define-data-vector-frobs (ptype) `(progn (define-vop (,(symbolicate "DATA-VECTOR-REF/" ptype)) - (:translate data-vector-ref) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg)) - (index :scs (unsigned-reg))) - (:arg-types ,ptype positive-fixnum) - (:results (value :scs (unsigned-reg signed-reg))) - (:result-types positive-fixnum) - (:generator 5 - (inst movzx value - (make-ea :word :base object :index index :scale 2 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag))))) + (:translate data-vector-ref) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg)) + (index :scs (unsigned-reg))) + (:arg-types ,ptype positive-fixnum) + (:results (value :scs (unsigned-reg signed-reg))) + (:result-types positive-fixnum) + (:generator 5 + (inst movzx value + (make-ea :word :base object :index index :scale 2 + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag))))) (define-vop (,(symbolicate "DATA-VECTOR-REF-C/" ptype)) - (:translate data-vector-ref) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg))) - (:info index) - (:arg-types ,ptype (:constant low-index)) - (:results (value :scs (unsigned-reg signed-reg))) - (:result-types positive-fixnum) - (:generator 4 - (inst movzx value - (make-ea :word :base object - :disp (- (+ (* vector-data-offset n-word-bytes) (* 2 index)) - other-pointer-lowtag))))) + (:translate data-vector-ref) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg))) + (:info index) + (:arg-types ,ptype (:constant low-index)) + (:results (value :scs (unsigned-reg signed-reg))) + (:result-types positive-fixnum) + (:generator 4 + (inst movzx value + (make-ea :word :base object + :disp (- (+ (* vector-data-offset n-word-bytes) (* 2 index)) + other-pointer-lowtag))))) (define-vop (,(symbolicate "DATA-VECTOR-SET/" ptype)) - (:translate data-vector-set) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg) :to (:eval 0)) - (index :scs (unsigned-reg) :to (:eval 0)) - (value :scs (unsigned-reg signed-reg) :target eax)) - (:arg-types ,ptype positive-fixnum positive-fixnum) - (:temporary (:sc unsigned-reg :offset eax-offset :target result - :from (:argument 2) :to (:result 0)) - eax) - (:results (result :scs (unsigned-reg signed-reg))) - (:result-types positive-fixnum) - (:generator 5 - (move eax value) - (inst mov (make-ea :word :base object :index index :scale 2 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag)) - ax-tn) - (move result eax))) + (:translate data-vector-set) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg) :to (:eval 0)) + (index :scs (unsigned-reg) :to (:eval 0)) + (value :scs (unsigned-reg signed-reg) :target eax)) + (:arg-types ,ptype positive-fixnum positive-fixnum) + (:temporary (:sc unsigned-reg :offset eax-offset :target result + :from (:argument 2) :to (:result 0)) + eax) + (:results (result :scs (unsigned-reg signed-reg))) + (:result-types positive-fixnum) + (:generator 5 + (move eax value) + (inst mov (make-ea :word :base object :index index :scale 2 + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag)) + ax-tn) + (move result eax))) (define-vop (,(symbolicate "DATA-VECTOR-SET-C/" ptype)) - (:translate data-vector-set) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg) :to (:eval 0)) - (value :scs (unsigned-reg signed-reg) :target eax)) - (:info index) - (:arg-types ,ptype (:constant low-index) - positive-fixnum) - (:temporary (:sc unsigned-reg :offset eax-offset :target result - :from (:argument 1) :to (:result 0)) - eax) - (:results (result :scs (unsigned-reg signed-reg))) - (:result-types positive-fixnum) - (:generator 4 - (move eax value) - (inst mov (make-ea :word :base object - :disp (- (+ (* vector-data-offset n-word-bytes) - (* 2 index)) - other-pointer-lowtag)) - ax-tn) - (move result eax)))))) + (:translate data-vector-set) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg) :to (:eval 0)) + (value :scs (unsigned-reg signed-reg) :target eax)) + (:info index) + (:arg-types ,ptype (:constant low-index) + positive-fixnum) + (:temporary (:sc unsigned-reg :offset eax-offset :target result + :from (:argument 1) :to (:result 0)) + eax) + (:results (result :scs (unsigned-reg signed-reg))) + (:result-types positive-fixnum) + (:generator 4 + (move eax value) + (inst mov (make-ea :word :base object + :disp (- (+ (* vector-data-offset n-word-bytes) + (* 2 index)) + other-pointer-lowtag)) + ax-tn) + (move result eax)))))) (define-data-vector-frobs simple-array-unsigned-byte-15) (define-data-vector-frobs simple-array-unsigned-byte-16)) (macrolet ((define-data-vector-frobs (ptype) `(progn (define-vop (,(symbolicate "DATA-VECTOR-REF/" ptype)) - (:translate data-vector-ref) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg)) - (index :scs (unsigned-reg))) - (:arg-types ,ptype positive-fixnum) - (:results (value :scs (unsigned-reg signed-reg))) - (:result-types positive-fixnum) - (:generator 5 - (inst movzxd value - (make-ea :dword :base object :index index :scale 4 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag))))) + (:translate data-vector-ref) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg)) + (index :scs (unsigned-reg))) + (:arg-types ,ptype positive-fixnum) + (:results (value :scs (unsigned-reg signed-reg))) + (:result-types positive-fixnum) + (:generator 5 + (inst movzxd value + (make-ea :dword :base object :index index :scale 4 + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag))))) (define-vop (,(symbolicate "DATA-VECTOR-REF-C/" ptype)) - (:translate data-vector-ref) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg))) - (:info index) - (:arg-types ,ptype (:constant low-index)) - (:results (value :scs (unsigned-reg signed-reg))) - (:result-types positive-fixnum) - (:generator 4 - (inst movzxd value - (make-ea :dword :base object - :disp (- (+ (* vector-data-offset n-word-bytes) - (* 4 index)) - other-pointer-lowtag))))) + (:translate data-vector-ref) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg))) + (:info index) + (:arg-types ,ptype (:constant low-index)) + (:results (value :scs (unsigned-reg signed-reg))) + (:result-types positive-fixnum) + (:generator 4 + (inst movzxd value + (make-ea :dword :base object + :disp (- (+ (* vector-data-offset n-word-bytes) + (* 4 index)) + other-pointer-lowtag))))) (define-vop (,(symbolicate "DATA-VECTOR-SET/" ptype)) - (:translate data-vector-set) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg) :to (:eval 0)) - (index :scs (unsigned-reg) :to (:eval 0)) - (value :scs (unsigned-reg signed-reg) :target rax)) - (:arg-types ,ptype positive-fixnum positive-fixnum) - (:temporary (:sc unsigned-reg :offset rax-offset :target result - :from (:argument 2) :to (:result 0)) - rax) - (:results (result :scs (unsigned-reg signed-reg))) - (:result-types positive-fixnum) - (:generator 5 - (move rax value) - (inst mov (make-ea :dword :base object :index index :scale 4 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag)) - eax-tn) - (move result rax))) + (:translate data-vector-set) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg) :to (:eval 0)) + (index :scs (unsigned-reg) :to (:eval 0)) + (value :scs (unsigned-reg signed-reg) :target rax)) + (:arg-types ,ptype positive-fixnum positive-fixnum) + (:temporary (:sc unsigned-reg :offset rax-offset :target result + :from (:argument 2) :to (:result 0)) + rax) + (:results (result :scs (unsigned-reg signed-reg))) + (:result-types positive-fixnum) + (:generator 5 + (move rax value) + (inst mov (make-ea :dword :base object :index index :scale 4 + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag)) + eax-tn) + (move result rax))) (define-vop (,(symbolicate "DATA-VECTOR-SET-C/" ptype)) - (:translate data-vector-set) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg) :to (:eval 0)) - (value :scs (unsigned-reg signed-reg) :target rax)) - (:info index) - (:arg-types ,ptype (:constant low-index) - positive-fixnum) - (:temporary (:sc unsigned-reg :offset rax-offset :target result - :from (:argument 1) :to (:result 0)) - rax) - (:results (result :scs (unsigned-reg signed-reg))) - (:result-types positive-fixnum) - (:generator 4 - (move rax value) - (inst mov (make-ea :dword :base object - :disp (- (+ (* vector-data-offset n-word-bytes) - (* 4 index)) - other-pointer-lowtag)) - eax-tn) - (move result rax)))))) + (:translate data-vector-set) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg) :to (:eval 0)) + (value :scs (unsigned-reg signed-reg) :target rax)) + (:info index) + (:arg-types ,ptype (:constant low-index) + positive-fixnum) + (:temporary (:sc unsigned-reg :offset rax-offset :target result + :from (:argument 1) :to (:result 0)) + rax) + (:results (result :scs (unsigned-reg signed-reg))) + (:result-types positive-fixnum) + (:generator 4 + (move rax value) + (inst mov (make-ea :dword :base object + :disp (- (+ (* vector-data-offset n-word-bytes) + (* 4 index)) + other-pointer-lowtag)) + eax-tn) + (move result rax)))))) (define-data-vector-frobs simple-array-unsigned-byte-32) (define-data-vector-frobs simple-array-unsigned-byte-31)) @@ -897,15 +909,15 @@ (:translate data-vector-ref) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (unsigned-reg))) + (index :scs (unsigned-reg))) (:arg-types simple-base-string positive-fixnum) (:results (value :scs (character-reg))) (:result-types character) (:generator 5 (inst movzx value - (make-ea :byte :base object :index index :scale 1 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag))))) + (make-ea :byte :base object :index index :scale 1 + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag))))) (define-vop (data-vector-ref-c/simple-base-string) (:translate data-vector-ref) @@ -917,9 +929,9 @@ (:result-types character) (:generator 4 (inst movzx value - (make-ea :byte :base object - :disp (- (+ (* vector-data-offset n-word-bytes) index) - other-pointer-lowtag))))) + (make-ea :byte :base object + :disp (- (+ (* vector-data-offset n-word-bytes) index) + other-pointer-lowtag))))) (define-vop (data-vector-set/simple-base-string) (:translate data-vector-set) @@ -969,15 +981,15 @@ (:translate data-vector-ref) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (unsigned-reg))) + (index :scs (unsigned-reg))) (:arg-types simple-base-string positive-fixnum) (:results (value :scs (character-reg))) (:result-types character) (:generator 5 (inst mov value - (make-ea :byte :base object :index index :scale 1 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag))))) + (make-ea :byte :base object :index index :scale 1 + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag))))) (define-vop (data-vector-ref-c/simple-base-string) (:translate data-vector-ref) @@ -989,40 +1001,40 @@ (:result-types character) (:generator 4 (inst mov value - (make-ea :byte :base object - :disp (- (+ (* vector-data-offset n-word-bytes) index) - other-pointer-lowtag))))) + (make-ea :byte :base object + :disp (- (+ (* vector-data-offset n-word-bytes) index) + other-pointer-lowtag))))) (define-vop (data-vector-set/simple-base-string) (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) - (index :scs (unsigned-reg) :to (:eval 0)) - (value :scs (character-reg) :target result)) + (index :scs (unsigned-reg) :to (:eval 0)) + (value :scs (character-reg) :target result)) (:arg-types simple-base-string positive-fixnum character) (:results (result :scs (character-reg))) (:result-types character) (:generator 5 (inst mov (make-ea :byte :base object :index index :scale 1 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag)) - value) + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag)) + value) (move result value))) (define-vop (data-vector-set-c/simple-base-string) (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) - (value :scs (character-reg))) + (value :scs (character-reg))) (:info index) (:arg-types simple-base-string (:constant low-index) character) (:results (result :scs (character-reg))) (:result-types character) (:generator 4 (inst mov (make-ea :byte :base object - :disp (- (+ (* vector-data-offset n-word-bytes) index) - other-pointer-lowtag)) - value) + :disp (- (+ (* vector-data-offset n-word-bytes) index) + other-pointer-lowtag)) + value) (move result value))) ) ; PROGN @@ -1030,72 +1042,72 @@ (macrolet ((define-data-vector-frobs (ptype) `(progn (define-vop (,(symbolicate "DATA-VECTOR-REF/" ptype)) - (:translate data-vector-ref) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg)) - (index :scs (unsigned-reg))) - (:arg-types ,ptype positive-fixnum) - (:results (value :scs (character-reg))) - (:result-types character) - (:generator 5 - (inst movzxd value - (make-ea :dword :base object :index index :scale 4 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag))))) + (:translate data-vector-ref) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg)) + (index :scs (unsigned-reg))) + (:arg-types ,ptype positive-fixnum) + (:results (value :scs (character-reg))) + (:result-types character) + (:generator 5 + (inst movzxd value + (make-ea :dword :base object :index index :scale 4 + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag))))) (define-vop (,(symbolicate "DATA-VECTOR-REF-C/" ptype)) - (:translate data-vector-ref) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg))) - (:info index) - (:arg-types ,ptype (:constant low-index)) - (:results (value :scs (character-reg))) - (:result-types character) - (:generator 4 - (inst movzxd value - (make-ea :dword :base object - :disp (- (+ (* vector-data-offset n-word-bytes) - (* 4 index)) - other-pointer-lowtag))))) + (:translate data-vector-ref) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg))) + (:info index) + (:arg-types ,ptype (:constant low-index)) + (:results (value :scs (character-reg))) + (:result-types character) + (:generator 4 + (inst movzxd value + (make-ea :dword :base object + :disp (- (+ (* vector-data-offset n-word-bytes) + (* 4 index)) + other-pointer-lowtag))))) (define-vop (,(symbolicate "DATA-VECTOR-SET/" ptype)) - (:translate data-vector-set) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg) :to (:eval 0)) - (index :scs (unsigned-reg) :to (:eval 0)) - (value :scs (character-reg) :target rax)) - (:arg-types ,ptype positive-fixnum character) - (:temporary (:sc character-reg :offset rax-offset :target result - :from (:argument 2) :to (:result 0)) - rax) - (:results (result :scs (character-reg))) - (:result-types character) - (:generator 5 - (move rax value) - (inst mov (make-ea :dword :base object :index index :scale 4 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag)) - eax-tn) - (move result rax))) + (:translate data-vector-set) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg) :to (:eval 0)) + (index :scs (unsigned-reg) :to (:eval 0)) + (value :scs (character-reg) :target rax)) + (:arg-types ,ptype positive-fixnum character) + (:temporary (:sc character-reg :offset rax-offset :target result + :from (:argument 2) :to (:result 0)) + rax) + (:results (result :scs (character-reg))) + (:result-types character) + (:generator 5 + (move rax value) + (inst mov (make-ea :dword :base object :index index :scale 4 + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag)) + eax-tn) + (move result rax))) (define-vop (,(symbolicate "DATA-VECTOR-SET-C/" ptype)) - (:translate data-vector-set) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg) :to (:eval 0)) - (value :scs (character-reg) :target rax)) - (:info index) - (:arg-types ,ptype (:constant low-index) character) - (:temporary (:sc character-reg :offset rax-offset :target result - :from (:argument 1) :to (:result 0)) - rax) - (:results (result :scs (character-reg))) - (:result-types character) - (:generator 4 - (move rax value) - (inst mov (make-ea :dword :base object - :disp (- (+ (* vector-data-offset n-word-bytes) - (* 4 index)) - other-pointer-lowtag)) - eax-tn) - (move result rax)))))) + (:translate data-vector-set) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg) :to (:eval 0)) + (value :scs (character-reg) :target rax)) + (:info index) + (:arg-types ,ptype (:constant low-index) character) + (:temporary (:sc character-reg :offset rax-offset :target result + :from (:argument 1) :to (:result 0)) + rax) + (:results (result :scs (character-reg))) + (:result-types character) + (:generator 4 + (move rax value) + (inst mov (make-ea :dword :base object + :disp (- (+ (* vector-data-offset n-word-bytes) + (* 4 index)) + other-pointer-lowtag)) + eax-tn) + (move result rax)))))) (define-data-vector-frobs simple-character-string)) ;;; signed-byte-8 @@ -1104,15 +1116,15 @@ (:translate data-vector-ref) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (unsigned-reg))) + (index :scs (unsigned-reg))) (:arg-types simple-array-signed-byte-8 positive-fixnum) (:results (value :scs (signed-reg))) (:result-types tagged-num) (:generator 5 (inst movsx value - (make-ea :byte :base object :index index :scale 1 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag))))) + (make-ea :byte :base object :index index :scale 1 + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag))))) (define-vop (data-vector-ref-c/simple-array-signed-byte-8) (:translate data-vector-ref) @@ -1124,49 +1136,49 @@ (:result-types tagged-num) (:generator 4 (inst movsx value - (make-ea :byte :base object - :disp (- (+ (* vector-data-offset n-word-bytes) index) - other-pointer-lowtag))))) + (make-ea :byte :base object + :disp (- (+ (* vector-data-offset n-word-bytes) index) + other-pointer-lowtag))))) (define-vop (data-vector-set/simple-array-signed-byte-8) (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) - (index :scs (unsigned-reg) :to (:eval 0)) - (value :scs (signed-reg) :target eax)) + (index :scs (unsigned-reg) :to (:eval 0)) + (value :scs (signed-reg) :target eax)) (:arg-types simple-array-signed-byte-8 positive-fixnum tagged-num) (:temporary (:sc unsigned-reg :offset eax-offset :target result - :from (:argument 2) :to (:result 0)) - eax) + :from (:argument 2) :to (:result 0)) + eax) (:results (result :scs (signed-reg))) (:result-types tagged-num) (:generator 5 (move eax value) (inst mov (make-ea :byte :base object :index index :scale 1 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag)) - al-tn) + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag)) + al-tn) (move result eax))) (define-vop (data-vector-set-c/simple-array-signed-byte-8) (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) - (value :scs (signed-reg) :target eax)) + (value :scs (signed-reg) :target eax)) (:info index) (:arg-types simple-array-signed-byte-8 (:constant low-index) - tagged-num) + tagged-num) (:temporary (:sc unsigned-reg :offset eax-offset :target result - :from (:argument 1) :to (:result 0)) - eax) + :from (:argument 1) :to (:result 0)) + eax) (:results (result :scs (signed-reg))) (:result-types tagged-num) (:generator 4 (move eax value) (inst mov (make-ea :byte :base object - :disp (- (+ (* vector-data-offset n-word-bytes) index) - other-pointer-lowtag)) - al-tn) + :disp (- (+ (* vector-data-offset n-word-bytes) index) + other-pointer-lowtag)) + al-tn) (move result eax))) ;;; signed-byte-16 @@ -1175,15 +1187,15 @@ (:translate data-vector-ref) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (unsigned-reg))) + (index :scs (unsigned-reg))) (:arg-types simple-array-signed-byte-16 positive-fixnum) (:results (value :scs (signed-reg))) (:result-types tagged-num) (:generator 5 (inst movsx value - (make-ea :word :base object :index index :scale 2 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag))))) + (make-ea :word :base object :index index :scale 2 + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag))))) (define-vop (data-vector-ref-c/simple-array-signed-byte-16) (:translate data-vector-ref) @@ -1195,51 +1207,51 @@ (:result-types tagged-num) (:generator 4 (inst movsx value - (make-ea :word :base object - :disp (- (+ (* vector-data-offset n-word-bytes) - (* 2 index)) - other-pointer-lowtag))))) + (make-ea :word :base object + :disp (- (+ (* vector-data-offset n-word-bytes) + (* 2 index)) + other-pointer-lowtag))))) (define-vop (data-vector-set/simple-array-signed-byte-16) (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) - (index :scs (unsigned-reg) :to (:eval 0)) - (value :scs (signed-reg) :target eax)) + (index :scs (unsigned-reg) :to (:eval 0)) + (value :scs (signed-reg) :target eax)) (:arg-types simple-array-signed-byte-16 positive-fixnum tagged-num) (:temporary (:sc signed-reg :offset eax-offset :target result - :from (:argument 2) :to (:result 0)) - eax) + :from (:argument 2) :to (:result 0)) + eax) (:results (result :scs (signed-reg))) (:result-types tagged-num) (:generator 5 (move eax value) (inst mov (make-ea :word :base object :index index :scale 2 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag)) - ax-tn) + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag)) + ax-tn) (move result eax))) (define-vop (data-vector-set-c/simple-array-signed-byte-16) (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) - (value :scs (signed-reg) :target eax)) + (value :scs (signed-reg) :target eax)) (:info index) (:arg-types simple-array-signed-byte-16 (:constant low-index) tagged-num) (:temporary (:sc signed-reg :offset eax-offset :target result - :from (:argument 1) :to (:result 0)) - eax) + :from (:argument 1) :to (:result 0)) + eax) (:results (result :scs (signed-reg))) (:result-types tagged-num) (:generator 4 (move eax value) (inst mov - (make-ea :word :base object - :disp (- (+ (* vector-data-offset n-word-bytes) - (* 2 index)) - other-pointer-lowtag)) - ax-tn) + (make-ea :word :base object + :disp (- (+ (* vector-data-offset n-word-bytes) + (* 2 index)) + other-pointer-lowtag)) + ax-tn) (move result eax))) @@ -1247,15 +1259,15 @@ (:translate data-vector-ref) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) - (index :scs (unsigned-reg))) + (index :scs (unsigned-reg))) (:arg-types simple-array-signed-byte-32 positive-fixnum) (:results (value :scs (signed-reg))) (:result-types tagged-num) (:generator 5 (inst movsxd value - (make-ea :dword :base object :index index :scale 4 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag))))) + (make-ea :dword :base object :index index :scale 4 + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag))))) (define-vop (data-vector-ref-c/simple-array-signed-byte-32) (:translate data-vector-ref) @@ -1267,119 +1279,53 @@ (:result-types tagged-num) (:generator 4 (inst movsxd value - (make-ea :dword :base object - :disp (- (+ (* vector-data-offset n-word-bytes) - (* 4 index)) - other-pointer-lowtag))))) + (make-ea :dword :base object + :disp (- (+ (* vector-data-offset n-word-bytes) + (* 4 index)) + other-pointer-lowtag))))) (define-vop (data-vector-set/simple-array-signed-byte-32) (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) - (index :scs (unsigned-reg) :to (:eval 0)) - (value :scs (signed-reg) :target eax)) + (index :scs (unsigned-reg) :to (:eval 0)) + (value :scs (signed-reg) :target eax)) (:arg-types simple-array-signed-byte-32 positive-fixnum tagged-num) (:temporary (:sc signed-reg :offset eax-offset :target result - :from (:argument 2) :to (:result 0)) - eax) + :from (:argument 2) :to (:result 0)) + eax) (:results (result :scs (signed-reg))) (:result-types tagged-num) (:generator 5 (move eax value) (inst mov (make-ea :dword :base object :index index :scale 4 - :disp (- (* vector-data-offset n-word-bytes) - other-pointer-lowtag)) - eax-tn) + :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag)) + eax-tn) (move result eax))) (define-vop (data-vector-set-c/simple-array-signed-byte-32) (:translate data-vector-set) (:policy :fast-safe) (:args (object :scs (descriptor-reg) :to (:eval 0)) - (value :scs (signed-reg) :target eax)) + (value :scs (signed-reg) :target eax)) (:info index) (:arg-types simple-array-signed-byte-32 (:constant low-index) tagged-num) (:temporary (:sc signed-reg :offset eax-offset :target result - :from (:argument 1) :to (:result 0)) - eax) + :from (:argument 1) :to (:result 0)) + eax) (:results (result :scs (signed-reg))) (:result-types tagged-num) (:generator 4 (move eax value) (inst mov - (make-ea :dword :base object - :disp (- (+ (* vector-data-offset n-word-bytes) - (* 4 index)) - other-pointer-lowtag)) - rax-tn) + (make-ea :dword :base object + :disp (- (+ (* vector-data-offset n-word-bytes) + (* 4 index)) + other-pointer-lowtag)) + eax-tn) (move result eax))) -;;; These VOPs are used for implementing float slots in structures (whose raw -;;; data is an unsigned-64 vector). -(define-vop (raw-ref-single data-vector-ref/simple-array-single-float) - (:translate %raw-ref-single) - (:arg-types sb!c::raw-vector positive-fixnum)) -(define-vop (raw-ref-single-c data-vector-ref-c/simple-array-single-float) - (:translate %raw-ref-single) - (:arg-types sb!c::raw-vector (:constant low-index))) -(define-vop (raw-set-single data-vector-set/simple-array-single-float) - (:translate %raw-set-single) - (:arg-types sb!c::raw-vector positive-fixnum single-float)) -(define-vop (raw-set-single-c data-vector-set-c/simple-array-single-float) - (:translate %raw-set-single) - (:arg-types sb!c::raw-vector (:constant low-index) single-float)) -(define-vop (raw-ref-double data-vector-ref/simple-array-double-float) - (:translate %raw-ref-double) - (:arg-types sb!c::raw-vector positive-fixnum)) -(define-vop (raw-ref-double-c data-vector-ref-c/simple-array-double-float) - (:translate %raw-ref-double) - (:arg-types sb!c::raw-vector (:constant low-index))) -(define-vop (raw-set-double data-vector-set/simple-array-double-float) - (:translate %raw-set-double) - (:arg-types sb!c::raw-vector positive-fixnum double-float)) -(define-vop (raw-set-double-c data-vector-set-c/simple-array-double-float) - (:translate %raw-set-double) - (:arg-types sb!c::raw-vector (:constant low-index) double-float)) - - -;;;; complex-float raw structure slot accessors - -(define-vop (raw-ref-complex-single - data-vector-ref/simple-array-complex-single-float) - (:translate %raw-ref-complex-single) - (:arg-types sb!c::raw-vector positive-fixnum)) -(define-vop (raw-ref-complex-single-c - data-vector-ref-c/simple-array-complex-single-float) - (:translate %raw-ref-complex-single) - (:arg-types sb!c::raw-vector (:constant low-index))) -(define-vop (raw-set-complex-single - data-vector-set/simple-array-complex-single-float) - (:translate %raw-set-complex-single) - (:arg-types sb!c::raw-vector positive-fixnum complex-single-float)) -(define-vop (raw-set-complex-single-c - data-vector-set-c/simple-array-complex-single-float) - (:translate %raw-set-complex-single) - (:arg-types sb!c::raw-vector (:constant low-index) - complex-single-float)) -(define-vop (raw-ref-complex-double - data-vector-ref/simple-array-complex-double-float) - (:translate %raw-ref-complex-double) - (:arg-types sb!c::raw-vector positive-fixnum)) -(define-vop (raw-ref-complex-double-c - data-vector-ref-c/simple-array-complex-double-float) - (:translate %raw-ref-complex-double) - (:arg-types sb!c::raw-vector (:constant low-index))) -(define-vop (raw-set-complex-double - data-vector-set/simple-array-complex-double-float) - (:translate %raw-set-complex-double) - (:arg-types sb!c::raw-vector positive-fixnum complex-double-float)) -(define-vop (raw-set-complex-double-c - data-vector-set-c/simple-array-complex-double-float) - (:translate %raw-set-complex-double) - (:arg-types sb!c::raw-vector (:constant low-index) - complex-double-float)) - - ;;; 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)