SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/riscv: Adjust csr write mask with XLEN

Browse Source 
Write mask is representing the bits we care about.

Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20220120122050.41546-11-zhiwei_liu@c-sky.com
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
LIU Zhiwei 2022-01-20 20:20:37 +08:00 committed by Alistair Francis
parent 47bdec821b
commit 83b519b8a4
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/riscv/insn_trans/trans_rvi.c.inc
View File

@ -924,7 +924,8 @@ static bool do_csrrw_i128(DisasContext *ctx, int rd, int rc,
static bool trans_csrrw(DisasContext *ctx, arg_csrrw *a) static bool trans_csrrw(DisasContext *ctx, arg_csrrw *a)
{ {
if (get_xl(ctx) < MXL_RV128) { RISCVMXL xl = get_xl(ctx);
if (xl < MXL_RV128) {
TCGv src = get_gpr(ctx, a->rs1, EXT_NONE); TCGv src = get_gpr(ctx, a->rs1, EXT_NONE);
/* /*
@ -935,7 +936,8 @@ static bool trans_csrrw(DisasContext *ctx, arg_csrrw *a)
return do_csrw(ctx, a->csr, src); return do_csrw(ctx, a->csr, src);
} }
TCGv mask = tcg_constant_tl(-1); TCGv mask = tcg_constant_tl(xl == MXL_RV32 ? UINT32_MAX :
(target_ulong)-1);
return do_csrrw(ctx, a->rd, a->csr, src, mask); return do_csrrw(ctx, a->rd, a->csr, src, mask);
} else { } else {
TCGv srcl = get_gpr(ctx, a->rs1, EXT_NONE); TCGv srcl = get_gpr(ctx, a->rs1, EXT_NONE);
@ -1013,7 +1015,8 @@ static bool trans_csrrc(DisasContext *ctx, arg_csrrc *a)
static bool trans_csrrwi(DisasContext *ctx, arg_csrrwi *a) static bool trans_csrrwi(DisasContext *ctx, arg_csrrwi *a)
{ {
if (get_xl(ctx) < MXL_RV128) { RISCVMXL xl = get_xl(ctx);
if (xl < MXL_RV128) {
TCGv src = tcg_constant_tl(a->rs1); TCGv src = tcg_constant_tl(a->rs1);
/* /*
@ -1024,7 +1027,8 @@ static bool trans_csrrwi(DisasContext *ctx, arg_csrrwi *a)
return do_csrw(ctx, a->csr, src); return do_csrw(ctx, a->csr, src);
} }
TCGv mask = tcg_constant_tl(-1); TCGv mask = tcg_constant_tl(xl == MXL_RV32 ? UINT32_MAX :
(target_ulong)-1);
return do_csrrw(ctx, a->rd, a->csr, src, mask); return do_csrrw(ctx, a->rd, a->csr, src, mask);
} else { } else {
TCGv src = tcg_constant_tl(a->rs1); TCGv src = tcg_constant_tl(a->rs1);

3
target/riscv/op_helper.c
View File

@ -50,7 +50,8 @@ target_ulong helper_csrr(CPURISCVState *env, int csr)
void helper_csrw(CPURISCVState *env, int csr, target_ulong src) void helper_csrw(CPURISCVState *env, int csr, target_ulong src)
{ {
RISCVException ret = riscv_csrrw(env, csr, NULL, src, -1); target_ulong mask = env->xl == MXL_RV32 ? UINT32_MAX : (target_ulong)-1;
RISCVException ret = riscv_csrrw(env, csr, NULL, src, mask);
if (ret != RISCV_EXCP_NONE) { if (ret != RISCV_EXCP_NONE) {
riscv_raise_exception(env, ret, GETPC()); riscv_raise_exception(env, ret, GETPC());