Respect users' decision for UC_ERR_INSN_INVALID

wtdcode · wtdcode · commit e03109d8c967 · 2024-03-08T17:31:27.000+08:00
diff --git a/qemu/accel/tcg/cpu-exec.c b/qemu/accel/tcg/cpu-exec.c
@@ -354,11 +354,10 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret)
         }
         if (!catched) {
             uc->invalid_error = UC_ERR_INSN_INVALID;
+            // we want to stop emulation
+            *ret = EXCP_HLT;
+            return true;
         }
-
-        // we want to stop emulation
-        *ret = EXCP_HLT;
-        return true;
     }
 
     if (cpu->exception_index < 0) {

Original file line number	Diff line number	Diff line change
`@@ -354,11 +354,10 @@ static inline bool cpu_handle_exception(CPUState cpu, int ret)`
`354`	`354`	`}`
`355`	`355`	`if (!catched) {`
`356`	`356`	`uc->invalid_error = UC_ERR_INSN_INVALID;`
	`357`	`+ // we want to stop emulation`
	`358`	`+ *ret = EXCP_HLT;`
	`359`	`+ return true;`
`357`	`360`	`}`
`358`		`-`
`359`		`- // we want to stop emulation`
`360`		`- *ret = EXCP_HLT;`
`361`		`- return true;`
`362`	`361`	`}`
`363`	`362`
`364`	`363`	`if (cpu->exception_index < 0) {`