Hi Frédéric,
On 16/12/25 22:24, Frédéric Pétrot wrote:
The lq and sq helpers for the experimental rv128 architecture currently
use direct (and erroneous) memory accesses.
Replace these direct accesses with the standard tcg_gen_qemu_{ld,st}_i128
TCG helpers that handle endianness issues.
Reported-by: Philippe Mathieu-Daudé <[email protected]>
Suggested-by: Richard Henderson <[email protected]>
Signed-off-by: Frédéric Pétrot <[email protected]>
---
target/riscv/insn_trans/trans_rvi.c.inc | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/target/riscv/insn_trans/trans_rvi.c.inc
b/target/riscv/insn_trans/trans_rvi.c.inc
index 54b9b4f241..ea5a961464 100644
--- a/target/riscv/insn_trans/trans_rvi.c.inc
+++ b/target/riscv/insn_trans/trans_rvi.c.inc
@@ -388,10 +388,14 @@ static bool gen_load_i128(DisasContext *ctx, arg_lb *a,
MemOp memop)
tcg_gen_movi_tl(desth, 0);
}
} else {
- /* assume little-endian memory access for now */
- tcg_gen_qemu_ld_tl(destl, addrl, ctx->mem_idx, MO_TEUQ);
- tcg_gen_addi_tl(addrl, addrl, 8);
- tcg_gen_qemu_ld_tl(desth, addrl, ctx->mem_idx, MO_TEUQ);
+ TCGv_i128 t16 = tcg_temp_new_i128();
+
+ tcg_gen_qemu_ld_i128(t16, addrl, ctx->mem_idx, memop);
+ if (mo_endian(ctx) == MO_LE) {
+ tcg_gen_extr_i128_i64(destl, desth, t16);
+ } else {
+ tcg_gen_extr_i128_i64(desth, destl, t16);
+ }
}
gen_set_gpr128(ctx, a->rd, destl, desth);
@@ -494,10 +498,14 @@ static bool gen_store_i128(DisasContext *ctx, arg_sb *a,
MemOp memop)
if ((memop & MO_SIZE) <= MO_64) {
tcg_gen_qemu_st_tl(src2l, addrl, ctx->mem_idx, memop);
} else {
- /* little-endian memory access assumed for now */
- tcg_gen_qemu_st_tl(src2l, addrl, ctx->mem_idx, MO_TEUQ);
- tcg_gen_addi_tl(addrl, addrl, 8);
- tcg_gen_qemu_st_tl(src2h, addrl, ctx->mem_idx, MO_TEUQ);
+ TCGv_i128 t16 = tcg_temp_new_i128();
+
+ if (mo_endian(ctx) == MO_LE) {
+ tcg_gen_concat_i64_i128(t16, src2l, src2h);
+ } else {
+ tcg_gen_concat_i64_i128(t16, src2h, src2l);
+ }
+ tcg_gen_qemu_st_i128(t16, addrl, ctx->mem_idx, memop);
}
return true;
}
Errors when building qemu-system-riscv32:
[3/5] Compiling C object
libqemu-riscv32-softmmu.a.p/target_riscv_translate.c.o
In file included from ../../target/riscv/translate.c:1192:
../../target/riscv/insn_trans/trans_rvi.c.inc:395:35: error:
incompatible pointer types passing 'TCGv' (aka 'struct TCGv_i32_d *') to
parameter of type 'TCGv_i64' (aka 'struct TCGv_i64_d *')
[-Werror,-Wincompatible-pointer-types]
395 | tcg_gen_extr_i128_i64(destl, desth, t16);
| ^~~~~
include/tcg/tcg-op-common.h:309:37: note: passing argument to parameter
'lo' here
309 | void tcg_gen_extr_i128_i64(TCGv_i64 lo, TCGv_i64 hi, TCGv_i128
arg);
| ^
In file included from ../../target/riscv/translate.c:1192:
../../target/riscv/insn_trans/trans_rvi.c.inc:395:42: error:
incompatible pointer types passing 'TCGv' (aka 'struct TCGv_i32_d *') to
parameter of type 'TCGv_i64' (aka 'struct TCGv_i64_d *')
[-Werror,-Wincompatible-pointer-types]
395 | tcg_gen_extr_i128_i64(destl, desth, t16);
| ^~~~~
include/tcg/tcg-op-common.h:309:50: note: passing argument to parameter
'hi' here
309 | void tcg_gen_extr_i128_i64(TCGv_i64 lo, TCGv_i64 hi, TCGv_i128
arg);
| ^
In file included from ../../target/riscv/translate.c:1192:
../../target/riscv/insn_trans/trans_rvi.c.inc:397:35: error:
incompatible pointer types passing 'TCGv' (aka 'struct TCGv_i32_d *') to
parameter of type 'TCGv_i64' (aka 'struct TCGv_i64_d *')
[-Werror,-Wincompatible-pointer-types]
397 | tcg_gen_extr_i128_i64(desth, destl, t16);
| ^~~~~
include/tcg/tcg-op-common.h:309:37: note: passing argument to parameter
'lo' here
309 | void tcg_gen_extr_i128_i64(TCGv_i64 lo, TCGv_i64 hi, TCGv_i128
arg);
| ^
In file included from ../../target/riscv/translate.c:1192:
../../target/riscv/insn_trans/trans_rvi.c.inc:397:42: error:
incompatible pointer types passing 'TCGv' (aka 'struct TCGv_i32_d *') to
parameter of type 'TCGv_i64' (aka 'struct TCGv_i64_d *')
[-Werror,-Wincompatible-pointer-types]
397 | tcg_gen_extr_i128_i64(desth, destl, t16);
| ^~~~~
include/tcg/tcg-op-common.h:309:50: note: passing argument to parameter
'hi' here
309 | void tcg_gen_extr_i128_i64(TCGv_i64 lo, TCGv_i64 hi, TCGv_i128
arg);
| ^
In file included from ../../target/riscv/translate.c:1192:
../../target/riscv/insn_trans/trans_rvi.c.inc:504:42: error:
incompatible pointer types passing 'TCGv' (aka 'struct TCGv_i32_d *') to
parameter of type 'TCGv_i64' (aka 'struct TCGv_i64_d *')
[-Werror,-Wincompatible-pointer-types]
504 | tcg_gen_concat_i64_i128(t16, src2l, src2h);
| ^~~~~
include/tcg/tcg-op-common.h:310:54: note: passing argument to parameter
'lo' here
310 | void tcg_gen_concat_i64_i128(TCGv_i128 ret, TCGv_i64 lo,
TCGv_i64 hi);
| ^
In file included from ../../target/riscv/translate.c:1192:
../../target/riscv/insn_trans/trans_rvi.c.inc:504:49: error:
incompatible pointer types passing 'TCGv' (aka 'struct TCGv_i32_d *') to
parameter of type 'TCGv_i64' (aka 'struct TCGv_i64_d *')
[-Werror,-Wincompatible-pointer-types]
504 | tcg_gen_concat_i64_i128(t16, src2l, src2h);
| ^~~~~
include/tcg/tcg-op-common.h:310:67: note: passing argument to parameter
'hi' here
310 | void tcg_gen_concat_i64_i128(TCGv_i128 ret, TCGv_i64 lo,
TCGv_i64 hi);
| ^
In file included from ../../target/riscv/translate.c:1192:
../../target/riscv/insn_trans/trans_rvi.c.inc:506:42: error:
incompatible pointer types passing 'TCGv' (aka 'struct TCGv_i32_d *') to
parameter of type 'TCGv_i64' (aka 'struct TCGv_i64_d *')
[-Werror,-Wincompatible-pointer-types]
506 | tcg_gen_concat_i64_i128(t16, src2h, src2l);
| ^~~~~
include/tcg/tcg-op-common.h:310:54: note: passing argument to parameter
'lo' here
310 | void tcg_gen_concat_i64_i128(TCGv_i128 ret, TCGv_i64 lo,
TCGv_i64 hi);
| ^
In file included from ../../target/riscv/translate.c:1192:
../../target/riscv/insn_trans/trans_rvi.c.inc:506:49: error:
incompatible pointer types passing 'TCGv' (aka 'struct TCGv_i32_d *') to
parameter of type 'TCGv_i64' (aka 'struct TCGv_i64_d *')
[-Werror,-Wincompatible-pointer-types]
506 | tcg_gen_concat_i64_i128(t16, src2h, src2l);
| ^~~~~
include/tcg/tcg-op-common.h:310:67: note: passing argument to parameter
'hi' here
310 | void tcg_gen_concat_i64_i128(TCGv_i128 ret, TCGv_i64 lo,
TCGv_i64 hi);
| ^
8 errors generated.
FAILED: [code=1] libqemu-riscv32-softmmu.a.p/target_riscv_translate.c.o
