diff options
| author | 2015-01-28 09:20:10 +0100 | |
|---|---|---|
| committer | 2015-01-28 09:20:10 +0100 | |
| commit | 26e7a17b6326aa5a75a6276e52cf84a94c16d7a0 (patch) | |
| tree | bab4468226c59d590688e0ece892f5bfbca58736 /src/emu/cpu | |
| parent | 13b862c4fae88f0f819c2c4416d49249e4de45b9 (diff) | |
Cleanups and version bumpmame0158
Diffstat (limited to 'src/emu/cpu')
| -rw-r--r-- | src/emu/cpu/arcompact/arcompact.c | 2 | ||||
| -rw-r--r-- | src/emu/cpu/arcompact/arcompact.h | 14 | ||||
| -rw-r--r-- | src/emu/cpu/arcompact/arcompact_execute.c | 4 | ||||
| -rw-r--r-- | src/emu/cpu/i386/i386dasm.c | 4 | ||||
| -rw-r--r-- | src/emu/cpu/m68000/m68k_in.c | 2 | ||||
| -rw-r--r-- | src/emu/cpu/m68000/m68kcpu.c | 2 | ||||
| -rw-r--r-- | src/emu/cpu/m68000/m68kfpu.inc | 7 | ||||
| -rw-r--r-- | src/emu/cpu/tms0980/tms0980.c | 6 |
8 files changed, 20 insertions, 21 deletions
diff --git a/src/emu/cpu/arcompact/arcompact.c b/src/emu/cpu/arcompact/arcompact.c index f7661f9bacd..be1eaae4fd8 100644 --- a/src/emu/cpu/arcompact/arcompact.c +++ b/src/emu/cpu/arcompact/arcompact.c @@ -51,7 +51,7 @@ ADDRESS_MAP_END arcompact_device::arcompact_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : cpu_device(mconfig, ARCA5, "ARCtangent-A5", tag, owner, clock, "arca5", __FILE__) , m_program_config("program", ENDIANNESS_LITTLE, 32, 32, 0) // some docs describe these as 'middle endian'?! - , m_io_config( "io", ENDIANNESS_LITTLE, 32, AUX_SPACE_ADDRESS_WIDTH, 0, ADDRESS_MAP_NAME( arcompact_auxreg_map ) ) + , m_io_config( "io", ENDIANNESS_LITTLE, 32, AUX_SPACE_ADDRESS_WIDTH, 0, ADDRESS_MAP_NAME( arcompact_auxreg_map ) ) { } diff --git a/src/emu/cpu/arcompact/arcompact.h b/src/emu/cpu/arcompact/arcompact.h index b98377b8fbb..f7b56cd010e 100644 --- a/src/emu/cpu/arcompact/arcompact.h +++ b/src/emu/cpu/arcompact/arcompact.h @@ -60,17 +60,17 @@ class arcompact_device : public cpu_device public: // construction/destruction arcompact_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + DECLARE_READ32_MEMBER( arcompact_auxreg002_LPSTART_r); DECLARE_WRITE32_MEMBER(arcompact_auxreg002_LPSTART_w); DECLARE_READ32_MEMBER( arcompact_auxreg003_LPEND_r); DECLARE_WRITE32_MEMBER(arcompact_auxreg003_LPEND_w); - + DECLARE_READ32_MEMBER( arcompact_auxreg00a_STATUS32_r); DECLARE_READ32_MEMBER( arcompact_auxreg025_INTVECTORBASE_r); DECLARE_WRITE32_MEMBER( arcompact_auxreg025_INTVECTORBASE_w); - + protected: // device-level overrides virtual void device_start(); @@ -184,17 +184,17 @@ protected: ARCOMPACT_RETTYPE arcompact_handle04_1c(OPS_32); ARCOMPACT_RETTYPE arcompact_handle04_1d(OPS_32); // ARCOMPACT_RETTYPE arcompact_handle04_20(OPS_32); -// ARCOMPACT_RETTYPE arcompact_handle04_21(OPS_32); +// ARCOMPACT_RETTYPE arcompact_handle04_21(OPS_32); ARCOMPACT_RETTYPE arcompact_handle04_22(OPS_32); ARCOMPACT_RETTYPE arcompact_handle04_23(OPS_32); ARCOMPACT_RETTYPE arcompact_handle04_28(OPS_32); ARCOMPACT_RETTYPE arcompact_handle04_29(OPS_32); -// ARCOMPACT_RETTYPE arcompact_handle04_2a(OPS_32); +// ARCOMPACT_RETTYPE arcompact_handle04_2a(OPS_32); // ARCOMPACT_RETTYPE arcompact_handle04_2b(OPS_32); ARCOMPACT_RETTYPE arcompact_handle04_2f_00(OPS_32); ARCOMPACT_RETTYPE arcompact_handle04_2f_01(OPS_32); // ARCOMPACT_RETTYPE arcompact_handle04_2f_02(OPS_32); -// ARCOMPACT_RETTYPE arcompact_handle04_2f_03(OPS_32); +// ARCOMPACT_RETTYPE arcompact_handle04_2f_03(OPS_32); ARCOMPACT_RETTYPE arcompact_handle04_2f_04(OPS_32); ARCOMPACT_RETTYPE arcompact_handle04_2f_05(OPS_32); ARCOMPACT_RETTYPE arcompact_handle04_2f_06(OPS_32); @@ -770,7 +770,7 @@ protected: ARCOMPACT_RETTYPE arcompact_handle19_0x_helper(OPS_16, const char* optext, int shift, int format); ARCOMPACT_RETTYPE arcompact_handle1e_0x_helper(OPS_16, const char* optext); ARCOMPACT_RETTYPE arcompact_handle1e_03_0x_helper(OPS_16, const char* optext); - + UINT32 handle_jump_to_addr(int delay, int link, UINT32 address, UINT32 next_addr); UINT32 handle_jump_to_register(int delay, int link, UINT32 reg, UINT32 next_addr, int flag); diff --git a/src/emu/cpu/arcompact/arcompact_execute.c b/src/emu/cpu/arcompact/arcompact_execute.c index acbd1a2af2d..115114efc8a 100644 --- a/src/emu/cpu/arcompact/arcompact_execute.c +++ b/src/emu/cpu/arcompact/arcompact_execute.c @@ -2142,7 +2142,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_21_p11_m0(OPS_32) // Jcc. size = 8; } - // c = limm; + // c = limm; } else @@ -2151,7 +2151,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_21_p11_m0(OPS_32) // Jcc. // Jcc [c] 0010 0RRR 1110 0000 0RRR CCCC CC0Q QQQQ // no conditional links to ILINK1, ILINK2? - // c = m_regs[creg]; + // c = m_regs[creg]; } if (!check_condition(condition)) diff --git a/src/emu/cpu/i386/i386dasm.c b/src/emu/cpu/i386/i386dasm.c index 2a74503d81e..281f58937a2 100644 --- a/src/emu/cpu/i386/i386dasm.c +++ b/src/emu/cpu/i386/i386dasm.c @@ -98,7 +98,7 @@ enum #define ALWAYS64 0x400 #define SPECIAL64 0x800 #define SPECIAL64_ENT(x) (SPECIAL64 | ((x) << 24)) -#define GROUP_MOD 0x1000 +#define GROUP_MOD 0x1000 struct I386_OPCODE { const char *mnemonic; @@ -1953,7 +1953,7 @@ static const GROUP_OP group_op_table[] = { "group0F0D", group0F0D_table }, { "group0F12", group0F12_table }, { "group0F16", group0F16_table }, - { "group0F18", group0F18_table }, + { "group0F18", group0F18_table }, { "group0F71", group0F71_table }, { "group0F72", group0F72_table }, { "group0F73", group0F73_table }, diff --git a/src/emu/cpu/m68000/m68k_in.c b/src/emu/cpu/m68000/m68k_in.c index 900fb0a502b..4b445a2c7a7 100644 --- a/src/emu/cpu/m68000/m68k_in.c +++ b/src/emu/cpu/m68000/m68k_in.c @@ -272,7 +272,7 @@ M68KMAKE_OPCODE_HANDLER_HEADER extern void m68040_fpu_op0(m68000_base_device *m68k); extern void m68040_fpu_op1(m68000_base_device *m68k); extern void m68881_mmu_ops(m68000_base_device *m68k); -extern void m68881_ftrap(m68000_base_device *m68k); +extern void m68881_ftrap(m68000_base_device *m68k); /* ======================================================================== */ /* ========================= INSTRUCTION HANDLERS ========================= */ diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c index 6f4f4126bbd..6c4c30d026e 100644 --- a/src/emu/cpu/m68000/m68kcpu.c +++ b/src/emu/cpu/m68000/m68kcpu.c @@ -699,7 +699,7 @@ static void m68k_cause_bus_error(m68000_base_device *m68k) { /* 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); diff --git a/src/emu/cpu/m68000/m68kfpu.inc b/src/emu/cpu/m68000/m68kfpu.inc index 47f39d8c4fb..47b554bc457 100644 --- a/src/emu/cpu/m68000/m68kfpu.inc +++ b/src/emu/cpu/m68000/m68kfpu.inc @@ -2177,11 +2177,11 @@ void m68881_ftrap(m68000_base_device *m68k) // trap here m68ki_exception_trap(m68k, EXCEPTION_TRAPV); } - else // fall through, requires eating the operand + else // fall through, requires eating the operand { switch (m68k->ir & 0x7) { - case 2: // word operand + case 2: // word operand OPER_I_16(m68k); break; @@ -2189,9 +2189,8 @@ void m68881_ftrap(m68000_base_device *m68k) OPER_I_32(m68k); break; - case 4: // no operand + case 4: // no operand break; } } } - diff --git a/src/emu/cpu/tms0980/tms0980.c b/src/emu/cpu/tms0980/tms0980.c index 025c0a7a575..a010d26c9ab 100644 --- a/src/emu/cpu/tms0980/tms0980.c +++ b/src/emu/cpu/tms0980/tms0980.c @@ -1037,7 +1037,7 @@ void tms1400_cpu_device::op_call() m_ps = m_ps << 4 | m_pa; m_pa = m_pb; - + m_cs = m_cs << 2 | m_ca; m_ca = m_cb; } @@ -1057,10 +1057,10 @@ void tms1400_cpu_device::op_retn() m_pc = m_sr & m_pc_mask; m_sr >>= m_pc_bits; - + m_pa = m_pb = m_ps & 0xf; m_ps >>= 4; - + m_ca = m_cb = m_cs & 3; m_cs >>= 2; } |
