ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/m68k: Switch over exception type in m68k_interrupt_all 

Replace an if ladder with a switch for clarity.

Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220602013401.303699-3-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Richard Henderson 2022-06-01 18:33:46 -07:00 committed by Laurent Vivier
parent 79e1d527e1
commit 02ea42b36d
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
target/m68k/op_helper.c
View File

@ -333,7 +333,8 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw)
sp &= ~1; sp &= ~1;
} }
if (cs->exception_index == EXCP_ACCESS) { switch (cs->exception_index) {
case EXCP_ACCESS:
if (env->mmu.fault) { if (env->mmu.fault) {
cpu_abort(cs, "DOUBLE MMU FAULT\n"); cpu_abort(cs, "DOUBLE MMU FAULT\n");
} }
@ -391,29 +392,39 @@ static void m68k_interrupt_all(CPUM68KState *env, int is_hw)
"ssw: %08x ea: %08x sfc: %d dfc: %d\n", "ssw: %08x ea: %08x sfc: %d dfc: %d\n",
env->mmu.ssw, env->mmu.ar, env->sfc, env->dfc); env->mmu.ssw, env->mmu.ar, env->sfc, env->dfc);
} }
} else if (cs->exception_index == EXCP_ADDRESS) { break;
case EXCP_ADDRESS:
do_stack_frame(env, &sp, 2, oldsr, 0, retaddr); do_stack_frame(env, &sp, 2, oldsr, 0, retaddr);
} else if (cs->exception_index == EXCP_ILLEGAL || break;
cs->exception_index == EXCP_DIV0 ||
cs->exception_index == EXCP_CHK || case EXCP_ILLEGAL:
cs->exception_index == EXCP_TRAPCC || case EXCP_DIV0:
cs->exception_index == EXCP_TRACE) { case EXCP_CHK:
case EXCP_TRAPCC:
case EXCP_TRACE:
/* FIXME: addr is not only env->pc */ /* FIXME: addr is not only env->pc */
do_stack_frame(env, &sp, 2, oldsr, env->pc, retaddr); do_stack_frame(env, &sp, 2, oldsr, env->pc, retaddr);
} else if (is_hw && oldsr & SR_M && break;
cs->exception_index >= EXCP_SPURIOUS &&
cs->exception_index <= EXCP_INT_LEVEL_7) { case EXCP_SPURIOUS ... EXCP_INT_LEVEL_7:
do_stack_frame(env, &sp, 0, oldsr, 0, retaddr); if (is_hw && oldsr & SR_M) {
oldsr = sr; do_stack_frame(env, &sp, 0, oldsr, 0, retaddr);
env->aregs[7] = sp; oldsr = sr;
cpu_m68k_set_sr(env, sr &= ~SR_M); env->aregs[7] = sp;
sp = env->aregs[7]; cpu_m68k_set_sr(env, sr &= ~SR_M);
if (!m68k_feature(env, M68K_FEATURE_UNALIGNED_DATA)) { sp = env->aregs[7];
sp &= ~1; if (!m68k_feature(env, M68K_FEATURE_UNALIGNED_DATA)) {
sp &= ~1;
}
do_stack_frame(env, &sp, 1, oldsr, 0, retaddr);
break;
} }
do_stack_frame(env, &sp, 1, oldsr, 0, retaddr); /* fall through */
} else {
default:
do_stack_frame(env, &sp, 0, oldsr, 0, retaddr); do_stack_frame(env, &sp, 0, oldsr, 0, retaddr);
break;
} }
env->aregs[7] = sp; env->aregs[7] = sp;