diff options
Diffstat (limited to 'src/emu')
66 files changed, 951 insertions, 963 deletions
diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak index 53cfe7a72bc..7eb9a7f3dce 100644 --- a/src/emu/cpu/cpu.mak +++ b/src/emu/cpu/cpu.mak @@ -1222,15 +1222,15 @@ $(CPUOBJ)/m6809/konami.o: $(CPUSRC)/m6809/konami.c \ $(CPUSRC)/m6809/m6809inl.h \ $(CPUOBJ)/m6809/konami.inc -$(CPUOBJ)/m6809/m6809.inc: $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/m6809.ops $(CPUSRC)/m6809/base6x09.ops +$(CPUOBJ)/m6809/m6809.inc: $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/m6809.ops $(CPUSRC)/m6809/base6x09.ops @echo Generating m6809 source file... $(PYTHON) $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/m6809.ops > $@ -$(CPUOBJ)/m6809/hd6309.inc: $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/hd6309.ops $(CPUSRC)/m6809/base6x09.ops +$(CPUOBJ)/m6809/hd6309.inc: $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/hd6309.ops $(CPUSRC)/m6809/base6x09.ops @echo Generating hd6309 source file... $(PYTHON) $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/hd6309.ops > $@ -$(CPUOBJ)/m6809/konami.inc: $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/konami.ops $(CPUSRC)/m6809/base6x09.ops +$(CPUOBJ)/m6809/konami.inc: $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/konami.ops $(CPUSRC)/m6809/base6x09.ops @echo Generating konami source file... $(PYTHON) $(CPUSRC)/m6809/m6809make.py $(CPUSRC)/m6809/konami.ops > $@ diff --git a/src/emu/cpu/g65816/g65816.c b/src/emu/cpu/g65816/g65816.c index 4e49f0678f4..47cfad6ae15 100644 --- a/src/emu/cpu/g65816/g65816.c +++ b/src/emu/cpu/g65816/g65816.c @@ -681,9 +681,9 @@ void set_5a22_map(legacy_cpu_device &cpu) cpu.space(AS_PROGRAM).install_legacy_write_handler(0x4204, 0x4204, 0, 0xbf0000, FUNC(wrdivl_w)); cpu.space(AS_PROGRAM).install_legacy_write_handler(0x4205, 0x4205, 0, 0xbf0000, FUNC(wrdivh_w)); cpu.space(AS_PROGRAM).install_legacy_write_handler(0x4206, 0x4206, 0, 0xbf0000, FUNC(wrdvdd_w)); - + cpu.space(AS_PROGRAM).install_legacy_write_handler(0x420d, 0x420d, 0, 0xbf0000, FUNC(memsel_w)); - + cpu.space(AS_PROGRAM).install_legacy_read_handler(0x4214, 0x4214, 0, 0xbf0000, FUNC(rddivl_r)); cpu.space(AS_PROGRAM).install_legacy_read_handler(0x4215, 0x4215, 0, 0xbf0000, FUNC(rddivh_r)); cpu.space(AS_PROGRAM).install_legacy_read_handler(0x4216, 0x4216, 0, 0xbf0000, FUNC(rdmpyl_r)); diff --git a/src/emu/cpu/jaguar/jaguar.c b/src/emu/cpu/jaguar/jaguar.c index 20ad81fe031..10843a961b8 100644 --- a/src/emu/cpu/jaguar/jaguar.c +++ b/src/emu/cpu/jaguar/jaguar.c @@ -103,8 +103,8 @@ struct jaguar_cpu_state address_space *program; direct_read_data *direct; - UINT32 internal_ram_start; - UINT32 internal_ram_end; + UINT32 internal_ram_start; + UINT32 internal_ram_end; }; diff --git a/src/emu/cpu/m6502/m3745x.c b/src/emu/cpu/m6502/m3745x.c index 87ecd7b5b25..bc3851ddb1e 100644 --- a/src/emu/cpu/m6502/m3745x.c +++ b/src/emu/cpu/m6502/m3745x.c @@ -11,16 +11,16 @@ // Interrupt control bits (interpolated from C68 program; need 7450 Group manual badly) -#define IRQ1_INT1 (0x04) -#define IRQ1_INT2 (0x08) // guess, not used in C68 -#define IRQ1_INT3 (0x10) // guess, not used in C68 +#define IRQ1_INT1 (0x04) +#define IRQ1_INT2 (0x08) // guess, not used in C68 +#define IRQ1_INT3 (0x10) // guess, not used in C68 -#define IRQ2_SERIALRX (0x08) -#define IRQ2_SERIALTX (0x10) -#define IRQ2_ADC (0x20) +#define IRQ2_SERIALRX (0x08) +#define IRQ2_SERIALTX (0x10) +#define IRQ2_ADC (0x20) -#define ADCTRL_CH_MASK (0x07) // AD ctrl reg. channel mask -#define ADCTRL_COMPLETE (0x08) // AD ctrl "start"/"complete" bit +#define ADCTRL_CH_MASK (0x07) // AD ctrl reg. channel mask +#define ADCTRL_COMPLETE (0x08) // AD ctrl "start"/"complete" bit //************************************************************************** // DEVICE DEFINITIONS @@ -75,7 +75,7 @@ void m3745x_device::device_start() write_p3.resolve_safe(); write_p4.resolve_safe(); write_p5.resolve_safe(); - write_p6.resolve_safe(); + write_p6.resolve_safe(); read_ad_0.resolve_safe(0); read_ad_1.resolve_safe(0); read_ad_2.resolve_safe(0); @@ -109,7 +109,7 @@ void m3745x_device::device_reset() { m740_device::device_reset(); - SP = 0x01ff; // we have the "traditional" stack in page 1, not 0 like some M740 derivatives + SP = 0x01ff; // we have the "traditional" stack in page 1, not 0 like some M740 derivatives for (int i = 0; i < NUM_TIMERS; i++) { @@ -179,7 +179,7 @@ void m3745x_device::execute_set_input(int inputnum, int state) } break; - case M3745X_SET_OVERFLOW: // the base 740 class can handle this + case M3745X_SET_OVERFLOW: // the base 740 class can handle this m740_device::execute_set_input(M740_SET_OVERFLOW, state); break; } @@ -190,7 +190,7 @@ void m3745x_device::execute_set_input(int inputnum, int state) void m3745x_device::recalc_irqs() { UINT16 all_ints = 0; - int static const irq_lines[16] = + int static const irq_lines[16] = { -1, -1, -1, M740_INT11_LINE, M740_INT12_LINE, M740_INT13_LINE, -1, -1, -1, -1, M740_INT2_LINE, M740_INT3_LINE, M740_INT4_LINE, -1, -1, -1 @@ -199,7 +199,7 @@ void m3745x_device::recalc_irqs() all_ints = (m_intreq1 & m_intctrl1) << 8; all_ints |= (m_intreq2 & m_intctrl2); -// printf("recalc_irqs: last_all_ints = %04x last_ints = %04x (req1 %02x ctrl1 %02x req2 %02x ctrl2 %02x)\n", all_ints, m_last_all_ints, m_intreq1, m_intctrl1, m_intreq2, m_intctrl2); +// printf("recalc_irqs: last_all_ints = %04x last_ints = %04x (req1 %02x ctrl1 %02x req2 %02x ctrl2 %02x)\n", all_ints, m_last_all_ints, m_intreq1, m_intctrl1, m_intreq2, m_intctrl2); // check all 16 IRQ bits for changes for (int i = 0; i < 16; i++) @@ -210,19 +210,19 @@ void m3745x_device::recalc_irqs() // and wasn't last time if (!(m_last_all_ints & (1 << i))) { -// printf(" asserting irq %d (%d)\n", i, irq_lines[i]); +// printf(" asserting irq %d (%d)\n", i, irq_lines[i]); if (irq_lines[i] != -1) { m740_device::execute_set_input(irq_lines[i], ASSERT_LINE); } } } - else // bit is clear now + else // bit is clear now { // ...and wasn't clear last time if (m_last_all_ints & (1 << i)) { -// printf(" clearing irq %d (%d)\n", i, irq_lines[i]); +// printf(" clearing irq %d (%d)\n", i, irq_lines[i]); if (irq_lines[i] != -1) { m740_device::execute_set_input(irq_lines[i], CLEAR_LINE); @@ -258,103 +258,103 @@ void m3745x_device::send_port(address_space &space, UINT8 offset, UINT8 data) UINT8 m3745x_device::read_port(UINT8 offset) { - UINT8 incoming = 0; + UINT8 incoming = 0; - switch (offset) - { - case 0: - incoming = read_p3(); - break; + switch (offset) + { + case 0: + incoming = read_p3(); + break; - case 1: - incoming = read_p4(); - break; + case 1: + incoming = read_p4(); + break; - case 2: - incoming = read_p5(); - break; + case 2: + incoming = read_p5(); + break; - case 3: - incoming = read_p6(); - break; - } + case 3: + incoming = read_p6(); + 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(m3745x_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 4: - return read_port(2); + case 4: + return read_port(2); - case 5: - return m_ddrs[2]; + case 5: + return m_ddrs[2]; - case 6: - return read_port(3); + case 6: + return read_port(3); - case 7: - return m_ddrs[3]; - } + case 7: + return m_ddrs[3]; + } - return 0xff; + return 0xff; } WRITE8_MEMBER(m3745x_device::ports_w) { - switch (offset) - { - case 0: // p3 - send_port(space, 0, data & m_ddrs[0]); - m_ports[0] = data; - break; - - case 1: // p3 ddr - send_port(space, 0, m_ports[0] & data); - m_ddrs[0] = data; - break; - - case 2: // p4 - send_port(space, 1, data & m_ddrs[1]); - m_ports[1] = data; - break; - - case 4: // p5 - send_port(space, 2, data & m_ddrs[2]); - m_ports[2] = data; - break; - - case 5: // p5 ddr - send_port(space, 2, m_ports[2] & data); - m_ddrs[2] = data; - break; - - case 6: // p6 - send_port(space, 3, data & m_ddrs[3]); - m_ports[3] = data; - break; - - case 7: // p6 ddr - send_port(space, 3, m_ports[3] & data); - m_ddrs[3] = data; - break; - } + switch (offset) + { + case 0: // p3 + send_port(space, 0, data & m_ddrs[0]); + m_ports[0] = data; + break; + + case 1: // p3 ddr + send_port(space, 0, m_ports[0] & data); + m_ddrs[0] = data; + break; + + case 2: // p4 + send_port(space, 1, data & m_ddrs[1]); + m_ports[1] = data; + break; + + case 4: // p5 + send_port(space, 2, data & m_ddrs[2]); + m_ports[2] = data; + break; + + case 5: // p5 ddr + send_port(space, 2, m_ports[2] & data); + m_ddrs[2] = data; + break; + + case 6: // p6 + send_port(space, 3, data & m_ddrs[3]); + m_ports[3] = data; + break; + + case 7: // p6 ddr + send_port(space, 3, m_ports[3] & data); + m_ddrs[3] = data; + break; + } } READ8_MEMBER(m3745x_device::intregs_r) @@ -495,4 +495,3 @@ m37450_device::m37450_device(const machine_config &mconfig, device_type type, co m3745x_device(mconfig, type, name, tag, owner, clock, ADDRESS_MAP_NAME(m37450_map)) { } - diff --git a/src/emu/cpu/m6502/m3745x.h b/src/emu/cpu/m6502/m3745x.h index 43798a5b83a..83178649083 100644 --- a/src/emu/cpu/m6502/m3745x.h +++ b/src/emu/cpu/m6502/m3745x.h @@ -63,31 +63,31 @@ public: const address_space_config m_program_config; - 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); } - template<class _read, class _write> void set_p4_callbacks(_read rd, _write wr) + template<class _read, class _write> void set_p4_callbacks(_read rd, _write wr) { read_p4.set_callback(rd); write_p4.set_callback(wr); } - template<class _read, class _write> void set_p5_callbacks(_read rd, _write wr) + template<class _read, class _write> void set_p5_callbacks(_read rd, _write wr) { read_p5.set_callback(rd); write_p5.set_callback(wr); } - template<class _read, class _write> void set_p6_callbacks(_read rd, _write wr) + template<class _read, class _write> void set_p6_callbacks(_read rd, _write wr) { read_p6.set_callback(rd); write_p6.set_callback(wr); } - template<class _read, class _read2, class _read3, class _read4> void set_ad14_callbacks(_read rd, _read2 rd2, _read3 rd3, _read4 rd4) + template<class _read, class _read2, class _read3, class _read4> void set_ad14_callbacks(_read rd, _read2 rd2, _read3 rd3, _read4 rd4) { read_ad_0.set_callback(rd); read_ad_1.set_callback(rd2); @@ -95,7 +95,7 @@ public: read_ad_3.set_callback(rd4); } - template<class _read, class _read2, class _read3, class _read4> void set_ad58_callbacks(_read rd, _read2 rd2, _read3 rd3, _read4 rd4) + template<class _read, class _read2, class _read3, class _read4> void set_ad58_callbacks(_read rd, _read2 rd2, _read3 rd3, _read4 rd4) { read_ad_4.set_callback(rd); read_ad_5.set_callback(rd2); @@ -108,12 +108,12 @@ public: devcb2_read8 read_ad_0, read_ad_1, read_ad_2, read_ad_3; devcb2_read8 read_ad_4, read_ad_5, read_ad_6, read_ad_7; - DECLARE_READ8_MEMBER(ports_r); - DECLARE_WRITE8_MEMBER(ports_w); - DECLARE_READ8_MEMBER(adc_r); - DECLARE_WRITE8_MEMBER(adc_w); - DECLARE_READ8_MEMBER(intregs_r); - DECLARE_WRITE8_MEMBER(intregs_w); + DECLARE_READ8_MEMBER(ports_r); + DECLARE_WRITE8_MEMBER(ports_w); + DECLARE_READ8_MEMBER(adc_r); + DECLARE_WRITE8_MEMBER(adc_w); + DECLARE_READ8_MEMBER(intregs_r); + DECLARE_WRITE8_MEMBER(intregs_w); bool are_port_bits_output(UINT8 port, UINT8 mask) { return ((m_ddrs[port] & mask) == mask) ? true : false; } @@ -127,11 +127,11 @@ 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(); - UINT8 m_ports[6], m_ddrs[6]; + UINT8 m_ports[6], m_ddrs[6]; UINT8 m_intreq1, m_intreq2, m_intctrl1, m_intctrl2; UINT8 m_adctrl; UINT16 m_last_all_ints; @@ -140,7 +140,7 @@ private: emu_timer *m_timers[NUM_TIMERS]; }; -class m37450_device : public m3745x_device +class m37450_device : public m3745x_device { public: m37450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/emu/cpu/m6502/m740.c b/src/emu/cpu/m6502/m740.c index 9aa42f13c37..f6035794c1e 100644 --- a/src/emu/cpu/m6502/m740.c +++ b/src/emu/cpu/m6502/m740.c @@ -88,12 +88,12 @@ UINT8 m740_device::do_seb(UINT8 in, UINT8 bit) // doesn't affect the flags UINT8 m740_device::do_rrf(UINT8 in) { - return ((in&0xf)<<4) | ((in&0xf0)>>4); + return ((in&0xf)<<4) | ((in&0xf0)>>4); } void m740_device::execute_set_input(int inputnum, int state) { - switch(inputnum) + switch(inputnum) { case M740_INT0_LINE: case M740_INT1_LINE: @@ -109,9 +109,9 @@ void m740_device::execute_set_input(int inputnum, int state) case M740_INT11_LINE: case M740_INT12_LINE: case M740_INT13_LINE: - case M740_INT14_LINE: // 37450 has 15 IRQ lines, no other known variant has that many + case M740_INT14_LINE: // 37450 has 15 IRQ lines, no other known variant has that many set_irq_line(inputnum - M740_INT0_LINE, state); - break; + break; case V_LINE: if(!v_state && state == ASSERT_LINE) @@ -151,7 +151,7 @@ void m740_device::set_irq_line(int line, int state) } } -// printf("M740 single IRQ state is %d (MPX %08x, vector %x)\n", irq_state, m_irq_multiplex, m_irq_vector); +// printf("M740 single IRQ state is %d (MPX %08x, vector %x)\n", irq_state, m_irq_multiplex, m_irq_vector); } #include "cpu/m6502/m740.inc" diff --git a/src/emu/cpu/m6502/m740.h b/src/emu/cpu/m6502/m740.h index 4e085f95cda..cdf738956c2 100644 --- a/src/emu/cpu/m6502/m740.h +++ b/src/emu/cpu/m6502/m740.h @@ -46,16 +46,16 @@ class m740_device : public m6502_device { public: enum { - M740_INT0_LINE = INPUT_LINE_IRQ0, // (fffc) - M740_INT1_LINE, // (fffa) - M740_INT2_LINE, // (fff8) - M740_INT3_LINE, // (fff6) - M740_INT4_LINE, // (fff4) - M740_INT5_LINE, // (fff2) - M740_INT6_LINE, // (fff0) - M740_INT7_LINE, // (ffee) - M740_INT8_LINE, // (ffec) - M740_INT9_LINE, // (ffea) + M740_INT0_LINE = INPUT_LINE_IRQ0, // (fffc) + M740_INT1_LINE, // (fffa) + M740_INT2_LINE, // (fff8) + M740_INT3_LINE, // (fff6) + M740_INT4_LINE, // (fff4) + M740_INT5_LINE, // (fff2) + M740_INT6_LINE, // (fff0) + M740_INT7_LINE, // (ffee) + M740_INT8_LINE, // (ffec) + M740_INT9_LINE, // (ffea) M740_INT10_LINE, // (ffe8) M740_INT11_LINE, // (ffe6) M740_INT12_LINE, // (ffe4) @@ -68,14 +68,14 @@ public: m740_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); m740_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock); - virtual void device_reset(); + virtual void device_reset(); - static const disasm_entry disasm_entries[0x100]; + static const disasm_entry disasm_entries[0x100]; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void do_exec_full(); - virtual void do_exec_partial(); - virtual void execute_set_input(int inputnum, int state); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual void do_exec_full(); + virtual void do_exec_partial(); + virtual void execute_set_input(int inputnum, int state); protected: #define O(o) void o ## _full(); void o ## _partial() diff --git a/src/emu/cpu/m6502/om740.lst b/src/emu/cpu/m6502/om740.lst index 49f9c4a782b..048fa1304ea 100644 --- a/src/emu/cpu/m6502/om740.lst +++ b/src/emu/cpu/m6502/om740.lst @@ -143,4 +143,3 @@ brk740_imp P |= F_I; // Do *not* move after the prefetch prefetch(); inst_state = -1; - diff --git a/src/emu/cpu/m6809/hd6309.c b/src/emu/cpu/m6809/hd6309.c index bc7362b5721..5fbb2a9fa78 100644 --- a/src/emu/cpu/m6809/hd6309.c +++ b/src/emu/cpu/m6809/hd6309.c @@ -26,7 +26,7 @@ History: March 2013 NPW: - Rewrite of 6809/6309/Konami CPU; attempted to make cycle exact. + Rewrite of 6809/6309/Konami CPU; attempted to make cycle exact. 070614 ZV: Fixed N flag setting in DIV overflow @@ -140,12 +140,12 @@ void hd6309_device::device_start() super::device_start(); // register our state for the debugger - state_add(HD6309_E, "E", m_w.b.h).mask(0xff); - state_add(HD6309_F, "F", m_w.b.l).mask(0xff); - state_add(HD6309_W, "W", m_w.w).mask(0xffff); - state_add(HD6309_V, "V", m_w.w).mask(0xffff); - state_add(HD6309_MD, "MD", m_md).mask(0xff); - + state_add(HD6309_E, "E", m_w.b.h).mask(0xff); + state_add(HD6309_F, "F", m_w.b.l).mask(0xff); + state_add(HD6309_W, "W", m_w.w).mask(0xffff); + state_add(HD6309_V, "V", m_w.w).mask(0xffff); + state_add(HD6309_MD, "MD", m_md).mask(0xff); + // initialize variables m_w.w = 0x0000; m_v.w = 0x0000; @@ -220,13 +220,13 @@ ATTR_FORCE_INLINE UINT8 hd6309_device::read_operand() { switch(m_addressing_mode) { - case ADDRESSING_MODE_EA: return read_memory(m_ea.w); - case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg(); - case ADDRESSING_MODE_REGISTER_A: return m_d.b.h; - case ADDRESSING_MODE_REGISTER_B: return m_d.b.l; - case ADDRESSING_MODE_REGISTER_E: return m_w.b.h; - case ADDRESSING_MODE_REGISTER_F: return m_w.b.l; - default: fatalerror("Unexpected"); return 0x00; + case ADDRESSING_MODE_EA: return read_memory(m_ea.w); + case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg(); + case ADDRESSING_MODE_REGISTER_A: return m_d.b.h; + case ADDRESSING_MODE_REGISTER_B: return m_d.b.l; + case ADDRESSING_MODE_REGISTER_E: return m_w.b.h; + case ADDRESSING_MODE_REGISTER_F: return m_w.b.l; + default: fatalerror("Unexpected"); return 0x00; } } @@ -239,18 +239,18 @@ ATTR_FORCE_INLINE UINT8 hd6309_device::read_operand(int ordinal) { switch(m_addressing_mode) { - case ADDRESSING_MODE_EA: return read_memory(m_ea.w + ordinal); - case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg(); - case ADDRESSING_MODE_REGISTER_D: return (ordinal & 1) ? m_d.b.l : m_d.b.h; - case ADDRESSING_MODE_REGISTER_W: return (ordinal & 1) ? m_w.b.l : m_w.b.h; - case ADDRESSING_MODE_REGISTER_X: return (ordinal & 1) ? m_x.b.l : m_x.b.h; - case ADDRESSING_MODE_REGISTER_Y: return (ordinal & 1) ? m_y.b.l : m_y.b.h; - case ADDRESSING_MODE_REGISTER_U: return (ordinal & 1) ? m_u.b.l : m_u.b.h; - case ADDRESSING_MODE_REGISTER_S: return (ordinal & 1) ? m_s.b.l : m_s.b.h; - case ADDRESSING_MODE_REGISTER_V: return (ordinal & 1) ? m_v.b.l : m_v.b.h; - case ADDRESSING_MODE_REGISTER_PC: return (ordinal & 1) ? m_pc.b.l : m_pc.b.h; - case ADDRESSING_MODE_ZERO: return 0x00; - default: fatalerror("Unexpected"); return 0x00; + case ADDRESSING_MODE_EA: return read_memory(m_ea.w + ordinal); + case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg(); + case ADDRESSING_MODE_REGISTER_D: return (ordinal & 1) ? m_d.b.l : m_d.b.h; + case ADDRESSING_MODE_REGISTER_W: return (ordinal & 1) ? m_w.b.l : m_w.b.h; + case ADDRESSING_MODE_REGISTER_X: return (ordinal & 1) ? m_x.b.l : m_x.b.h; + case ADDRESSING_MODE_REGISTER_Y: return (ordinal & 1) ? m_y.b.l : m_y.b.h; + case ADDRESSING_MODE_REGISTER_U: return (ordinal & 1) ? m_u.b.l : m_u.b.h; + case ADDRESSING_MODE_REGISTER_S: return (ordinal & 1) ? m_s.b.l : m_s.b.h; + case ADDRESSING_MODE_REGISTER_V: return (ordinal & 1) ? m_v.b.l : m_v.b.h; + case ADDRESSING_MODE_REGISTER_PC: return (ordinal & 1) ? m_pc.b.l : m_pc.b.h; + case ADDRESSING_MODE_ZERO: return 0x00; + default: fatalerror("Unexpected"); return 0x00; } } @@ -263,13 +263,13 @@ ATTR_FORCE_INLINE void hd6309_device::write_operand(UINT8 data) { switch(m_addressing_mode) { - case ADDRESSING_MODE_EA: write_memory(m_ea.w, data); break; - case ADDRESSING_MODE_REGISTER_A: m_d.b.h = data; break; - case ADDRESSING_MODE_REGISTER_B: m_d.b.l = data; break; - case ADDRESSING_MODE_REGISTER_E: m_w.b.h = data; break; - case ADDRESSING_MODE_REGISTER_F: m_w.b.l = data; break; - case ADDRESSING_MODE_ZERO: break; - default: fatalerror("Unexpected"); break; + case ADDRESSING_MODE_EA: write_memory(m_ea.w, data); break; + case ADDRESSING_MODE_REGISTER_A: m_d.b.h = data; break; + case ADDRESSING_MODE_REGISTER_B: m_d.b.l = data; break; + case ADDRESSING_MODE_REGISTER_E: m_w.b.h = data; break; + case ADDRESSING_MODE_REGISTER_F: m_w.b.l = data; break; + case ADDRESSING_MODE_ZERO: break; + default: fatalerror("Unexpected"); break; } } @@ -282,17 +282,17 @@ ATTR_FORCE_INLINE void hd6309_device::write_operand(int ordinal, UINT8 data) { switch(m_addressing_mode) { - case ADDRESSING_MODE_EA: write_memory(m_ea.w + ordinal, data); break; - case ADDRESSING_MODE_REGISTER_D: *((ordinal & 1) ? &m_d.b.l : &m_d.b.h) = data; break; - case ADDRESSING_MODE_REGISTER_W: *((ordinal & 1) ? &m_w.b.l : &m_w.b.h) = data; break; - case ADDRESSING_MODE_REGISTER_X: *((ordinal & 1) ? &m_x.b.l : &m_x.b.h) = data; break; - case ADDRESSING_MODE_REGISTER_Y: *((ordinal & 1) ? &m_y.b.l : &m_y.b.h) = data; break; - case ADDRESSING_MODE_REGISTER_U: *((ordinal & 1) ? &m_u.b.l : &m_u.b.h) = data; break; - case ADDRESSING_MODE_REGISTER_S: *((ordinal & 1) ? &m_s.b.l : &m_s.b.h) = data; break; - case ADDRESSING_MODE_REGISTER_V: *((ordinal & 1) ? &m_v.b.l : &m_v.b.h) = data; break; - case ADDRESSING_MODE_REGISTER_PC: *((ordinal & 1) ? &m_pc.b.l : &m_pc.b.h) = data; break; - case ADDRESSING_MODE_ZERO: break; - default: fatalerror("Unexpected"); break; + case ADDRESSING_MODE_EA: write_memory(m_ea.w + ordinal, data); break; + case ADDRESSING_MODE_REGISTER_D: *((ordinal & 1) ? &m_d.b.l : &m_d.b.h) = data; break; + case ADDRESSING_MODE_REGISTER_W: *((ordinal & 1) ? &m_w.b.l : &m_w.b.h) = data; break; + case ADDRESSING_MODE_REGISTER_X: *((ordinal & 1) ? &m_x.b.l : &m_x.b.h) = data; break; + case ADDRESSING_MODE_REGISTER_Y: *((ordinal & 1) ? &m_y.b.l : &m_y.b.h) = data; break; + case ADDRESSING_MODE_REGISTER_U: *((ordinal & 1) ? &m_u.b.l : &m_u.b.h) = data; break; + case ADDRESSING_MODE_REGISTER_S: *((ordinal & 1) ? &m_s.b.l : &m_s.b.h) = data; break; + case ADDRESSING_MODE_REGISTER_V: *((ordinal & 1) ? &m_v.b.l : &m_v.b.h) = data; break; + case ADDRESSING_MODE_REGISTER_PC: *((ordinal & 1) ? &m_pc.b.l : &m_pc.b.h) = data; break; + case ADDRESSING_MODE_ZERO: break; + default: fatalerror("Unexpected"); break; } } @@ -305,10 +305,10 @@ ATTR_FORCE_INLINE UINT8 &hd6309_device::bittest_register() { switch(m_temp_im & 0xC0) { - case 0x00: return m_cc; - case 0x40: return m_d.b.h; - case 0x80: return m_d.b.l; - default: return m_temp.b.l; + case 0x00: return m_cc; + case 0x40: return m_d.b.h; + case 0x80: return m_d.b.l; + default: return m_temp.b.l; } } @@ -357,22 +357,22 @@ ATTR_FORCE_INLINE m6809_base_device::exgtfr_register hd6309_device::read_exgtfr_ switch(reg & 0x0F) { - case 0: value = m_d.w; break; // D - case 1: value = m_x.w; break; // X - case 2: value = m_y.w; break; // Y - case 3: value = m_u.w; break; // U - case 4: value = m_s.w; break; // S - case 5: value = m_pc.w; break; // PC - case 6: value = m_w.w; break; // W - case 7: value = m_v.w; break; // V - case 8: value = ((UINT16) m_d.b.h) << 8 | m_d.b.h; break; // A - case 9: value = ((UINT16) m_d.b.l) << 8 | m_d.b.l; break; // B - case 10: value = ((UINT16) m_cc) << 8 | m_cc; break; // CC - case 11: value = ((UINT16) m_dp) << 8 | m_dp; break; // DP - case 12: value = 0; break; // 0 - case 13: value = 0; break; // 0 - case 14: value = ((UINT16) m_w.b.h) << 8 | m_w.b.h; break; // E - case 15: value = ((UINT16) m_w.b.l) << 8 | m_w.b.l; break; // F + case 0: value = m_d.w; break; // D + case 1: value = m_x.w; break; // X + case 2: value = m_y.w; break; // Y + case 3: value = m_u.w; break; // U + case 4: value = m_s.w; break; // S + case 5: value = m_pc.w; break; // PC + case 6: value = m_w.w; break; // W + case 7: value = m_v.w; break; // V + case 8: value = ((UINT16) m_d.b.h) << 8 | m_d.b.h; break; // A + case 9: value = ((UINT16) m_d.b.l) << 8 | m_d.b.l; break; // B + case 10: value = ((UINT16) m_cc) << 8 | m_cc; break; // CC + case 11: value = ((UINT16) m_dp) << 8 | m_dp; break; // DP + case 12: value = 0; break; // 0 + case 13: value = 0; break; // 0 + case 14: value = ((UINT16) m_w.b.h) << 8 | m_w.b.h; break; // E + case 15: value = ((UINT16) m_w.b.l) << 8 | m_w.b.l; break; // F default: fatalerror("Should not reach here"); break; @@ -394,22 +394,22 @@ ATTR_FORCE_INLINE void hd6309_device::write_exgtfr_register(UINT8 reg, m6809_bas { switch(reg & 0x0F) { - case 0: m_d.w = value.word_value; break; // D - case 1: m_x.w = value.word_value; break; // X - case 2: m_y.w = value.word_value; break; // Y - case 3: m_u.w = value.word_value; break; // U - case 4: m_s.w = value.word_value; break; // S - case 5: m_pc.w = value.word_value; break; // PC - case 6: m_w.w = value.word_value; break; // W - case 7: m_v.w = value.word_value; break; // V - case 8: m_d.b.h = (UINT8) (value.word_value >> 8); break; // A - case 9: m_d.b.l = (UINT8) (value.word_value >> 0); break; // B - case 10: m_cc = (UINT8) (value.word_value >> 0); break; // CC - case 11: m_dp = (UINT8) (value.word_value >> 8); break; // DP - case 12: break; // 0 - case 13: break; // 0 - case 14: m_w.b.h = (UINT8) (value.word_value >> 8); break; // E - case 15: m_w.b.l = (UINT8) (value.word_value >> 0); break; // F + case 0: m_d.w = value.word_value; break; // D + case 1: m_x.w = value.word_value; break; // X + case 2: m_y.w = value.word_value; break; // Y + case 3: m_u.w = value.word_value; break; // U + case 4: m_s.w = value.word_value; break; // S + case 5: m_pc.w = value.word_value; break; // PC + case 6: m_w.w = value.word_value; break; // W + case 7: m_v.w = value.word_value; break; // V + case 8: m_d.b.h = (UINT8) (value.word_value >> 8); break; // A + case 9: m_d.b.l = (UINT8) (value.word_value >> 0); break; // B + case 10: m_cc = (UINT8) (value.word_value >> 0); break; // CC + case 11: m_dp = (UINT8) (value.word_value >> 8); break; // DP + case 12: break; // 0 + case 13: break; // 0 + case 14: m_w.b.h = (UINT8) (value.word_value >> 8); break; // E + case 15: m_w.b.l = (UINT8) (value.word_value >> 0); break; // F default: fatalerror("Should not reach here"); break; @@ -428,22 +428,22 @@ ATTR_FORCE_INLINE bool hd6309_device::tfr_read(UINT8 opcode, UINT8 arg, UINT8 &d switch(arg & 0xF0) { - case 0x00: reg = &m_d; break; - case 0x10: reg = &m_x; break; - case 0x20: reg = &m_y; break; - case 0x30: reg = &m_u; break; - case 0x40: reg = &m_s; break; - default: return false; + case 0x00: reg = &m_d; break; + case 0x10: reg = &m_x; break; + case 0x20: reg = &m_y; break; + case 0x30: reg = &m_u; break; + case 0x40: reg = &m_s; break; + default: return false; } data = read_memory(reg->w); switch(opcode & 0x03) { - case 0x00: reg->w++; break; // TFM R0+,R1+ - case 0x01: reg->w--; break; // TFM R0-,R1- - case 0x02: reg->w++; break; // TFM R0+,R1 - case 0x03: break; // TFM R0,R1+ + case 0x00: reg->w++; break; // TFM R0+,R1+ + case 0x01: reg->w--; break; // TFM R0-,R1- + case 0x02: reg->w++; break; // TFM R0+,R1 + case 0x03: break; // TFM R0,R1+ } return true; @@ -461,22 +461,22 @@ ATTR_FORCE_INLINE bool hd6309_device::tfr_write(UINT8 opcode, UINT8 arg, UINT8 d switch(arg & 0x0F) { - case 0x00: reg = &m_d; break; - case 0x01: reg = &m_x; break; - case 0x02: reg = &m_y; break; - case 0x03: reg = &m_u; break; - case 0x04: reg = &m_s; break; - default: return false; + case 0x00: reg = &m_d; break; + case 0x01: reg = &m_x; break; + case 0x02: reg = &m_y; break; + case 0x03: reg = &m_u; break; + case 0x04: reg = &m_s; break; + default: return false; } write_memory(reg->w, data); switch(opcode & 0x03) { - case 0x00: reg->w++; break; // TFM R0+,R1+ - case 0x01: reg->w--; break; // TFM R0-,R1- - case 0x02: break; // TFM R0+,R1 - case 0x03: reg->w++; break; // TFM R0,R1+ + case 0x00: reg->w++; break; // TFM R0+,R1+ + case 0x01: reg->w--; break; // TFM R0-,R1- + case 0x02: break; // TFM R0+,R1 + case 0x03: reg->w++; break; // TFM R0,R1+ } return true; @@ -501,22 +501,22 @@ void hd6309_device::register_register_op() // set destination switch((operand >> 0) & 0x0F) { - case 0: set_regop16(m_d); break; // D - case 1: set_regop16(m_x); break; // X - case 2: set_regop16(m_y); break; // Y - case 3: set_regop16(m_u); break; // U - case 4: set_regop16(m_s); break; // S - case 5: set_regop16(m_pc); break; // PC - case 6: set_regop16(m_w); break; // W - case 7: set_regop16(m_v); break; // V - case 8: if (promote) set_regop16(m_d); else set_regop8(m_d.b.h); break; // A - case 9: if (promote) set_regop16(m_d); else set_regop8(m_d.b.l); break; // B - case 10: if (promote) set_regop16(m_temp); else set_regop8(m_cc); break; // CC - case 11: if (promote) set_regop16(m_temp); else set_regop8(m_dp); break; // DP - case 12: if (promote) set_regop16(m_temp); else set_regop8(m_temp.b.l); break; // 0 - case 13: if (promote) set_regop16(m_temp); else set_regop8(m_temp.b.l); break; // 0 - case 14: if (promote) set_regop16(m_w); else set_regop8(m_w.b.h); break; // E - case 15: if (promote) set_regop16(m_w); else set_regop8(m_w.b.l); break; // F + case 0: set_regop16(m_d); break; // D + case 1: set_regop16(m_x); break; // X + case 2: set_regop16(m_y); break; // Y + case 3: set_regop16(m_u); break; // U + case 4: set_regop16(m_s); break; // S + case 5: set_regop16(m_pc); break; // PC + case 6: set_regop16(m_w); break; // W + case 7: set_regop16(m_v); break; // V + case 8: if (promote) set_regop16(m_d); else set_regop8(m_d.b.h); break; // A + case 9: if (promote) set_regop16(m_d); else set_regop8(m_d.b.l); break; // B + case 10: if (promote) set_regop16(m_temp); else set_regop8(m_cc); break; // CC + case 11: if (promote) set_regop16(m_temp); else set_regop8(m_dp); break; // DP + case 12: if (promote) set_regop16(m_temp); else set_regop8(m_temp.b.l); break; // 0 + case 13: if (promote) set_regop16(m_temp); else set_regop8(m_temp.b.l); break; // 0 + case 14: if (promote) set_regop16(m_w); else set_regop8(m_w.b.h); break; // E + case 15: if (promote) set_regop16(m_w); else set_regop8(m_w.b.l); break; // F default: fatalerror("Should not reach here"); break; @@ -525,22 +525,22 @@ void hd6309_device::register_register_op() // set source switch((operand >> 4) & 0x0F) { - case 0: m_addressing_mode = ADDRESSING_MODE_REGISTER_D; break; // D - case 1: m_addressing_mode = ADDRESSING_MODE_REGISTER_X; break; // X - case 2: m_addressing_mode = ADDRESSING_MODE_REGISTER_Y; break; // Y - case 3: m_addressing_mode = ADDRESSING_MODE_REGISTER_U; break; // U - case 4: m_addressing_mode = ADDRESSING_MODE_REGISTER_S; break; // S - case 5: m_addressing_mode = ADDRESSING_MODE_REGISTER_PC; break; // PC - case 6: m_addressing_mode = ADDRESSING_MODE_REGISTER_W; break; // W - case 7: m_addressing_mode = ADDRESSING_MODE_REGISTER_V; break; // V - case 8: m_addressing_mode = promote ? ADDRESSING_MODE_REGISTER_D : ADDRESSING_MODE_REGISTER_A; break; // A - case 9: m_addressing_mode = promote ? ADDRESSING_MODE_REGISTER_D : ADDRESSING_MODE_REGISTER_B; break; // B - case 10: m_addressing_mode = promote ? ADDRESSING_MODE_ZERO : ADDRESSING_MODE_REGISTER_CC; break; // CC - case 11: m_addressing_mode = promote ? ADDRESSING_MODE_ZERO : ADDRESSING_MODE_REGISTER_DP; break; // DP - case 12: m_addressing_mode = ADDRESSING_MODE_ZERO; break; // 0 - case 13: m_addressing_mode = ADDRESSING_MODE_ZERO; break; // 0 - case 14: m_addressing_mode = promote ? ADDRESSING_MODE_REGISTER_W : ADDRESSING_MODE_REGISTER_E; break; // E - case 15: m_addressing_mode = promote ? ADDRESSING_MODE_REGISTER_W : ADDRESSING_MODE_REGISTER_F; break; // F + case 0: m_addressing_mode = ADDRESSING_MODE_REGISTER_D; break; // D + case 1: m_addressing_mode = ADDRESSING_MODE_REGISTER_X; break; // X + case 2: m_addressing_mode = ADDRESSING_MODE_REGISTER_Y; break; // Y + case 3: m_addressing_mode = ADDRESSING_MODE_REGISTER_U; break; // U + case 4: m_addressing_mode = ADDRESSING_MODE_REGISTER_S; break; // S + case 5: m_addressing_mode = ADDRESSING_MODE_REGISTER_PC; break; // PC + case 6: m_addressing_mode = ADDRESSING_MODE_REGISTER_W; break; // W + case 7: m_addressing_mode = ADDRESSING_MODE_REGISTER_V; break; // V + case 8: m_addressing_mode = promote ? ADDRESSING_MODE_REGISTER_D : ADDRESSING_MODE_REGISTER_A; break; // A + case 9: m_addressing_mode = promote ? ADDRESSING_MODE_REGISTER_D : ADDRESSING_MODE_REGISTER_B; break; // B + case 10: m_addressing_mode = promote ? ADDRESSING_MODE_ZERO : ADDRESSING_MODE_REGISTER_CC; break; // CC + case 11: m_addressing_mode = promote ? ADDRESSING_MODE_ZERO : ADDRESSING_MODE_REGISTER_DP; break; // DP + case 12: m_addressing_mode = ADDRESSING_MODE_ZERO; break; // 0 + case 13: m_addressing_mode = ADDRESSING_MODE_ZERO; break; // 0 + case 14: m_addressing_mode = promote ? ADDRESSING_MODE_REGISTER_W : ADDRESSING_MODE_REGISTER_E; break; // E + case 15: m_addressing_mode = promote ? ADDRESSING_MODE_REGISTER_W : ADDRESSING_MODE_REGISTER_F; break; // F default: fatalerror("Should not reach here"); break; @@ -623,7 +623,7 @@ bool hd6309_device::divq() // soft overflow m_cc |= CC_V; - if ((result > 65536 ) || (result < -65535 )) + if ((result > 65536 ) || (result < -65535 )) { // hard overflow - division is aborted if (old_q < 0) diff --git a/src/emu/cpu/m6809/hd6309.h b/src/emu/cpu/m6809/hd6309.h index f2deda9c24f..121f1209275 100644 --- a/src/emu/cpu/m6809/hd6309.h +++ b/src/emu/cpu/m6809/hd6309.h @@ -2,7 +2,7 @@ hd6309.h - Portable Hitachi 6309 emulator + Portable Hitachi 6309 emulator **********************************************************************/ @@ -67,14 +67,14 @@ private: { VECTOR_ILLEGAL = 0xFFF0 }; - + // CPU registers - PAIR16 m_w; - PAIR16 m_v; - UINT8 m_md; - + PAIR16 m_w; + PAIR16 m_v; + UINT8 m_md; + // other state - UINT8 m_temp_im; + UINT8 m_temp_im; // operand reading/writing UINT8 read_operand(); @@ -83,8 +83,8 @@ private: void write_operand(int ordinal, UINT8 data); // interrupt registers - bool firq_saves_entire_state() { return m_md & 0x02; } - UINT16 entire_state_registers() { return hd6309_native_mode() ? 0x3FF : 0xFF; } + bool firq_saves_entire_state() { return m_md & 0x02; } + UINT16 entire_state_registers() { return hd6309_native_mode() ? 0x3FF : 0xFF; } // bit tests UINT8 &bittest_register(); @@ -102,16 +102,16 @@ private: void put_q(UINT32 value); // miscellaneous - void set_e() { m_addressing_mode = ADDRESSING_MODE_REGISTER_E; } - void set_f() { m_addressing_mode = ADDRESSING_MODE_REGISTER_F; } - void set_w() { m_addressing_mode = ADDRESSING_MODE_REGISTER_W; } + void set_e() { m_addressing_mode = ADDRESSING_MODE_REGISTER_E; } + void set_f() { m_addressing_mode = ADDRESSING_MODE_REGISTER_F; } + void set_w() { m_addressing_mode = ADDRESSING_MODE_REGISTER_W; } exgtfr_register read_exgtfr_register(UINT8 reg); void write_exgtfr_register(UINT8 reg, exgtfr_register value); bool tfr_read(UINT8 opcode, UINT8 arg, UINT8 &data); bool tfr_write(UINT8 opcode, UINT8 arg, UINT8 data); - bool add8_sets_h() { return (m_opcode & 0xFE) != 0x30; } + bool add8_sets_h() { return (m_opcode & 0xFE) != 0x30; } void register_register_op(); - bool hd6309_native_mode() { return m_md & 0x01; } + bool hd6309_native_mode() { return m_md & 0x01; } void execute_one(); }; @@ -140,4 +140,3 @@ enum #define HD6309_FIRQ_LINE 1 /* FIRQ line number */ #endif // __HD6309_H__ - diff --git a/src/emu/cpu/m6809/konami.c b/src/emu/cpu/m6809/konami.c index 01abfa12cbf..25e00f8787f 100644 --- a/src/emu/cpu/m6809/konami.c +++ b/src/emu/cpu/m6809/konami.c @@ -2,7 +2,7 @@ konami.c - Portable Konami cpu emulator + Portable Konami cpu emulator Copyright Nicola Salmoria and the MAME Team @@ -27,19 +27,19 @@ History: March 2013 NPW: - Rewrite of 6809/6309/Konami CPU; overall core is now unified and - supports mid-instruction timings. + Rewrite of 6809/6309/Konami CPU; overall core is now unified and + supports mid-instruction timings. - Some of the instruction timings have changed with the new core; the - old core had some nonsensical timings. For example (from scontra): - - 819A 3A 07 1F 8C STA $1f8C + Some of the instruction timings have changed with the new core; the + old core had some nonsensical timings. For example (from scontra): - Under the old core, this took four clock cycles, which is dubious - because this instruction would have to do four opcode reads and one - write. OGalibert says that the current timings are just a guess and - nobody has done precise readings, so I'm replacing the old guesses - with new guesses. + 819A 3A 07 1F 8C STA $1f8C + + Under the old core, this took four clock cycles, which is dubious + because this instruction would have to do four opcode reads and one + write. OGalibert says that the current timings are just a guess and + nobody has done precise readings, so I'm replacing the old guesses + with new guesses. 991022 HJB: Tried to improve speed: Using bit7 of cycles1 as flag for multi @@ -133,10 +133,10 @@ inline ATTR_FORCE_INLINE UINT8 konami_cpu_device::read_operand(int ordinal) { switch(m_addressing_mode) { - case ADDRESSING_MODE_EA: return read_memory(m_ea.w + ordinal); - case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg(); - case ADDRESSING_MODE_REGISTER_D: return (ordinal & 1) ? m_d.b.l : m_d.b.h; - default: fatalerror("Unexpected"); return 0x00; + case ADDRESSING_MODE_EA: return read_memory(m_ea.w + ordinal); + case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg(); + case ADDRESSING_MODE_REGISTER_D: return (ordinal & 1) ? m_d.b.l : m_d.b.h; + default: fatalerror("Unexpected"); return 0x00; } } @@ -160,10 +160,10 @@ ATTR_FORCE_INLINE void konami_cpu_device::write_operand(int ordinal, UINT8 data) { switch(m_addressing_mode) { - case ADDRESSING_MODE_IMMEDIATE: /* do nothing */ break; - case ADDRESSING_MODE_EA: write_memory(m_ea.w + ordinal, data); break; - case ADDRESSING_MODE_REGISTER_D: *((ordinal & 1) ? &m_d.b.l : &m_d.b.h) = data; break; - default: fatalerror("Unexpected"); break; + case ADDRESSING_MODE_IMMEDIATE: /* do nothing */ break; + case ADDRESSING_MODE_EA: write_memory(m_ea.w + ordinal, data); break; + case ADDRESSING_MODE_REGISTER_D: *((ordinal & 1) ? &m_d.b.l : &m_d.b.h) = data; break; + default: fatalerror("Unexpected"); break; } } @@ -176,11 +176,11 @@ ATTR_FORCE_INLINE UINT16 &konami_cpu_device::ireg() { switch(m_opcode & 0x70) { - case 0x20: return m_x.w; - case 0x30: return m_y.w; - case 0x50: return m_u.w; - case 0x60: return m_s.w; - case 0x70: return m_pc.w; + case 0x20: return m_x.w; + case 0x30: return m_y.w; + case 0x50: return m_u.w; + case 0x60: return m_s.w; + case 0x70: return m_pc.w; default: fatalerror("Should not get here"); return m_x.w; @@ -199,12 +199,12 @@ ATTR_FORCE_INLINE m6809_base_device::exgtfr_register konami_cpu_device::read_exg switch(reg & 0x07) { - case 0: result.word_value = m_d.b.h; break; // A - case 1: result.word_value = m_d.b.l; break; // B - case 2: result.word_value = m_x.w; break; // X - case 3: result.word_value = m_y.w; break; // Y - case 4: result.word_value = m_s.w; break; // S - case 5: result.word_value = m_u.w; break; // U + case 0: result.word_value = m_d.b.h; break; // A + case 1: result.word_value = m_d.b.l; break; // B + case 2: result.word_value = m_x.w; break; // X + case 3: result.word_value = m_y.w; break; // Y + case 4: result.word_value = m_s.w; break; // S + case 5: result.word_value = m_u.w; break; // U } result.byte_value = (UINT8) result.word_value; return result; @@ -219,12 +219,12 @@ ATTR_FORCE_INLINE void konami_cpu_device::write_exgtfr_register(UINT8 reg, m6809 { switch(reg & 0x07) { - case 0: m_d.b.h = value.byte_value; break; // A - case 1: m_d.b.l = value.byte_value; break; // B - case 2: m_x.w = value.word_value; break; // X - case 3: m_y.w = value.word_value; break; // Y - case 4: m_s.w = value.word_value; break; // S - case 5: m_u.w = value.word_value; break; // U + case 0: m_d.b.h = value.byte_value; break; // A + case 1: m_d.b.l = value.byte_value; break; // B + case 2: m_x.w = value.word_value; break; // X + case 3: m_y.w = value.word_value; break; // Y + case 4: m_s.w = value.word_value; break; // S + case 5: m_u.w = value.word_value; break; // U } } diff --git a/src/emu/cpu/m6809/konami.h b/src/emu/cpu/m6809/konami.h index 200762ab8e7..d8f6c006578 100644 --- a/src/emu/cpu/m6809/konami.h +++ b/src/emu/cpu/m6809/konami.h @@ -2,7 +2,7 @@ konami.h - Portable Konami CPU emulator + Portable Konami CPU emulator **********************************************************************/ diff --git a/src/emu/cpu/m6809/m6809.c b/src/emu/cpu/m6809/m6809.c index 8f8d7c736c8..b7d1fa46142 100644 --- a/src/emu/cpu/m6809/m6809.c +++ b/src/emu/cpu/m6809/m6809.c @@ -21,7 +21,7 @@ History: March 2013 NPW: - Rewrite of 6809/6309/Konami CPU; attempted to make cycle exact. + Rewrite of 6809/6309/Konami CPU; attempted to make cycle exact. 991026 HJB: Fixed missing calls to cpu_changepc() for the TFR and EXG ocpodes. @@ -84,7 +84,7 @@ March 2013 NPW: // PARAMETERS //************************************************************************** -#define LOG_INTERRUPTS 0 +#define LOG_INTERRUPTS 0 // turn off 'unreferenced label' errors #ifdef __GNUC__ @@ -150,18 +150,18 @@ void m6809_base_device::device_start() // register our state for the debugger astring tempstr; state_add(STATE_GENPC, "GENPC", m_pc.w).noshow(); - state_add(STATE_GENPCBASE, "GENPCBASE", m_ppc.w).noshow(); + state_add(STATE_GENPCBASE, "GENPCBASE", m_ppc.w).noshow(); state_add(STATE_GENFLAGS, "GENFLAGS", m_cc).callimport().callexport().formatstr("%8s").noshow(); - state_add(M6809_PC, "PC", m_pc.w).mask(0xffff); - state_add(M6809_S, "S", m_s.w).mask(0xffff); + state_add(M6809_PC, "PC", m_pc.w).mask(0xffff); + state_add(M6809_S, "S", m_s.w).mask(0xffff); state_add(M6809_CC, "CC", m_cc).mask(0xff); - state_add(M6809_U, "U", m_u.w).mask(0xffff); - state_add(M6809_A, "A", m_d.b.h).mask(0xff); - state_add(M6809_B, "B", m_d.b.l).mask(0xff); - state_add(M6809_X, "X", m_x.w).mask(0xffff); - state_add(M6809_Y, "Y", m_y.w).mask(0xffff); + state_add(M6809_U, "U", m_u.w).mask(0xffff); + state_add(M6809_A, "A", m_d.b.h).mask(0xff); + state_add(M6809_B, "B", m_d.b.l).mask(0xff); + state_add(M6809_X, "X", m_x.w).mask(0xffff); + state_add(M6809_Y, "Y", m_y.w).mask(0xffff); state_add(M6809_DP, "DP", m_dp).mask(0xff); - + // initialize variables m_cc = 0; m_pc.w = 0; @@ -215,10 +215,10 @@ void m6809_base_device::device_reset() m_irq_line = false; m_lds_encountered = false; - m_dp = 0x00; // reset direct page register + m_dp = 0x00; // reset direct page register - m_cc |= CC_I; // IRQ disabled - m_cc |= CC_F; // FIRQ disabled + m_cc |= CC_I; // IRQ disabled + m_cc |= CC_F; // FIRQ disabled m_pc.b.h = m_program->read_byte(VECTOR_RESET_FFFE + 0); m_pc.b.l = m_program->read_byte(VECTOR_RESET_FFFE + 1); @@ -462,10 +462,10 @@ const char *m6809_base_device::inputnum_string(int inputnum) { switch(inputnum) { - case INPUT_LINE_NMI: return "NMI"; - case M6809_FIRQ_LINE: return "FIRQ"; - case M6809_IRQ_LINE: return "IRQ"; - default: return "???"; + case INPUT_LINE_NMI: return "NMI"; + case M6809_FIRQ_LINE: return "FIRQ"; + case M6809_IRQ_LINE: return "IRQ"; + default: return "???"; } } @@ -482,16 +482,16 @@ ATTR_FORCE_INLINE m6809_base_device::exgtfr_register m6809_base_device::read_exg switch(reg & 0x0F) { - case 0: result.word_value = m_d.w; break; // D - case 1: result.word_value = m_x.w; break; // X - case 2: result.word_value = m_y.w; break; // Y - case 3: result.word_value = m_u.w; break; // U - case 4: result.word_value = m_s.w; break; // S - case 5: result.word_value = m_pc.w; break; // PC - case 8: result.byte_value = m_d.b.h; break; // A - case 9: result.byte_value = m_d.b.l; break; // B - case 10: result.byte_value = m_cc; break; // CC - case 11: result.byte_value = m_dp; break; // DP + case 0: result.word_value = m_d.w; break; // D + case 1: result.word_value = m_x.w; break; // X + case 2: result.word_value = m_y.w; break; // Y + case 3: result.word_value = m_u.w; break; // U + case 4: result.word_value = m_s.w; break; // S + case 5: result.word_value = m_pc.w; break; // PC + case 8: result.byte_value = m_d.b.h; break; // A + case 9: result.byte_value = m_d.b.l; break; // B + case 10: result.byte_value = m_cc; break; // CC + case 11: result.byte_value = m_dp; break; // DP } return result; } @@ -505,23 +505,23 @@ ATTR_FORCE_INLINE void m6809_base_device::write_exgtfr_register(UINT8 reg, m6809 { switch(reg & 0x0F) { - case 0: m_d.w = value.word_value; break; // D - case 1: m_x.w = value.word_value; break; // X - case 2: m_y.w = value.word_value; break; // Y - case 3: m_u.w = value.word_value; break; // U - case 4: m_s.w = value.word_value; break; // S - case 5: m_pc.w = value.word_value; break; // PC - case 8: m_d.b.h = value.byte_value; break; // A - case 9: m_d.b.l = value.byte_value; break; // B - case 10: m_cc = value.byte_value; break; // CC - case 11: m_dp = value.byte_value; break; // DP + case 0: m_d.w = value.word_value; break; // D + case 1: m_x.w = value.word_value; break; // X + case 2: m_y.w = value.word_value; break; // Y + case 3: m_u.w = value.word_value; break; // U + case 4: m_s.w = value.word_value; break; // S + case 5: m_pc.w = value.word_value; break; // PC + case 8: m_d.b.h = value.byte_value; break; // A + case 9: m_d.b.l = value.byte_value; break; // B + case 10: m_cc = value.byte_value; break; // CC + case 11: m_dp = value.byte_value; break; // DP } } //------------------------------------------------- // log_illegal - used to log hits to illegal -// instructions (except for HD6309 which traps) +// instructions (except for HD6309 which traps) //------------------------------------------------- void m6809_base_device::log_illegal() diff --git a/src/emu/cpu/m6809/m6809.h b/src/emu/cpu/m6809/m6809.h index d6e7f3c0953..6d806672360 100644 --- a/src/emu/cpu/m6809/m6809.h +++ b/src/emu/cpu/m6809/m6809.h @@ -2,7 +2,7 @@ m6809.h - Portable Motorola 6809 emulator + Portable Motorola 6809 emulator **********************************************************************/ @@ -77,116 +77,116 @@ protected: // device_state_interface overrides virtual void state_string_export(const device_state_entry &entry, astring &string); - + // addressing modes enum { - ADDRESSING_MODE_IMMEDIATE = 0, - ADDRESSING_MODE_EA = 1, - ADDRESSING_MODE_REGISTER_A = 2, - ADDRESSING_MODE_REGISTER_B = 3, + ADDRESSING_MODE_IMMEDIATE = 0, + ADDRESSING_MODE_EA = 1, + ADDRESSING_MODE_REGISTER_A = 2, + ADDRESSING_MODE_REGISTER_B = 3, ADDRESSING_MODE_REGISTER_D = 4 }; // register transfer struct exgtfr_register { - UINT8 byte_value; - UINT16 word_value; + UINT8 byte_value; + UINT16 word_value; }; // flag bits in the cc register enum { - CC_C = 0x01, // Carry - CC_V = 0x02, // Overflow - CC_Z = 0x04, // Zero - CC_N = 0x08, // Negative - CC_I = 0x10, // Inhibit IRQ - CC_H = 0x20, // Half (auxiliary) carry - CC_F = 0x40, // Inhibit FIRQ - CC_E = 0x80 // Entire state pushed + CC_C = 0x01, // Carry + CC_V = 0x02, // Overflow + CC_Z = 0x04, // Zero + CC_N = 0x08, // Negative + CC_I = 0x10, // Inhibit IRQ + CC_H = 0x20, // Half (auxiliary) carry + CC_F = 0x40, // Inhibit FIRQ + CC_E = 0x80 // Entire state pushed }; // flag combinations enum { - CC_VC = CC_V | CC_C, - CC_ZC = CC_Z | CC_C, - CC_NZ = CC_N | CC_Z, - CC_NZC = CC_N | CC_Z | CC_C, - CC_NZV = CC_N | CC_Z | CC_V, - CC_NZVC = CC_N | CC_Z | CC_V | CC_C, + CC_VC = CC_V | CC_C, + CC_ZC = CC_Z | CC_C, + CC_NZ = CC_N | CC_Z, + CC_NZC = CC_N | CC_Z | CC_C, + CC_NZV = CC_N | CC_Z | CC_V, + CC_NZVC = CC_N | CC_Z | CC_V | CC_C, CC_HNZVC = CC_H | CC_N | CC_Z | CC_V | CC_C }; // interrupt vectors enum { - VECTOR_SWI3 = 0xFFF2, - VECTOR_SWI2 = 0xFFF4, - VECTOR_FIRQ = 0xFFF6, - VECTOR_IRQ = 0xFFF8, - VECTOR_SWI = 0xFFFA, - VECTOR_NMI = 0xFFFC, - VECTOR_RESET_FFFE = 0xFFFE + VECTOR_SWI3 = 0xFFF2, + VECTOR_SWI2 = 0xFFF4, + VECTOR_FIRQ = 0xFFF6, + VECTOR_IRQ = 0xFFF8, + VECTOR_SWI = 0xFFFA, + VECTOR_NMI = 0xFFFC, + VECTOR_RESET_FFFE = 0xFFFE }; // CPU registers - PAIR16 m_pc; // program counter - PAIR16 m_ppc; // previous program counter - PAIR16 m_d; // accumulator a and b - PAIR16 m_x, m_y; // index registers - PAIR16 m_u, m_s; // stack pointers - UINT8 m_dp; // direct page register - UINT8 m_cc; - PAIR16 m_temp; - UINT8 m_opcode; + PAIR16 m_pc; // program counter + PAIR16 m_ppc; // previous program counter + PAIR16 m_d; // accumulator a and b + PAIR16 m_x, m_y; // index registers + PAIR16 m_u, m_s; // stack pointers + UINT8 m_dp; // direct page register + UINT8 m_cc; + PAIR16 m_temp; + UINT8 m_opcode; // other internal state - bool m_nmi_line; - bool m_nmi_asserted; - bool m_firq_line; - bool m_irq_line; - bool m_lds_encountered; - int m_icount; - int m_addressing_mode; - PAIR16 m_ea; // effective address + bool m_nmi_line; + bool m_nmi_asserted; + bool m_firq_line; + bool m_irq_line; + bool m_lds_encountered; + int m_icount; + int m_addressing_mode; + PAIR16 m_ea; // effective address // eat cycles - ATTR_FORCE_INLINE void eat(int cycles) { m_icount -= cycles; } + ATTR_FORCE_INLINE void eat(int cycles) { m_icount -= cycles; } void eat_remaining(); // read a byte from given memory location - ATTR_FORCE_INLINE UINT8 read_memory(UINT16 address) { eat(1); return m_program->read_byte(address); } + ATTR_FORCE_INLINE UINT8 read_memory(UINT16 address) { eat(1); return m_program->read_byte(address); } // write a byte to given memory location - ATTR_FORCE_INLINE void write_memory(UINT16 address, UINT8 data) { eat(1); m_program->write_byte(address, data); } + ATTR_FORCE_INLINE void write_memory(UINT16 address, UINT8 data) { eat(1); m_program->write_byte(address, data); } // read_opcode() is like read_memory() except it is used for reading opcodes. In the case of a system - // with memory mapped I/O, this function can be used to greatly speed up emulation. - ATTR_FORCE_INLINE UINT8 read_opcode(UINT16 address) { eat(1); return m_direct->read_decrypted_byte(address); } + // with memory mapped I/O, this function can be used to greatly speed up emulation. + ATTR_FORCE_INLINE UINT8 read_opcode(UINT16 address) { eat(1); return m_direct->read_decrypted_byte(address); } // read_opcode_arg() is identical to read_opcode() except it is used for reading opcode arguments. This // difference can be used to support systems that use different encoding mechanisms for opcodes // and opcode arguments. - ATTR_FORCE_INLINE UINT8 read_opcode_arg(UINT16 address) { eat(1); return m_direct->read_raw_byte(address); } + ATTR_FORCE_INLINE UINT8 read_opcode_arg(UINT16 address) { eat(1); return m_direct->read_raw_byte(address); } // read_opcode() and bump the program counter - ATTR_FORCE_INLINE UINT8 read_opcode() { return read_opcode(m_pc.w++); } - ATTR_FORCE_INLINE UINT8 read_opcode_arg() { return read_opcode_arg(m_pc.w++); } + ATTR_FORCE_INLINE UINT8 read_opcode() { return read_opcode(m_pc.w++); } + ATTR_FORCE_INLINE UINT8 read_opcode_arg() { return read_opcode_arg(m_pc.w++); } // state stack - implemented as a UINT32 - void push_state(UINT8 state) { m_state = (m_state << 8) | state; } - UINT8 pop_state() { UINT8 result = (UINT8) m_state; m_state >>= 8; return result; } - void reset_state() { m_state = 0; } + void push_state(UINT8 state) { m_state = (m_state << 8) | state; } + UINT8 pop_state() { UINT8 result = (UINT8) m_state; m_state >>= 8; return result; } + void reset_state() { m_state = 0; } // effective address reading/writing - UINT8 read_ea() { return read_memory(m_ea.w); } - void write_ea(UINT8 data) { write_memory(m_ea.w, data); } - void set_ea(UINT16 ea) { m_ea.w = ea; m_addressing_mode = ADDRESSING_MODE_EA; } - void set_ea_h(UINT8 ea_h) { m_ea.b.h = ea_h; } - void set_ea_l(UINT8 ea_l) { m_ea.b.l = ea_l; m_addressing_mode = ADDRESSING_MODE_EA; } + UINT8 read_ea() { return read_memory(m_ea.w); } + void write_ea(UINT8 data) { write_memory(m_ea.w, data); } + void set_ea(UINT16 ea) { m_ea.w = ea; m_addressing_mode = ADDRESSING_MODE_EA; } + void set_ea_h(UINT8 ea_h) { m_ea.b.h = ea_h; } + void set_ea_l(UINT8 ea_l) { m_ea.b.l = ea_l; m_addressing_mode = ADDRESSING_MODE_EA; } // operand reading/writing UINT8 read_operand(); @@ -203,20 +203,20 @@ protected: void mul(); // miscellaneous - void nop() { } + void nop() { } template<class T> T rotate_right(T value); template<class T> UINT32 rotate_left(T value); - void set_a() { m_addressing_mode = ADDRESSING_MODE_REGISTER_A; } - void set_b() { m_addressing_mode = ADDRESSING_MODE_REGISTER_B; } - void set_d() { m_addressing_mode = ADDRESSING_MODE_REGISTER_D; } - void set_imm() { m_addressing_mode = ADDRESSING_MODE_IMMEDIATE; } - void set_regop8(UINT8 ®) { m_reg8 = ® m_reg16 = NULL; } - void set_regop16(PAIR16 ®) { m_reg16 = ® m_reg8 = NULL; } - UINT8 ®op8() { assert(m_reg8 != NULL); return *m_reg8; } - PAIR16 ®op16() { assert(m_reg16 != NULL); return *m_reg16; } - bool is_register_register_op_16_bit() { return m_reg16 != NULL; } - bool add8_sets_h() { return true; } - bool hd6309_native_mode() { return false; } + void set_a() { m_addressing_mode = ADDRESSING_MODE_REGISTER_A; } + void set_b() { m_addressing_mode = ADDRESSING_MODE_REGISTER_B; } + void set_d() { m_addressing_mode = ADDRESSING_MODE_REGISTER_D; } + void set_imm() { m_addressing_mode = ADDRESSING_MODE_IMMEDIATE; } + void set_regop8(UINT8 ®) { m_reg8 = ® m_reg16 = NULL; } + void set_regop16(PAIR16 ®) { m_reg16 = ® m_reg8 = NULL; } + UINT8 ®op8() { assert(m_reg8 != NULL); return *m_reg8; } + PAIR16 ®op16() { assert(m_reg16 != NULL); return *m_reg16; } + bool is_register_register_op_16_bit() { return m_reg16 != NULL; } + bool add8_sets_h() { return true; } + bool hd6309_native_mode() { return false; } // index reg UINT16 &ireg(); @@ -226,20 +226,20 @@ protected: template<class T> T set_flags(UINT8 mask, T r); // branch conditions - ATTR_FORCE_INLINE bool cond_hi() { return !(m_cc & CC_ZC); } // BHI/BLS - ATTR_FORCE_INLINE bool cond_cc() { return !(m_cc & CC_C); } // BCC/BCS - ATTR_FORCE_INLINE bool cond_ne() { return !(m_cc & CC_Z); } // BNE/BEQ - ATTR_FORCE_INLINE bool cond_vc() { return !(m_cc & CC_V); } // BVC/BVS - ATTR_FORCE_INLINE bool cond_pl() { return !(m_cc & CC_N); } // BPL/BMI - ATTR_FORCE_INLINE bool cond_ge() { return (m_cc & CC_N ? true : false) == (m_cc & CC_V ? true : false); } // BGE/BLT - ATTR_FORCE_INLINE bool cond_gt() { return cond_ge() && !(m_cc & CC_Z); } // BGT/BLE - ATTR_FORCE_INLINE void set_cond(bool cond) { m_cond = cond; } - ATTR_FORCE_INLINE bool branch_taken() { return m_cond; } + ATTR_FORCE_INLINE bool cond_hi() { return !(m_cc & CC_ZC); } // BHI/BLS + ATTR_FORCE_INLINE bool cond_cc() { return !(m_cc & CC_C); } // BCC/BCS + ATTR_FORCE_INLINE bool cond_ne() { return !(m_cc & CC_Z); } // BNE/BEQ + ATTR_FORCE_INLINE bool cond_vc() { return !(m_cc & CC_V); } // BVC/BVS + ATTR_FORCE_INLINE bool cond_pl() { return !(m_cc & CC_N); } // BPL/BMI + ATTR_FORCE_INLINE bool cond_ge() { return (m_cc & CC_N ? true : false) == (m_cc & CC_V ? true : false); } // BGE/BLT + ATTR_FORCE_INLINE bool cond_gt() { return cond_ge() && !(m_cc & CC_Z); } // BGT/BLE + ATTR_FORCE_INLINE void set_cond(bool cond) { m_cond = cond; } + ATTR_FORCE_INLINE bool branch_taken() { return m_cond; } // interrupt registers - bool firq_saves_entire_state() { return false; } - UINT16 partial_state_registers() { return 0x81; } - UINT16 entire_state_registers() { return 0xFF; } + bool firq_saves_entire_state() { return false; } + UINT16 partial_state_registers() { return 0x81; } + UINT16 entire_state_registers() { return 0xFF; } // miscellaneous exgtfr_register read_exgtfr_register(UINT8 reg); @@ -252,19 +252,19 @@ protected: private: // address spaces - const address_space_config m_program_config; - address_space * m_program; - direct_read_data * m_direct; + const address_space_config m_program_config; + address_space * m_program; + direct_read_data * m_direct; // other state - UINT32 m_state; - int m_reg; - UINT8 * m_reg8; - PAIR16 * m_reg16; - bool m_cond; + UINT32 m_state; + int m_reg; + UINT8 * m_reg8; + PAIR16 * m_reg16; + bool m_cond; // incidentals - int m_clock_divider; + int m_clock_divider; // functions void execute_one(); diff --git a/src/emu/cpu/m6809/m6809inl.h b/src/emu/cpu/m6809/m6809inl.h index ac299d91818..09567f73c00 100644 --- a/src/emu/cpu/m6809/m6809inl.h +++ b/src/emu/cpu/m6809/m6809inl.h @@ -2,8 +2,8 @@ m6809inl.h - Portable 6809 emulator - Inline functions for the purposes of - optimization + Portable 6809 emulator - Inline functions for the purposes of + optimization **********************************************************************/ @@ -67,11 +67,11 @@ inline ATTR_FORCE_INLINE UINT8 m6809_base_device::read_operand() { switch(m_addressing_mode) { - case ADDRESSING_MODE_EA: return read_memory(m_ea.w); - case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg(); - case ADDRESSING_MODE_REGISTER_A: return m_d.b.h; - case ADDRESSING_MODE_REGISTER_B: return m_d.b.l; - default: fatalerror("Unexpected"); return 0x00; + case ADDRESSING_MODE_EA: return read_memory(m_ea.w); + case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg(); + case ADDRESSING_MODE_REGISTER_A: return m_d.b.h; + case ADDRESSING_MODE_REGISTER_B: return m_d.b.l; + default: fatalerror("Unexpected"); return 0x00; } } @@ -84,9 +84,9 @@ inline ATTR_FORCE_INLINE UINT8 m6809_base_device::read_operand(int ordinal) { switch(m_addressing_mode) { - case ADDRESSING_MODE_EA: return read_memory(m_ea.w + ordinal); - case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg(); - default: fatalerror("Unexpected"); return 0x00; + case ADDRESSING_MODE_EA: return read_memory(m_ea.w + ordinal); + case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg(); + default: fatalerror("Unexpected"); return 0x00; } } @@ -99,11 +99,11 @@ inline ATTR_FORCE_INLINE void m6809_base_device::write_operand(UINT8 data) { switch(m_addressing_mode) { - case ADDRESSING_MODE_IMMEDIATE: /* do nothing */ break; - case ADDRESSING_MODE_EA: write_memory(m_ea.w, data); break; - case ADDRESSING_MODE_REGISTER_A: m_d.b.h = data; break; - case ADDRESSING_MODE_REGISTER_B: m_d.b.l = data; break; - default: fatalerror("Unexpected"); break; + case ADDRESSING_MODE_IMMEDIATE: /* do nothing */ break; + case ADDRESSING_MODE_EA: write_memory(m_ea.w, data); break; + case ADDRESSING_MODE_REGISTER_A: m_d.b.h = data; break; + case ADDRESSING_MODE_REGISTER_B: m_d.b.l = data; break; + default: fatalerror("Unexpected"); break; } } @@ -116,9 +116,9 @@ inline ATTR_FORCE_INLINE void m6809_base_device::write_operand(int ordinal, UINT { switch(m_addressing_mode) { - case ADDRESSING_MODE_IMMEDIATE: /* do nothing */ break; - case ADDRESSING_MODE_EA: write_memory(m_ea.w + ordinal, data); break; - default: fatalerror("Unexpected"); break; + case ADDRESSING_MODE_IMMEDIATE: /* do nothing */ break; + case ADDRESSING_MODE_EA: write_memory(m_ea.w + ordinal, data); break; + default: fatalerror("Unexpected"); break; } } @@ -129,10 +129,10 @@ inline ATTR_FORCE_INLINE void m6809_base_device::write_operand(int ordinal, UINT inline ATTR_FORCE_INLINE bool m6809_base_device::match_target_bytes(UINT16 address, const UINT8 *bytes, int length) { - UINT8 *start_raw = (UINT8 *) m_direct->read_raw_ptr(address); - UINT8 *start_decrypted = (UINT8 *) m_direct->read_decrypted_ptr(address); - UINT8 *end_raw = (UINT8 *) m_direct->read_raw_ptr(address + length - 1); - UINT8 *end_decrypted = (UINT8 *) m_direct->read_decrypted_ptr(address + length - 1); + UINT8 *start_raw = (UINT8 *) m_direct->read_raw_ptr(address); + UINT8 *start_decrypted = (UINT8 *) m_direct->read_decrypted_ptr(address); + UINT8 *end_raw = (UINT8 *) m_direct->read_raw_ptr(address + length - 1); + UINT8 *end_decrypted = (UINT8 *) m_direct->read_decrypted_ptr(address + length - 1); return (start_raw != NULL) && (end_raw != NULL) @@ -145,7 +145,7 @@ inline ATTR_FORCE_INLINE bool m6809_base_device::match_target_bytes(UINT16 addre //------------------------------------------------- // burn_any_delay_loops - optimization for delay -// loops +// loops //------------------------------------------------- inline ATTR_FORCE_INLINE void m6809_base_device::burn_any_delay_loops() @@ -176,15 +176,15 @@ inline ATTR_FORCE_INLINE void m6809_base_device::daa() UINT8 lsn = m_d.b.h & 0x0F; // compute the carry - if (lsn > 0x09 || m_cc & CC_H) cf |= 0x06; - if (msn > 0x80 && lsn > 0x09 ) cf |= 0x60; - if (msn > 0x90 || m_cc & CC_C) cf |= 0x60; + if (lsn > 0x09 || m_cc & CC_H) cf |= 0x06; + if (msn > 0x80 && lsn > 0x09 ) cf |= 0x60; + if (msn > 0x90 || m_cc & CC_C) cf |= 0x60; // calculate the result t = m_d.b.h + cf; m_cc &= ~CC_V; - if (t & 0x0100) // keep carry from previous operation + if (t & 0x0100) // keep carry from previous operation m_cc |= CC_C; // and put it back into A @@ -220,10 +220,10 @@ inline ATTR_FORCE_INLINE UINT16 &m6809_base_device::ireg() { switch(m_opcode & 0x60) { - case 0x00: return m_x.w; - case 0x20: return m_y.w; - case 0x40: return m_u.w; - case 0x60: return m_s.w; + case 0x00: return m_x.w; + case 0x20: return m_y.w; + case 0x40: return m_u.w; + case 0x60: return m_s.w; default: fatalerror("Unexpected"); return m_x.w; @@ -276,7 +276,7 @@ inline void m6809_base_device::eat_remaining() UINT16 real_pc = m_pc.w; eat(m_icount); - + m_pc.w = m_ppc.w; debugger_instruction_hook(this, m_pc.w); m_pc.w = real_pc; @@ -333,10 +333,10 @@ inline UINT16 m6809_base_device::check_pending_interrupt() switch(result) { case VECTOR_FIRQ: - standard_irq_callback(M6809_FIRQ_LINE); + standard_irq_callback(M6809_FIRQ_LINE); break; case VECTOR_IRQ: - standard_irq_callback(M6809_IRQ_LINE); + standard_irq_callback(M6809_IRQ_LINE); break; } diff --git a/src/emu/cpu/sh2/sh2drc.c b/src/emu/cpu/sh2/sh2drc.c index e2963aa4033..6448ffa4257 100644 --- a/src/emu/cpu/sh2/sh2drc.c +++ b/src/emu/cpu/sh2/sh2drc.c @@ -1171,7 +1171,7 @@ static void static_generate_memory_accessor(sh2_state *sh2, int size, int iswrit UML_LABEL(block, label++); // label: -#if 0 // DO NOT ENABLE - SEVERE AARON DAMAGE +#if 0 // DO NOT ENABLE - SEVERE AARON DAMAGE for (int ramnum = 0; ramnum < SH2_MAX_FASTRAM; ramnum++) { if (sh2->fastram[ramnum].base != NULL && (!iswrite || !sh2->fastram[ramnum].readonly)) @@ -2020,24 +2020,24 @@ static int generate_group_0(sh2_state *sh2, drcuml_block *block, compiler_state int skip = compiler->labelnum+1; compiler->labelnum += 3; - UML_MOV(block, I0, mem(&sh2->sleep_mode)); // mov i0, sleep_mode - UML_CMP(block, I0, 0x2); // cmp i0, #2 - UML_JMPc(block, COND_E, skip+1); // beq skip + 1 + UML_MOV(block, I0, mem(&sh2->sleep_mode)); // mov i0, sleep_mode + UML_CMP(block, I0, 0x2); // cmp i0, #2 + UML_JMPc(block, COND_E, skip+1); // beq skip + 1 // sleep mode != 2 - UML_CMP(block, I0, 0x0); // cmp i0, #0 - UML_JMPc(block, COND_NE, skip); // bne skip - UML_MOV(block, mem(&sh2->sleep_mode), 0x1); // mov sleep_mode, #1 + UML_CMP(block, I0, 0x0); // cmp i0, #0 + UML_JMPc(block, COND_NE, skip); // bne skip + UML_MOV(block, mem(&sh2->sleep_mode), 0x1); // mov sleep_mode, #1 - UML_LABEL(block, skip); // skip: - generate_update_cycles(sh2, block, compiler, desc->pc, TRUE); // repeat this insn - UML_JMP(block, skip+2); // jmp skip+2 + UML_LABEL(block, skip); // skip: + generate_update_cycles(sh2, block, compiler, desc->pc, TRUE); // repeat this insn + UML_JMP(block, skip+2); // jmp skip+2 - UML_LABEL(block, skip+1); // skip + 1: + UML_LABEL(block, skip+1); // skip + 1: // sleep_mode == 2 - UML_MOV(block, mem(&sh2->sleep_mode), 0x0); // sleep_mode = 0 - generate_update_cycles(sh2, block, compiler, desc->pc+2, TRUE); // go to next insn + UML_MOV(block, mem(&sh2->sleep_mode), 0x0); // sleep_mode = 0 + generate_update_cycles(sh2, block, compiler, desc->pc+2, TRUE); // go to next insn - UML_LABEL(block, skip+2); // skip + 2: + UML_LABEL(block, skip+2); // skip + 2: } return TRUE; diff --git a/src/emu/debug/debugcpu.h b/src/emu/debug/debugcpu.h index bd2fc5ec0d4..edabecf9070 100644 --- a/src/emu/debug/debugcpu.h +++ b/src/emu/debug/debugcpu.h @@ -311,8 +311,8 @@ private: int m_stopirq; // stop IRQ number for DEBUG_FLAG_STOP_INTERRUPT int m_stopexception; // stop exception number for DEBUG_FLAG_STOP_EXCEPTION attotime m_endexectime; // ending time of the current execution - UINT64 m_total_cycles; // current total cycles - UINT64 m_last_total_cycles; // last total cycles + UINT64 m_total_cycles; // current total cycles + UINT64 m_last_total_cycles; // last total cycles // history offs_t m_pc_history[HISTORY_SIZE]; // history of recent PCs diff --git a/src/emu/machine/6840ptm.c b/src/emu/machine/6840ptm.c index c234d60545d..ecd6815bf17 100644 --- a/src/emu/machine/6840ptm.c +++ b/src/emu/machine/6840ptm.c @@ -159,7 +159,7 @@ void ptm6840_device::device_reset() m_t3_divisor = 1; m_status_read_since_int = 0; m_IRQ = 0; - m_t3_scaler = 0; + m_t3_scaler = 0; for (int i = 0; i < 3; i++) { m_counter[i] = 0xffff; diff --git a/src/emu/machine/mos6551.c b/src/emu/machine/mos6551.c index 63436791ddd..46ab2323f08 100644 --- a/src/emu/machine/mos6551.c +++ b/src/emu/machine/mos6551.c @@ -242,7 +242,7 @@ void mos6551_device::update_serial() m_connection_state &= ~SERIAL_STATE_RTS; else m_connection_state |= SERIAL_STATE_RTS; - + m_write_rts((m_connection_state & SERIAL_STATE_RTS) ? 0 : 1); serial_connection_out(); @@ -371,7 +371,7 @@ WRITE_LINE_MEMBER( mos6551_device::rxc_w ) WRITE_LINE_MEMBER( mos6551_device::cts_w ) { - m_cts = state; + m_cts = state; } diff --git a/src/emu/machine/mos6551.h b/src/emu/machine/mos6551.h index 1736d61c2bb..6f84e41b213 100644 --- a/src/emu/machine/mos6551.h +++ b/src/emu/machine/mos6551.h @@ -66,7 +66,7 @@ public: mos6551_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template<class _irq> void set_irq_callback(_irq irq) { m_write_irq.set_callback(irq); } - template<class _rxd, class _txd> void set_rxd_txd_callbacks(_rxd rxd, _txd txd) { + template<class _rxd, class _txd> void set_rxd_txd_callbacks(_rxd rxd, _txd txd) { m_read_rxd.set_callback(rxd); m_write_txd.set_callback(txd); } diff --git a/src/emu/machine/nscsi_hd.c b/src/emu/machine/nscsi_hd.c index b6def37b0c9..8f1b3fd51b7 100644 --- a/src/emu/machine/nscsi_hd.c +++ b/src/emu/machine/nscsi_hd.c @@ -139,8 +139,8 @@ void nscsi_harddisk_device::scsi_command() strcpy((char *)&scsi_cmdbuf[8], " SEAGATE"); strcpy((char *)&scsi_cmdbuf[15], " ST225N"); strcpy((char *)&scsi_cmdbuf[31], "1.00"); - scsi_cmdbuf[36] = 0x00; // # of extents high - scsi_cmdbuf[37] = 0x08; // # of extents low + scsi_cmdbuf[36] = 0x00; // # of extents high + scsi_cmdbuf[37] = 0x08; // # of extents low scsi_cmdbuf[38] = 0x00; // group 0 commands 0-1f scsi_cmdbuf[39] = 0x99; // commands 0,3,4,7 scsi_cmdbuf[40] = 0xa0; // commands 8, a @@ -156,7 +156,7 @@ void nscsi_harddisk_device::scsi_command() scsi_cmdbuf[50] = 0xa0; // commands 8, a scsi_cmdbuf[51] = 0x00; scsi_cmdbuf[52] = 0x00; - scsi_cmdbuf[53] = 0xff; // end of list + scsi_cmdbuf[53] = 0xff; // end of list if(size > 54) size = 54; scsi_data_in(0, size); diff --git a/src/emu/machine/saturn.c b/src/emu/machine/saturn.c index e91e64ca174..e44137ff67f 100644 --- a/src/emu/machine/saturn.c +++ b/src/emu/machine/saturn.c @@ -1,39 +1,39 @@ /************************************************************************************** - Sega Saturn (c) 1994 Sega - - List of things that needs to be implemented: - - There's definitely an ack mechanism in SCU irqs. This is almost surely done via - the ISM register (i.e. going 0->1 to the given bit acks it). - - There might be a delay to exactly when SCU irqs happens. This is due to the basic - fact that SCU runs at 14-ish MHz, so it needs some time before actually firing the - irq. - - Vblank-Out actually happens at the last screen line, not at 0. - - VDP2 V counter has a similar roll-back as MD correspondent register: - vpos line 0 == 0x1ff (Vblank-Out happens here) - vpos line 1 == 0 + Sega Saturn (c) 1994 Sega + + List of things that needs to be implemented: + - There's definitely an ack mechanism in SCU irqs. This is almost surely done via + the ISM register (i.e. going 0->1 to the given bit acks it). + - There might be a delay to exactly when SCU irqs happens. This is due to the basic + fact that SCU runs at 14-ish MHz, so it needs some time before actually firing the + irq. + - Vblank-Out actually happens at the last screen line, not at 0. + - VDP2 V counter has a similar roll-back as MD correspondent register: + vpos line 0 == 0x1ff (Vblank-Out happens here) + vpos line 1 == 0 ... vpos line 241 == 0xf0 (Vblank-In happens here) vpos line 246 == 0xf5 - vpos line 247 == 0x1ef (rolls back here) - vpos line 263 == 0x1ff again - - HBlank bit seems to follow a normal logic instead. - - Timer 0 doesn't work if the TENB bit isn't enabled (documentation is a bit fussy - over this). - - Timer 0 fires at the HBlank-In signal, not before. - - VDP2 H Counter actually counts x2 in non Hi-Res mode. - - Timer 1 is definitely annoying. Starts from H-Blank signal and starts counting from - that position. - H counter value 0x282 (642) -> timer 1 fires at setting 1 - H counter value 0x284 (644) -> 2 - H counter value 0x2a0 (672) -> 0x10 + vpos line 247 == 0x1ef (rolls back here) + vpos line 263 == 0x1ff again + - HBlank bit seems to follow a normal logic instead. + - Timer 0 doesn't work if the TENB bit isn't enabled (documentation is a bit fussy + over this). + - Timer 0 fires at the HBlank-In signal, not before. + - VDP2 H Counter actually counts x2 in non Hi-Res mode. + - Timer 1 is definitely annoying. Starts from H-Blank signal and starts counting from + that position. + H counter value 0x282 (642) -> timer 1 fires at setting 1 + H counter value 0x284 (644) -> 2 + H counter value 0x2a0 (672) -> 0x10 H counter value 0x2c0 (704) -> 0x20 H counter value 0x300 (768) -> 0x40 H counter value 0x340 (832) -> 0x60 - H counter value 0x352 (850) -> 0x69 - H counter value 0x000 (0) -> 0x6a, V counter goes +1 here (max range?) - H counter value 0x02c (44) -> 0x80 - H counter value 0x0ec (236) -> 0xe0 + H counter value 0x352 (850) -> 0x69 + H counter value 0x000 (0) -> 0x6a, V counter goes +1 here (max range?) + H counter value 0x02c (44) -> 0x80 + H counter value 0x0ec (236) -> 0xe0 H counter value 0x12c (300) -> 0x100 - Timer 1 seems to count backwards compared to Timer 0 from setting 0x6b onward. @@ -250,9 +250,9 @@ READ32_MEMBER(saturn_state::saturn_scu_r) case 0xa4/4: if(LOG_SCU && !space.debugger_access()) logerror("(PC=%08x) IRQ status reg read MASK=%08x IST=%08x | ISM=%08x\n",space.device().safe_pc(),mem_mask,m_scu.ist,m_scu.ism); /* TODO: Bug! trips an HW fault. Basically, it tries to read the IST bit 1 with that irq enabled. - Densetsu no Ogre Battle doesn't like this, so it needs investigation ... + Densetsu no Ogre Battle doesn't like this, so it needs investigation ... */ -// res = m_scu.ist | ~m_scu.ism; +// res = m_scu.ist | ~m_scu.ism; res = m_scu.ist; break; case 0xc8/4: @@ -474,7 +474,7 @@ void saturn_state::scu_dma_direct(address_space &space, UINT8 dma_ch) } /* Burning Rangers doesn't agree with this. */ -// m_scu.size[dma_ch] = 0; +// m_scu.size[dma_ch] = 0; if(!(DRUP(dma_ch))) m_scu.src[dma_ch] = tmp_src; if(!(DWUP(dma_ch))) m_scu.dst[dma_ch] = tmp_dst; diff --git a/src/emu/machine/smpc.c b/src/emu/machine/smpc.c index 86e38bfe6fa..07dbec9f35f 100644 --- a/src/emu/machine/smpc.c +++ b/src/emu/machine/smpc.c @@ -299,7 +299,7 @@ static TIMER_CALLBACK( stv_smpc_intback ) saturn_state *state = machine.driver_data<saturn_state>(); int i; -// printf("%02x %02x %02x\n",state->m_smpc.intback_buf[0],state->m_smpc.intback_buf[1],state->m_smpc.intback_buf[2]); +// printf("%02x %02x %02x\n",state->m_smpc.intback_buf[0],state->m_smpc.intback_buf[1],state->m_smpc.intback_buf[2]); if(state->m_smpc.intback_buf[0] != 0) { diff --git a/src/emu/machine/stvcd.c b/src/emu/machine/stvcd.c index 1b36f1de64d..3d91387ca7f 100644 --- a/src/emu/machine/stvcd.c +++ b/src/emu/machine/stvcd.c @@ -721,10 +721,10 @@ void saturn_state::cd_exec_command( void ) CDROM_LOG(("%s:CD: Set Filter Connection %x => mode %x parm %04x\n", machine().describe_context(), fnum, cr1 & 0xf, cr2)) - if (cr1 & 1) // set true condition + if (cr1 & 1) // set true condition filters[fnum].condtrue = (cr2>>8)&0xff; - if (cr1 & 2) // set false condition + if (cr1 & 2) // set false condition filters[fnum].condfalse = cr2&0xff; hirqreg |= (CMOK|ESEL); diff --git a/src/emu/machine/tms9901.c b/src/emu/machine/tms9901.c index 7437e647882..b37f1e1ad7d 100644 --- a/src/emu/machine/tms9901.c +++ b/src/emu/machine/tms9901.c @@ -510,7 +510,7 @@ void tms9901_device::device_reset(void) field_interrupts(); m_clock_mode = false; - + m_clock_register = 0; timer_reload(); } @@ -537,7 +537,7 @@ void tms9901_device::device_start(void) } m_interrupt.resolve(intf->interrupt_callback, *this); - + m_clock_register = 0; } diff --git a/src/emu/machine/z80sti.c b/src/emu/machine/z80sti.c index e48861668fe..14f75d1e8af 100644 --- a/src/emu/machine/z80sti.c +++ b/src/emu/machine/z80sti.c @@ -261,7 +261,7 @@ void z80sti_device::device_start() void z80sti_device::device_reset() { memset(m_tmc, 0, sizeof(m_tmc)); - memset(m_to, 0, sizeof(m_to)); + memset(m_to, 0, sizeof(m_to)); } diff --git a/src/emu/romload.c b/src/emu/romload.c index 2ac6ada8a21..6fa7c0af6cd 100644 --- a/src/emu/romload.c +++ b/src/emu/romload.c @@ -1324,7 +1324,7 @@ void load_software_part_region(device_t *device, char *swlist, char *swname, rom romdata->romstotal = 0; romdata->romstotalsize = 0; romdata->romsloadedsize = 0; - + if (software_get_support(device->machine().options(), swlist, swname) == SOFTWARE_SUPPORTED_PARTIAL) { romdata->errorstring.catprintf("WARNING: support for software %s (in list %s) is only partial\n", swname, swlist); @@ -1377,14 +1377,14 @@ void load_software_part_region(device_t *device, char *swlist, char *swname, rom else fill_random(romdata->machine(), romdata->region->base(), romdata->region->bytes()); #endif - + /* update total number of roms */ for (const rom_entry *rom = rom_first_file(region); rom != NULL; rom = rom_next_file(rom)) { romdata->romstotal++; romdata->romstotalsize += rom_file_size(rom); } - + /* now process the entries in the region */ if (ROMREGION_ISROMDATA(region)) process_rom_entries(romdata, locationtag, region, region + 1, device, TRUE); @@ -1393,7 +1393,7 @@ void load_software_part_region(device_t *device, char *swlist, char *swname, rom } /* now go back and post-process all the regions */ - for (region = start_region; region != NULL; region = rom_next_region(region)) + for (region = start_region; region != NULL; region = rom_next_region(region)) { device->subtag(regiontag, ROMREGION_GETTAG(region)); region_post_process(romdata, regiontag.cstr(), ROMREGION_ISINVERTED(region)); diff --git a/src/emu/sound/astrocde.c b/src/emu/sound/astrocde.c index 52ab586f69c..dfb7674f1fa 100644 --- a/src/emu/sound/astrocde.c +++ b/src/emu/sound/astrocde.c @@ -57,18 +57,18 @@ const device_type ASTROCADE = &device_creator<astrocade_device>; astrocade_device::astrocade_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ASTROCADE, "Astrocade", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_stream(NULL), - m_master_count(0), - m_vibrato_clock(0), - m_noise_clock(0), - m_noise_state(0), - m_a_count(0), - m_a_state(0), - m_b_count(0), - m_b_state(0), - m_c_count(0), - m_c_state(0) + device_sound_interface(mconfig, *this), + m_stream(NULL), + m_master_count(0), + m_vibrato_clock(0), + m_noise_clock(0), + m_noise_state(0), + m_a_count(0), + m_a_state(0), + m_b_count(0), + m_b_state(0), + m_c_count(0), + m_c_state(0) { memset(m_reg, 0, sizeof(UINT8)*8); memset(m_bitswap, 0, sizeof(UINT8)*256); @@ -281,4 +281,3 @@ WRITE8_MEMBER( astrocade_device::astrocade_sound_w ) /* stash the new register value */ m_reg[offset & 7] = data; } - diff --git a/src/emu/sound/astrocde.h b/src/emu/sound/astrocde.h index 36516a6d735..799a2a32b1c 100644 --- a/src/emu/sound/astrocde.h +++ b/src/emu/sound/astrocde.h @@ -22,7 +22,7 @@ // ======================> astrocade_device class astrocade_device : public device_t, - public device_sound_interface + public device_sound_interface { public: astrocade_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -37,10 +37,10 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - DECLARE_WRITE8_MEMBER( astrocade_sound_w ); + DECLARE_WRITE8_MEMBER( astrocade_sound_w ); private: - void state_save_register(); + void state_save_register(); private: sound_stream *m_stream; /* sound stream */ diff --git a/src/emu/sound/beep.c b/src/emu/sound/beep.c index 51bf4f3c8c3..b2fe51f4356 100644 --- a/src/emu/sound/beep.c +++ b/src/emu/sound/beep.c @@ -31,12 +31,12 @@ const device_type BEEP = &device_creator<beep_device>; beep_device::beep_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, BEEP, "Beep", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_stream(NULL), - m_enable(0), - m_frequency(0), - m_incr(0), - m_signal(0) + device_sound_interface(mconfig, *this), + m_stream(NULL), + m_enable(0), + m_frequency(0), + m_incr(0), + m_signal(0) { } diff --git a/src/emu/sound/beep.h b/src/emu/sound/beep.h index d7b50bacbe9..7b9fbf5cd67 100644 --- a/src/emu/sound/beep.h +++ b/src/emu/sound/beep.h @@ -27,9 +27,9 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - void set_state(int on); - void set_frequency(int frequency); - void set_volume(int volume); + void set_state(int on); + void set_frequency(int frequency); + void set_volume(int volume); private: sound_stream *m_stream; /* stream number */ diff --git a/src/emu/sound/c140.c b/src/emu/sound/c140.c index faae14e0f15..cf731de3a16 100644 --- a/src/emu/sound/c140.c +++ b/src/emu/sound/c140.c @@ -86,14 +86,14 @@ INLINE int limit(INT32 in) c140_device::c140_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, C140, "C140", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_sample_rate(0), - m_stream(NULL), - m_banking_type(0), - m_mixer_buffer_left(NULL), - m_mixer_buffer_right(NULL), - m_baserate(0), - m_pRom(NULL) + device_sound_interface(mconfig, *this), + m_sample_rate(0), + m_stream(NULL), + m_banking_type(0), + m_mixer_buffer_left(NULL), + m_mixer_buffer_right(NULL), + m_baserate(0), + m_pRom(NULL) { memset(m_REG, 0, sizeof(UINT8)*0x200); memset(m_pcmtbl, 0, sizeof(INT16)*8); diff --git a/src/emu/sound/c140.h b/src/emu/sound/c140.h index 175127906f0..f77d320b4b7 100644 --- a/src/emu/sound/c140.h +++ b/src/emu/sound/c140.h @@ -36,22 +36,22 @@ struct c140_interface struct C140_VOICE { - C140_VOICE() : - ptoffset(0), - pos(0), - key(0), - lastdt(0), - prevdt(0), - dltdt(0), - rvol(0), - lvol(0), - frequency(0), - bank(0), - mode(0), - sample_start(0), - sample_end(0), - sample_loop(0) {} - + C140_VOICE() : + ptoffset(0), + pos(0), + key(0), + lastdt(0), + prevdt(0), + dltdt(0), + rvol(0), + lvol(0), + frequency(0), + bank(0), + mode(0), + sample_start(0), + sample_end(0), + sample_loop(0) {} + long ptoffset; long pos; long key; @@ -89,15 +89,15 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - DECLARE_READ8_MEMBER( c140_r ); - DECLARE_WRITE8_MEMBER( c140_w ); + DECLARE_READ8_MEMBER( c140_r ); + DECLARE_WRITE8_MEMBER( c140_w ); public: - void set_base(void *base); + void set_base(void *base); private: - void init_voice( C140_VOICE *v ); - long find_sample(long adrs, long bank, int voice); + void init_voice( C140_VOICE *v ); + long find_sample(long adrs, long bank, int voice); private: int m_sample_rate; diff --git a/src/emu/sound/cem3394.c b/src/emu/sound/cem3394.c index b685eb4f6e3..162fb664c93 100644 --- a/src/emu/sound/cem3394.c +++ b/src/emu/sound/cem3394.c @@ -94,7 +94,7 @@ #define WAVE_SAWTOOTH 2 #define WAVE_PULSE 4 -// keep lots of fractional bits +// keep lots of fractional bits #define FRACTION_BITS 28 #define FRACTION_ONE (1 << FRACTION_BITS) #define FRACTION_ONE_D ((double)(1 << FRACTION_BITS)) @@ -115,26 +115,26 @@ const device_type CEM3394 = &device_creator<cem3394_device>; cem3394_device::cem3394_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, CEM3394, "CEM3394", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_external(NULL), - m_stream(NULL), - m_vco_zero_freq(0.0), - m_filter_zero_freq(0.0), - m_wave_select(0), - m_volume(0), - m_mixer_internal(0), - m_mixer_external(0), - m_position(0), - m_step(0), - m_filter_position(0), - m_filter_step(0), - m_modulation_depth(0), - m_last_ext(0), - m_pulse_width(0), - m_inv_sample_rate(0.0), - m_sample_rate(0), - m_mixer_buffer(NULL), - m_external_buffer(NULL) + device_sound_interface(mconfig, *this), + m_external(NULL), + m_stream(NULL), + m_vco_zero_freq(0.0), + m_filter_zero_freq(0.0), + m_wave_select(0), + m_volume(0), + m_mixer_internal(0), + m_mixer_external(0), + m_position(0), + m_step(0), + m_filter_position(0), + m_filter_step(0), + m_modulation_depth(0), + m_last_ext(0), + m_pulse_width(0), + m_inv_sample_rate(0.0), + m_sample_rate(0), + m_mixer_buffer(NULL), + m_external_buffer(NULL) { memset(m_values, 0, 8*sizeof(double)); } diff --git a/src/emu/sound/cem3394.h b/src/emu/sound/cem3394.h index 0beb55b212d..0581df78a94 100644 --- a/src/emu/sound/cem3394.h +++ b/src/emu/sound/cem3394.h @@ -40,7 +40,7 @@ enum class cem3394_device : public device_t, - public device_sound_interface + public device_sound_interface { public: cem3394_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -54,23 +54,23 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - // Set the voltage going to a particular parameter - void set_voltage(int input, double voltage); - - // Get the translated parameter associated with the given input as follows: - // CEM3394_VCO_FREQUENCY: frequency in Hz - // CEM3394_MODULATION_AMOUNT: scale factor, 0.0 to 2.0 - // CEM3394_WAVE_SELECT: voltage from this line - // CEM3394_PULSE_WIDTH: width fraction, from 0.0 to 1.0 - // CEM3394_MIXER_BALANCE: balance, from -1.0 to 1.0 - // CEM3394_FILTER_RESONANCE: resonance, from 0.0 to 1.0 - // CEM3394_FILTER_FREQENCY: frequency, in Hz - // CEM3394_FINAL_GAIN: gain, in dB - double get_parameter(int input); + // Set the voltage going to a particular parameter + void set_voltage(int input, double voltage); + + // Get the translated parameter associated with the given input as follows: + // CEM3394_VCO_FREQUENCY: frequency in Hz + // CEM3394_MODULATION_AMOUNT: scale factor, 0.0 to 2.0 + // CEM3394_WAVE_SELECT: voltage from this line + // CEM3394_PULSE_WIDTH: width fraction, from 0.0 to 1.0 + // CEM3394_MIXER_BALANCE: balance, from -1.0 to 1.0 + // CEM3394_FILTER_RESONANCE: resonance, from 0.0 to 1.0 + // CEM3394_FILTER_FREQENCY: frequency, in Hz + // CEM3394_FINAL_GAIN: gain, in dB + double get_parameter(int input); private: - double compute_db(double voltage); - UINT32 compute_db_volume(double voltage); + double compute_db(double voltage); + UINT32 compute_db_volume(double voltage); private: void (*m_external)(device_t*, int, short*);/* callback to generate external samples */ diff --git a/src/emu/sound/es8712.c b/src/emu/sound/es8712.c index ed9e1b80382..853125b2639 100644 --- a/src/emu/sound/es8712.c +++ b/src/emu/sound/es8712.c @@ -39,19 +39,19 @@ const device_type ES8712 = &device_creator<es8712_device>; es8712_device::es8712_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ES8712, "ES8712", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_playing(0), - m_base_offset(0), - m_sample(0), - m_count(0), - m_signal(0), - m_step(0), - m_start(0), - m_end(0), - m_repeat(0), - m_bank_offset(0), - m_region_base(NULL), - m_stream(NULL) + device_sound_interface(mconfig, *this), + m_playing(0), + m_base_offset(0), + m_sample(0), + m_count(0), + m_signal(0), + m_step(0), + m_start(0), + m_end(0), + m_repeat(0), + m_bank_offset(0), + m_region_base(NULL), + m_stream(NULL) { } diff --git a/src/emu/sound/es8712.h b/src/emu/sound/es8712.h index 07311424953..acbb8eb9b78 100644 --- a/src/emu/sound/es8712.h +++ b/src/emu/sound/es8712.h @@ -23,7 +23,7 @@ // ======================> es8712_device class es8712_device : public device_t, - public device_sound_interface + public device_sound_interface { public: es8712_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -38,17 +38,17 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - DECLARE_WRITE8_MEMBER( es8712_w ); + DECLARE_WRITE8_MEMBER( es8712_w ); public: - void play(); - void set_bank_base(int base); - void set_frequency(int frequency); + void play(); + void set_bank_base(int base); + void set_frequency(int frequency); private: - void compute_tables(); - void generate_adpcm(stream_sample_t *buffer, int samples); - void es8712_state_save_register(); + void compute_tables(); + void generate_adpcm(stream_sample_t *buffer, int samples); + void es8712_state_save_register(); private: UINT8 m_playing; /* 1 if we're actively playing */ diff --git a/src/emu/sound/filter.h b/src/emu/sound/filter.h index 6441dfb804a..b2ed922b642 100644 --- a/src/emu/sound/filter.h +++ b/src/emu/sound/filter.h @@ -65,20 +65,20 @@ filter_real filter_compute(filter* f, filter_state* s); struct filter2_context { - filter2_context() : - x0(0.0), - x1(0.0), - x2(0.0), - y0(0.0), - y1(0.0), - y2(0.0), - a1(0.0), - a2(0.0), - b0(0.0), - b1(0.0), - b2(0.0) - {} - + filter2_context() : + x0(0.0), + x1(0.0), + x2(0.0), + y0(0.0), + y1(0.0), + y2(0.0), + a1(0.0), + a2(0.0), + b0(0.0), + b1(0.0), + b2(0.0) + {} + double x0, x1, x2; /* x[k], x[k-1], x[k-2], current and previous 2 input values */ double y0, y1, y2; /* y[k], y[k-1], y[k-2], current and previous 2 output values */ double a1, a2; /* digital filter coefficients, denominator */ diff --git a/src/emu/sound/k051649.c b/src/emu/sound/k051649.c index 44465fc604e..1dcc60446fe 100644 --- a/src/emu/sound/k051649.c +++ b/src/emu/sound/k051649.c @@ -43,14 +43,14 @@ const device_type K051649 = &device_creator<k051649_device>; k051649_device::k051649_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, K051649, "K051649", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_stream(NULL), - m_mclock(0), - m_rate(0), - m_mixer_table(NULL), - m_mixer_lookup(NULL), - m_mixer_buffer(NULL), - m_test(0) + device_sound_interface(mconfig, *this), + m_stream(NULL), + m_mclock(0), + m_rate(0), + m_mixer_table(NULL), + m_mixer_lookup(NULL), + m_mixer_buffer(NULL), + m_test(0) { } @@ -61,15 +61,15 @@ k051649_device::k051649_device(const machine_config &mconfig, const char *tag, d void k051649_device::device_start() { - // get stream channels + // get stream channels m_rate = clock()/16; m_stream = stream_alloc(0, 1, m_rate); m_mclock = clock(); - // allocate a buffer to mix into - 1 second's worth should be more than enough + // allocate a buffer to mix into - 1 second's worth should be more than enough m_mixer_buffer = auto_alloc_array(machine(), short, 2 * m_rate); - // build the mixer table + // build the mixer table make_mixer_table(5); } @@ -83,9 +83,9 @@ void k051649_device::device_reset() k051649_sound_channel *voice = m_channel_list; int i; - // reset all the voices + // reset all the voices for (i = 0; i < 5; i++) - { + { voice[i].frequency = 0; voice[i].volume = 0xf; voice[i].counter = 0; @@ -108,12 +108,12 @@ void k051649_device::sound_stream_update(sound_stream &stream, stream_sample_t * short *mix; int i,j; - // zap the contents of the mixer buffer + // zap the contents of the mixer buffer memset(m_mixer_buffer, 0, samples * sizeof(short)); for (j = 0; j < 5; j++) - { - // channel is halted for freq < 9 + { + // channel is halted for freq < 9 if (voice[j].frequency > 8) { const signed char *w = voice[j].waveram; @@ -123,7 +123,7 @@ void k051649_device::sound_stream_update(sound_stream &stream, stream_sample_t * mix = m_mixer_buffer; - // add our contribution + // add our contribution for (i = 0; i < samples; i++) { int offs; @@ -133,12 +133,12 @@ void k051649_device::sound_stream_update(sound_stream &stream, stream_sample_t * *mix++ += (w[offs] * v)>>3; } - // update the counter for this voice + // update the counter for this voice voice[j].counter = c; } } - // mix it down + // mix it down mix = m_mixer_buffer; for (i = 0; i < samples; i++) *buffer++ = m_mixer_lookup[*mix++]; @@ -150,7 +150,7 @@ void k051649_device::sound_stream_update(sound_stream &stream, stream_sample_t * WRITE8_MEMBER( k051649_device::k051649_waveform_w ) { - // waveram is read-only? + // waveram is read-only? if (m_test & 0x40 || (m_test & 0x80 && offset >= 0x60)) return; @@ -158,7 +158,7 @@ WRITE8_MEMBER( k051649_device::k051649_waveform_w ) if (offset >= 0x60) { - // channel 5 shares waveram with channel 4 + // channel 5 shares waveram with channel 4 m_channel_list[3].waveram[offset&0x1f]=data; m_channel_list[4].waveram[offset&0x1f]=data; } @@ -169,7 +169,7 @@ WRITE8_MEMBER( k051649_device::k051649_waveform_w ) READ8_MEMBER ( k051649_device::k051649_waveform_r ) { - // test-register bits 6/7 expose the internal counter + // test-register bits 6/7 expose the internal counter if (m_test & 0xc0) { m_stream->update(); @@ -185,7 +185,7 @@ READ8_MEMBER ( k051649_device::k051649_waveform_r ) WRITE8_MEMBER( k051649_device::k052539_waveform_w ) { - // waveram is read-only? + // waveram is read-only? if (m_test & 0x40) return; @@ -196,7 +196,7 @@ WRITE8_MEMBER( k051649_device::k052539_waveform_w ) READ8_MEMBER ( k051649_device::k052539_waveform_r ) { - // test-register bit 6 exposes the internal counter + // test-register bit 6 exposes the internal counter if (m_test & 0x40) { m_stream->update(); @@ -220,13 +220,13 @@ WRITE8_MEMBER( k051649_device::k051649_frequency_w ) m_stream->update(); - // test-register bit 5 resets the internal counter + // test-register bit 5 resets the internal counter if (m_test & 0x20) m_channel_list[offset].counter = ~0; else if (m_channel_list[offset].frequency < 9) m_channel_list[offset].counter |= ((1 << FREQ_BITS) - 1); - // update frequency + // update frequency if (freq_hi) m_channel_list[offset].frequency = (m_channel_list[offset].frequency & 0x0ff) | (data << 8 & 0xf00); else @@ -240,7 +240,7 @@ WRITE8_MEMBER( k051649_device::k051649_keyonoff_w ) m_stream->update(); for (i = 0; i < 5; i++) - { + { m_channel_list[i].key=data&1; data >>= 1; } @@ -255,7 +255,7 @@ WRITE8_MEMBER( k051649_device::k051649_test_w ) READ8_MEMBER ( k051649_device::k051649_test_r ) { - // reading the test register sets it to $ff! + // reading the test register sets it to $ff! k051649_test_w(space, offset, 0xff); return 0xff; } @@ -269,13 +269,13 @@ void k051649_device::make_mixer_table(int voices) { int i; - // allocate memory + // allocate memory m_mixer_table = auto_alloc_array(machine(), INT16, 512 * voices); - // find the middle of the table + // find the middle of the table m_mixer_lookup = m_mixer_table + (256 * voices); - // fill in the table - 16 bit case + // fill in the table - 16 bit case for (i = 0; i < (voices * 256); i++) { int val = i * DEF_GAIN * 16 / voices; @@ -284,5 +284,3 @@ void k051649_device::make_mixer_table(int voices) m_mixer_lookup[-i] = -val; } } - - diff --git a/src/emu/sound/k051649.h b/src/emu/sound/k051649.h index aa042095915..c0bc7606284 100644 --- a/src/emu/sound/k051649.h +++ b/src/emu/sound/k051649.h @@ -23,15 +23,15 @@ // Parameters for a channel struct k051649_sound_channel { - k051649_sound_channel() : - counter(0), - frequency(0), - volume(0), - key(0) - { - memset(waveram, 0, sizeof(signed char)*32); - } - + k051649_sound_channel() : + counter(0), + frequency(0), + volume(0), + key(0) + { + memset(waveram, 0, sizeof(signed char)*32); + } + unsigned long counter; int frequency; int volume; @@ -43,7 +43,7 @@ struct k051649_sound_channel // ======================> k051649_device class k051649_device : public device_t, - public device_sound_interface + public device_sound_interface { public: k051649_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -58,19 +58,19 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - DECLARE_WRITE8_MEMBER( k051649_waveform_w ); - DECLARE_READ8_MEMBER ( k051649_waveform_r ); - DECLARE_WRITE8_MEMBER( k051649_volume_w ); - DECLARE_WRITE8_MEMBER( k051649_frequency_w ); - DECLARE_WRITE8_MEMBER( k051649_keyonoff_w ); - DECLARE_WRITE8_MEMBER( k051649_test_w ); - DECLARE_READ8_MEMBER ( k051649_test_r ); + DECLARE_WRITE8_MEMBER( k051649_waveform_w ); + DECLARE_READ8_MEMBER ( k051649_waveform_r ); + DECLARE_WRITE8_MEMBER( k051649_volume_w ); + DECLARE_WRITE8_MEMBER( k051649_frequency_w ); + DECLARE_WRITE8_MEMBER( k051649_keyonoff_w ); + DECLARE_WRITE8_MEMBER( k051649_test_w ); + DECLARE_READ8_MEMBER ( k051649_test_r ); - DECLARE_WRITE8_MEMBER( k052539_waveform_w ); - DECLARE_READ8_MEMBER ( k052539_waveform_r ); + DECLARE_WRITE8_MEMBER( k052539_waveform_w ); + DECLARE_READ8_MEMBER ( k052539_waveform_r ); private: - void make_mixer_table(int voices); + void make_mixer_table(int voices); private: k051649_sound_channel m_channel_list[5]; @@ -78,7 +78,7 @@ private: /* global sound parameters */ sound_stream *m_stream; int m_mclock; - int m_rate; + int m_rate; /* mixer tables and internal buffers */ INT16 *m_mixer_table; diff --git a/src/emu/sound/mos6560.h b/src/emu/sound/mos6560.h index 13cacb5d8ae..5c398516669 100644 --- a/src/emu/sound/mos6560.h +++ b/src/emu/sound/mos6560.h @@ -185,8 +185,8 @@ protected: const address_space_config m_videoram_space_config; const address_space_config m_colorram_space_config; - devcb2_read8 m_read_potx; - devcb2_read8 m_read_poty; + devcb2_read8 m_read_potx; + devcb2_read8 m_read_poty; const char *m_screen_tag; screen_device *m_screen; diff --git a/src/emu/sound/mos7360.c b/src/emu/sound/mos7360.c index 45d9261f716..8c85769c6d3 100644 --- a/src/emu/sound/mos7360.c +++ b/src/emu/sound/mos7360.c @@ -410,7 +410,7 @@ void mos7360_device::device_timer(emu_timer &timer, device_timer_id id, int para m_timer3_active = 1; set_interrupt(0x40); break; - + case TIMER_LINE: raster_interrupt_gen(); break; diff --git a/src/emu/sound/okim6258.c b/src/emu/sound/okim6258.c index 97e2d2922b0..6ec9ddc6b43 100644 --- a/src/emu/sound/okim6258.c +++ b/src/emu/sound/okim6258.c @@ -46,17 +46,17 @@ const device_type OKIM6258 = &device_creator<okim6258_device>; okim6258_device::okim6258_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, OKIM6258, "OKI6258", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_status(0), - m_master_clock(0), - m_divider(0), - m_adpcm_type(0), - m_data_in(0), - m_nibble_shift(0), - m_stream(NULL), - m_output_bits(0), - m_signal(0), - m_step(0) + device_sound_interface(mconfig, *this), + m_status(0), + m_master_clock(0), + m_divider(0), + m_adpcm_type(0), + m_data_in(0), + m_nibble_shift(0), + m_stream(NULL), + m_output_bits(0), + m_signal(0), + m_step(0) { } @@ -338,5 +338,3 @@ WRITE8_MEMBER( okim6258_device::okim6258_ctrl_w ) m_status &= ~STATUS_RECORDING; } } - - diff --git a/src/emu/sound/okim6258.h b/src/emu/sound/okim6258.h index 6a58988cc63..9e1f2087c57 100644 --- a/src/emu/sound/okim6258.h +++ b/src/emu/sound/okim6258.h @@ -54,18 +54,18 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - DECLARE_READ8_MEMBER( okim6258_status_r ); - DECLARE_WRITE8_MEMBER( okim6258_data_w ); - DECLARE_WRITE8_MEMBER( okim6258_ctrl_w ); + DECLARE_READ8_MEMBER( okim6258_status_r ); + DECLARE_WRITE8_MEMBER( okim6258_data_w ); + DECLARE_WRITE8_MEMBER( okim6258_ctrl_w ); public: - void set_divider(int val); - void set_clock(int val); - int get_vclk(); + void set_divider(int val); + void set_clock(int val); + int get_vclk(); private: - void okim6258_state_save_register(); - INT16 clock_adpcm(UINT8 nibble); + void okim6258_state_save_register(); + INT16 clock_adpcm(UINT8 nibble); private: UINT8 m_status; diff --git a/src/emu/sound/pokey.c b/src/emu/sound/pokey.c index b44c21eef58..10b69d28d6e 100644 --- a/src/emu/sound/pokey.c +++ b/src/emu/sound/pokey.c @@ -279,7 +279,7 @@ void pokey_device::device_start() m_out_filter = 0; m_output = 0; m_kbd_state = 0; - + /* reset more internal state */ for (i=0; i<3; i++) { diff --git a/src/emu/sound/rf5c400.c b/src/emu/sound/rf5c400.c index 97af027bc14..3a8e3d140ad 100644 --- a/src/emu/sound/rf5c400.c +++ b/src/emu/sound/rf5c400.c @@ -65,10 +65,10 @@ const device_type RF5C400 = &device_creator<rf5c400_device>; rf5c400_device::rf5c400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, RF5C400, "RF5C400", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_rom(NULL), - m_rom_length(0), - m_stream(NULL) + device_sound_interface(mconfig, *this), + m_rom(NULL), + m_rom_length(0), + m_stream(NULL) { memset(m_env_ar_table, 0, sizeof(double)*0x9f); memset(m_env_dr_table, 0, sizeof(double)*0x9f); diff --git a/src/emu/sound/rf5c400.h b/src/emu/sound/rf5c400.h index 8dc085c0265..23ac6ec91af 100644 --- a/src/emu/sound/rf5c400.h +++ b/src/emu/sound/rf5c400.h @@ -21,7 +21,7 @@ struct rf5c400_channel { - rf5c400_channel() : + rf5c400_channel() : startH(0), startL(0), freq(0), @@ -42,8 +42,8 @@ struct rf5c400_channel env_level(0.0), env_step(0.0), env_scale(0.0) - { } - + { } + UINT16 startH; UINT16 startL; UINT16 freq; @@ -74,7 +74,7 @@ struct rf5c400_channel // ======================> rf5c400_device class rf5c400_device : public device_t, - public device_sound_interface + public device_sound_interface { public: rf5c400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -88,12 +88,12 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - DECLARE_READ16_MEMBER( rf5c400_r ); - DECLARE_WRITE16_MEMBER( rf5c400_w ); + DECLARE_READ16_MEMBER( rf5c400_r ); + DECLARE_WRITE16_MEMBER( rf5c400_w ); private: - void rf5c400_init_chip(); - UINT8 decode80(UINT8 val); + void rf5c400_init_chip(); + UINT8 decode80(UINT8 val); private: INT16 *m_rom; diff --git a/src/emu/sound/rf5c68.c b/src/emu/sound/rf5c68.c index 09f917402dd..9cbef82f167 100644 --- a/src/emu/sound/rf5c68.c +++ b/src/emu/sound/rf5c68.c @@ -20,12 +20,12 @@ const device_type RF5C68 = &device_creator<rf5c68_device>; rf5c68_device::rf5c68_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, RF5C68, "RF5C68", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_stream(NULL), - m_cbank(0), - m_wbank(0), - m_enable(0), - m_sample_callback(NULL) + device_sound_interface(mconfig, *this), + m_stream(NULL), + m_cbank(0), + m_wbank(0), + m_enable(0), + m_sample_callback(NULL) { memset(m_data, 0, sizeof(UINT8)*0x10000); } @@ -142,7 +142,7 @@ void rf5c68_device::sound_stream_update(sound_stream &stream, stream_sample_t ** //------------------------------------------------- -// RF5C68 write register +// RF5C68 write register //------------------------------------------------- READ8_MEMBER( rf5c68_device::rf5c68_r ) @@ -219,7 +219,7 @@ WRITE8_MEMBER( rf5c68_device::rf5c68_w ) //------------------------------------------------- -// RF5C68 read memory +// RF5C68 read memory //------------------------------------------------- READ8_MEMBER( rf5c68_device::rf5c68_mem_r ) @@ -229,7 +229,7 @@ READ8_MEMBER( rf5c68_device::rf5c68_mem_r ) //------------------------------------------------- -// RF5C68 write memory +// RF5C68 write memory //------------------------------------------------- WRITE8_MEMBER( rf5c68_device::rf5c68_mem_w ) diff --git a/src/emu/sound/rf5c68.h b/src/emu/sound/rf5c68.h index 091dc77ecfe..22468038f2b 100644 --- a/src/emu/sound/rf5c68.h +++ b/src/emu/sound/rf5c68.h @@ -32,15 +32,15 @@ struct rf5c68_interface struct rf5c68_pcm_channel { - rf5c68_pcm_channel() : - enable(0), - env(0), - pan(0), - start(0), - addr(0), - step(0), - loopst(0) {} - + rf5c68_pcm_channel() : + enable(0), + env(0), + pan(0), + start(0), + addr(0), + step(0), + loopst(0) {} + UINT8 enable; UINT8 env; UINT8 pan; @@ -55,7 +55,7 @@ struct rf5c68_pcm_channel // ======================> rf5c68_device class rf5c68_device : public device_t, - public device_sound_interface + public device_sound_interface { public: rf5c68_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -69,11 +69,11 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - DECLARE_READ8_MEMBER( rf5c68_r ); - DECLARE_WRITE8_MEMBER( rf5c68_w ); + DECLARE_READ8_MEMBER( rf5c68_r ); + DECLARE_WRITE8_MEMBER( rf5c68_w ); - DECLARE_READ8_MEMBER( rf5c68_mem_r ); - DECLARE_WRITE8_MEMBER( rf5c68_mem_w ); + DECLARE_READ8_MEMBER( rf5c68_mem_r ); + DECLARE_WRITE8_MEMBER( rf5c68_mem_w ); private: sound_stream* m_stream; diff --git a/src/emu/sound/saa1099.c b/src/emu/sound/saa1099.c index 03f221fc87d..0e2b04c593c 100644 --- a/src/emu/sound/saa1099.c +++ b/src/emu/sound/saa1099.c @@ -133,20 +133,20 @@ const device_type SAA1099 = &device_creator<saa1099_device>; saa1099_device::saa1099_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SAA1099, "SAA1099", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_stream(NULL), - m_all_ch_enable(0), - m_sync_state(0), - m_selected_reg(0), - m_sample_rate(0.0) + device_sound_interface(mconfig, *this), + m_stream(NULL), + m_all_ch_enable(0), + m_sync_state(0), + m_selected_reg(0), + m_sample_rate(0.0) { - memset(m_noise_params, 0, sizeof(int)*2); - memset(m_env_enable, 0, sizeof(int)*2); - memset(m_env_reverse_right, 0, sizeof(int)*2); - memset(m_env_mode, 0, sizeof(int)*2); - memset(m_env_bits, 0, sizeof(int)*2); - memset(m_env_clock, 0, sizeof(int)*2); - memset(m_env_step, 0, sizeof(int)*2); + memset(m_noise_params, 0, sizeof(int)*2); + memset(m_env_enable, 0, sizeof(int)*2); + memset(m_env_reverse_right, 0, sizeof(int)*2); + memset(m_env_mode, 0, sizeof(int)*2); + memset(m_env_bits, 0, sizeof(int)*2); + memset(m_env_clock, 0, sizeof(int)*2); + memset(m_env_step, 0, sizeof(int)*2); } diff --git a/src/emu/sound/saa1099.h b/src/emu/sound/saa1099.h index f7350286070..75452e2c0ce 100644 --- a/src/emu/sound/saa1099.h +++ b/src/emu/sound/saa1099.h @@ -23,19 +23,19 @@ struct saa1099_channel { - saa1099_channel() : - frequency(0), - freq_enable(0), - noise_enable(0), - octave(0), - counter(0.0), - freq(0.0), - level(0) - { - memset(amplitude, 0, sizeof(int)*2); - memset(envelope, 0, sizeof(int)*2); - } - + saa1099_channel() : + frequency(0), + freq_enable(0), + noise_enable(0), + octave(0), + counter(0.0), + freq(0.0), + level(0) + { + memset(amplitude, 0, sizeof(int)*2); + memset(envelope, 0, sizeof(int)*2); + } + int frequency; /* frequency (0x00..0xff) */ int freq_enable; /* frequency enable */ int noise_enable; /* noise enable */ @@ -51,11 +51,11 @@ struct saa1099_channel struct saa1099_noise { - saa1099_noise() : - counter(0.0), - freq(0.0), - level(0) {} - + saa1099_noise() : + counter(0.0), + freq(0.0), + level(0) {} + /* vars to simulate the noise generator output */ double counter; double freq; @@ -66,7 +66,7 @@ struct saa1099_noise // ======================> saa1099_device class saa1099_device : public device_t, - public device_sound_interface + public device_sound_interface { public: saa1099_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -80,27 +80,27 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - DECLARE_WRITE8_MEMBER( saa1099_control_w ); - DECLARE_WRITE8_MEMBER( saa1099_data_w ); + DECLARE_WRITE8_MEMBER( saa1099_control_w ); + DECLARE_WRITE8_MEMBER( saa1099_data_w ); private: - void saa1099_envelope(int ch); + void saa1099_envelope(int ch); private: - sound_stream *m_stream; /* our stream */ - int m_noise_params[2]; /* noise generators parameters */ - int m_env_enable[2]; /* envelope generators enable */ - int m_env_reverse_right[2]; /* envelope reversed for right channel */ - int m_env_mode[2]; /* envelope generators mode */ - int m_env_bits[2]; /* non zero = 3 bits resolution */ - int m_env_clock[2]; /* envelope clock mode (non-zero external) */ - int m_env_step[2]; /* current envelope step */ - int m_all_ch_enable; /* all channels enable */ - int m_sync_state; /* sync all channels */ - int m_selected_reg; /* selected register */ - saa1099_channel m_channels[6]; /* channels */ - saa1099_noise m_noise[2]; /* noise generators */ - double m_sample_rate; + sound_stream *m_stream; /* our stream */ + int m_noise_params[2]; /* noise generators parameters */ + int m_env_enable[2]; /* envelope generators enable */ + int m_env_reverse_right[2]; /* envelope reversed for right channel */ + int m_env_mode[2]; /* envelope generators mode */ + int m_env_bits[2]; /* non zero = 3 bits resolution */ + int m_env_clock[2]; /* envelope clock mode (non-zero external) */ + int m_env_step[2]; /* current envelope step */ + int m_all_ch_enable; /* all channels enable */ + int m_sync_state; /* sync all channels */ + int m_selected_reg; /* selected register */ + saa1099_channel m_channels[6]; /* channels */ + saa1099_noise m_noise[2]; /* noise generators */ + double m_sample_rate; }; extern const device_type SAA1099; diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c index 9d8a64c97db..537199f92a1 100644 --- a/src/emu/sound/scsp.c +++ b/src/emu/sound/scsp.c @@ -1066,17 +1066,17 @@ static unsigned short SCSP_r16(scsp_state *scsp, address_space &space, unsigned 004A88: 3540 009E move.w D0, ($9e,A2) 004A8C: 4E75 rts - 004C9A: 48E7 4000 movem.l D1, -(A7) - 004C9E: 3010 move.w (A0), D0 ;reads from 0x100ee0/ee2 - 004CA0: 4A40 tst.w D0 - 004CA2: 6A00 0004 bpl $4ca8 - 004CA6: 4440 neg.w D0 - 004CA8: 3211 move.w (A1), D1 - 004CAA: D041 add.w D1, D0 - 004CAC: E248 lsr.w #1, D0 - 004CAE: 3280 move.w D0, (A1) ;writes to RAM buffer 0x790/0x792 - 004CB0: 4CDF 0002 movem.l (A7)+, D1 - 004CB4: 4E75 rts + 004C9A: 48E7 4000 movem.l D1, -(A7) + 004C9E: 3010 move.w (A0), D0 ;reads from 0x100ee0/ee2 + 004CA0: 4A40 tst.w D0 + 004CA2: 6A00 0004 bpl $4ca8 + 004CA6: 4440 neg.w D0 + 004CA8: 3211 move.w (A1), D1 + 004CAA: D041 add.w D1, D0 + 004CAC: E248 lsr.w #1, D0 + 004CAE: 3280 move.w D0, (A1) ;writes to RAM buffer 0x790/0x792 + 004CB0: 4CDF 0002 movem.l (A7)+, D1 + 004CB4: 4E75 rts */ logerror("SCSP: Reading from unmapped register %08x\n",addr); if(addr == 0xee0) diff --git a/src/emu/sound/st0016.c b/src/emu/sound/st0016.c index 68e212363a2..e7283d3a937 100644 --- a/src/emu/sound/st0016.c +++ b/src/emu/sound/st0016.c @@ -24,13 +24,13 @@ const device_type ST0016 = &device_creator<st0016_device>; st0016_device::st0016_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ST0016, "ST0016", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_stream(NULL), - m_sound_ram(NULL) + device_sound_interface(mconfig, *this), + m_stream(NULL), + m_sound_ram(NULL) { memset(m_vpos, 0, sizeof(int)*8); - memset(m_frac, 0, sizeof(int)*8); - memset(m_lponce, 0, sizeof(int)*8); + memset(m_frac, 0, sizeof(int)*8); + memset(m_lponce, 0, sizeof(int)*8); memset(m_regs, 0, sizeof(UINT8)*0x100); } @@ -159,4 +159,3 @@ WRITE8_MEMBER( st0016_device::st0016_snd_w ) } } } - diff --git a/src/emu/sound/st0016.h b/src/emu/sound/st0016.h index 322afca9ee6..3e1b1c35b8e 100644 --- a/src/emu/sound/st0016.h +++ b/src/emu/sound/st0016.h @@ -27,7 +27,7 @@ struct st0016_interface // ======================> st0016_device class st0016_device : public device_t, - public device_sound_interface + public device_sound_interface { public: st0016_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -41,15 +41,15 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - DECLARE_READ8_MEMBER( st0016_snd_r ); - DECLARE_WRITE8_MEMBER( st0016_snd_w ); + DECLARE_READ8_MEMBER( st0016_snd_r ); + DECLARE_WRITE8_MEMBER( st0016_snd_w ); private: sound_stream *m_stream; UINT8 **m_sound_ram; int m_vpos[8]; - int m_frac[8]; - int m_lponce[8]; + int m_frac[8]; + int m_lponce[8]; UINT8 m_regs[0x100]; }; diff --git a/src/emu/sound/tms3615.c b/src/emu/sound/tms3615.c index f543f8a66b6..5a32a33e94d 100644 --- a/src/emu/sound/tms3615.c +++ b/src/emu/sound/tms3615.c @@ -21,16 +21,16 @@ const device_type TMS3615 = &device_creator<tms3615_device>; tms3615_device::tms3615_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TMS3615, "TMS3615", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_channel(0), - m_samplerate(0), - m_basefreq(0), - m_output8(0), - m_output16(0), - m_enable(0) + device_sound_interface(mconfig, *this), + m_channel(0), + m_samplerate(0), + m_basefreq(0), + m_output8(0), + m_output16(0), + m_enable(0) { - memset(m_counter8, 0, TMS3615_TONES); - memset(m_counter16, 0, TMS3615_TONES); + memset(m_counter8, 0, TMS3615_TONES); + memset(m_counter16, 0, TMS3615_TONES); } @@ -105,5 +105,3 @@ void tms3615_device::enable_w(int enable) { m_enable = enable; } - - diff --git a/src/emu/sound/tms3615.h b/src/emu/sound/tms3615.h index 31c4ef5574a..5fc23aaabed 100644 --- a/src/emu/sound/tms3615.h +++ b/src/emu/sound/tms3615.h @@ -26,7 +26,7 @@ // ======================> tms3615_device class tms3615_device : public device_t, - public device_sound_interface + public device_sound_interface { public: tms3615_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -40,7 +40,7 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - void enable_w(int enable); + void enable_w(int enable); private: sound_stream *m_channel; /* returned by stream_create() */ diff --git a/src/emu/sound/tms36xx.c b/src/emu/sound/tms36xx.c index f5d494a755f..303d627cad6 100644 --- a/src/emu/sound/tms36xx.c +++ b/src/emu/sound/tms36xx.c @@ -323,23 +323,23 @@ const device_type TMS36XX = &device_creator<tms36xx_device>; tms36xx_device::tms36xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, TMS36XX, "TMS36XX", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_subtype(NULL), - m_channel(NULL), - m_samplerate(0), - m_basefreq(0), - m_octave(0), - m_speed(0), - m_tune_counter(0), - m_note_counter(0), - m_voices(0), - m_shift(0), - m_output(0), - m_enable(0), - m_tune_num(0), - m_tune_ofs(0), - m_tune_max(0), - m_intf(NULL) + device_sound_interface(mconfig, *this), + m_subtype(NULL), + m_channel(NULL), + m_samplerate(0), + m_basefreq(0), + m_octave(0), + m_speed(0), + m_tune_counter(0), + m_note_counter(0), + m_voices(0), + m_shift(0), + m_output(0), + m_enable(0), + m_tune_num(0), + m_tune_ofs(0), + m_tune_max(0), + m_intf(NULL) { memset(m_vol, 0, sizeof(int)*12); memset(m_vol_counter, 0, sizeof(int)*12); @@ -491,7 +491,7 @@ void tms36xx_device::tms36xx_note_w(int octave, int note) //------------------------------------------------- // TMS3617 interface functions //------------------------------------------------- - + void tms36xx_device::tms3617_enable_w(int enable) { tms3617_enable(enable); diff --git a/src/emu/sound/tms36xx.h b/src/emu/sound/tms36xx.h index 1d3ff6a63f2..fc4c7c9bac6 100644 --- a/src/emu/sound/tms36xx.h +++ b/src/emu/sound/tms36xx.h @@ -36,7 +36,7 @@ struct tms36xx_interface // ======================> tms36xx_device class tms36xx_device : public device_t, - public device_sound_interface + public device_sound_interface { public: tms36xx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); @@ -50,18 +50,18 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - // MM6221AA interface functions - void mm6221aa_tune_w(int tune); + // MM6221AA interface functions + void mm6221aa_tune_w(int tune); - // TMS3615/17 interface functions - void tms36xx_note_w(int octave, int note); + // TMS3615/17 interface functions + void tms36xx_note_w(int octave, int note); - // TMS3617 interface functions - void tms3617_enable_w(int enable); + // TMS3617 interface functions + void tms3617_enable_w(int enable); private: - void tms36xx_reset_counters(); - void tms3617_enable(int enable); + void tms36xx_reset_counters(); + void tms3617_enable(int enable); private: char *m_subtype; // subtype name MM6221AA, TMS3615 or TMS3617 diff --git a/src/emu/sound/zsg2.c b/src/emu/sound/zsg2.c index 65f36bcff9f..1bac9113c23 100644 --- a/src/emu/sound/zsg2.c +++ b/src/emu/sound/zsg2.c @@ -61,12 +61,12 @@ const device_type ZSG2 = &device_creator<zsg2_device>; zsg2_device::zsg2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, ZSG2, "ZSG-2", tag, owner, clock), - device_sound_interface(mconfig, *this), - m_alow(0), - m_ahigh(0), - m_bank_samples(NULL), - m_sample_rate(0), - m_stream(NULL) + device_sound_interface(mconfig, *this), + m_alow(0), + m_ahigh(0), + m_bank_samples(NULL), + m_sample_rate(0), + m_stream(NULL) { memset(m_act, 0, sizeof(UINT16)*3); } @@ -239,4 +239,3 @@ READ16_MEMBER( zsg2_device::zsg2_r ) return 0; } - diff --git a/src/emu/sound/zsg2.h b/src/emu/sound/zsg2.h index ccb55e1ed89..0411e762a31 100644 --- a/src/emu/sound/zsg2.h +++ b/src/emu/sound/zsg2.h @@ -30,11 +30,11 @@ struct zsg2_interface // 16 registers per channel, 48 channels struct zchan { - zchan() - { - memset(v, 0, sizeof(UINT16)*16); - } - + zchan() + { + memset(v, 0, sizeof(UINT16)*16); + } + UINT16 v[16]; }; @@ -56,22 +56,22 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); public: - DECLARE_READ16_MEMBER( zsg2_r ); - DECLARE_WRITE16_MEMBER( zsg2_w ); + DECLARE_READ16_MEMBER( zsg2_r ); + DECLARE_WRITE16_MEMBER( zsg2_w ); public: - void chan_w(int chan, int reg, UINT16 data); - UINT16 chan_r(int chan, int reg); - void check_channel(int chan); - void keyon(int chan); - void control_w(int reg, UINT16 data); - UINT16 control_r(int reg); + void chan_w(int chan, int reg, UINT16 data); + UINT16 chan_r(int chan, int reg); + void check_channel(int chan); + void keyon(int chan); + void control_w(int reg, UINT16 data); + UINT16 control_r(int reg); private: zchan m_zc[48]; UINT16 m_act[3]; UINT16 m_alow; - UINT16 m_ahigh; + UINT16 m_ahigh; UINT8 *m_bank_samples; int m_sample_rate; diff --git a/src/emu/video/315_5124.c b/src/emu/video/315_5124.c index 39d312bfd0d..a13cf4b1050 100644 --- a/src/emu/video/315_5124.c +++ b/src/emu/video/315_5124.c @@ -335,7 +335,7 @@ void sega315_5124_device::process_line_timer() /* Activate flags that were pending until the end of previous line. */ check_pending_flags(m_screen->width()); - + /* Check if we're on the last line of a frame */ if (vpos == vpos_limit - 1) { @@ -542,7 +542,7 @@ READ8_MEMBER( sega315_5124_device::register_read ) check_pending_flags(m_screen->hpos()); temp = m_status; - + if ( !space.debugger_access() ) { /* Clear pending write flag */ @@ -636,7 +636,7 @@ WRITE8_MEMBER( sega315_5124_device::register_write ) set_display_settings(); if ( ( reg_num == 0 && (m_status & STATUS_HINT) ) || - ( reg_num == 1 && (m_status & STATUS_VINT) ) ) + ( reg_num == 1 && (m_status & STATUS_VINT) ) ) { // For HINT disabling through register 00: // "Line IRQ VCount" test, of Flubba's VDPTest ROM, disables HINT to wait @@ -650,7 +650,7 @@ WRITE8_MEMBER( sega315_5124_device::register_write ) // The following bit of code takes care of that. // if ( ( (m_status & STATUS_HINT) && !(m_reg[0x00] & 0x10) ) || - ( (m_status & STATUS_VINT) && !(m_reg[0x01] & 0x20) ) ) + ( (m_status & STATUS_VINT) && !(m_reg[0x01] & 0x20) ) ) { if (m_irq_state == 1) { diff --git a/src/emu/video/ef9340_1.h b/src/emu/video/ef9340_1.h index aab26d8391f..e6dee063a84 100644 --- a/src/emu/video/ef9340_1.h +++ b/src/emu/video/ef9340_1.h @@ -70,7 +70,7 @@ protected: UINT8 Y0; UINT8 R; UINT8 M; - int max_vpos; + int max_vpos; } m_ef9340; UINT8 m_ef934x_ram_a[1024]; UINT8 m_ef934x_ram_b[1024]; diff --git a/src/emu/video/hd66421.c b/src/emu/video/hd66421.c index c3d81390c95..93b2856235d 100644 --- a/src/emu/video/hd66421.c +++ b/src/emu/video/hd66421.c @@ -251,6 +251,6 @@ UINT32 hd66421_device::update_screen(screen_device &screen, bitmap_ind16 &bitmap rectangle rect(0, HD66421_WIDTH - 1, 0, HD66421_HEIGHT - 1); bitmap.fill(get_white_pen(machine()), rect); } - + return 0; } diff --git a/src/emu/video/mc6847.c b/src/emu/video/mc6847.c index d5471d5f00f..e1e16559fb1 100644 --- a/src/emu/video/mc6847.c +++ b/src/emu/video/mc6847.c @@ -65,8 +65,8 @@ if skew existed. SockMaster has confirmed that scanlines are in fact 228 clock cycles. - The PAL emulation is little more than having more scanlines; surely - there are details that we are missing here. + The PAL emulation is little more than having more scanlines; surely + there are details that we are missing here. **********************************************************************/ diff --git a/src/emu/video/stvvdp1.c b/src/emu/video/stvvdp1.c index 4badc5408f9..2fc000a13ba 100644 --- a/src/emu/video/stvvdp1.c +++ b/src/emu/video/stvvdp1.c @@ -190,7 +190,7 @@ void saturn_state::stv_clear_framebuffer( int which_framebuffer ) start_y = STV_VDP1_EWLR_Y1 * (m_vdp1.framebuffer_double_interlace+1); end_x = STV_VDP1_EWRR_X3 * ((STV_VDP1_TVM & 1) ? 16 : 8); end_y = (STV_VDP1_EWRR_Y3+1) * (m_vdp1.framebuffer_double_interlace+1); -// popmessage("%d %d %d %d %d",STV_VDP1_EWLR_X1,STV_VDP1_EWLR_Y1,STV_VDP1_EWRR_X3,STV_VDP1_EWRR_Y3,m_vdp1.framebuffer_double_interlace); +// popmessage("%d %d %d %d %d",STV_VDP1_EWLR_X1,STV_VDP1_EWLR_Y1,STV_VDP1_EWRR_X3,STV_VDP1_EWRR_Y3,m_vdp1.framebuffer_double_interlace); if(STV_VDP1_TVM & 1) { @@ -206,7 +206,7 @@ void saturn_state::stv_clear_framebuffer( int which_framebuffer ) } if ( VDP1_LOG ) logerror( "Clearing %d framebuffer\n", m_vdp1.framebuffer_current_draw ); -// memset( m_vdp1.framebuffer[ which_framebuffer ], m_vdp1.ewdr, 1024 * 256 * sizeof(UINT16) * 2 ); +// memset( m_vdp1.framebuffer[ which_framebuffer ], m_vdp1.ewdr, 1024 * 256 * sizeof(UINT16) * 2 ); } diff --git a/src/emu/video/stvvdp2.c b/src/emu/video/stvvdp2.c index ec9aadda1dd..a3f09e64c7c 100644 --- a/src/emu/video/stvvdp2.c +++ b/src/emu/video/stvvdp2.c @@ -2577,7 +2577,7 @@ void saturn_state::stv_vdp2_drawgfxzoom_rgb555( gfxdata = m_vdp2.gfx_decode + code * 0x20; if(stv2_current_tilemap.window_control.enabled[0] || - stv2_current_tilemap.window_control.enabled[1]) + stv2_current_tilemap.window_control.enabled[1]) popmessage("Window Enabled for RGB555 Zoom"); if (!scalex || !scaley) return; @@ -2804,8 +2804,8 @@ void saturn_state::stv_vdp2_drawgfx_rgb555( bitmap_rgb32 &dest_bmp, const rectan sprite_screen_width = sprite_screen_height = 8; if(stv2_current_tilemap.window_control.enabled[0] || - stv2_current_tilemap.window_control.enabled[1]) - popmessage("Window Enabled for RGB555 tiles"); + stv2_current_tilemap.window_control.enabled[1]) + popmessage("Window Enabled for RGB555 tiles"); /* KW 991012 -- Added code to force clip to bitmap boundary */ myclip = clip; @@ -2918,8 +2918,8 @@ void saturn_state::stv_vdp2_drawgfx_rgb888( bitmap_rgb32 &dest_bmp, const rectan sprite_screen_width = sprite_screen_height = 8; if(stv2_current_tilemap.window_control.enabled[0] || - stv2_current_tilemap.window_control.enabled[1]) - popmessage("Window Enabled for RGB888 tiles"); + stv2_current_tilemap.window_control.enabled[1]) + popmessage("Window Enabled for RGB888 tiles"); /* KW 991012 -- Added code to force clip to bitmap boundary */ myclip = clip; @@ -3053,7 +3053,7 @@ void saturn_state::stv_vdp2_drawgfx_alpha(bitmap_rgb32 &dest_bmp,const rectangle /* clip top */ if (sy < clip.min_y) - { int pixels = clip.min_y-sy; + { int pixels = clip.min_y-sy; sy += pixels; y_index += yinc*pixels; } @@ -3130,7 +3130,7 @@ void saturn_state::stv_vdp2_drawgfx_transpen(bitmap_rgb32 &dest_bmp,const rectan /* clip top */ if (sy < clip.min_y) - { int pixels = clip.min_y-sy; + { int pixels = clip.min_y-sy; sy += pixels; y_index += yinc*pixels; } @@ -3492,7 +3492,7 @@ void saturn_state::stv_vdp2_draw_basic_bitmap(bitmap_rgb32 &bitmap, const rectan { // case 0: draw_4bpp_bitmap(bitmap,cliprect); return; case 1: draw_8bpp_bitmap(bitmap,cliprect); return; - // case 2: draw_11bpp_bitmap(bitmap, cliprect); return; + // case 2: draw_11bpp_bitmap(bitmap, cliprect); return; case 3: draw_rgb15_bitmap(bitmap,cliprect); return; case 4: draw_rgb32_bitmap(bitmap,cliprect); return; } @@ -4474,8 +4474,8 @@ void saturn_state::stv_vdp2_check_tilemap(bitmap_rgb32 &bitmap, const rectangle /* Ide Yousuke Meijin No Shin Jissen Mahjong 0x0303 */ /* Decathlete 0x088 */ /* Sexy Parodius 0x2300 */ -// if(STV_VDP2_WCTLD & 0x2000) -// popmessage("Special window enabled %04x, contact MAMEdev",STV_VDP2_WCTLD); +// if(STV_VDP2_WCTLD & 0x2000) +// popmessage("Special window enabled %04x, contact MAMEdev",STV_VDP2_WCTLD); /* Shining Force III, After Burner 2 (doesn't make a proper use tho?) */ /* Layer Section */ @@ -4963,10 +4963,10 @@ void saturn_state::stv_vdp2_draw_NBG0(bitmap_rgb32 &bitmap, const rectangle &cli stv2_current_tilemap.window_control.logic = STV_VDP2_N0LOG; stv2_current_tilemap.window_control.enabled[0] = STV_VDP2_N0W0E; stv2_current_tilemap.window_control.enabled[1] = STV_VDP2_N0W1E; -// stv2_current_tilemap.window_control.? = STV_VDP2_N0SWE; +// stv2_current_tilemap.window_control.? = STV_VDP2_N0SWE; stv2_current_tilemap.window_control.area[0] = STV_VDP2_N0W0A; stv2_current_tilemap.window_control.area[1] = STV_VDP2_N0W1A; -// stv2_current_tilemap.window_control.? = STV_VDP2_N0SWA; +// stv2_current_tilemap.window_control.? = STV_VDP2_N0SWA; stv2_current_tilemap.line_screen_enabled = STV_VDP2_N0LCEN; stv2_current_tilemap.mosaic_screen_enabled = STV_VDP2_N0MZE; @@ -5063,10 +5063,10 @@ void saturn_state::stv_vdp2_draw_NBG1(bitmap_rgb32 &bitmap, const rectangle &cli stv2_current_tilemap.window_control.logic = STV_VDP2_N1LOG; stv2_current_tilemap.window_control.enabled[0] = STV_VDP2_N1W0E; stv2_current_tilemap.window_control.enabled[1] = STV_VDP2_N1W1E; -// stv2_current_tilemap.window_control.? = STV_VDP2_N1SWE; +// stv2_current_tilemap.window_control.? = STV_VDP2_N1SWE; stv2_current_tilemap.window_control.area[0] = STV_VDP2_N1W0A; stv2_current_tilemap.window_control.area[1] = STV_VDP2_N1W1A; -// stv2_current_tilemap.window_control.? = STV_VDP2_N1SWA; +// stv2_current_tilemap.window_control.? = STV_VDP2_N1SWA; stv2_current_tilemap.line_screen_enabled = STV_VDP2_N1LCEN; stv2_current_tilemap.mosaic_screen_enabled = STV_VDP2_N1MZE; @@ -5164,10 +5164,10 @@ void saturn_state::stv_vdp2_draw_NBG2(bitmap_rgb32 &bitmap, const rectangle &cli stv2_current_tilemap.window_control.logic = STV_VDP2_N2LOG; stv2_current_tilemap.window_control.enabled[0] = STV_VDP2_N2W0E; stv2_current_tilemap.window_control.enabled[1] = STV_VDP2_N2W1E; -// stv2_current_tilemap.window_control.? = STV_VDP2_N2SWE; +// stv2_current_tilemap.window_control.? = STV_VDP2_N2SWE; stv2_current_tilemap.window_control.area[0] = STV_VDP2_N2W0A; stv2_current_tilemap.window_control.area[1] = STV_VDP2_N2W1A; -// stv2_current_tilemap.window_control.? = STV_VDP2_N2SWA; +// stv2_current_tilemap.window_control.? = STV_VDP2_N2SWA; stv2_current_tilemap.line_screen_enabled = STV_VDP2_N2LCEN; stv2_current_tilemap.mosaic_screen_enabled = STV_VDP2_N2MZE; @@ -5267,10 +5267,10 @@ void saturn_state::stv_vdp2_draw_NBG3(bitmap_rgb32 &bitmap, const rectangle &cli stv2_current_tilemap.window_control.logic = STV_VDP2_N3LOG; stv2_current_tilemap.window_control.enabled[0] = STV_VDP2_N3W0E; stv2_current_tilemap.window_control.enabled[1] = STV_VDP2_N3W1E; -// stv2_current_tilemap.window_control.? = STV_VDP2_N3SWE; +// stv2_current_tilemap.window_control.? = STV_VDP2_N3SWE; stv2_current_tilemap.window_control.area[0] = STV_VDP2_N3W0A; stv2_current_tilemap.window_control.area[1] = STV_VDP2_N3W1A; -// stv2_current_tilemap.window_control.? = STV_VDP2_N3SWA; +// stv2_current_tilemap.window_control.? = STV_VDP2_N3SWA; stv2_current_tilemap.line_screen_enabled = STV_VDP2_N3LCEN; stv2_current_tilemap.mosaic_screen_enabled = STV_VDP2_N3MZE; @@ -5419,8 +5419,8 @@ void saturn_state::stv_vdp2_draw_rotation_screen(bitmap_rgb32 &bitmap, const rec colour_calculation_enabled = stv2_current_tilemap.colour_calculation_enabled; stv2_current_tilemap.colour_calculation_enabled = 0; -// window_control = stv2_current_tilemap.window_control; -// stv2_current_tilemap.window_control = 0; +// window_control = stv2_current_tilemap.window_control; +// stv2_current_tilemap.window_control = 0; fade_control = stv2_current_tilemap.fade_control; stv2_current_tilemap.fade_control = 0; g_profiler.start(PROFILER_USER1); @@ -5528,10 +5528,10 @@ void saturn_state::stv_vdp2_draw_RBG0(bitmap_rgb32 &bitmap, const rectangle &cli stv2_current_tilemap.window_control.logic = STV_VDP2_R0LOG; stv2_current_tilemap.window_control.enabled[0] = STV_VDP2_R0W0E; stv2_current_tilemap.window_control.enabled[1] = STV_VDP2_R0W1E; -// stv2_current_tilemap.window_control.? = STV_VDP2_R0SWE; +// stv2_current_tilemap.window_control.? = STV_VDP2_R0SWE; stv2_current_tilemap.window_control.area[0] = STV_VDP2_R0W0A; stv2_current_tilemap.window_control.area[1] = STV_VDP2_R0W1A; -// stv2_current_tilemap.window_control.? = STV_VDP2_R0SWA; +// stv2_current_tilemap.window_control.? = STV_VDP2_R0SWA; stv2_current_tilemap.scrollx = 0; stv2_current_tilemap.scrolly = 0; @@ -6325,7 +6325,7 @@ int saturn_state::stv_vdp2_window_process(int x,int y) int w0_pix, w1_pix; if (stv2_current_tilemap.window_control.enabled[0] == 0 && - stv2_current_tilemap.window_control.enabled[1] == 0) + stv2_current_tilemap.window_control.enabled[1] == 0) return 1; stv_vdp2_get_window0_coordinates(&s_x, &e_x, &s_y, &e_y); @@ -6479,12 +6479,12 @@ void saturn_state::draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect, stv2_current_tilemap.window_control.logic = STV_VDP2_SPLOG; stv2_current_tilemap.window_control.enabled[0] = STV_VDP2_SPW0E; stv2_current_tilemap.window_control.enabled[1] = STV_VDP2_SPW1E; -// stv2_current_tilemap.window_control.? = STV_VDP2_SPSWE; +// stv2_current_tilemap.window_control.? = STV_VDP2_SPSWE; stv2_current_tilemap.window_control.area[0] = STV_VDP2_SPW0A; stv2_current_tilemap.window_control.area[1] = STV_VDP2_SPW1A; -// stv2_current_tilemap.window_control.? = STV_VDP2_SPSWA; +// stv2_current_tilemap.window_control.? = STV_VDP2_SPSWA; -// stv_vdp2_apply_window_on_layer(mycliprect); +// stv_vdp2_apply_window_on_layer(mycliprect); if (interlace_framebuffer == 0 && double_x == 0 ) { |
