Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-23 14:19:01 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fixed a few issues caught by an MSVC compile (why doesn't gcc complain??)

Browse Source
This commit is contained in:
Aaron Giles 2008-11-06 15:44:58 +00:00
parent 3d15bc42d0
commit 1228d0ad9e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/emu/cpu/m68000/m68k_in.c
View File

@ -1818,7 +1818,7 @@ M68KMAKE_OP(andi, 32, ., .)
M68KMAKE_OP(andi, 16, toc, .) 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, .) 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)) 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; return;
} }
m68ki_exception_illegal(m68k); m68ki_exception_illegal(m68k);
@ -6714,7 +6714,7 @@ M68KMAKE_OP(move, 16, frc, .)
{ {
if(CPU_TYPE_IS_010_PLUS(m68k->cpu_type)) 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; return;
} }
m68ki_exception_illegal(m68k); m68ki_exception_illegal(m68k);
@ -8315,7 +8315,7 @@ M68KMAKE_OP(ori, 32, ., .)
M68KMAKE_OP(ori, 16, toc, .) 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));
} }

2
src/emu/cpu/m68000/m68kcpu.c
View File

@ -780,7 +780,7 @@ int m68k_execute(m68ki_cpu_core *m68k, int num_cycles)
m68ki_trace_t1(); /* auto-disable (see m68kcpu.h) */ m68ki_trace_t1(); /* auto-disable (see m68kcpu.h) */
/* Set the address space for reads */ /* 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 */ /* Call external hook to peek at CPU */
debugger_instruction_hook(Machine, REG_PC); debugger_instruction_hook(Machine, REG_PC);

4
src/emu/cpu/m68000/m68kcpu.h
View File

@ -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) INLINE UINT32 m68ki_get_ea_pcdi(m68ki_cpu_core *m68k)
{ {
UINT32 old_pc = REG_PC; 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)); return old_pc + MAKE_INT_16(m68ki_read_imm_16(m68k));
} }
INLINE UINT32 m68ki_get_ea_pcix(m68ki_cpu_core *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); return m68ki_get_ea_ix(m68k, REG_PC);
} }