Skip to contentSkip to conversation

target/riscv: fix for virtual instr exception

PATCH New Deepak Gupta 1 participant 1 message Jan 27, 2023 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target/riscv: fix for virtual instr exception

commit fb3f3730e4 added mechanism to generate virtual instruction exception during instruction decode when virt is enabled.

However in some situations, illegal instruction exception can be raised due to state of CPU. One such situation is implementing branch tracking.
[1] An indirect branch if doesn't land on a landing pad instruction, then cpu must raise an illegal instruction exception. Implementation would raise such expcetion due to missing landing pad inst and not due to decode. Thus DisasContext must have virt_inst_excp initialized to false during DisasContxt initialization for TB.

[1] - https://github.com/riscv/riscv-cfi

---
 target/riscv/translate.c | 1 +
 1 file changed, 1 insertion(+)
target/riscv/translate.c +1 -0
index df38db7553..76f61a39d3 100644
@@ -1167,6 +1167,7 @@ static void riscv_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs)
     ctx->pm_base_enabled = FIELD_EX32(tb_flags, TB_FLAGS, PM_BASE_ENABLED);
     ctx->itrigger = FIELD_EX32(tb_flags, TB_FLAGS, ITRIGGER);
     ctx->zero = tcg_constant_tl(0);
+    ctx->virt_inst_excp = false;
 }
 
 static void riscv_tr_tb_start(DisasContextBase *db, CPUState *cpu)
Signature · 1 line
2.25.1