50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
|
|
From 1c6b234766bae8c2b518cfd882e8907b831d8d03 Mon Sep 17 00:00:00 2001
|
||
|
|
From: gubin <gubin_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Sat, 11 Jan 2025 11:10:29 +0800
|
||
|
|
Subject: [PATCH] target/riscv/vector_helper.c: fix 'vmvr_v' memcpy endianess
|
||
|
|
|
||
|
|
cherry-pick from 768e7b329c0be22035da077fe76221dd0a47103b
|
||
|
|
|
||
|
|
vmvr_v isn't handling the case where the host might be big endian and
|
||
|
|
the bytes to be copied aren't sequential.
|
||
|
|
|
||
|
|
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
|
||
|
|
Fixes: f714361ed7 ("target/riscv: rvv-1.0: implement vstart CSR")
|
||
|
|
Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
|
||
|
|
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
|
||
|
|
Reviewed-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com>
|
||
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
||
|
|
Message-ID: <20240314175704.478276-4-dbarboza@ventanamicro.com>
|
||
|
|
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
|
||
|
|
Signed-off-by: gubin <gubin_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
target/riscv/vector_helper.c | 10 +++++++++-
|
||
|
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
|
||
|
|
index 42ffd3a68a..351842f66a 100644
|
||
|
|
--- a/target/riscv/vector_helper.c
|
||
|
|
+++ b/target/riscv/vector_helper.c
|
||
|
|
@@ -5063,9 +5063,17 @@ void HELPER(vmvr_v)(void *vd, void *vs2, CPURISCVState *env, uint32_t desc)
|
||
|
|
uint32_t startb = env->vstart * sewb;
|
||
|
|
uint32_t i = startb;
|
||
|
|
|
||
|
|
+ if (HOST_BIG_ENDIAN && i % 8 != 0) {
|
||
|
|
+ uint32_t j = ROUND_UP(i, 8);
|
||
|
|
+ memcpy((uint8_t *)vd + H1(j - 1),
|
||
|
|
+ (uint8_t *)vs2 + H1(j - 1),
|
||
|
|
+ j - i);
|
||
|
|
+ i = j;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
memcpy((uint8_t *)vd + H1(i),
|
||
|
|
(uint8_t *)vs2 + H1(i),
|
||
|
|
- maxsz - startb);
|
||
|
|
+ maxsz - i);
|
||
|
|
|
||
|
|
env->vstart = 0;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|