From: David Hildenbrand <da...@redhat.com>
We missed that we always read a "double-wide even-odd element
pair of the fourth operand". Fix it in all four variants.
Fixes: 1b430aec4157 ("s390x/tcg: Implement VECTOR MULTIPLY AND ADD *")
Reviewed-by: Richard Henderson <richard.hender...@linaro.org>
Signed-off-by: David Hildenbrand <da...@redhat.com>
Message-Id: <20191021085715.3797-3-da...@redhat.com>
Signed-off-by: Cornelia Huck <coh...@redhat.com>
---
target/s390x/vec_int_helper.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/target/s390x/vec_int_helper.c b/target/s390x/vec_int_helper.c
index 03ae8631d958..1b3aaecbdb3d 100644
--- a/target/s390x/vec_int_helper.c
+++ b/target/s390x/vec_int_helper.c
@@ -336,7 +336,7 @@ void HELPER(gvec_vmae##BITS)(void *v1, const void *v2,
const void *v3, \
for (i = 0, j = 0; i < (128 / TBITS); i++, j += 2) {
\
int##TBITS##_t a = (int##BITS##_t)s390_vec_read_element##BITS(v2, j);
\
int##TBITS##_t b = (int##BITS##_t)s390_vec_read_element##BITS(v3, j);
\
- int##TBITS##_t c = (int##BITS##_t)s390_vec_read_element##BITS(v4, j);
\
+ int##TBITS##_t c = s390_vec_read_element##TBITS(v4, i);
\
\
s390_vec_write_element##TBITS(v1, i, a * b + c);
\
}
\
@@ -354,7 +354,7 @@ void HELPER(gvec_vmale##BITS)(void *v1, const void *v2,
const void *v3, \
for (i = 0, j = 0; i < (128 / TBITS); i++, j += 2) {
\
uint##TBITS##_t a = s390_vec_read_element##BITS(v2, j);
\
uint##TBITS##_t b = s390_vec_read_element##BITS(v3, j);
\
- uint##TBITS##_t c = s390_vec_read_element##BITS(v4, j);
\
+ uint##TBITS##_t c = s390_vec_read_element##TBITS(v4, i);
\
\
s390_vec_write_element##TBITS(v1, i, a * b + c);
\
}
\
@@ -372,7 +372,7 @@ void HELPER(gvec_vmao##BITS)(void *v1, const void *v2,
const void *v3, \
for (i = 0, j = 1; i < (128 / TBITS); i++, j += 2) {
\
int##TBITS##_t a = (int##BITS##_t)s390_vec_read_element##BITS(v2, j);
\
int##TBITS##_t b = (int##BITS##_t)s390_vec_read_element##BITS(v3, j);
\
- int##TBITS##_t c = (int##BITS##_t)s390_vec_read_element##BITS(v4, j);
\
+ int##TBITS##_t c = s390_vec_read_element##TBITS(v4, i);
\
\
s390_vec_write_element##TBITS(v1, i, a * b + c);
\
}
\
@@ -390,7 +390,7 @@ void HELPER(gvec_vmalo##BITS)(void *v1, const void *v2,
const void *v3, \
for (i = 0, j = 1; i < (128 / TBITS); i++, j += 2) {
\
uint##TBITS##_t a = s390_vec_read_element##BITS(v2, j);
\
uint##TBITS##_t b = s390_vec_read_element##BITS(v3, j);
\
- uint##TBITS##_t c = s390_vec_read_element##BITS(v4, j);
\
+ uint##TBITS##_t c = s390_vec_read_element##TBITS(v4, i);
\
\
s390_vec_write_element##TBITS(v1, i, a * b + c);
\
}
\
--
2.21.0
