summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Pavone <pavone@retrodev.com>2017-03-13 23:14:13 -0700
committerMichael Pavone <pavone@retrodev.com>2017-03-13 23:14:13 -0700
commite122c5e6ee30c5fb8d0cbf7bf0ae760c0e0fc038 (patch)
treec6ed1f7e3227169d1b86594449bdc0b0789419ae
parent6376d19908958c62cddec0ff1535cdc80e3d95ef (diff)
RESET is not a terminal instruction on the 68K. Fixes a crash bug in Chavez II and possibly other games
-rw-r--r--m68k_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/m68k_core.c b/m68k_core.c
index 19600bd..49c26ec 100644
--- a/m68k_core.c
+++ b/m68k_core.c
@@ -681,7 +681,7 @@ static uint8_t get_native_inst_size(m68k_options * opts, uint32_t address)
uint8_t m68k_is_terminal(m68kinst * inst)
{
return inst->op == M68K_RTS || inst->op == M68K_RTE || inst->op == M68K_RTR || inst->op == M68K_JMP
- || inst->op == M68K_TRAP || inst->op == M68K_ILLEGAL || inst->op == M68K_INVALID || inst->op == M68K_RESET
+ || inst->op == M68K_TRAP || inst->op == M68K_ILLEGAL || inst->op == M68K_INVALID
|| (inst->op == M68K_BCC && inst->extra.cond == COND_TRUE);
}