| Message ID | 20230330034636.44585-1-liweiwei@iscas.ac.cn |
|---|---|
| State | New |
| Headers | show |
| Series | target/riscv: Set opcode to env->bins for illegal/virtual instruction fault | expand |
On 3/30/23 00:46, Weiwei Li wrote: > decode_save_opc() will not work for generate_exception(), since 0 is passed > to riscv_raise_exception() as pc in helper_raise_exception(), and bins will > not be restored in this case. > > Signed-off-by: Weiwei Li <liweiwei@iscas.ac.cn> > Signed-off-by: Junqiang Wang <wangjunqiang@iscas.ac.cn> > --- Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > target/riscv/insn_trans/trans_rvh.c.inc | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/target/riscv/insn_trans/trans_rvh.c.inc b/target/riscv/insn_trans/trans_rvh.c.inc > index 9248b48c36..4b730cd492 100644 > --- a/target/riscv/insn_trans/trans_rvh.c.inc > +++ b/target/riscv/insn_trans/trans_rvh.c.inc > @@ -20,6 +20,8 @@ > static bool check_access(DisasContext *ctx) > { > if (!ctx->hlsx) { > + tcg_gen_st_i32(tcg_constant_i32(ctx->opcode), cpu_env, > + offsetof(CPURISCVState, bins)); > if (ctx->virt_enabled) { > generate_exception(ctx, RISCV_EXCP_VIRT_INSTRUCTION_FAULT); > } else {
On Thu, Mar 30, 2023 at 1:47 PM Weiwei Li <liweiwei@iscas.ac.cn> wrote: > > decode_save_opc() will not work for generate_exception(), since 0 is passed > to riscv_raise_exception() as pc in helper_raise_exception(), and bins will > not be restored in this case. > > Signed-off-by: Weiwei Li <liweiwei@iscas.ac.cn> > Signed-off-by: Junqiang Wang <wangjunqiang@iscas.ac.cn> Acked-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > target/riscv/insn_trans/trans_rvh.c.inc | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/target/riscv/insn_trans/trans_rvh.c.inc b/target/riscv/insn_trans/trans_rvh.c.inc > index 9248b48c36..4b730cd492 100644 > --- a/target/riscv/insn_trans/trans_rvh.c.inc > +++ b/target/riscv/insn_trans/trans_rvh.c.inc > @@ -20,6 +20,8 @@ > static bool check_access(DisasContext *ctx) > { > if (!ctx->hlsx) { > + tcg_gen_st_i32(tcg_constant_i32(ctx->opcode), cpu_env, > + offsetof(CPURISCVState, bins)); > if (ctx->virt_enabled) { > generate_exception(ctx, RISCV_EXCP_VIRT_INSTRUCTION_FAULT); > } else { > -- > 2.25.1 > >
On Thu, Mar 30, 2023 at 1:47 PM Weiwei Li <liweiwei@iscas.ac.cn> wrote: > > decode_save_opc() will not work for generate_exception(), since 0 is passed > to riscv_raise_exception() as pc in helper_raise_exception(), and bins will > not be restored in this case. > > Signed-off-by: Weiwei Li <liweiwei@iscas.ac.cn> > Signed-off-by: Junqiang Wang <wangjunqiang@iscas.ac.cn> Thanks! Applied to riscv-to-apply.next Alistair > --- > target/riscv/insn_trans/trans_rvh.c.inc | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/target/riscv/insn_trans/trans_rvh.c.inc b/target/riscv/insn_trans/trans_rvh.c.inc > index 9248b48c36..4b730cd492 100644 > --- a/target/riscv/insn_trans/trans_rvh.c.inc > +++ b/target/riscv/insn_trans/trans_rvh.c.inc > @@ -20,6 +20,8 @@ > static bool check_access(DisasContext *ctx) > { > if (!ctx->hlsx) { > + tcg_gen_st_i32(tcg_constant_i32(ctx->opcode), cpu_env, > + offsetof(CPURISCVState, bins)); > if (ctx->virt_enabled) { > generate_exception(ctx, RISCV_EXCP_VIRT_INSTRUCTION_FAULT); > } else { > -- > 2.25.1 > >
diff --git a/target/riscv/insn_trans/trans_rvh.c.inc b/target/riscv/insn_trans/trans_rvh.c.inc index 9248b48c36..4b730cd492 100644 --- a/target/riscv/insn_trans/trans_rvh.c.inc +++ b/target/riscv/insn_trans/trans_rvh.c.inc @@ -20,6 +20,8 @@ static bool check_access(DisasContext *ctx) { if (!ctx->hlsx) { + tcg_gen_st_i32(tcg_constant_i32(ctx->opcode), cpu_env, + offsetof(CPURISCVState, bins)); if (ctx->virt_enabled) { generate_exception(ctx, RISCV_EXCP_VIRT_INSTRUCTION_FAULT); } else {