diff options
Diffstat (limited to 'src/emu/cpu/m68000')
| -rw-r--r-- | src/emu/cpu/m68000/m68kcpu.h | 44 | ||||
| -rw-r--r-- | src/emu/cpu/m68000/m68kfpu.c | 12 |
2 files changed, 28 insertions, 28 deletions
diff --git a/src/emu/cpu/m68000/m68kcpu.h b/src/emu/cpu/m68000/m68kcpu.h index 3190a6409cf..9311cfa2f52 100644 --- a/src/emu/cpu/m68000/m68kcpu.h +++ b/src/emu/cpu/m68000/m68kcpu.h @@ -80,7 +80,7 @@ typedef struct _m68ki_cpu_core m68ki_cpu_core; #define CPU_TYPE_010 (0x00000004) #define CPU_TYPE_EC020 (0x00000008) #define CPU_TYPE_020 (0x00000010) -#define CPU_TYPE_EC030 (0x00000020) +#define CPU_TYPE_EC030 (0x00000020) #define CPU_TYPE_030 (0x00000040) #define CPU_TYPE_EC040 (0x00000080) #define CPU_TYPE_LC040 (0x00000100) @@ -669,7 +669,7 @@ struct _m68ki_cpu_core UINT32 virq_state; UINT32 nmi_pending; - void (**jump_table)(m68ki_cpu_core *m68k); + void (**jump_table)(m68ki_cpu_core *m68k); const UINT8* cyc_instruction; const UINT8* cyc_exception; @@ -904,31 +904,31 @@ INLINE void m68ki_ic_clear(m68ki_cpu_core *m68k) INLINE UINT32 m68ki_ic_readimm16(m68ki_cpu_core *m68k, UINT32 address) { -/* if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type) && (m68k->cacr & M68K_CACR_EI)) - { - UINT32 ic_offset = (address >> 1) % M68K_IC_SIZE; - if (m68k->ic_address[ic_offset] == address) - { - return m68k->ic_data[ic_offset]; - } - else - { - UINT32 data = m68k->memory.readimm16(address); - if (!m68k->mmu_tmp_buserror_occurred) - { - m68k->ic_data[ic_offset] = data; - m68k->ic_address[ic_offset] = address; - } - return data; - } - } - else*/ +/* if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type) && (m68k->cacr & M68K_CACR_EI)) + { + UINT32 ic_offset = (address >> 1) % M68K_IC_SIZE; + if (m68k->ic_address[ic_offset] == address) + { + return m68k->ic_data[ic_offset]; + } + else + { + UINT32 data = m68k->memory.readimm16(address); + if (!m68k->mmu_tmp_buserror_occurred) + { + m68k->ic_data[ic_offset] = data; + m68k->ic_address[ic_offset] = address; + } + return data; + } + } + else*/ { return m68k->memory.readimm16(address); } // this can't happen, but Apple GCC insists -// return 0; +// return 0; } /* Handles all immediate reads, does address error check, function code setting, diff --git a/src/emu/cpu/m68000/m68kfpu.c b/src/emu/cpu/m68000/m68kfpu.c index 9c226f9eb1f..7e17bbfb1a5 100644 --- a/src/emu/cpu/m68000/m68kfpu.c +++ b/src/emu/cpu/m68000/m68kfpu.c @@ -1495,22 +1495,22 @@ static void fmove_fpcr(m68ki_cpu_core *m68k, UINT16 w2) { address = EA_AY_DI_32(m68k); } - else if (mode == 6) + else if (mode == 6) { address = EA_AY_IX_32(m68k); } if (dir) // From system control reg to <ea> { - if (regsel & 4) { m68ki_write_32(m68k, address, REG_FPCR); address += 4; } - if (regsel & 2) { m68ki_write_32(m68k, address, REG_FPSR); address += 4; } - if (regsel & 1) { m68ki_write_32(m68k, address, REG_FPIAR); address += 4; } + if (regsel & 4) { m68ki_write_32(m68k, address, REG_FPCR); address += 4; } + if (regsel & 2) { m68ki_write_32(m68k, address, REG_FPSR); address += 4; } + if (regsel & 1) { m68ki_write_32(m68k, address, REG_FPIAR); address += 4; } } else // From <ea> to system control reg { if (regsel & 4) { REG_FPCR = m68ki_read_32(m68k, address); address += 4; } - if (regsel & 2) { REG_FPSR = m68ki_read_32(m68k, address); address += 4; } - if (regsel & 1) { REG_FPIAR = m68ki_read_32(m68k, address); address += 4; } + if (regsel & 2) { REG_FPSR = m68ki_read_32(m68k, address); address += 4; } + if (regsel & 1) { REG_FPIAR = m68ki_read_32(m68k, address); address += 4; } } } else |
