diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/emu/cpu/m68000/m68k_in.c | 10 | ||||
-rw-r--r-- | src/emu/cpu/m68000/m68kcpu.c | 2 | ||||
-rw-r--r-- | src/emu/cpu/m68000/m68kcpu.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/emu/cpu/m68000/m68k_in.c b/src/emu/cpu/m68000/m68k_in.c index 753a87615d2..e675ccac3ea 100644 --- a/src/emu/cpu/m68000/m68k_in.c +++ b/src/emu/cpu/m68000/m68k_in.c @@ -1818,7 +1818,7 @@ M68KMAKE_OP(andi, 32, ., .) M68KMAKE_OP(andi, 16, toc, .) { - m68ki_set_ccr(m68k, m68ki_get_ccr() & OPER_I_16(m68k)); + m68ki_set_ccr(m68k, m68ki_get_ccr(m68k) & OPER_I_16(m68k)); } @@ -5178,7 +5178,7 @@ M68KMAKE_OP(eori, 32, ., .) M68KMAKE_OP(eori, 16, toc, .) { - m68ki_set_ccr(m68k, m68ki_get_ccr() ^ OPER_I_16(m68k)); + m68ki_set_ccr(m68k, m68ki_get_ccr(m68k) ^ OPER_I_16(m68k)); } @@ -6703,7 +6703,7 @@ M68KMAKE_OP(move, 16, frc, d) { if(CPU_TYPE_IS_010_PLUS(m68k->cpu_type)) { - DY = MASK_OUT_BELOW_16(DY) | m68ki_get_ccr(); + DY = MASK_OUT_BELOW_16(DY) | m68ki_get_ccr(m68k); return; } m68ki_exception_illegal(m68k); @@ -6714,7 +6714,7 @@ M68KMAKE_OP(move, 16, frc, .) { if(CPU_TYPE_IS_010_PLUS(m68k->cpu_type)) { - m68ki_write_16(m68k, M68KMAKE_GET_EA_AY_16, m68ki_get_ccr()); + m68ki_write_16(m68k, M68KMAKE_GET_EA_AY_16, m68ki_get_ccr(m68k)); return; } m68ki_exception_illegal(m68k); @@ -8315,7 +8315,7 @@ M68KMAKE_OP(ori, 32, ., .) M68KMAKE_OP(ori, 16, toc, .) { - m68ki_set_ccr(m68k, m68ki_get_ccr() | OPER_I_16(m68k)); + m68ki_set_ccr(m68k, m68ki_get_ccr(m68k) | OPER_I_16(m68k)); } diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c index c1859cd551c..7a27ce02673 100644 --- a/src/emu/cpu/m68000/m68kcpu.c +++ b/src/emu/cpu/m68000/m68kcpu.c @@ -780,7 +780,7 @@ int m68k_execute(m68ki_cpu_core *m68k, int num_cycles) m68ki_trace_t1(); /* auto-disable (see m68kcpu.h) */ /* Set the address space for reads */ - m68ki_use_data_space(); /* auto-disable (see m68kcpu.h) */ + m68ki_use_data_space(m68k); /* auto-disable (see m68kcpu.h) */ /* Call external hook to peek at CPU */ debugger_instruction_hook(Machine, REG_PC); diff --git a/src/emu/cpu/m68000/m68kcpu.h b/src/emu/cpu/m68000/m68kcpu.h index cf4e686737a..02eb6ab8883 100644 --- a/src/emu/cpu/m68000/m68kcpu.h +++ b/src/emu/cpu/m68000/m68kcpu.h @@ -948,14 +948,14 @@ INLINE void m68ki_write_32_pd_fc(m68ki_cpu_core *m68k, UINT32 address, UINT32 fc INLINE UINT32 m68ki_get_ea_pcdi(m68ki_cpu_core *m68k) { UINT32 old_pc = REG_PC; - m68ki_use_program_space(); /* auto-disable */ + m68ki_use_program_space(m68k); /* auto-disable */ return old_pc + MAKE_INT_16(m68ki_read_imm_16(m68k)); } INLINE UINT32 m68ki_get_ea_pcix(m68ki_cpu_core *m68k) { - m68ki_use_program_space(); /* auto-disable */ + m68ki_use_program_space(m68k); /* auto-disable */ return m68ki_get_ea_ix(m68k, REG_PC); } |