summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/m68000/m68kcpu.h
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-02-23 14:07:01 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-02-23 14:07:01 +0000
commitdc0fc0e01fd65f29fade25c082977da1cbeb1e9d (patch)
treecfe02770c3afb527e555fd64c9d69a77ff8fada6 /src/emu/cpu/m68000/m68kcpu.h
parentbce5902abcf585ae837332d613394361656e4d73 (diff)
Sync OG changes from MESS (no whatsnew)
Diffstat (limited to 'src/emu/cpu/m68000/m68kcpu.h')
-rw-r--r--src/emu/cpu/m68000/m68kcpu.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/emu/cpu/m68000/m68kcpu.h b/src/emu/cpu/m68000/m68kcpu.h
index 0cd94d1b044..5697b6fba2d 100644
--- a/src/emu/cpu/m68000/m68kcpu.h
+++ b/src/emu/cpu/m68000/m68kcpu.h
@@ -707,6 +707,8 @@ public:
UINT16 mmu_tmp_rw; /* temporary hack: read/write (1/0) for the mmu */
UINT32 mmu_tmp_buserror_address; /* temporary hack: (first) bus error address */
UINT16 mmu_tmp_buserror_occurred; /* temporary hack: flag that bus error has occurred from mmu */
+ UINT16 mmu_tmp_buserror_fc; /* temporary hack: (first) bus error fc */
+ UINT16 mmu_tmp_buserror_rw; /* temporary hack: (first) bus error rw */
UINT32 ic_address[M68K_IC_SIZE]; /* instruction cache address data */
UINT16 ic_data[M68K_IC_SIZE]; /* instruction cache content data */
@@ -1571,8 +1573,8 @@ void m68ki_stack_frame_1000(m68ki_cpu_core *m68k, UINT32 pc, UINT32 sr, UINT32 v
*/
void m68ki_stack_frame_1010(m68ki_cpu_core *m68k, UINT32 sr, UINT32 vector, UINT32 pc, UINT32 fault_address)
{
- int orig_rw = m68k->mmu_tmp_rw; // this gets splatted by the following pushes, so save it now
- int orig_fc = m68k->mmu_tmp_fc;
+ int orig_rw = m68k->mmu_tmp_buserror_rw; // this gets splatted by the following pushes, so save it now
+ int orig_fc = m68k->mmu_tmp_buserror_fc;
/* INTERNAL REGISTER */
m68ki_push_16(m68k, 0);
@@ -1623,8 +1625,8 @@ void m68ki_stack_frame_1010(m68ki_cpu_core *m68k, UINT32 sr, UINT32 vector, UINT
*/
void m68ki_stack_frame_1011(m68ki_cpu_core *m68k, UINT32 sr, UINT32 vector, UINT32 pc, UINT32 fault_address)
{
- int orig_rw = m68k->mmu_tmp_rw; // this gets splatted by the following pushes, so save it now
- int orig_fc = m68k->mmu_tmp_fc;
+ int orig_rw = m68k->mmu_tmp_buserror_rw; // this gets splatted by the following pushes, so save it now
+ int orig_fc = m68k->mmu_tmp_buserror_fc;
/* INTERNAL REGISTERS (18 words) */
m68ki_push_32(m68k, 0);
@@ -1697,8 +1699,8 @@ void m68ki_stack_frame_1011(m68ki_cpu_core *m68k, UINT32 sr, UINT32 vector, UINT
*/
void m68ki_stack_frame_0111(m68ki_cpu_core *m68k, UINT32 sr, UINT32 vector, UINT32 pc, UINT32 fault_address, bool in_mmu)
{
- int orig_rw = m68k->mmu_tmp_rw; // this gets splatted by the following pushes, so save it now
- int orig_fc = m68k->mmu_tmp_fc;
+ int orig_rw = m68k->mmu_tmp_buserror_rw; // this gets splatted by the following pushes, so save it now
+ int orig_fc = m68k->mmu_tmp_buserror_fc;
/* INTERNAL REGISTERS (18 words) */
m68ki_push_32(m68k, 0);