summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2017-10-31 20:53:35 -0400
committer GitHub <noreply@github.com>2017-10-31 20:53:35 -0400
commit7421ffdf7e6477e7a1fa751667ceb12e285b24f8 (patch)
treee8177d2406decf2238c5cf11fbb17b053987c10e
parent355a0ccdaa2f0970b7ef90103085a8a57b57784c (diff)
parent2a262acb7b731a94f3ff42aa3de61ef18dca1662 (diff)
Merge pull request #2763 from jfdelnero/master
Bus error stack frame : 68010 / 68020 / 68030 stack frames formats su…
-rw-r--r--src/devices/cpu/m68000/m68kcpu.h20
1 files changed, 18 insertions, 2 deletions
diff --git a/src/devices/cpu/m68000/m68kcpu.h b/src/devices/cpu/m68000/m68kcpu.h
index df2a754a13f..dce0c2205a8 100644
--- a/src/devices/cpu/m68000/m68kcpu.h
+++ b/src/devices/cpu/m68000/m68kcpu.h
@@ -1672,8 +1672,24 @@ static inline void m68ki_exception_address_error(m68000_base_device *m68k)
}
m68k->run_mode = RUN_MODE_BERR_AERR_RESET;
- /* Note: This is implemented for 68000 only! */
- m68ki_stack_frame_buserr(m68k, sr);
+ if (!CPU_TYPE_IS_010_PLUS(m68k->cpu_type))
+ {
+ /* Note: This is implemented for 68000 only! */
+ m68ki_stack_frame_buserr(m68k, sr);
+ }
+ else if (CPU_TYPE_IS_010(m68k->cpu_type))
+ {
+ /* only the 68010 throws this unique type-1000 frame */
+ m68ki_stack_frame_1000(m68k, REG_PPC(m68k), sr, EXCEPTION_BUS_ERROR);
+ }
+ else if (m68k->mmu_tmp_buserror_address == REG_PPC(m68k))
+ {
+ m68ki_stack_frame_1010(m68k, sr, EXCEPTION_BUS_ERROR, REG_PPC(m68k), m68k->mmu_tmp_buserror_address);
+ }
+ else
+ {
+ m68ki_stack_frame_1011(m68k, sr, EXCEPTION_BUS_ERROR, REG_PPC(m68k), m68k->mmu_tmp_buserror_address);
+ }
m68ki_jump_vector(m68k, EXCEPTION_ADDRESS_ERROR);