hvf: arm: Do not advance PC when raising an exception

hvf did not advance PC when raising an exception for most unhandled system registers, but it mistakenly advanced PC when raising an exception for GICv3 registers. Cc: [email protected] Fixes: a226098 ("hvf: arm: Add support for GICv3") Signed-off-by: Akihiko Odaki <[email protected]> Message-id: [email protected] Reviewed-by: Peter Maydell <[email protected]> Signed-off-by: Peter Maydell <[email protected]> (cherry picked from commit 30a1690) Signed-off-by: Michael Tokarev <[email protected]>
riscv-mcu · Jul 19, 2024 · 44304ff · 44304ff
1 parent 43929c8
commit 44304ff
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
@@ -1277,6 +1277,7 @@ static int hvf_sysreg_read(CPUState *cpu, uint32_t reg, uint32_t rt)
         /* Call the TCG sysreg handler. This is only safe for GICv3 regs. */
         if (!hvf_sysreg_read_cp(cpu, reg, &val)) {
             hvf_raise_exception(cpu, EXCP_UDEF, syn_uncategorized());
+            return 1;
         }
         break;
     case SYSREG_DBGBVR0_EL1: