diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2013-04-09 06:46:57 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2013-04-09 06:46:57 +0000 |
commit | c6cd8a09c87f9830898b0c2eb236492b70f0c255 (patch) | |
tree | cf528302c3e6ea6ce70addf4a2a133c5115124a6 /src/emu/cpu/m6502 | |
parent | 8fb2921edb6e1c8146e6348972eb1d23df2fd093 (diff) |
Cleanups and version bumpmame0148u3
Diffstat (limited to 'src/emu/cpu/m6502')
-rw-r--r-- | src/emu/cpu/m6502/m5074x.c | 189 | ||||
-rw-r--r-- | src/emu/cpu/m6502/m5074x.h | 24 | ||||
-rw-r--r-- | src/emu/cpu/m6502/m6502.h | 4 | ||||
-rw-r--r-- | src/emu/cpu/m6502/om740.lst | 1 |
4 files changed, 108 insertions, 110 deletions
diff --git a/src/emu/cpu/m6502/m5074x.c b/src/emu/cpu/m6502/m5074x.c index 7c6699f0d7c..fb82c61a5b0 100644 --- a/src/emu/cpu/m6502/m5074x.c +++ b/src/emu/cpu/m6502/m5074x.c @@ -9,14 +9,14 @@ // MACROS / CONSTANTS //************************************************************************** -#define IRQ_CNTRREQ (0x80) -#define IRQ_CNTRENA (0x40) -#define IRQ_TMR1REQ (0x20) -#define IRQ_TMR1ENA (0x10) -#define IRQ_TMR2REQ (0x08) -#define IRQ_TMR2ENA (0x04) -#define IRQ_INTREQ (0x02) -#define IRQ_INTENA (0x01) +#define IRQ_CNTRREQ (0x80) +#define IRQ_CNTRENA (0x40) +#define IRQ_TMR1REQ (0x20) +#define IRQ_TMR1ENA (0x10) +#define IRQ_TMR2REQ (0x08) +#define IRQ_TMR2ENA (0x04) +#define IRQ_INTREQ (0x02) +#define IRQ_INTENA (0x01) #define TMRC_TMRXREQ (0x80) #define TMRC_TMRXENA (0x40) @@ -64,7 +64,7 @@ void m5074x_device::device_start() write_p0.resolve_safe(); write_p1.resolve_safe(); write_p2.resolve_safe(); - write_p3.resolve_safe(); + write_p3.resolve_safe(); for (int i = 0; i < NUM_TIMERS; i++) { @@ -243,7 +243,7 @@ void m5074x_device::recalc_timer(int timer) break; case 2: - // Timer X modes: 00 = free run countdown, 01 = invert CNTR pin each time expires, + // Timer X modes: 00 = free run countdown, 01 = invert CNTR pin each time expires, // 10 = count each time CNTR pin inverts, 11 = count when CNTR pin low if ((m_tmrctrl & TMRC_TMRXMDE) == 0) { @@ -291,111 +291,111 @@ void m5074x_device::send_port(address_space &space, UINT8 offset, UINT8 data) UINT8 m5074x_device::read_port(UINT8 offset) { - UINT8 incoming = 0; + UINT8 incoming = 0; - switch (offset) - { - case 0: - incoming = read_p0(); - break; + switch (offset) + { + case 0: + incoming = read_p0(); + break; - case 1: - incoming = read_p1(); - break; + case 1: + incoming = read_p1(); + break; - case 2: - incoming = read_p2(); - break; + case 2: + incoming = read_p2(); + break; - case 3: - incoming = read_p3(); - break; - } + case 3: + incoming = read_p3(); + break; + } - // apply data direction registers - incoming &= (m_ddrs[offset] ^ 0xff); - // OR in ddr-masked version of port writes - incoming |= (m_ports[offset] & m_ddrs[offset]); + // apply data direction registers + incoming &= (m_ddrs[offset] ^ 0xff); + // OR in ddr-masked version of port writes + incoming |= (m_ports[offset] & m_ddrs[offset]); - return incoming; + return incoming; } READ8_MEMBER(m5074x_device::ports_r) { - switch (offset) - { - case 0: - return read_port(0); + switch (offset) + { + case 0: + return read_port(0); - case 1: - return m_ddrs[0]; + case 1: + return m_ddrs[0]; - case 2: - return read_port(1); + case 2: + return read_port(1); - case 3: - return m_ddrs[1]; + case 3: + return m_ddrs[1]; - case 4: - return read_port(2); + case 4: + return read_port(2); - case 5: - return m_ddrs[2]; + case 5: + return m_ddrs[2]; - case 8: - return read_port(3); + case 8: + return read_port(3); - case 9: - return m_ddrs[3]; - } + case 9: + return m_ddrs[3]; + } - return 0xff; + return 0xff; } WRITE8_MEMBER(m5074x_device::ports_w) { - switch (offset) - { - case 0: // p0 - send_port(space, 0, data & m_ddrs[0]); - m_ports[0] = data; - break; - - case 1: // p0 ddr - send_port(space, 0, m_ports[0] & data); - m_ddrs[0] = data; - break; - - case 2: // p1 - send_port(space, 1, data & m_ddrs[1]); - m_ports[1] = data; - break; - - case 3: // p1 ddr - send_port(space, 1, m_ports[1] & data); - m_ddrs[1] = data; - break; - - case 4: // p2 - send_port(space, 2, data & m_ddrs[2]); - m_ports[2] = data; - break; - - case 5: // p2 ddr - send_port(space, 2, m_ports[2] & data); - m_ddrs[2] = data; - break; - - case 8: // p3 - send_port(space, 3, data & m_ddrs[3]); - m_ports[3] = data; - break; - - case 9: // p3 ddr - send_port(space, 3, m_ports[3] & data); - m_ddrs[3] = data; - break; - } + switch (offset) + { + case 0: // p0 + send_port(space, 0, data & m_ddrs[0]); + m_ports[0] = data; + break; + + case 1: // p0 ddr + send_port(space, 0, m_ports[0] & data); + m_ddrs[0] = data; + break; + + case 2: // p1 + send_port(space, 1, data & m_ddrs[1]); + m_ports[1] = data; + break; + + case 3: // p1 ddr + send_port(space, 1, m_ports[1] & data); + m_ddrs[1] = data; + break; + + case 4: // p2 + send_port(space, 2, data & m_ddrs[2]); + m_ports[2] = data; + break; + + case 5: // p2 ddr + send_port(space, 2, m_ports[2] & data); + m_ddrs[2] = data; + break; + + case 8: // p3 + send_port(space, 3, data & m_ddrs[3]); + m_ports[3] = data; + break; + + case 9: // p3 ddr + send_port(space, 3, m_ports[3] & data); + m_ddrs[3] = data; + break; + } } READ8_MEMBER(m5074x_device::tmrirq_r) @@ -429,7 +429,7 @@ READ8_MEMBER(m5074x_device::tmrirq_r) WRITE8_MEMBER(m5074x_device::tmrirq_w) { -// printf("%02x to tmrirq @ %d\n", data, offset); +// printf("%02x to tmrirq @ %d\n", data, offset); switch (offset) { @@ -505,4 +505,3 @@ m50741_device::m50741_device(const machine_config &mconfig, device_type type, co m5074x_device(mconfig, type, name, tag, owner, clock, ADDRESS_MAP_NAME(m50741_map), shortname, source) { } - diff --git a/src/emu/cpu/m6502/m5074x.h b/src/emu/cpu/m6502/m5074x.h index 98c7848d4e1..d29ed852fca 100644 --- a/src/emu/cpu/m6502/m5074x.h +++ b/src/emu/cpu/m6502/m5074x.h @@ -54,25 +54,25 @@ public: const address_space_config m_program_config; - template<class _read, class _write> void set_p0_callbacks(_read rd, _write wr) + template<class _read, class _write> void set_p0_callbacks(_read rd, _write wr) { read_p0.set_callback(rd); write_p0.set_callback(wr); } - template<class _read, class _write> void set_p1_callbacks(_read rd, _write wr) + template<class _read, class _write> void set_p1_callbacks(_read rd, _write wr) { read_p1.set_callback(rd); write_p1.set_callback(wr); } - template<class _read, class _write> void set_p2_callbacks(_read rd, _write wr) + template<class _read, class _write> void set_p2_callbacks(_read rd, _write wr) { read_p2.set_callback(rd); write_p2.set_callback(wr); } - template<class _read, class _write> void set_p3_callbacks(_read rd, _write wr) + template<class _read, class _write> void set_p3_callbacks(_read rd, _write wr) { read_p3.set_callback(rd); write_p3.set_callback(wr); @@ -81,10 +81,10 @@ public: devcb2_read8 read_p0, read_p1, read_p2, read_p3; devcb2_write8 write_p0, write_p1, write_p2, write_p3; - DECLARE_READ8_MEMBER(ports_r); - DECLARE_WRITE8_MEMBER(ports_w); - DECLARE_READ8_MEMBER(tmrirq_r); - DECLARE_WRITE8_MEMBER(tmrirq_w); + DECLARE_READ8_MEMBER(ports_r); + DECLARE_WRITE8_MEMBER(ports_w); + DECLARE_READ8_MEMBER(tmrirq_r); + DECLARE_WRITE8_MEMBER(tmrirq_w); bool are_port_bits_output(UINT8 port, UINT8 mask) { return ((m_ddrs[port] & mask) == mask) ? true : false; } @@ -97,12 +97,12 @@ protected: virtual const address_space_config *memory_space_config(address_spacenum spacenum) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; } void send_port(address_space &space, UINT8 offset, UINT8 data); - UINT8 read_port(UINT8 offset); + UINT8 read_port(UINT8 offset); void recalc_irqs(); void recalc_timer(int timer); - UINT8 m_ports[6], m_ddrs[6]; + UINT8 m_ports[6], m_ddrs[6]; UINT8 m_intctrl, m_tmrctrl; UINT8 m_tmr12pre, m_tmr1, m_tmr2, m_tmrxpre, m_tmrx; UINT8 m_tmr1latch, m_tmr2latch, m_tmrxlatch; @@ -112,7 +112,7 @@ private: emu_timer *m_timers[NUM_TIMERS]; }; -class m50740_device : public m5074x_device +class m50740_device : public m5074x_device { public: m50740_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -123,7 +123,7 @@ protected: private: }; -class m50741_device : public m5074x_device +class m50741_device : public m5074x_device { public: m50741_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/emu/cpu/m6502/m6502.h b/src/emu/cpu/m6502/m6502.h index 4cdff2abd9b..2eccedf3010 100644 --- a/src/emu/cpu/m6502/m6502.h +++ b/src/emu/cpu/m6502/m6502.h @@ -129,8 +129,8 @@ protected: DASM_spg, /* "special page": implied FF00 OR immediate value (M740)*/ DASM_biz, /* bit, zero page (M740) */ DASM_bzr, /* bit, zero page, relative offset (M740) */ - DASM_bar, /* bit, accumulator, relative offset (M740) */ - DASM_bac /* bit, accumulator (M740) */ + DASM_bar, /* bit, accumulator, relative offset (M740) */ + DASM_bac /* bit, accumulator (M740) */ }; enum { diff --git a/src/emu/cpu/m6502/om740.lst b/src/emu/cpu/m6502/om740.lst index 5082ffad591..d944a0cbcb5 100644 --- a/src/emu/cpu/m6502/om740.lst +++ b/src/emu/cpu/m6502/om740.lst @@ -747,4 +747,3 @@ sbct_zpx do_sbct(TMP); write(X, TMP2); prefetch(); - |