diff options
| author | 2015-06-24 07:36:50 +0200 | |
|---|---|---|
| committer | 2015-06-24 07:36:50 +0200 | |
| commit | d1583b9850d9fb45470648a515eb734e05fd926f (patch) | |
| tree | 33a4d9934bd2ff6c41526abe0ba06c1d1ea73eb6 /src/emu | |
| parent | 03a5bfa56fa4af400f6b9fb07a5e1333aa8fa52f (diff) | |
Cleanups and version bumpmame0163
Diffstat (limited to 'src/emu')
55 files changed, 1321 insertions, 1338 deletions
diff --git a/src/emu/bus/apricot/expansion.h b/src/emu/bus/apricot/expansion.h index 91b3e8e31c8..38687db4399 100644 --- a/src/emu/bus/apricot/expansion.h +++ b/src/emu/bus/apricot/expansion.h @@ -2,42 +2,42 @@ // copyright-holders:Dirk Best /*************************************************************************** - ACT Apricot Expansion Slot + ACT Apricot Expansion Slot A B - -12V 32 +12V - +5V 31 +5V - DB0 30 DB1 - DB2 29 DB3 - DB4 28 DB5 - DB6 27 DB7 - AB10 26 AB9 - AB11 25 AB12 - /AMWC 24 /MRDC - /DMA2 23 DT/R - /DMA1 22 /IORC - /MWTC 21 /RES - /IOWC 20 /AIOWC - GND 19 GND - /CLK5 18 DEN - /IRDY 17 /MRDY - /EXT1 16 /EXT2 - /INT3 15 /ALE - AB6 14 /INT2 - AB8 13 AB7 - DB9 12 DB8 - DB11 11 DB10 - DB13 10 DB12 - DB15 9 DB14 - AB2 8 AB1 - AB4 7 AB3 - AB0 6 AB5 - AB14 5 AB13 - AB15 4 AB16 - AB17 3 AB18 - AB19 2 /BHE - NMI 1 CLK15 + -12V 32 +12V + +5V 31 +5V + DB0 30 DB1 + DB2 29 DB3 + DB4 28 DB5 + DB6 27 DB7 + AB10 26 AB9 + AB11 25 AB12 + /AMWC 24 /MRDC + /DMA2 23 DT/R + /DMA1 22 /IORC + /MWTC 21 /RES + /IOWC 20 /AIOWC + GND 19 GND + /CLK5 18 DEN + /IRDY 17 /MRDY + /EXT1 16 /EXT2 + /INT3 15 /ALE + AB6 14 /INT2 + AB8 13 AB7 + DB9 12 DB8 + DB11 11 DB10 + DB13 10 DB12 + DB15 9 DB14 + AB2 8 AB1 + AB4 7 AB3 + AB0 6 AB5 + AB14 5 AB13 + AB15 4 AB16 + AB17 3 AB18 + AB19 2 /BHE + NMI 1 CLK15 ***************************************************************************/ diff --git a/src/emu/bus/cpc/hd20.c b/src/emu/bus/cpc/hd20.c index dec34db50dc..6a778bf6162 100644 --- a/src/emu/bus/cpc/hd20.c +++ b/src/emu/bus/cpc/hd20.c @@ -2,7 +2,7 @@ // copyright-holders:Barry Rodewald /* - Dobbertin HD20 hard disk + Dobbertin HD20 hard disk */ @@ -81,7 +81,7 @@ void cpc_hd20_device::device_reset() READ8_MEMBER(cpc_hd20_device::hdc_r) { UINT8 ret = 0xff; - + switch(offset) { case 0: @@ -95,7 +95,7 @@ READ8_MEMBER(cpc_hd20_device::hdc_r) ret = 0x01; break; } - + return ret; } @@ -123,7 +123,6 @@ WRITE8_MEMBER(cpc_hd20_device::hdc_w) WRITE_LINE_MEMBER(cpc_hd20_device::irq_w) { -// if(state) -// m_hdc->set_ready(); +// if(state) +// m_hdc->set_ready(); } - diff --git a/src/emu/bus/cpc/hd20.h b/src/emu/bus/cpc/hd20.h index 7ff253a92cc..0926e6bd5be 100644 --- a/src/emu/bus/cpc/hd20.h +++ b/src/emu/bus/cpc/hd20.h @@ -2,13 +2,13 @@ // copyright-holders:Barry Rodewald /* - Dobbertin HD20 hard disk + Dobbertin HD20 hard disk + + Fixed disk interface for the Amstrad CPC + + Controller: Seagate ST11M XT HD Controller + Disk: 3.5" 20MB Seagate, Kyocera, NEC or Miniscribe (Geometry: 615 cylinders/4 heads/17 sectors) - Fixed disk interface for the Amstrad CPC - - Controller: Seagate ST11M XT HD Controller - Disk: 3.5" 20MB Seagate, Kyocera, NEC or Miniscribe (Geometry: 615 cylinders/4 heads/17 sectors) - */ #ifndef HD20_H_ @@ -32,7 +32,7 @@ public: DECLARE_READ8_MEMBER(hdc_r); DECLARE_WRITE8_MEMBER(hdc_w); DECLARE_WRITE_LINE_MEMBER(irq_w); - + protected: // device-level overrides virtual void device_start(); diff --git a/src/emu/bus/isa/hdc.c b/src/emu/bus/isa/hdc.c index 7f839f818f3..45b6bc334dd 100644 --- a/src/emu/bus/isa/hdc.c +++ b/src/emu/bus/isa/hdc.c @@ -163,7 +163,7 @@ const device_type ST11M_HDC = &device_creator<st11m_device>; xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, XT_HDC, "Generic PC-XT Fixed Disk Controller", tag, owner, clock, "xt_hdc", __FILE__), - m_irq_handler(*this), + m_irq_handler(*this), m_drq_handler(*this) { m_type = STANDARD; @@ -171,14 +171,14 @@ xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, dev xt_hdc_device::xt_hdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source), - m_irq_handler(*this), + m_irq_handler(*this), m_drq_handler(*this) { } ec1841_device::ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : xt_hdc_device(mconfig, EC1841_HDC, "EC1841 Fixed Disk Controller", tag, owner, clock, "ec1481", __FILE__), - m_irq_handler(*this), + m_irq_handler(*this), m_drq_handler(*this) { m_type = EC1841; @@ -186,7 +186,7 @@ ec1841_device::ec1841_device(const machine_config &mconfig, const char *tag, dev st11m_device::st11m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : xt_hdc_device(mconfig, EC1841_HDC, "Seagate ST11M Fixed Disk Controller", tag, owner, clock, "st11m", __FILE__), - m_irq_handler(*this), + m_irq_handler(*this), m_drq_handler(*this) { m_type = ST11M; @@ -250,7 +250,7 @@ hard_disk_file *xt_hdc_device::pc_hdc_file(int id) void xt_hdc_device::pc_hdc_result(int set_error_info) { - if ( ( hdc_control & 0x02 )) + if ( ( hdc_control & 0x02 )) { // dip switch selected IRQ 5 or 2 m_irq_handler(1); @@ -478,7 +478,7 @@ void xt_hdc_device::execute_write() hdcdma_dst = hdcdma_data; hdcdma_write = write_; hdcdma_size = size; - + if (!no_dma()) { m_drq_handler(1); diff --git a/src/emu/cheat.c b/src/emu/cheat.c index c5cce57604b..08f86957eac 100644 --- a/src/emu/cheat.c +++ b/src/emu/cheat.c @@ -1135,7 +1135,7 @@ void cheat_manager::reload() m_disabled = false; // load the cheat file, if it's a system that has a software list then try softlist_name/shortname.xml first, - // if it fails to load then try to load via crc32 - basename/crc32.xml ( eg. 01234567.xml ) + // if it fails to load then try to load via crc32 - basename/crc32.xml ( eg. 01234567.xml ) image_interface_iterator iter(machine().root_device()); for (device_image_interface *image = iter.first(); image != NULL; image = iter.next()) if (image->exists()) @@ -1150,7 +1150,7 @@ void cheat_manager::reload() load_cheats(filename.c_str()); break; } - // else we are loading outside the software list, try to load machine_basename/crc32.xml + // else we are loading outside the software list, try to load machine_basename/crc32.xml else { UINT32 crc = image->crc(); diff --git a/src/emu/cpu/hmcs40/hmcs40.c b/src/emu/cpu/hmcs40/hmcs40.c index dabc9740004..fdcaa430189 100644 --- a/src/emu/cpu/hmcs40/hmcs40.c +++ b/src/emu/cpu/hmcs40/hmcs40.c @@ -493,11 +493,11 @@ void hmcs40_cpu_device::execute_set_input(int line, int state) } else m_timer->adjust(m_timer_halted_remain); - + m_halt = state; return; } - + if (line != 0 && line != 1) return; @@ -577,7 +577,7 @@ void hmcs40_cpu_device::execute_run() m_icount = 0; return; } - + while (m_icount > 0) { // LPU is handled 1 cycle later diff --git a/src/emu/cpu/hphybrid/hphybrid.c b/src/emu/cpu/hphybrid/hphybrid.c index 8a50c78368d..691e7d56711 100644 --- a/src/emu/cpu/hphybrid/hphybrid.c +++ b/src/emu/cpu/hphybrid/hphybrid.c @@ -9,39 +9,39 @@ #include "hphybrid.h" enum { - HPHYBRID_A, - HPHYBRID_B, - HPHYBRID_C, - HPHYBRID_D, - HPHYBRID_P, - HPHYBRID_R, - HPHYBRID_IV, - HPHYBRID_PA, - HPHYBRID_DMAPA, - HPHYBRID_DMAMA, - HPHYBRID_DMAC, - HPHYBRID_I + HPHYBRID_A, + HPHYBRID_B, + HPHYBRID_C, + HPHYBRID_D, + HPHYBRID_P, + HPHYBRID_R, + HPHYBRID_IV, + HPHYBRID_PA, + HPHYBRID_DMAPA, + HPHYBRID_DMAMA, + HPHYBRID_DMAC, + HPHYBRID_I }; -#define BIT_MASK(n) (1U << (n)) +#define BIT_MASK(n) (1U << (n)) // Macros to clear/set single bits -#define BIT_CLR(w , n) ((w) &= ~BIT_MASK(n)) -#define BIT_SET(w , n) ((w) |= BIT_MASK(n)) +#define BIT_CLR(w , n) ((w) &= ~BIT_MASK(n)) +#define BIT_SET(w , n) ((w) |= BIT_MASK(n)) // Bits in m_flags -#define HPHYBRID_C_BIT 0 // Carry/extend -#define HPHYBRID_O_BIT 1 // Overflow -#define HPHYBRID_CB_BIT 2 // Cb -#define HPHYBRID_DB_BIT 3 // Db -#define HPHYBRID_INTEN_BIT 4 // Interrupt enable -#define HPHYBRID_DMAEN_BIT 5 // DMA enable -#define HPHYBRID_DMADIR_BIT 6 // DMA direction (1 = OUT) -#define HPHYBRID_HALT_BIT 7 // Halt flag -#define HPHYBRID_IRH_BIT 8 // IRH requested -#define HPHYBRID_IRL_BIT 9 // IRL requested -#define HPHYBRID_IRH_SVC_BIT 10 // IRH in service -#define HPHYBRID_IRL_SVC_BIT 11 // IRL in service +#define HPHYBRID_C_BIT 0 // Carry/extend +#define HPHYBRID_O_BIT 1 // Overflow +#define HPHYBRID_CB_BIT 2 // Cb +#define HPHYBRID_DB_BIT 3 // Db +#define HPHYBRID_INTEN_BIT 4 // Interrupt enable +#define HPHYBRID_DMAEN_BIT 5 // DMA enable +#define HPHYBRID_DMADIR_BIT 6 // DMA direction (1 = OUT) +#define HPHYBRID_HALT_BIT 7 // Halt flag +#define HPHYBRID_IRH_BIT 8 // IRH requested +#define HPHYBRID_IRL_BIT 9 // IRL requested +#define HPHYBRID_IRH_SVC_BIT 10 // IRH in service +#define HPHYBRID_IRL_SVC_BIT 11 // IRL in service #define HPHYBRID_IV_MASK 0xfff0 // IV mask @@ -53,99 +53,99 @@ const device_type HP_5061_3011 = &device_creator<hp_5061_3011_cpu_device>; hp_hybrid_cpu_device::hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__), - m_program_config("program", ENDIANNESS_BIG, 16, 16, -1), - m_io_config("io", ENDIANNESS_BIG, 16, 6, -1) + m_program_config("program", ENDIANNESS_BIG, 16, 16, -1), + m_io_config("io", ENDIANNESS_BIG, 16, 6, -1) { } void hp_hybrid_cpu_device::device_start() { - m_reg_A = 0; - m_reg_B = 0; - m_reg_P = HP_RESET_ADDR; - m_reg_R = 0; - m_reg_C = 0; - m_reg_D = 0; - m_reg_IV = 0; - m_reg_PA[ 0 ] = 0; - m_reg_PA[ 1 ] = 0; - m_reg_PA[ 2 ] = 0; - m_flags = 0; - m_dmapa = 0; - m_dmama = 0; - m_dmac = 0; - m_reg_I = 0; - - { - state_add(HPHYBRID_A, "A", m_reg_A); - state_add(HPHYBRID_B, "B", m_reg_B); - state_add(HPHYBRID_C, "C", m_reg_C); - state_add(HPHYBRID_D, "D", m_reg_D); - state_add(HPHYBRID_P, "P", m_reg_P); - state_add(STATE_GENPC, "GENPC", m_reg_P).noshow(); - state_add(HPHYBRID_R, "R", m_reg_R); - state_add(STATE_GENSP, "GENSP", m_reg_R).noshow(); - state_add(HPHYBRID_IV, "IV", m_reg_IV); - state_add(HPHYBRID_PA, "PA", m_reg_PA[ 0 ]); - state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).noshow().formatstr("%9s"); - state_add(HPHYBRID_DMAPA , "DMAPA" , m_dmapa).noshow(); - state_add(HPHYBRID_DMAMA , "DMAMA" , m_dmama).noshow(); - state_add(HPHYBRID_DMAC , "DMAC" , m_dmac).noshow(); - state_add(HPHYBRID_I , "I" , m_reg_I).noshow(); - } - - m_program = &space(AS_PROGRAM); - m_direct = &m_program->direct(); - m_io = &space(AS_IO); - - save_item(NAME(m_reg_A)); - save_item(NAME(m_reg_B)); - save_item(NAME(m_reg_C)); - save_item(NAME(m_reg_D)); - save_item(NAME(m_reg_P)); - save_item(NAME(m_reg_R)); - save_item(NAME(m_reg_IV)); - save_item(NAME(m_reg_PA[0])); - save_item(NAME(m_reg_PA[1])); - save_item(NAME(m_reg_PA[2])); - save_item(NAME(m_flags)); - save_item(NAME(m_dmapa)); - save_item(NAME(m_dmama)); - save_item(NAME(m_dmac)); - save_item(NAME(m_reg_I)); - - m_icountptr = &m_icount; + m_reg_A = 0; + m_reg_B = 0; + m_reg_P = HP_RESET_ADDR; + m_reg_R = 0; + m_reg_C = 0; + m_reg_D = 0; + m_reg_IV = 0; + m_reg_PA[ 0 ] = 0; + m_reg_PA[ 1 ] = 0; + m_reg_PA[ 2 ] = 0; + m_flags = 0; + m_dmapa = 0; + m_dmama = 0; + m_dmac = 0; + m_reg_I = 0; + + { + state_add(HPHYBRID_A, "A", m_reg_A); + state_add(HPHYBRID_B, "B", m_reg_B); + state_add(HPHYBRID_C, "C", m_reg_C); + state_add(HPHYBRID_D, "D", m_reg_D); + state_add(HPHYBRID_P, "P", m_reg_P); + state_add(STATE_GENPC, "GENPC", m_reg_P).noshow(); + state_add(HPHYBRID_R, "R", m_reg_R); + state_add(STATE_GENSP, "GENSP", m_reg_R).noshow(); + state_add(HPHYBRID_IV, "IV", m_reg_IV); + state_add(HPHYBRID_PA, "PA", m_reg_PA[ 0 ]); + state_add(STATE_GENFLAGS, "GENFLAGS", m_flags).noshow().formatstr("%9s"); + state_add(HPHYBRID_DMAPA , "DMAPA" , m_dmapa).noshow(); + state_add(HPHYBRID_DMAMA , "DMAMA" , m_dmama).noshow(); + state_add(HPHYBRID_DMAC , "DMAC" , m_dmac).noshow(); + state_add(HPHYBRID_I , "I" , m_reg_I).noshow(); + } + + m_program = &space(AS_PROGRAM); + m_direct = &m_program->direct(); + m_io = &space(AS_IO); + + save_item(NAME(m_reg_A)); + save_item(NAME(m_reg_B)); + save_item(NAME(m_reg_C)); + save_item(NAME(m_reg_D)); + save_item(NAME(m_reg_P)); + save_item(NAME(m_reg_R)); + save_item(NAME(m_reg_IV)); + save_item(NAME(m_reg_PA[0])); + save_item(NAME(m_reg_PA[1])); + save_item(NAME(m_reg_PA[2])); + save_item(NAME(m_flags)); + save_item(NAME(m_dmapa)); + save_item(NAME(m_dmama)); + save_item(NAME(m_dmac)); + save_item(NAME(m_reg_I)); + + m_icountptr = &m_icount; } void hp_hybrid_cpu_device::device_reset() { - m_reg_P = HP_RESET_ADDR; - m_reg_I = RM(m_reg_P); - m_flags = 0; + m_reg_P = HP_RESET_ADDR; + m_reg_I = RM(m_reg_P); + m_flags = 0; } void hp_hybrid_cpu_device::execute_run() { - do { - debugger_instruction_hook(this, m_reg_P); + do { + debugger_instruction_hook(this, m_reg_P); - // Check for interrupts - check_for_interrupts(); + // Check for interrupts + check_for_interrupts(); - // TODO: check dma - m_reg_I = execute_one(m_reg_I); - } while (m_icount > 0); + // TODO: check dma + m_reg_I = execute_one(m_reg_I); + } while (m_icount > 0); } void hp_hybrid_cpu_device::execute_set_input(int inputnum, int state) { - if (inputnum < HPHYBRID_INT_LVLS) { - if (state) { - BIT_SET(m_flags , HPHYBRID_IRH_BIT + inputnum); - } else { - BIT_CLR(m_flags , HPHYBRID_IRH_BIT + inputnum); - } - } + if (inputnum < HPHYBRID_INT_LVLS) { + if (state) { + BIT_SET(m_flags , HPHYBRID_IRH_BIT + inputnum); + } else { + BIT_CLR(m_flags , HPHYBRID_IRH_BIT + inputnum); + } + } } /** @@ -157,14 +157,14 @@ void hp_hybrid_cpu_device::execute_set_input(int inputnum, int state) */ UINT16 hp_hybrid_cpu_device::execute_one(UINT16 opcode) { - if ((opcode & 0x7fe0) == 0x7000) { - // EXE - m_icount -= 8; - return RM(opcode & 0x1f); - } else { - m_reg_P = execute_one_sub(opcode); - return RM(m_reg_P); - } + if ((opcode & 0x7fe0) == 0x7000) { + // EXE + m_icount -= 8; + return RM(opcode & 0x1f); + } else { + m_reg_P = execute_one_sub(opcode); + return RM(m_reg_P); + } } /** @@ -176,747 +176,747 @@ UINT16 hp_hybrid_cpu_device::execute_one(UINT16 opcode) */ UINT16 hp_hybrid_cpu_device::execute_one_sub(UINT16 opcode) { - UINT16 ea; - UINT16 tmp; - - switch (opcode & 0x7800) { - case 0x0000: - // LDA - m_icount -= 13; - m_reg_A = RM(get_ea(opcode)); - break; - - case 0x0800: - // LDB - m_icount -= 13; - m_reg_B = RM(get_ea(opcode)); - break; - - case 0x1000: - // CPA - m_icount -= 16; - if (m_reg_A != RM(get_ea(opcode))) { - // Skip next instruction - return m_reg_P + 2; - } - break; - - case 0x1800: - // CPB - m_icount -= 16; - if (m_reg_B != RM(get_ea(opcode))) { - // Skip next instruction - return m_reg_P + 2; - } - break; - - case 0x2000: - // ADA - m_icount -= 13; - do_add(m_reg_A , RM(get_ea(opcode))); - break; - - case 0x2800: - // ADB - m_icount -= 13; - do_add(m_reg_B , RM(get_ea(opcode))); - break; - - case 0x3000: - // STA - m_icount -= 13; - WM(get_ea(opcode) , m_reg_A); - break; - - case 0x3800: - // STB - m_icount -= 13; - WM(get_ea(opcode) , m_reg_B); - break; - - case 0x4000: - // JSM - m_icount -= 17; - WM(++m_reg_R , m_reg_P); - return get_ea(opcode); - - case 0x4800: - // ISZ - m_icount -= 19; - ea = get_ea(opcode); - tmp = RM(ea) + 1; - WM(ea , tmp); - if (tmp == 0) { - // Skip next instruction - return m_reg_P + 2; - } - break; - - case 0x5000: - // AND - m_icount -= 13; - m_reg_A &= RM(get_ea(opcode)); - break; - - case 0x5800: - // DSZ - m_icount -= 19; - ea = get_ea(opcode); - tmp = RM(ea) - 1; - WM(ea , tmp); - if (tmp == 0) { - // Skip next instruction - return m_reg_P + 2; - } - break; - - case 0x6000: - // IOR - m_icount -= 13; - m_reg_A |= RM(get_ea(opcode)); - break; - - case 0x6800: - // JMP - m_icount -= 8; - return get_ea(opcode); - - default: - switch (opcode & 0xfec0) { - case 0x7400: - // RZA - // SZA - m_icount -= 14; - return get_skip_addr(opcode , m_reg_A == 0); - - case 0x7440: - // RIA - // SIA - m_icount -= 14; - return get_skip_addr(opcode , m_reg_A++ == 0); - - case 0x7480: - // SFS - // SFC - m_icount -= 14; - // TODO: read flag bit - return get_skip_addr(opcode , true); - - case 0x7C00: - // RZB - // SZB - m_icount -= 14; - return get_skip_addr(opcode , m_reg_B == 0); - - case 0x7C40: - // RIB - // SIB - m_icount -= 14; - return get_skip_addr(opcode , m_reg_B++ == 0); - - case 0x7c80: - // SSS - // SSC - m_icount -= 14; - // TODO: read status bit - return get_skip_addr(opcode , true); - - case 0x7cc0: - // SHS - // SHC - m_icount -= 14; - return get_skip_addr(opcode , !BIT(m_flags , HPHYBRID_HALT_BIT)); - - default: - switch (opcode & 0xfe00) { - case 0x7600: - // SLA - // RLA - m_icount -= 14; - return get_skip_addr_sc(opcode , m_reg_A , 0); - - case 0x7e00: - // SLB - // RLB - m_icount -= 14; - return get_skip_addr_sc(opcode , m_reg_B , 0); - - case 0xf400: - // SAP - // SAM - m_icount -= 14; - return get_skip_addr_sc(opcode , m_reg_A , 15); - - case 0xf600: - // SOC - // SOS - m_icount -= 14; - return get_skip_addr_sc(opcode , m_flags , HPHYBRID_O_BIT); - - case 0xfc00: - // SBP - // SBM - m_icount -= 14; - return get_skip_addr_sc(opcode , m_reg_B , 15); - - case 0xfe00: - // SEC - // SES - m_icount -= 14; - return get_skip_addr_sc(opcode , m_flags , HPHYBRID_C_BIT); - - default: - switch (opcode & 0xfff0) { - case 0xf100: - // AAR - tmp = (opcode & 0xf) + 1; - m_icount -= (9 + tmp); - // A shift by 16 positions is equivalent to a shift by 15 - tmp = tmp > 15 ? 15 : tmp; - m_reg_A = ((m_reg_A ^ 0x8000) >> tmp) - (0x8000 >> tmp); - break; - - case 0xf900: - // ABR - tmp = (opcode & 0xf) + 1; - m_icount -= (9 + tmp); - tmp = tmp > 15 ? 15 : tmp; - m_reg_B = ((m_reg_B ^ 0x8000) >> tmp) - (0x8000 >> tmp); - break; - - case 0xf140: - // SAR - tmp = (opcode & 0xf) + 1; - m_icount -= (9 + tmp); - m_reg_A >>= tmp; - break; - - case 0xf940: - // SBR - tmp = (opcode & 0xf) + 1; - m_icount -= (9 + tmp); - m_reg_B >>= tmp; - break; - - case 0xf180: - // SAL - tmp = (opcode & 0xf) + 1; - m_icount -= (9 + tmp); - m_reg_A <<= tmp; - break; - - case 0xf980: - // SBL - tmp = (opcode & 0xf) + 1; - m_icount -= (9 + tmp); - m_reg_B <<= tmp; - break; - - case 0xf1c0: - // RAR - tmp = (opcode & 0xf) + 1; - m_icount -= (9 + tmp); - m_reg_A = (m_reg_A >> tmp) | (m_reg_A << (16 - tmp)); - break; - - case 0xf9c0: - // RBR - tmp = (opcode & 0xf) + 1; - m_icount -= (9 + tmp); - m_reg_B = (m_reg_B >> tmp) | (m_reg_B << (16 - tmp)); - break; - - default: - if ((opcode & 0xf760) == 0x7160) { - // Place/withdraw instructions - m_icount -= 23; - do_pw(opcode); - } else if ((opcode & 0xff80) == 0xf080) { - // RET - m_icount -= 16; - if (BIT(opcode , 6)) { - // Pop PA stack - if (BIT(m_flags , HPHYBRID_IRH_SVC_BIT)) { - BIT_CLR(m_flags , HPHYBRID_IRH_SVC_BIT); - memmove(&m_reg_PA[ 0 ] , &m_reg_PA[ 1 ] , HPHYBRID_INT_LVLS); - } else if (BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) { - BIT_CLR(m_flags , HPHYBRID_IRL_SVC_BIT); - memmove(&m_reg_PA[ 0 ] , &m_reg_PA[ 1 ] , HPHYBRID_INT_LVLS); - } - } - tmp = RM(m_reg_R--) + (opcode & 0x1f); - return BIT(opcode , 5) ? tmp - 0x20 : tmp; - } else { - switch (opcode) { - case 0x7100: - // SDO - m_icount -= 12; - BIT_SET(m_flags , HPHYBRID_DMADIR_BIT); - break; - - case 0x7108: - // SDI - m_icount -= 12; - BIT_CLR(m_flags , HPHYBRID_DMADIR_BIT); - break; - - case 0x7110: - // EIR - m_icount -= 12; - BIT_SET(m_flags , HPHYBRID_INTEN_BIT); - break; - - case 0x7118: - // DIR - m_icount -= 12; - BIT_CLR(m_flags , HPHYBRID_INTEN_BIT); - break; - - case 0x7120: - // DMA - m_icount -= 12; - BIT_SET(m_flags , HPHYBRID_DMAEN_BIT); - break; - - case 0x7138: - // DDR - m_icount -= 12; - BIT_CLR(m_flags , HPHYBRID_DMAEN_BIT); - break; - - case 0x7140: - // DBL - m_icount -= 12; - BIT_CLR(m_flags , HPHYBRID_DB_BIT); - break; - - case 0x7148: - // CBL - m_icount -= 12; - BIT_CLR(m_flags , HPHYBRID_CB_BIT); - break; - - case 0x7150: - // DBU - m_icount -= 12; - BIT_SET(m_flags , HPHYBRID_DB_BIT); - break; - - case 0x7158: - // CBU - m_icount -= 12; - BIT_SET(m_flags , HPHYBRID_CB_BIT); - break; - - case 0xf020: - // TCA - m_icount -= 9; - m_reg_A = ~m_reg_A; - do_add(m_reg_A , 1); - break; - - case 0xf060: - // CMA - m_icount -= 9; - m_reg_A = ~m_reg_A; - break; - - case 0xf820: - // TCB - m_icount -= 9; - m_reg_B = ~m_reg_B; - do_add(m_reg_B , 1); - break; - - case 0xf860: - // CMB - m_icount -= 9; - m_reg_B = ~m_reg_B; - break; - - default: - // Unrecognized instructions: NOP - // Execution time is fictional - m_icount -= 6; - } - } - } - } - } - } - - return m_reg_P + 1; + UINT16 ea; + UINT16 tmp; + + switch (opcode & 0x7800) { + case 0x0000: + // LDA + m_icount -= 13; + m_reg_A = RM(get_ea(opcode)); + break; + + case 0x0800: + // LDB + m_icount -= 13; + m_reg_B = RM(get_ea(opcode)); + break; + + case 0x1000: + // CPA + m_icount -= 16; + if (m_reg_A != RM(get_ea(opcode))) { + // Skip next instruction + return m_reg_P + 2; + } + break; + + case 0x1800: + // CPB + m_icount -= 16; + if (m_reg_B != RM(get_ea(opcode))) { + // Skip next instruction + return m_reg_P + 2; + } + break; + + case 0x2000: + // ADA + m_icount -= 13; + do_add(m_reg_A , RM(get_ea(opcode))); + break; + + case 0x2800: + // ADB + m_icount -= 13; + do_add(m_reg_B , RM(get_ea(opcode))); + break; + + case 0x3000: + // STA + m_icount -= 13; + WM(get_ea(opcode) , m_reg_A); + break; + + case 0x3800: + // STB + m_icount -= 13; + WM(get_ea(opcode) , m_reg_B); + break; + + case 0x4000: + // JSM + m_icount -= 17; + WM(++m_reg_R , m_reg_P); + return get_ea(opcode); + + case 0x4800: + // ISZ + m_icount -= 19; + ea = get_ea(opcode); + tmp = RM(ea) + 1; + WM(ea , tmp); + if (tmp == 0) { + // Skip next instruction + return m_reg_P + 2; + } + break; + + case 0x5000: + // AND + m_icount -= 13; + m_reg_A &= RM(get_ea(opcode)); + break; + + case 0x5800: + // DSZ + m_icount -= 19; + ea = get_ea(opcode); + tmp = RM(ea) - 1; + WM(ea , tmp); + if (tmp == 0) { + // Skip next instruction + return m_reg_P + 2; + } + break; + + case 0x6000: + // IOR + m_icount -= 13; + m_reg_A |= RM(get_ea(opcode)); + break; + + case 0x6800: + // JMP + m_icount -= 8; + return get_ea(opcode); + + default: + switch (opcode & 0xfec0) { + case 0x7400: + // RZA + // SZA + m_icount -= 14; + return get_skip_addr(opcode , m_reg_A == 0); + + case 0x7440: + // RIA + // SIA + m_icount -= 14; + return get_skip_addr(opcode , m_reg_A++ == 0); + + case 0x7480: + // SFS + // SFC + m_icount -= 14; + // TODO: read flag bit + return get_skip_addr(opcode , true); + + case 0x7C00: + // RZB + // SZB + m_icount -= 14; + return get_skip_addr(opcode , m_reg_B == 0); + + case 0x7C40: + // RIB + // SIB + m_icount -= 14; + return get_skip_addr(opcode , m_reg_B++ == 0); + + case 0x7c80: + // SSS + // SSC + m_icount -= 14; + // TODO: read status bit + return get_skip_addr(opcode , true); + + case 0x7cc0: + // SHS + // SHC + m_icount -= 14; + return get_skip_addr(opcode , !BIT(m_flags , HPHYBRID_HALT_BIT)); + + default: + switch (opcode & 0xfe00) { + case 0x7600: + // SLA + // RLA + m_icount -= 14; + return get_skip_addr_sc(opcode , m_reg_A , 0); + + case 0x7e00: + // SLB + // RLB + m_icount -= 14; + return get_skip_addr_sc(opcode , m_reg_B , 0); + + case 0xf400: + // SAP + // SAM + m_icount -= 14; + return get_skip_addr_sc(opcode , m_reg_A , 15); + + case 0xf600: + // SOC + // SOS + m_icount -= 14; + return get_skip_addr_sc(opcode , m_flags , HPHYBRID_O_BIT); + + case 0xfc00: + // SBP + // SBM + m_icount -= 14; + return get_skip_addr_sc(opcode , m_reg_B , 15); + + case 0xfe00: + // SEC + // SES + m_icount -= 14; + return get_skip_addr_sc(opcode , m_flags , HPHYBRID_C_BIT); + + default: + switch (opcode & 0xfff0) { + case 0xf100: + // AAR + tmp = (opcode & 0xf) + 1; + m_icount -= (9 + tmp); + // A shift by 16 positions is equivalent to a shift by 15 + tmp = tmp > 15 ? 15 : tmp; + m_reg_A = ((m_reg_A ^ 0x8000) >> tmp) - (0x8000 >> tmp); + break; + + case 0xf900: + // ABR + tmp = (opcode & 0xf) + 1; + m_icount -= (9 + tmp); + tmp = tmp > 15 ? 15 : tmp; + m_reg_B = ((m_reg_B ^ 0x8000) >> tmp) - (0x8000 >> tmp); + break; + + case 0xf140: + // SAR + tmp = (opcode & 0xf) + 1; + m_icount -= (9 + tmp); + m_reg_A >>= tmp; + break; + + case 0xf940: + // SBR + tmp = (opcode & 0xf) + 1; + m_icount -= (9 + tmp); + m_reg_B >>= tmp; + break; + + case 0xf180: + // SAL + tmp = (opcode & 0xf) + 1; + m_icount -= (9 + tmp); + m_reg_A <<= tmp; + break; + + case 0xf980: + // SBL + tmp = (opcode & 0xf) + 1; + m_icount -= (9 + tmp); + m_reg_B <<= tmp; + break; + + case 0xf1c0: + // RAR + tmp = (opcode & 0xf) + 1; + m_icount -= (9 + tmp); + m_reg_A = (m_reg_A >> tmp) | (m_reg_A << (16 - tmp)); + break; + + case 0xf9c0: + // RBR + tmp = (opcode & 0xf) + 1; + m_icount -= (9 + tmp); + m_reg_B = (m_reg_B >> tmp) | (m_reg_B << (16 - tmp)); + break; + + default: + if ((opcode & 0xf760) == 0x7160) { + // Place/withdraw instructions + m_icount -= 23; + do_pw(opcode); + } else if ((opcode & 0xff80) == 0xf080) { + // RET + m_icount -= 16; + if (BIT(opcode , 6)) { + // Pop PA stack + if (BIT(m_flags , HPHYBRID_IRH_SVC_BIT)) { + BIT_CLR(m_flags , HPHYBRID_IRH_SVC_BIT); + memmove(&m_reg_PA[ 0 ] , &m_reg_PA[ 1 ] , HPHYBRID_INT_LVLS); + } else if (BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) { + BIT_CLR(m_flags , HPHYBRID_IRL_SVC_BIT); + memmove(&m_reg_PA[ 0 ] , &m_reg_PA[ 1 ] , HPHYBRID_INT_LVLS); + } + } + tmp = RM(m_reg_R--) + (opcode & 0x1f); + return BIT(opcode , 5) ? tmp - 0x20 : tmp; + } else { + switch (opcode) { + case 0x7100: + // SDO + m_icount -= 12; + BIT_SET(m_flags , HPHYBRID_DMADIR_BIT); + break; + + case 0x7108: + // SDI + m_icount -= 12; + BIT_CLR(m_flags , HPHYBRID_DMADIR_BIT); + break; + + case 0x7110: + // EIR + m_icount -= 12; + BIT_SET(m_flags , HPHYBRID_INTEN_BIT); + break; + + case 0x7118: + // DIR + m_icount -= 12; + BIT_CLR(m_flags , HPHYBRID_INTEN_BIT); + break; + + case 0x7120: + // DMA + m_icount -= 12; + BIT_SET(m_flags , HPHYBRID_DMAEN_BIT); + break; + + case 0x7138: + // DDR + m_icount -= 12; + BIT_CLR(m_flags , HPHYBRID_DMAEN_BIT); + break; + + case 0x7140: + // DBL + m_icount -= 12; + BIT_CLR(m_flags , HPHYBRID_DB_BIT); + break; + + case 0x7148: + // CBL + m_icount -= 12; + BIT_CLR(m_flags , HPHYBRID_CB_BIT); + break; + + case 0x7150: + // DBU + m_icount -= 12; + BIT_SET(m_flags , HPHYBRID_DB_BIT); + break; + + case 0x7158: + // CBU + m_icount -= 12; + BIT_SET(m_flags , HPHYBRID_CB_BIT); + break; + + case 0xf020: + // TCA + m_icount -= 9; + m_reg_A = ~m_reg_A; + do_add(m_reg_A , 1); + break; + + case 0xf060: + // CMA + m_icount -= 9; + m_reg_A = ~m_reg_A; + break; + + case 0xf820: + // TCB + m_icount -= 9; + m_reg_B = ~m_reg_B; + do_add(m_reg_B , 1); + break; + + case 0xf860: + // CMB + m_icount -= 9; + m_reg_B = ~m_reg_B; + break; + + default: + // Unrecognized instructions: NOP + // Execution time is fictional + m_icount -= 6; + } + } + } + } + } + } + + return m_reg_P + 1; } void hp_hybrid_cpu_device::state_string_export(const device_state_entry &entry, std::string &str) { - if (entry.index() == STATE_GENFLAGS) { - strprintf(str, "%s %s %c %c", - BIT(m_flags , HPHYBRID_DB_BIT) ? "Db":"..", - BIT(m_flags , HPHYBRID_CB_BIT) ? "Cb":"..", - BIT(m_flags , HPHYBRID_O_BIT) ? 'O':'.', - BIT(m_flags , HPHYBRID_C_BIT) ? 'E':'.'); - } + if (entry.index() == STATE_GENFLAGS) { + strprintf(str, "%s %s %c %c", + BIT(m_flags , HPHYBRID_DB_BIT) ? "Db":"..", + BIT(m_flags , HPHYBRID_CB_BIT) ? "Cb":"..", + BIT(m_flags , HPHYBRID_O_BIT) ? 'O':'.', + BIT(m_flags , HPHYBRID_C_BIT) ? 'E':'.'); + } } offs_t hp_hybrid_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) { - extern CPU_DISASSEMBLE(hp_hybrid); - return CPU_DISASSEMBLE_NAME(hp_hybrid)(this, buffer, pc, oprom, opram, options); + extern CPU_DISASSEMBLE(hp_hybrid); + return CPU_DISASSEMBLE_NAME(hp_hybrid)(this, buffer, pc, oprom, opram, options); } UINT16 hp_hybrid_cpu_device::get_ea(UINT16 opcode) { - UINT16 base; - UINT16 off; - - if (BIT(opcode , 10)) { - // Current page - base = m_reg_P; - } else { - // Base page - base = 0; - } - - off = opcode & 0x3ff; - if (off & 0x200) { - off -= 0x400; - } - - base += off; - - if (BIT(opcode , 15)) { - // Indirect addressing - m_icount -= 6; - return RM(base); - } else { - // Direct addressing - return base; - } + UINT16 base; + UINT16 off; + + if (BIT(opcode , 10)) { + // Current page + base = m_reg_P; + } else { + // Base page + base = 0; + } + + off = opcode & 0x3ff; + if (off & 0x200) { + off -= 0x400; + } + + base += off; + + if (BIT(opcode , 15)) { + // Indirect addressing + m_icount -= 6; + return RM(base); + } else { + // Direct addressing + return base; + } } void hp_hybrid_cpu_device::do_add(UINT16& addend1 , UINT16 addend2) { - UINT32 tmp = addend1 + addend2; + UINT32 tmp = addend1 + addend2; - if (BIT(tmp , 16)) { - // Carry - BIT_SET(m_flags , HPHYBRID_C_BIT); - } + if (BIT(tmp , 16)) { + // Carry + BIT_SET(m_flags , HPHYBRID_C_BIT); + } - if (BIT((tmp ^ addend1) & (tmp ^ addend2) , 15)) { - // Overflow - BIT_SET(m_flags , HPHYBRID_O_BIT); - } + if (BIT((tmp ^ addend1) & (tmp ^ addend2) , 15)) { + // Overflow + BIT_SET(m_flags , HPHYBRID_O_BIT); + } - addend1 = (UINT16)tmp; + addend1 = (UINT16)tmp; } UINT16 hp_hybrid_cpu_device::get_skip_addr(UINT16 opcode , bool condition) const { - bool skip_val = BIT(opcode , 8) != 0; - - if (condition == skip_val) { - UINT16 off = opcode & 0x1f; - - if (BIT(opcode , 5)) { - off -= 0x20; - } - return m_reg_P + off; - } else { - return m_reg_P + 1; - } + bool skip_val = BIT(opcode , 8) != 0; + + if (condition == skip_val) { + UINT16 off = opcode & 0x1f; + + if (BIT(opcode , 5)) { + off -= 0x20; + } + return m_reg_P + off; + } else { + return m_reg_P + 1; + } } UINT16 hp_hybrid_cpu_device::get_skip_addr_sc(UINT16 opcode , UINT16& v , unsigned n) { - bool val = BIT(v , n); + bool val = BIT(v , n); - if (BIT(opcode , 7)) { - if (BIT(opcode , 6)) { - BIT_SET(v , n); - } else { - BIT_CLR(v , n); - } - } + if (BIT(opcode , 7)) { + if (BIT(opcode , 6)) { + BIT_SET(v , n); + } else { + BIT_CLR(v , n); + } + } - return get_skip_addr(opcode , val); + return get_skip_addr(opcode , val); } void hp_hybrid_cpu_device::do_pw(UINT16 opcode) { - UINT16 tmp; - UINT16 reg_addr = opcode & 7; - UINT16 *ptr_reg; - UINT16 b_mask; - - if (BIT(opcode , 3)) { - ptr_reg = &m_reg_D; - b_mask = BIT_MASK(HPHYBRID_DB_BIT); - } else { - ptr_reg = &m_reg_C; - b_mask = BIT_MASK(HPHYBRID_CB_BIT); - } - - if (BIT(opcode , 4)) { - // Withdraw - if (BIT(opcode , 11)) { - // Byte - UINT32 tmp_addr = (UINT32)(*ptr_reg); - if (m_flags & b_mask) { - tmp_addr |= 0x10000; - } - tmp = RM((UINT16)(tmp_addr >> 1)); - if (BIT(tmp_addr , 0)) { - tmp &= 0xff; - } else { - tmp >>= 8; - } - } else { - // Word - tmp = RM(*ptr_reg); - } - WM(reg_addr , tmp); - - if (BIT(opcode , 7)) { - // Post-decrement - if ((*ptr_reg)-- == 0) { - m_flags ^= b_mask; - } - } else { - // Post-increment - if (++(*ptr_reg) == 0) { - m_flags ^= b_mask; - } - } - } else { - // Place - if (BIT(opcode , 7)) { - // Pre-decrement - if ((*ptr_reg)-- == 0) { - m_flags ^= b_mask; - } - } else { - // Pre-increment - if (++(*ptr_reg) == 0) { - m_flags ^= b_mask; - } - } - tmp = RM(reg_addr); - if (BIT(opcode , 11)) { - // Byte - UINT32 tmp_addr = (UINT32)(*ptr_reg); - if (m_flags & b_mask) { - tmp_addr |= 0x10000; - } - WMB(tmp_addr , (UINT8)tmp); - } else { - // Word - WM(*ptr_reg , tmp); - } - } + UINT16 tmp; + UINT16 reg_addr = opcode & 7; + UINT16 *ptr_reg; + UINT16 b_mask; + + if (BIT(opcode , 3)) { + ptr_reg = &m_reg_D; + b_mask = BIT_MASK(HPHYBRID_DB_BIT); + } else { + ptr_reg = &m_reg_C; + b_mask = BIT_MASK(HPHYBRID_CB_BIT); + } + + if (BIT(opcode , 4)) { + // Withdraw + if (BIT(opcode , 11)) { + // Byte + UINT32 tmp_addr = (UINT32)(*ptr_reg); + if (m_flags & b_mask) { + tmp_addr |= 0x10000; + } + tmp = RM((UINT16)(tmp_addr >> 1)); + if (BIT(tmp_addr , 0)) { + tmp &= 0xff; + } else { + tmp >>= 8; + } + } else { + // Word + tmp = RM(*ptr_reg); + } + WM(reg_addr , tmp); + + if (BIT(opcode , 7)) { + // Post-decrement + if ((*ptr_reg)-- == 0) { + m_flags ^= b_mask; + } + } else { + // Post-increment + if (++(*ptr_reg) == 0) { + m_flags ^= b_mask; + } + } + } else { + // Place + if (BIT(opcode , 7)) { + // Pre-decrement + if ((*ptr_reg)-- == 0) { + m_flags ^= b_mask; + } + } else { + // Pre-increment + if (++(*ptr_reg) == 0) { + m_flags ^= b_mask; + } + } + tmp = RM(reg_addr); + if (BIT(opcode , 11)) { + // Byte + UINT32 tmp_addr = (UINT32)(*ptr_reg); + if (m_flags & b_mask) { + tmp_addr |= 0x10000; + } + WMB(tmp_addr , (UINT8)tmp); + } else { + // Word + WM(*ptr_reg , tmp); + } + } } void hp_hybrid_cpu_device::check_for_interrupts(void) { - if (!BIT(m_flags , HPHYBRID_INTEN_BIT) || BIT(m_flags , HPHYBRID_IRH_SVC_BIT)) { - return; - } - - int irqline; - - if (BIT(m_flags , HPHYBRID_IRH_BIT)) { - // Service high-level interrupt - BIT_SET(m_flags , HPHYBRID_IRH_SVC_BIT); - irqline = HPHYBRID_IRH; - } else if (BIT(m_flags , HPHYBRID_IRL_BIT) && !BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) { - // Service low-level interrupt - BIT_SET(m_flags , HPHYBRID_IRL_SVC_BIT); - irqline = HPHYBRID_IRL; - } else { - return; - } - - // Get interrupt vector in low byte - UINT8 vector = (UINT8)standard_irq_callback(irqline); - UINT8 new_PA; - - // Get highest numbered 1 - // Don't know what happens if vector is 0, here we assume bit 7 = 1 - if (vector == 0) { - new_PA = 7; - } else { - for (new_PA = 7; new_PA && !BIT(vector , 7); new_PA--, vector <<= 1) { - } - } - if (irqline == HPHYBRID_IRH) { - BIT_SET(new_PA , 3); - } - - // Push PA stack - memmove(&m_reg_PA[ 1 ] , &m_reg_PA[ 0 ] , HPHYBRID_INT_LVLS); - - CURRENT_PA = new_PA; - - // Is this correct? Patent @ pg 210 suggests that the whole interrupt recognition sequence - // lasts for 32 cycles (6 are already accounted for in get_ea for one indirection) - m_icount -= 26; - - // Do a double-indirect JSM IV,I instruction - WM(++m_reg_R , m_reg_P); - m_reg_P = RM(get_ea(0xc008)); - m_reg_I = RM(m_reg_P); + if (!BIT(m_flags , HPHYBRID_INTEN_BIT) || BIT(m_flags , HPHYBRID_IRH_SVC_BIT)) { + return; + } + + int irqline; + + if (BIT(m_flags , HPHYBRID_IRH_BIT)) { + // Service high-level interrupt + BIT_SET(m_flags , HPHYBRID_IRH_SVC_BIT); + irqline = HPHYBRID_IRH; + } else if (BIT(m_flags , HPHYBRID_IRL_BIT) && !BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) { + // Service low-level interrupt + BIT_SET(m_flags , HPHYBRID_IRL_SVC_BIT); + irqline = HPHYBRID_IRL; + } else { + return; + } + + // Get interrupt vector in low byte + UINT8 vector = (UINT8)standard_irq_callback(irqline); + UINT8 new_PA; + + // Get highest numbered 1 + // Don't know what happens if vector is 0, here we assume bit 7 = 1 + if (vector == 0) { + new_PA = 7; + } else { + for (new_PA = 7; new_PA && !BIT(vector , 7); new_PA--, vector <<= 1) { + } + } + if (irqline == HPHYBRID_IRH) { + BIT_SET(new_PA , 3); + } + + // Push PA stack + memmove(&m_reg_PA[ 1 ] , &m_reg_PA[ 0 ] , HPHYBRID_INT_LVLS); + + CURRENT_PA = new_PA; + + // Is this correct? Patent @ pg 210 suggests that the whole interrupt recognition sequence + // lasts for 32 cycles (6 are already accounted for in get_ea for one indirection) + m_icount -= 26; + + // Do a double-indirect JSM IV,I instruction + WM(++m_reg_R , m_reg_P); + m_reg_P = RM(get_ea(0xc008)); + m_reg_I = RM(m_reg_P); } UINT16 hp_hybrid_cpu_device::RM(UINT16 addr) { - UINT16 tmp; - - if (addr <= HP_REG_LAST_ADDR) { - // Memory mapped registers - switch (addr) { - case HP_REG_A_ADDR: - return m_reg_A; - - case HP_REG_B_ADDR: - return m_reg_B; - - case HP_REG_P_ADDR: - return m_reg_P; - - case HP_REG_R_ADDR: - return m_reg_R; - - case HP_REG_R4_ADDR: - case HP_REG_R5_ADDR: - case HP_REG_R6_ADDR: - case HP_REG_R7_ADDR: - return RIO(CURRENT_PA , addr - HP_REG_R4_ADDR); - - case HP_REG_IV_ADDR: - // Correct? - if (!BIT(m_flags , HPHYBRID_IRH_SVC_BIT) && !BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) { - return m_reg_IV; - } else { - return m_reg_IV | CURRENT_PA; - } - - case HP_REG_PA_ADDR: - return CURRENT_PA; - - case HP_REG_DMAPA_ADDR: - tmp = m_dmapa & HP_REG_PA_MASK; - if (BIT(m_flags , HPHYBRID_CB_BIT)) { - BIT_SET(tmp , 15); - } - if (BIT(m_flags , HPHYBRID_DB_BIT)) { - BIT_SET(tmp , 14); - } - return tmp; - - case HP_REG_DMAMA_ADDR: - return m_dmama; - - case HP_REG_DMAC_ADDR: - return m_dmac; - - case HP_REG_C_ADDR: - return m_reg_C; - - case HP_REG_D_ADDR: - return m_reg_D; - - default: - // Unknown registers are returned as 0 - return 0; - } - } else { - return m_direct->read_decrypted_word((offs_t)addr << 1); - } + UINT16 tmp; + + if (addr <= HP_REG_LAST_ADDR) { + // Memory mapped registers + switch (addr) { + case HP_REG_A_ADDR: + return m_reg_A; + + case HP_REG_B_ADDR: + return m_reg_B; + + case HP_REG_P_ADDR: + return m_reg_P; + + case HP_REG_R_ADDR: + return m_reg_R; + + case HP_REG_R4_ADDR: + case HP_REG_R5_ADDR: + case HP_REG_R6_ADDR: + case HP_REG_R7_ADDR: + return RIO(CURRENT_PA , addr - HP_REG_R4_ADDR); + + case HP_REG_IV_ADDR: + // Correct? + if (!BIT(m_flags , HPHYBRID_IRH_SVC_BIT) && !BIT(m_flags , HPHYBRID_IRL_SVC_BIT)) { + return m_reg_IV; + } else { + return m_reg_IV | CURRENT_PA; + } + + case HP_REG_PA_ADDR: + return CURRENT_PA; + + case HP_REG_DMAPA_ADDR: + tmp = m_dmapa & HP_REG_PA_MASK; + if (BIT(m_flags , HPHYBRID_CB_BIT)) { + BIT_SET(tmp , 15); + } + if (BIT(m_flags , HPHYBRID_DB_BIT)) { + BIT_SET(tmp , 14); + } + return tmp; + + case HP_REG_DMAMA_ADDR: + return m_dmama; + + case HP_REG_DMAC_ADDR: + return m_dmac; + + case HP_REG_C_ADDR: + return m_reg_C; + + case HP_REG_D_ADDR: + return m_reg_D; + + default: + // Unknown registers are returned as 0 + return 0; + } + } else { + return m_direct->read_decrypted_word((offs_t)addr << 1); + } } void hp_hybrid_cpu_device::WM(UINT16 addr , UINT16 v) { - if (addr <= HP_REG_LAST_ADDR) { - // Memory mapped registers - switch (addr) { - case HP_REG_A_ADDR: - m_reg_A = v; - break; - - case HP_REG_B_ADDR: - m_reg_B = v; - break; - - case HP_REG_P_ADDR: - m_reg_P = v; - break; - - case HP_REG_R_ADDR: - m_reg_R = v; - break; - - case HP_REG_R4_ADDR: - case HP_REG_R5_ADDR: - case HP_REG_R6_ADDR: - case HP_REG_R7_ADDR: - WIO(CURRENT_PA , addr - HP_REG_R4_ADDR , v); - break; - - case HP_REG_IV_ADDR: - m_reg_IV = v & HP_REG_IV_MASK; - break; - - case HP_REG_PA_ADDR: - CURRENT_PA = v & HP_REG_PA_MASK; - break; - - case HP_REG_DMAPA_ADDR: - m_dmapa = v & HP_REG_PA_MASK; - break; - - case HP_REG_DMAMA_ADDR: - m_dmama = v; - break; - - case HP_REG_DMAC_ADDR: - m_dmac = v; - break; - - case HP_REG_C_ADDR: - m_reg_C = v; - break; - - case HP_REG_D_ADDR: - m_reg_D = v; - break; - - default: - // Unknown registers are silently discarded - break; - } - } else { - m_program->write_word((offs_t)addr << 1 , v); - } + if (addr <= HP_REG_LAST_ADDR) { + // Memory mapped registers + switch (addr) { + case HP_REG_A_ADDR: + m_reg_A = v; + break; + + case HP_REG_B_ADDR: + m_reg_B = v; + break; + + case HP_REG_P_ADDR: + m_reg_P = v; + break; + + case HP_REG_R_ADDR: + m_reg_R = v; + break; + + case HP_REG_R4_ADDR: + case HP_REG_R5_ADDR: + case HP_REG_R6_ADDR: + case HP_REG_R7_ADDR: + WIO(CURRENT_PA , addr - HP_REG_R4_ADDR , v); + break; + + case HP_REG_IV_ADDR: + m_reg_IV = v & HP_REG_IV_MASK; + break; + + case HP_REG_PA_ADDR: + CURRENT_PA = v & HP_REG_PA_MASK; + break; + + case HP_REG_DMAPA_ADDR: + m_dmapa = v & HP_REG_PA_MASK; + break; + + case HP_REG_DMAMA_ADDR: + m_dmama = v; + break; + + case HP_REG_DMAC_ADDR: + m_dmac = v; + break; + + case HP_REG_C_ADDR: + m_reg_C = v; + break; + + case HP_REG_D_ADDR: + m_reg_D = v; + break; + + default: + // Unknown registers are silently discarded + break; + } + } else { + m_program->write_word((offs_t)addr << 1 , v); + } } void hp_hybrid_cpu_device::WMB(UINT32 addr , UINT8 v) { - if (addr <= (HP_REG_LAST_ADDR * 2 + 1)) { - // Cannot write bytes to registers - } else { - m_program->write_byte(addr , v); - } + if (addr <= (HP_REG_LAST_ADDR * 2 + 1)) { + // Cannot write bytes to registers + } else { + m_program->write_byte(addr , v); + } } UINT16 hp_hybrid_cpu_device::RIO(UINT8 pa , UINT8 ic) { - return m_io->read_word(HP_MAKE_IOADDR(pa, ic) << 1); + return m_io->read_word(HP_MAKE_IOADDR(pa, ic) << 1); } void hp_hybrid_cpu_device::WIO(UINT8 pa , UINT8 ic , UINT16 v) { - m_io->write_word(HP_MAKE_IOADDR(pa, ic) << 1 , v); + m_io->write_word(HP_MAKE_IOADDR(pa, ic) << 1 , v); } hp_5061_3011_cpu_device::hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) diff --git a/src/emu/cpu/hphybrid/hphybrid.h b/src/emu/cpu/hphybrid/hphybrid.h index 1d24a1cfd14..a4f7d3a1c79 100644 --- a/src/emu/cpu/hphybrid/hphybrid.h +++ b/src/emu/cpu/hphybrid/hphybrid.h @@ -24,7 +24,7 @@ // Input lines #define HPHYBRID_IRH 0 // High-level interrupt #define HPHYBRID_IRL 1 // Low-level interrupt -#define HPHYBRID_INT_LVLS 2 // Levels of interrupt +#define HPHYBRID_INT_LVLS 2 // Levels of interrupt #define HPHYBRID_DMAR 2 // DMA request #define HPHYBRID_HALT 3 // "Halt" input @@ -66,76 +66,76 @@ class hp_hybrid_cpu_device : public cpu_device { public: protected: - hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); - - // device-level overrides - virtual void device_start(); - virtual void device_reset(); - - // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 6; } - virtual UINT32 execute_max_cycles() const { return 25; } - virtual UINT32 execute_input_lines() const { return 2; } - virtual UINT32 execute_default_irq_vector() const { return 0xffff; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); - - UINT16 execute_one(UINT16 opcode); - UINT16 execute_one_sub(UINT16 opcode); - - // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); } - - // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); - - // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 2; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + hp_hybrid_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); + + // device-level overrides + virtual void device_start(); + virtual void device_reset(); + + // device_execute_interface overrides + virtual UINT32 execute_min_cycles() const { return 6; } + virtual UINT32 execute_max_cycles() const { return 25; } + virtual UINT32 execute_input_lines() const { return 2; } + virtual UINT32 execute_default_irq_vector() const { return 0xffff; } + virtual void execute_run(); + virtual void execute_set_input(int inputnum, int state); + + UINT16 execute_one(UINT16 opcode); + UINT16 execute_one_sub(UINT16 opcode); + + // device_memory_interface overrides + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : NULL ); } + + // device_state_interface overrides + void state_string_export(const device_state_entry &entry, std::string &str); + + // device_disasm_interface overrides + virtual UINT32 disasm_min_opcode_bytes() const { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const { return 2; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); private: - address_space_config m_program_config; - address_space_config m_io_config; - - address_space *m_program; - direct_read_data *m_direct; - address_space *m_io; - int m_icount; - - // State of processor - UINT16 m_reg_A; // Register A - UINT16 m_reg_B; // Register B - UINT16 m_reg_P; // Register P - UINT16 m_reg_R; // Register R - UINT16 m_reg_C; // Register C - UINT16 m_reg_D; // Register D - UINT16 m_reg_IV; // Register IV - UINT8 m_reg_PA[ HPHYBRID_INT_LVLS + 1 ]; // Stack of register PA (4 bit-long) - UINT16 m_flags; // Flags (carry, overflow, cb, db, int en, dma en, dma dir) - UINT8 m_dmapa; // DMA peripheral address (4 bits) - UINT16 m_dmama; // DMA address - UINT16 m_dmac; // DMA counter - UINT16 m_reg_I; // Instruction register - - UINT16 get_ea(UINT16 opcode); - void do_add(UINT16& addend1 , UINT16 addend2); - UINT16 get_skip_addr(UINT16 opcode , bool condition) const; - UINT16 get_skip_addr_sc(UINT16 opcode , UINT16& v , unsigned n); - void do_pw(UINT16 opcode); - void check_for_interrupts(void); - - UINT16 RM(UINT16 addr); - void WM(UINT16 addr , UINT16 v); - void WMB(UINT32 addr , UINT8 v); - UINT16 RIO(UINT8 pa , UINT8 ic); - void WIO(UINT8 pa , UINT8 ic , UINT16 v); + address_space_config m_program_config; + address_space_config m_io_config; + + address_space *m_program; + direct_read_data *m_direct; + address_space *m_io; + int m_icount; + + // State of processor + UINT16 m_reg_A; // Register A + UINT16 m_reg_B; // Register B + UINT16 m_reg_P; // Register P + UINT16 m_reg_R; // Register R + UINT16 m_reg_C; // Register C + UINT16 m_reg_D; // Register D + UINT16 m_reg_IV; // Register IV + UINT8 m_reg_PA[ HPHYBRID_INT_LVLS + 1 ]; // Stack of register PA (4 bit-long) + UINT16 m_flags; // Flags (carry, overflow, cb, db, int en, dma en, dma dir) + UINT8 m_dmapa; // DMA peripheral address (4 bits) + UINT16 m_dmama; // DMA address + UINT16 m_dmac; // DMA counter + UINT16 m_reg_I; // Instruction register + + UINT16 get_ea(UINT16 opcode); + void do_add(UINT16& addend1 , UINT16 addend2); + UINT16 get_skip_addr(UINT16 opcode , bool condition) const; + UINT16 get_skip_addr_sc(UINT16 opcode , UINT16& v , unsigned n); + void do_pw(UINT16 opcode); + void check_for_interrupts(void); + + UINT16 RM(UINT16 addr); + void WM(UINT16 addr , UINT16 v); + void WMB(UINT32 addr , UINT8 v); + UINT16 RIO(UINT8 pa , UINT8 ic); + void WIO(UINT8 pa , UINT8 ic , UINT16 v); }; class hp_5061_3011_cpu_device : public hp_hybrid_cpu_device { public: - hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + hp_5061_3011_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; extern const device_type HP_5061_3011; diff --git a/src/emu/cpu/hphybrid/hphybrid_dasm.c b/src/emu/cpu/hphybrid/hphybrid_dasm.c index a74fb69963f..e9eddf49a96 100644 --- a/src/emu/cpu/hphybrid/hphybrid_dasm.c +++ b/src/emu/cpu/hphybrid/hphybrid_dasm.c @@ -11,84 +11,84 @@ typedef void (*fn_dis_param)(char *buffer , offs_t pc , UINT16 opcode); typedef struct { - UINT16 m_op_mask; - UINT16 m_opcode; - const char *m_mnemonic; - fn_dis_param m_param_fn; - UINT32 m_dasm_flags; + UINT16 m_op_mask; + UINT16 m_opcode; + const char *m_mnemonic; + fn_dis_param m_param_fn; + UINT32 m_dasm_flags; } dis_entry_t; static void addr_2_str(char *buffer , UINT16 addr , bool indirect) { - char *s = buffer + strlen(buffer); + char *s = buffer + strlen(buffer); - s += sprintf(s , "$%04x" , addr); + s += sprintf(s , "$%04x" , addr); - switch (addr) { - case HP_REG_A_ADDR: - strcpy(s , "(A)"); - break; + switch (addr) { + case HP_REG_A_ADDR: + strcpy(s , "(A)"); + break; - case HP_REG_B_ADDR: - strcpy(s , "(B)"); - break; + case HP_REG_B_ADDR: + strcpy(s , "(B)"); + break; - case HP_REG_P_ADDR: - strcpy(s , "(P)"); - break; + case HP_REG_P_ADDR: + strcpy(s , "(P)"); + break; - case HP_REG_R_ADDR: - strcpy(s , "(R)"); - break; + case HP_REG_R_ADDR: + strcpy(s , "(R)"); + break; - case HP_REG_R4_ADDR: - strcpy(s , "(R4)"); - break; + case HP_REG_R4_ADDR: + strcpy(s , "(R4)"); + break; - case HP_REG_R5_ADDR: - strcpy(s , "(R5)"); - break; + case HP_REG_R5_ADDR: + strcpy(s , "(R5)"); + break; - case HP_REG_R6_ADDR: - strcpy(s , "(R6)"); - break; + case HP_REG_R6_ADDR: + strcpy(s , "(R6)"); + break; - case HP_REG_R7_ADDR: - strcpy(s , "(R7)"); - break; + case HP_REG_R7_ADDR: + strcpy(s , "(R7)"); + break; - case HP_REG_IV_ADDR: - strcpy(s , "(IV)"); - break; + case HP_REG_IV_ADDR: + strcpy(s , "(IV)"); + break; - case HP_REG_PA_ADDR: - strcpy(s , "(PA)"); - break; + case HP_REG_PA_ADDR: + strcpy(s , "(PA)"); + break; - case HP_REG_DMAPA_ADDR: - strcpy(s , "(DMAPA)"); - break; + case HP_REG_DMAPA_ADDR: + strcpy(s , "(DMAPA)"); + break; - case HP_REG_DMAMA_ADDR: - strcpy(s , "(DMAMA)"); - break; + case HP_REG_DMAMA_ADDR: + strcpy(s , "(DMAMA)"); + break; - case HP_REG_DMAC_ADDR: - strcpy(s , "(DMAC)"); - break; + case HP_REG_DMAC_ADDR: + strcpy(s , "(DMAC)"); + break; - case HP_REG_C_ADDR: - strcpy(s , "(C)"); - break; + case HP_REG_C_ADDR: + strcpy(s , "(C)"); + break; - case HP_REG_D_ADDR: - strcpy(s , "(D)"); - break; - } + case HP_REG_D_ADDR: + strcpy(s , "(D)"); + break; + } - if (indirect) { - strcat(s , ",I"); - } + if (indirect) { + strcat(s , ",I"); + } } static void param_none(char *buffer , offs_t pc , UINT16 opcode) @@ -97,185 +97,185 @@ static void param_none(char *buffer , offs_t pc , UINT16 opcode) static void param_loc(char *buffer , offs_t pc , UINT16 opcode) { - UINT16 base; - UINT16 off; - - if (opcode & 0x0400) { - // Current page - base = pc; - } else { - // Base page - base = 0; - } - - off = opcode & 0x3ff; - if (off & 0x200) { - off -= 0x400; - } - - addr_2_str(buffer , base + off , (opcode & 0x8000) != 0); + UINT16 base; + UINT16 off; + + if (opcode & 0x0400) { + // Current page + base = pc; + } else { + // Base page + base = 0; + } + + off = opcode & 0x3ff; + if (off & 0x200) { + off -= 0x400; + } + + addr_2_str(buffer , base + off , (opcode & 0x8000) != 0); } static void param_addr32(char *buffer , offs_t pc , UINT16 opcode) { - addr_2_str(buffer , opcode & 0x1f , (opcode & 0x8000) != 0); + addr_2_str(buffer , opcode & 0x1f , (opcode & 0x8000) != 0); } static void param_skip(char *buffer , offs_t pc , UINT16 opcode) { - UINT16 off = opcode & 0x3f; - if (off & 0x20) { - off -= 0x40; - } - addr_2_str(buffer , pc + off , false); + UINT16 off = opcode & 0x3f; + if (off & 0x20) { + off -= 0x40; + } + addr_2_str(buffer , pc + off , false); } static void param_skip_sc(char *buffer , offs_t pc , UINT16 opcode) { - param_skip(buffer, pc, opcode); - - if (opcode & 0x80) { - if (opcode & 0x40) { - strcat(buffer , ",S"); - } else { - strcat(buffer , ",C"); - } - } + param_skip(buffer, pc, opcode); + + if (opcode & 0x80) { + if (opcode & 0x40) { + strcat(buffer , ",S"); + } else { + strcat(buffer , ",C"); + } + } } static void param_ret(char *buffer , offs_t pc , UINT16 opcode) { - char *s = buffer + strlen(buffer); + char *s = buffer + strlen(buffer); - int off = opcode & 0x3f; + int off = opcode & 0x3f; - if (off & 0x20) { - off -= 0x40; - } + if (off & 0x20) { + off -= 0x40; + } - s += sprintf(s , "%d" , off); - if (opcode & 0x40) { - strcpy(s , ",P"); - } + s += sprintf(s , "%d" , off); + if (opcode & 0x40) { + strcpy(s , ",P"); + } } static void param_n16(char *buffer , offs_t pc , UINT16 opcode) { - char *s = buffer + strlen(buffer); + char *s = buffer + strlen(buffer); - sprintf(s , "%u" , (opcode & 0xf) + 1); + sprintf(s , "%u" , (opcode & 0xf) + 1); } static void param_reg_id(char *buffer , offs_t pc , UINT16 opcode) { - addr_2_str(buffer, opcode & 7, false); + addr_2_str(buffer, opcode & 7, false); - if (opcode & 0x80) { - strcat(buffer , ",D"); - } else { - strcat(buffer , ",I"); - } + if (opcode & 0x80) { + strcat(buffer , ",D"); + } else { + strcat(buffer , ",I"); + } } static const dis_entry_t dis_table[] = { - // *** BPC Instructions *** - {0xffff , 0x0000 , "NOP" , param_none , 0 }, - {0x7800 , 0x0000 , "LDA" , param_loc , 0 }, - {0x7800 , 0x0800 , "LDB" , param_loc , 0 }, - {0x7800 , 0x1000 , "CPA" , param_loc , 0 }, - {0x7800 , 0x1800 , "CPB" , param_loc , 0 }, - {0x7800 , 0x2000 , "ADA" , param_loc , 0 }, - {0x7800 , 0x2800 , "ADB" , param_loc , 0 }, - {0x7800 , 0x3000 , "STA" , param_loc , 0 }, - {0x7800 , 0x3800 , "STB" , param_loc , 0 }, - {0x7800 , 0x4000 , "JSM" , param_loc , DASMFLAG_STEP_OVER }, - {0x7800 , 0x4800 , "ISZ" , param_loc , 0 }, - {0x7800 , 0x5000 , "AND" , param_loc , 0 }, - {0x7800 , 0x5800 , "DSZ" , param_loc , 0 }, - {0x7800 , 0x6000 , "IOR" , param_loc , 0 }, - {0x7800 , 0x6800 , "JMP" , param_loc , 0 }, - {0x7fe0 , 0x7000 , "EXE" , param_addr32 , 0 }, - {0xffc0 , 0x7400 , "RZA" , param_skip , 0 }, - {0xffc0 , 0x7C00 , "RZB" , param_skip , 0 }, - {0xffc0 , 0x7440 , "RIA" , param_skip , 0 }, - {0xffc0 , 0x7C40 , "RIB" , param_skip , 0 }, - {0xffc0 , 0x7500 , "SZA" , param_skip , 0 }, - {0xffc0 , 0x7D00 , "SZB" , param_skip , 0 }, - {0xffc0 , 0x7540 , "SIA" , param_skip , 0 }, - {0xffc0 , 0x7D40 , "SIB" , param_skip , 0 }, - {0xffc0 , 0x7480 , "SFS" , param_skip , 0 }, - {0xffc0 , 0x7580 , "SFC" , param_skip , 0 }, - {0xffc0 , 0x7c80 , "SSS" , param_skip , 0 }, - {0xffc0 , 0x7d80 , "SSC" , param_skip , 0 }, - {0xffc0 , 0x7cc0 , "SHS" , param_skip , 0 }, - {0xffc0 , 0x7dc0 , "SHC" , param_skip , 0 }, - {0xff00 , 0x7600 , "SLA" , param_skip_sc , 0 }, - {0xff00 , 0x7e00 , "SLB" , param_skip_sc , 0 }, - {0xff00 , 0x7700 , "RLA" , param_skip_sc , 0 }, - {0xff00 , 0x7f00 , "RLB" , param_skip_sc , 0 }, - {0xff00 , 0xf400 , "SAP" , param_skip_sc , 0 }, - {0xff00 , 0xfc00 , "SBP" , param_skip_sc , 0 }, - {0xff00 , 0xf500 , "SAM" , param_skip_sc , 0 }, - {0xff00 , 0xfd00 , "SBM" , param_skip_sc , 0 }, - {0xff00 , 0xf600 , "SOC" , param_skip_sc , 0 }, - {0xff00 , 0xf700 , "SOS" , param_skip_sc , 0 }, - {0xff00 , 0xfe00 , "SEC" , param_skip_sc , 0 }, - {0xff00 , 0xff00 , "SES" , param_skip_sc , 0 }, - {0xffff , 0xf020 , "TCA" , param_none , 0 }, - {0xffff , 0xf820 , "TCB" , param_none , 0 }, - {0xffff , 0xf060 , "CMA" , param_none , 0 }, - {0xffff , 0xf860 , "CMB" , param_none , 0 }, - {0xff80 , 0xf080 , "RET" , param_ret , DASMFLAG_STEP_OUT }, - {0xfff0 , 0xf100 , "AAR" , param_n16 , 0 }, - {0xfff0 , 0xf900 , "ABR" , param_n16 , 0 }, - {0xffff , 0xf14f , "CLA" , param_none , 0 }, - {0xfff0 , 0xf140 , "SAR" , param_n16 , 0 }, - {0xffff , 0xf94f , "CLB" , param_none , 0 }, - {0xfff0 , 0xf940 , "SBR" , param_n16 , 0 }, - {0xfff0 , 0xf180 , "SAL" , param_n16 , 0 }, - {0xfff0 , 0xf980 , "SBL" , param_n16 , 0 }, - {0xfff0 , 0xf1c0 , "RAR" , param_n16 , 0 }, - {0xfff0 , 0xf9c0 , "RBR" , param_n16 , 0 }, - // *** IOC Instructions *** - {0xffff , 0x7100 , "SDO" , param_none , 0 }, - {0xffff , 0x7108 , "SDI" , param_none , 0 }, - {0xffff , 0x7110 , "EIR" , param_none , 0 }, - {0xffff , 0x7118 , "DIR" , param_none , 0 }, - {0xffff , 0x7120 , "DMA" , param_none , 0 }, - {0xffff , 0x7128 , "PCM" , param_none , 0 }, - {0xffff , 0x7138 , "DDR" , param_none , 0 }, - {0xffff , 0x7140 , "DBL" , param_none , 0 }, - {0xffff , 0x7148 , "CBL" , param_none , 0 }, - {0xffff , 0x7150 , "DBU" , param_none , 0 }, - {0xffff , 0x7158 , "CBU" , param_none , 0 }, - {0xff78 , 0x7160 , "PWC" , param_reg_id , 0 }, - {0xff78 , 0x7168 , "PWD" , param_reg_id , 0 }, - {0xff78 , 0x7960 , "PBC" , param_reg_id , 0 }, - {0xff78 , 0x7968 , "PBD" , param_reg_id , 0 }, - {0xff78 , 0x7170 , "WWC" , param_reg_id , 0 }, - {0xff78 , 0x7178 , "WWD" , param_reg_id , 0 }, - {0xff78 , 0x7970 , "WBC" , param_reg_id , 0 }, - {0xff78 , 0x7978 , "WBD" , param_reg_id , 0 }, - // *** END *** - {0 , 0 , NULL , NULL , 0 } + // *** BPC Instructions *** + {0xffff , 0x0000 , "NOP" , param_none , 0 }, + {0x7800 , 0x0000 , "LDA" , param_loc , 0 }, + {0x7800 , 0x0800 , "LDB" , param_loc , 0 }, + {0x7800 , 0x1000 , "CPA" , param_loc , 0 }, + {0x7800 , 0x1800 , "CPB" , param_loc , 0 }, + {0x7800 , 0x2000 , "ADA" , param_loc , 0 }, + {0x7800 , 0x2800 , "ADB" , param_loc , 0 }, + {0x7800 , 0x3000 , "STA" , param_loc , 0 }, + {0x7800 , 0x3800 , "STB" , param_loc , 0 }, + {0x7800 , 0x4000 , "JSM" , param_loc , DASMFLAG_STEP_OVER }, + {0x7800 , 0x4800 , "ISZ" , param_loc , 0 }, + {0x7800 , 0x5000 , "AND" , param_loc , 0 }, + {0x7800 , 0x5800 , "DSZ" , param_loc , 0 }, + {0x7800 , 0x6000 , "IOR" , param_loc , 0 }, + {0x7800 , 0x6800 , "JMP" , param_loc , 0 }, + {0x7fe0 , 0x7000 , "EXE" , param_addr32 , 0 }, + {0xffc0 , 0x7400 , "RZA" , param_skip , 0 }, + {0xffc0 , 0x7C00 , "RZB" , param_skip , 0 }, + {0xffc0 , 0x7440 , "RIA" , param_skip , 0 }, + {0xffc0 , 0x7C40 , "RIB" , param_skip , 0 }, + {0xffc0 , 0x7500 , "SZA" , param_skip , 0 }, + {0xffc0 , 0x7D00 , "SZB" , param_skip , 0 }, + {0xffc0 , 0x7540 , "SIA" , param_skip , 0 }, + {0xffc0 , 0x7D40 , "SIB" , param_skip , 0 }, + {0xffc0 , 0x7480 , "SFS" , param_skip , 0 }, + {0xffc0 , 0x7580 , "SFC" , param_skip , 0 }, + {0xffc0 , 0x7c80 , "SSS" , param_skip , 0 }, + {0xffc0 , 0x7d80 , "SSC" , param_skip , 0 }, + {0xffc0 , 0x7cc0 , "SHS" , param_skip , 0 }, + {0xffc0 , 0x7dc0 , "SHC" , param_skip , 0 }, + {0xff00 , 0x7600 , "SLA" , param_skip_sc , 0 }, + {0xff00 , 0x7e00 , "SLB" , param_skip_sc , 0 }, + {0xff00 , 0x7700 , "RLA" , param_skip_sc , 0 }, + {0xff00 , 0x7f00 , "RLB" , param_skip_sc , 0 }, + {0xff00 , 0xf400 , "SAP" , param_skip_sc , 0 }, + {0xff00 , 0xfc00 , "SBP" , param_skip_sc , 0 }, + {0xff00 , 0xf500 , "SAM" , param_skip_sc , 0 }, + {0xff00 , 0xfd00 , "SBM" , param_skip_sc , 0 }, + {0xff00 , 0xf600 , "SOC" , param_skip_sc , 0 }, + {0xff00 , 0xf700 , "SOS" , param_skip_sc , 0 }, + {0xff00 , 0xfe00 , "SEC" , param_skip_sc , 0 }, + {0xff00 , 0xff00 , "SES" , param_skip_sc , 0 }, + {0xffff , 0xf020 , "TCA" , param_none , 0 }, + {0xffff , 0xf820 , "TCB" , param_none , 0 }, + {0xffff , 0xf060 , "CMA" , param_none , 0 }, + {0xffff , 0xf860 , "CMB" , param_none , 0 }, + {0xff80 , 0xf080 , "RET" , param_ret , DASMFLAG_STEP_OUT }, + {0xfff0 , 0xf100 , "AAR" , param_n16 , 0 }, + {0xfff0 , 0xf900 , "ABR" , param_n16 , 0 }, + {0xffff , 0xf14f , "CLA" , param_none , 0 }, + {0xfff0 , 0xf140 , "SAR" , param_n16 , 0 }, + {0xffff , 0xf94f , "CLB" , param_none , 0 }, + {0xfff0 , 0xf940 , "SBR" , param_n16 , 0 }, + {0xfff0 , 0xf180 , "SAL" , param_n16 , 0 }, + {0xfff0 , 0xf980 , "SBL" , param_n16 , 0 }, + {0xfff0 , 0xf1c0 , "RAR" , param_n16 , 0 }, + {0xfff0 , 0xf9c0 , "RBR" , param_n16 , 0 }, + // *** IOC Instructions *** + {0xffff , 0x7100 , "SDO" , param_none , 0 }, + {0xffff , 0x7108 , "SDI" , param_none , 0 }, + {0xffff , 0x7110 , "EIR" , param_none , 0 }, + {0xffff , 0x7118 , "DIR" , param_none , 0 }, + {0xffff , 0x7120 , "DMA" , param_none , 0 }, + {0xffff , 0x7128 , "PCM" , param_none , 0 }, + {0xffff , 0x7138 , "DDR" , param_none , 0 }, + {0xffff , 0x7140 , "DBL" , param_none , 0 }, + {0xffff , 0x7148 , "CBL" , param_none , 0 }, + {0xffff , 0x7150 , "DBU" , param_none , 0 }, + {0xffff , 0x7158 , "CBU" , param_none , 0 }, + {0xff78 , 0x7160 , "PWC" , param_reg_id , 0 }, + {0xff78 , 0x7168 , "PWD" , param_reg_id , 0 }, + {0xff78 , 0x7960 , "PBC" , param_reg_id , 0 }, + {0xff78 , 0x7968 , "PBD" , param_reg_id , 0 }, + {0xff78 , 0x7170 , "WWC" , param_reg_id , 0 }, + {0xff78 , 0x7178 , "WWD" , param_reg_id , 0 }, + {0xff78 , 0x7970 , "WBC" , param_reg_id , 0 }, + {0xff78 , 0x7978 , "WBD" , param_reg_id , 0 }, + // *** END *** + {0 , 0 , NULL , NULL , 0 } }; CPU_DISASSEMBLE(hp_hybrid) { - UINT16 opcode = ((UINT16)oprom[ 0 ] << 8) | oprom[ 1 ]; - const dis_entry_t *p; - - for (p = dis_table; p->m_op_mask; p++) { - if ((opcode & p->m_op_mask) == p->m_opcode) { - strcpy(buffer , p->m_mnemonic); - strcat(buffer , " "); - p->m_param_fn(buffer , pc , opcode); - return 1 | p->m_dasm_flags | DASMFLAG_SUPPORTED; - } - } - - // Unknown opcode - strcpy(buffer , "???"); - - return 1 | DASMFLAG_SUPPORTED; + UINT16 opcode = ((UINT16)oprom[ 0 ] << 8) | oprom[ 1 ]; + const dis_entry_t *p; + + for (p = dis_table; p->m_op_mask; p++) { + if ((opcode & p->m_op_mask) == p->m_opcode) { + strcpy(buffer , p->m_mnemonic); + strcat(buffer , " "); + p->m_param_fn(buffer , pc , opcode); + return 1 | p->m_dasm_flags | DASMFLAG_SUPPORTED; + } + } + + // Unknown opcode + strcpy(buffer , "???"); + + return 1 | DASMFLAG_SUPPORTED; } diff --git a/src/emu/cpu/i86/i86.c b/src/emu/cpu/i86/i86.c index 299d85b1f59..9ded05705f1 100644 --- a/src/emu/cpu/i86/i86.c +++ b/src/emu/cpu/i86/i86.c @@ -1915,9 +1915,9 @@ bool i8086_common_cpu_device::common_op(UINT8 op) break; case 0xe4: // i_inal - if (m_lock) m_lock_handler(1); + if (m_lock) m_lock_handler(1); m_regs.b[AL] = read_port_byte( fetch() ); - if (m_lock) { m_lock_handler(0); m_lock = false; } + if (m_lock) { m_lock_handler(0); m_lock = false; } CLK(IN_IMM8); break; diff --git a/src/emu/cpu/melps4/m58846.c b/src/emu/cpu/melps4/m58846.c index 0bc2c8592b5..4d892d38307 100644 --- a/src/emu/cpu/melps4/m58846.c +++ b/src/emu/cpu/melps4/m58846.c @@ -76,7 +76,7 @@ void m58846_device::device_timer(emu_timer &timer, device_timer_id id, int param { if (id != 0) return; - + // timer 1: 7-bit fixed counter (manual specifically says 127) if (++m_tmr_count[0] == 127) { @@ -84,7 +84,7 @@ void m58846_device::device_timer(emu_timer &timer, device_timer_id id, int param m_irqflag[1] = true; m_possible_irq = true; } - + // timer 2: 8-bit user defined counter with auto-reload if (m_v & 8 && ++m_tmr_count[1] == 0) { @@ -107,7 +107,7 @@ void m58846_device::write_v(UINT8 data) // d3: timer 2 enable m_tmr_irq_enabled[0] = (data & 1) ? true : false; m_possible_irq = true; - + m_v = data; } diff --git a/src/emu/cpu/melps4/m58846.h b/src/emu/cpu/melps4/m58846.h index 72d8253dd23..25d850b455e 100644 --- a/src/emu/cpu/melps4/m58846.h +++ b/src/emu/cpu/melps4/m58846.h @@ -33,7 +33,7 @@ protected: // timers virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); virtual void write_v(UINT8 data); - + emu_timer *m_timer; void reset_timer(); }; diff --git a/src/emu/cpu/melps4/melps4.c b/src/emu/cpu/melps4/melps4.c index 5b58d73bb55..9986407aad4 100644 --- a/src/emu/cpu/melps4/melps4.c +++ b/src/emu/cpu/melps4/melps4.c @@ -85,7 +85,7 @@ void melps4_cpu_device::device_start() m_prgmask = (1 << m_prgwidth) - 1; m_datamask = (1 << m_datawidth) - 1; m_d_mask = (1 << m_d_pins) - 1; - + // resolve callbacks m_read_k.resolve_safe(0); m_read_d.resolve_safe(0); @@ -106,7 +106,7 @@ void melps4_cpu_device::device_start() m_op = 0; m_prev_op = 0; m_bitmask = 0; - + m_port_d = 0; m_port_s = 0; m_port_f = 0; @@ -257,7 +257,7 @@ UINT8 melps4_cpu_device::read_gen_port(int port) return m_port_s | m_read_s(port, 0xff); case MELPS4_PORTF: return m_port_f | (m_read_f(port, 0xff) & 0xf); - + default: break; } @@ -284,7 +284,7 @@ void melps4_cpu_device::write_gen_port(int port, UINT8 data) case MELPS4_PORTU: m_write_u(port, data & 1, 0xff); break; - + default: break; } @@ -306,7 +306,7 @@ void melps4_cpu_device::write_d_pin(int bit, int state) m_port_d = 0; m_write_d(bit, 0, 0xffff); } - + // set/reset one port D pin else { @@ -325,7 +325,7 @@ void melps4_cpu_device::write_d_pin(int bit, int state) void melps4_cpu_device::execute_set_input(int line, int state) { state = (state) ? 1 : 0; - + switch (line) { // external interrupt @@ -338,7 +338,7 @@ void melps4_cpu_device::execute_set_input(int line, int state) } m_int_state = state; break; - + // timer input pin case MELPS4_INPUT_LINE_T: write_t_in(state); @@ -353,14 +353,14 @@ void melps4_cpu_device::do_interrupt(int which) { m_inte = 0; m_irqflag[which] = false; - + m_icount--; push_pc(); m_sms = m_sm; m_sm = false; m_op = 0; // fake nop m_pc = m_int_page << 7 | (which * 2); - + standard_irq_callback(which); } @@ -370,7 +370,7 @@ void melps4_cpu_device::check_interrupt() return; int which = 0; - + // assume that lower irq vectors have higher priority if (m_irqflag[0]) which = 0; @@ -380,7 +380,7 @@ void melps4_cpu_device::check_interrupt() which = 2; else return; - + do_interrupt(which); } @@ -408,7 +408,7 @@ void melps4_cpu_device::execute_run() // remember previous state m_prev_op = m_op; m_prev_pc = m_pc; - + // Interrupts are not accepted during skips or LXY, LA, EI, DI, RT/RTS/RTI or any branch. // Documentation is conflicting here: older docs say that it is allowed during skips, // newer docs specifically say when interrupts are prohibited. diff --git a/src/emu/cpu/melps4/melps4.h b/src/emu/cpu/melps4/melps4.h index ac0724778f3..329ea035b13 100644 --- a/src/emu/cpu/melps4/melps4.h +++ b/src/emu/cpu/melps4/melps4.h @@ -191,7 +191,7 @@ protected: UINT16 m_op; UINT16 m_prev_op; UINT8 m_bitmask; // opcode bit argument - + UINT16 m_port_d; // last written port data UINT8 m_port_s; // " UINT8 m_port_f; // " @@ -241,7 +241,7 @@ protected: devcb_write8 m_write_g; devcb_write8 m_write_u; devcb_write_line m_write_t; - + virtual void write_t_in(int state) { m_t_in_state = state; } virtual void write_v(UINT8 data) { m_v = data; } virtual void write_w(UINT8 data) { m_w = data; } diff --git a/src/emu/cpu/melps4/melps4op.inc b/src/emu/cpu/melps4/melps4op.inc index 382ecb1489b..f9afc5eda91 100644 --- a/src/emu/cpu/melps4/melps4op.inc +++ b/src/emu/cpu/melps4/melps4op.inc @@ -490,7 +490,7 @@ void melps4_cpu_device::op_b() { // B xy: branch m_prohibit_irq = true; - + // determine new page: // - short call: subroutine page // - short jump: current page, or sub. page + 1 when in sub. mode @@ -503,9 +503,9 @@ void melps4_cpu_device::op_b() } else if (m_sm) page = m_sm_page | (m_op >> 7 & 1); - + m_pc = page << 7 | (m_op & 0x7f); - + // if BA opcode was executed, set PC low 4 bits to A if (m_ba_flag) { diff --git a/src/emu/cpu/mn10200/mn10200.c b/src/emu/cpu/mn10200/mn10200.c index 0fdb1edd946..bf00be5b984 100644 --- a/src/emu/cpu/mn10200/mn10200.c +++ b/src/emu/cpu/mn10200/mn10200.c @@ -539,7 +539,6 @@ void mn10200_device::execute_run() { while (m_cycles > 0) { - // internal peripheral, external pin, or prev instruction may have changed irq state while (m_possible_irq) { diff --git a/src/emu/info.c b/src/emu/info.c index adb0f3468d4..d87cc529bb0 100644 --- a/src/emu/info.c +++ b/src/emu/info.c @@ -421,16 +421,16 @@ void info_xml_creator::output_devices() if (shortnames.add(dev->shortname(), 0, FALSE) != TMERR_DUPLICATE) output_one_device(*dev, temptag.c_str()); - // also, check for subdevices with ROMs (a few devices are missed otherwise, e.g. MPU401) - device_iterator deviter2(*dev); - for (device_t *device = deviter2.first(); device != NULL; device = deviter2.next()) - { - if (device->owner() == dev && device->shortname()!= NULL && strlen(device->shortname())!=0) - { - if (shortnames.add(device->shortname(), 0, FALSE) != TMERR_DUPLICATE) - output_one_device(*device, device->tag()); - } - } + // also, check for subdevices with ROMs (a few devices are missed otherwise, e.g. MPU401) + device_iterator deviter2(*dev); + for (device_t *device = deviter2.first(); device != NULL; device = deviter2.next()) + { + if (device->owner() == dev && device->shortname()!= NULL && strlen(device->shortname())!=0) + { + if (shortnames.add(device->shortname(), 0, FALSE) != TMERR_DUPLICATE) + output_one_device(*device, device->tag()); + } + } const_cast<machine_config &>(m_drivlist.config()).device_remove(&m_drivlist.config().root_device(), temptag.c_str()); } diff --git a/src/emu/machine/6532riot.c b/src/emu/machine/6532riot.c index 937c66db6f3..98bb8c2dacc 100644 --- a/src/emu/machine/6532riot.c +++ b/src/emu/machine/6532riot.c @@ -480,4 +480,4 @@ void riot6532_device::device_timer(emu_timer &timer, device_timer_id id, int par default: assert_always(FALSE, "Unknown id in riot6532_device::device_timer"); } -}
\ No newline at end of file +} diff --git a/src/emu/machine/6532riot.h b/src/emu/machine/6532riot.h index 75b3653489a..2825f31dc9d 100644 --- a/src/emu/machine/6532riot.h +++ b/src/emu/machine/6532riot.h @@ -113,7 +113,7 @@ private: UINT8 m_timershift; UINT8 m_timerstate; emu_timer * m_timer; - + enum { TIMER_END_CB diff --git a/src/emu/machine/netlist.h b/src/emu/machine/netlist.h index 3893807de07..191caca87ca 100644 --- a/src/emu/machine/netlist.h +++ b/src/emu/machine/netlist.h @@ -73,7 +73,7 @@ private: pstring m_name; }; -#define MEMREGION_SOURCE(_name) \ +#define MEMREGION_SOURCE(_name) \ setup.register_source(palloc(netlist_source_memregion_t, _name)); #define NETDEV_ANALOG_CALLBACK_MEMBER(_name) \ diff --git a/src/emu/machine/tms1024.c b/src/emu/machine/tms1024.c index d728f7dfd28..f362349ef16 100644 --- a/src/emu/machine/tms1024.c +++ b/src/emu/machine/tms1024.c @@ -3,10 +3,10 @@ /* Texas Instruments TMS1024/TMS1025 I/O expander - + No documentation was available, just a pinout. Other than more port pins, TMS1025 is assumed to be same as TMS1024. - + TODO: - writes to port 0 - what's the MS pin? @@ -99,13 +99,13 @@ WRITE8_MEMBER(tms1024_device::write_s) WRITE_LINE_MEMBER(tms1024_device::write_std) { state = (state) ? 1 : 0; - + // output on rising edge if (state && !m_std) { if (m_s != 0) (*m_write_port[m_s-1])((offs_t)(m_s-1), m_h); } - + m_std = state; } diff --git a/src/emu/machine/tms1024.h b/src/emu/machine/tms1024.h index e91c0ca5a2d..a7bdb4539bf 100644 --- a/src/emu/machine/tms1024.h +++ b/src/emu/machine/tms1024.h @@ -88,7 +88,7 @@ protected: UINT8 m_h; // 4-bit data latch UINT8 m_s; // 3-bit port select UINT8 m_std; // strobe pin - + // callbacks devcb_write8 m_write_port1, m_write_port2, m_write_port3, m_write_port4, m_write_port5, m_write_port6, m_write_port7; devcb_write8 *m_write_port[7]; diff --git a/src/emu/netlist/devices/net_lib.c b/src/emu/netlist/devices/net_lib.c index a98004bb079..75acd004a85 100644 --- a/src/emu/netlist/devices/net_lib.c +++ b/src/emu/netlist/devices/net_lib.c @@ -54,7 +54,7 @@ void initialize_factory(factory_list_t &factory) ENTRY(VCCS, VCCS, "-") ENTRY(CCCS, CCCS, "-") ENTRY(dummy_input, DUMMY_INPUT, "-") - ENTRY(frontier, FRONTIER_DEV, "+I,G,Q") // not intended to be used directly + ENTRY(frontier, FRONTIER_DEV, "+I,G,Q") // not intended to be used directly ENTRY(QBJT_EB, QBJT_EB, "model") ENTRY(QBJT_switch, QBJT_SW, "model") ENTRY(ttl_input, TTL_INPUT, "IN") diff --git a/src/emu/netlist/devices/nld_system.h b/src/emu/netlist/devices/nld_system.h index 1da91d2a813..eb547c847e0 100644 --- a/src/emu/netlist/devices/nld_system.h +++ b/src/emu/netlist/devices/nld_system.h @@ -51,7 +51,7 @@ NET_C(_G, _name.G) \ NET_C(_OUT, _name.Q) -#define OPTIMIZE_FRONTIER(_attach, _r_in, _r_out) \ +#define OPTIMIZE_FRONTIER(_attach, _r_in, _r_out) \ setup.register_frontier(# _attach, _r_in, _r_out); #define RES_SWITCH(_name, _IN, _P1, _P2) \ diff --git a/src/emu/netlist/devices/nld_truthtable.c b/src/emu/netlist/devices/nld_truthtable.c index c4030e8bff3..a5185c1fed1 100644 --- a/src/emu/netlist/devices/nld_truthtable.c +++ b/src/emu/netlist/devices/nld_truthtable.c @@ -238,11 +238,11 @@ void truthtable_desc_t::setup(const pstring_list_t &truthtable, UINT32 disabled_ } -#define ENTRYX(_n,_m,_h) case (_n * 1000 + _m * 10 + _h): \ +#define ENTRYX(_n,_m,_h) case (_n * 1000 + _m * 10 + _h): \ { typedef netlist_factory_truthtable_t<_n,_m,_h> xtype; \ - return palloc(xtype,name,classname,def_param); } break + return palloc(xtype,name,classname,def_param); } break -#define ENTRYY(_n,_m) ENTRYX(_n,_m,0); ENTRYX(_n,_m,1) +#define ENTRYY(_n,_m) ENTRYX(_n,_m,0); ENTRYX(_n,_m,1) #define ENTRY(_n) ENTRYY(_n, 1); ENTRYY(_n, 2); ENTRYY(_n, 3); ENTRYY(_n, 4); ENTRYY(_n, 5); ENTRYY(_n, 6) diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c index 588b4e53f35..f5c585fc570 100644 --- a/src/emu/netlist/nl_base.c +++ b/src/emu/netlist/nl_base.c @@ -99,7 +99,6 @@ public: const logic_family_desc_t *logic_family_desc_t::from_model(const pstring &model) { - if (setup_t::model_value_str(model, "TYPE", "") == "TTL") return &netlist_family_TTL; if (setup_t::model_value_str(model, "TYPE", "") == "CD4000") diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h index b6347eb5fe8..a884370c647 100644 --- a/src/emu/netlist/nl_base.h +++ b/src/emu/netlist/nl_base.h @@ -170,9 +170,8 @@ typedef UINT8 netlist_sig_t; // MACROS / netlist devices //============================================================ -#define NETLIB_NAMESPACE_DEVICES_START() namespace netlist { namespace devices { - -#define NETLIB_NAMESPACE_DEVICES_END() }} +#define NETLIB_NAMESPACE_DEVICES_START() namespace netlist { namespace devices { +#define NETLIB_NAMESPACE_DEVICES_END() }} #define NETLIB_NAME(_chip) nld_ ## _chip @@ -292,7 +291,7 @@ namespace netlist fatalerror_e(const char *format, va_list ap); virtual ~fatalerror_e() throw() {} - const pstring &text() { return m_text; } + const pstring &text() { return m_text; } private: pstring m_text; }; @@ -432,7 +431,7 @@ namespace netlist // ----------------------------------------------------------------------------- // netlist_owned_object_t // ----------------------------------------------------------------------------- - + class owned_object_t : public object_t { NETLIST_PREVENT_COPYING(owned_object_t) diff --git a/src/emu/netlist/nl_config.h b/src/emu/netlist/nl_config.h index 439e779b1ce..debddd8b97c 100644 --- a/src/emu/netlist/nl_config.h +++ b/src/emu/netlist/nl_config.h @@ -17,42 +17,42 @@ /* * The following options determine how object::update is called. * NL_PMF_TYPE_VIRTUAL - * Use stock virtual call + * Use stock virtual call * * NL_PMF_TYPE_GNUC_PMF - * Use standard pointer to member function syntax + * Use standard pointer to member function syntax * - * NL_PMF_TYPE_GNUC_PMF_CONV - * Use gnu extension and convert the pmf to a function pointer. - * This is not standard compliant and needs - * -Wno-pmf-conversions to compile. + * NL_PMF_TYPE_GNUC_PMF_CONV + * Use gnu extension and convert the pmf to a function pointer. + * This is not standard compliant and needs + * -Wno-pmf-conversions to compile. * - * NL_PMF_TYPE_INTERNAL - * Use the same approach as MAME for deriving the function pointer. - * This is compiler-dependant as well + * NL_PMF_TYPE_INTERNAL + * Use the same approach as MAME for deriving the function pointer. + * This is compiler-dependant as well * - * Benchmarks for ./nltool -c run -f src/mame/drivers/nl_pong.c -t 10 -n pong_fast + * Benchmarks for ./nltool -c run -f src/mame/drivers/nl_pong.c -t 10 -n pong_fast * - * NL_PMF_TYPE_INTERNAL: 215% - * NL_PMF_TYPE_GNUC_PMF: 163% - * NL_PMF_TYPE_GNUC_PMF_CONV: 215% - * NL_PMF_TYPE_VIRTUAL: 213% + * NL_PMF_TYPE_INTERNAL: 215% + * NL_PMF_TYPE_GNUC_PMF: 163% + * NL_PMF_TYPE_GNUC_PMF_CONV: 215% + * NL_PMF_TYPE_VIRTUAL: 213% * - * The whole exercise was done to avoid virtual calls. In prior versions of - * netlist, the INTERNAL and GNUC_PMF_CONV approach provided significant improvement. - * Since than, ATTR_COLD was removed from functions declared as virtual. - * This may explain that the recent benchmarks show no difference at all. + * The whole exercise was done to avoid virtual calls. In prior versions of + * netlist, the INTERNAL and GNUC_PMF_CONV approach provided significant improvement. + * Since than, ATTR_COLD was removed from functions declared as virtual. + * This may explain that the recent benchmarks show no difference at all. * - * Disappointing is the GNUC_PMF performance. + * Disappointing is the GNUC_PMF performance. */ // This will be autodetected //#define NL_PMF_TYPE 3 -#define NL_PMF_TYPE_VIRTUAL 0 -#define NL_PMF_TYPE_GNUC_PMF 1 -#define NL_PMF_TYPE_GNUC_PMF_CONV 2 -#define NL_PMF_TYPE_INTERNAL 3 +#define NL_PMF_TYPE_VIRTUAL 0 +#define NL_PMF_TYPE_GNUC_PMF 1 +#define NL_PMF_TYPE_GNUC_PMF_CONV 2 +#define NL_PMF_TYPE_INTERNAL 3 #ifndef NL_PMF_TYPE #if PHAS_PMF_INTERNAL diff --git a/src/emu/netlist/nl_factory.c b/src/emu/netlist/nl_factory.c index 7275a7bb772..a62c889baed 100644 --- a/src/emu/netlist/nl_factory.c +++ b/src/emu/netlist/nl_factory.c @@ -13,7 +13,6 @@ namespace netlist { - // ---------------------------------------------------------------------------------------- // net_device_t_base_factory // ---------------------------------------------------------------------------------------- diff --git a/src/emu/netlist/nl_factory.h b/src/emu/netlist/nl_factory.h index e2cecebf7cd..2b29efca61f 100644 --- a/src/emu/netlist/nl_factory.h +++ b/src/emu/netlist/nl_factory.h @@ -16,7 +16,6 @@ namespace netlist { - // ----------------------------------------------------------------------------- // net_dev class factory // ----------------------------------------------------------------------------- diff --git a/src/emu/netlist/nl_lists.h b/src/emu/netlist/nl_lists.h index 6aaaef22330..bea7508a7d8 100644 --- a/src/emu/netlist/nl_lists.h +++ b/src/emu/netlist/nl_lists.h @@ -19,7 +19,6 @@ namespace netlist { - template <class _Element, class _Time> class timed_queue { diff --git a/src/emu/netlist/nl_parser.h b/src/emu/netlist/nl_parser.h index 1039e01997f..44074b8b9ca 100644 --- a/src/emu/netlist/nl_parser.h +++ b/src/emu/netlist/nl_parser.h @@ -14,7 +14,6 @@ namespace netlist { - class parser_t : public ptokenizer { NETLIST_PREVENT_COPYING(parser_t) diff --git a/src/emu/netlist/nl_setup.c b/src/emu/netlist/nl_setup.c index 68bc5452815..a135caf5598 100644 --- a/src/emu/netlist/nl_setup.c +++ b/src/emu/netlist/nl_setup.c @@ -39,7 +39,6 @@ NETLIST_END() namespace netlist { - setup_t::setup_t(netlist_t *netlist) : m_netlist(netlist) , m_proxy_cnt(0) diff --git a/src/emu/netlist/nl_setup.h b/src/emu/netlist/nl_setup.h index 2c6d341913c..ddc26ba8390 100644 --- a/src/emu/netlist/nl_setup.h +++ b/src/emu/netlist/nl_setup.h @@ -55,10 +55,9 @@ #define NETLIST_START(_name) \ ATTR_COLD void NETLIST_NAME(_name)(netlist::setup_t &setup) \ { - #define NETLIST_END() } -#define LOCAL_SOURCE(_name) \ +#define LOCAL_SOURCE(_name) \ setup.register_source(palloc(netlist::source_proc_t, # _name, &NETLIST_NAME(_name))); #define INCLUDE(_name) \ @@ -75,7 +74,6 @@ ATTR_COLD void NETLIST_NAME(_name)(netlist::setup_t &setup) namespace netlist { - // Forward definition so we keep nl_factory.h out of the public class factory_list_t; @@ -282,8 +280,8 @@ namespace netlist public: source_proc_t(pstring name, void (*setup_func)(setup_t &)) : setup_t::source_t(), - m_setup_func(setup_func), - m_setup_func_name(name) + m_setup_func(setup_func), + m_setup_func_name(name) { } diff --git a/src/emu/netlist/nl_time.h b/src/emu/netlist/nl_time.h index 72079b8d17b..4473b67d2c8 100644 --- a/src/emu/netlist/nl_time.h +++ b/src/emu/netlist/nl_time.h @@ -27,7 +27,6 @@ namespace netlist { - struct netlist_time { public: diff --git a/src/emu/netlist/plib/pconfig.h b/src/emu/netlist/plib/pconfig.h index cfb4fe8fb60..1918ec61fb6 100644 --- a/src/emu/netlist/plib/pconfig.h +++ b/src/emu/netlist/plib/pconfig.h @@ -145,10 +145,10 @@ public: // construct from any member function pointer class generic_class; typedef void (*generic_function)(); - + #if (PSTANDALONE) typedef std::size_t FPTR; - #endif + #endif template<typename _MemberFunctionType> pmfp(_MemberFunctionType mfp) diff --git a/src/emu/netlist/plib/plists.h b/src/emu/netlist/plib/plists.h index 4193f4956cc..0f71a35c9e4 100644 --- a/src/emu/netlist/plib/plists.h +++ b/src/emu/netlist/plib/plists.h @@ -97,7 +97,7 @@ public: plist_t() : std::vector<_ListClass>() {} plist_t(const int numElements) : std::vector<_ListClass>(numElements) {} - void add(const _ListClass &elem) { this->push_back(elem); } + void add(const _ListClass &elem) { this->push_back(elem); } void clear_and_free() { for (_ListClass *i = this->data(); i < this->data() + this->size(); i++) @@ -106,7 +106,7 @@ public: } this->clear(); } - bool contains(const _ListClass &elem) const + bool contains(const _ListClass &elem) const { for (const _ListClass *i = this->data(); i < this->data() + this->size(); i++) { @@ -116,7 +116,7 @@ public: return false; } - void remove(const _ListClass &elem) + void remove(const _ListClass &elem) { for (int i = 0; i < this->size(); i++) { @@ -127,12 +127,12 @@ public: } } } - void remove_at(const int pos) + void remove_at(const int pos) { this->erase(this->begin() + pos); } - int indexof(const _ListClass &elem) const + int indexof(const _ListClass &elem) const { for (int i = 0; i < this->size(); i++) { @@ -539,7 +539,6 @@ public: pstring_list_t(const pstring &str, const pstring &onstr, bool ignore_empty = false) : plist_t<pstring>() { - int p = 0; int pn; @@ -607,9 +606,9 @@ static inline void psort_list(Class &sl) { for(int i = 0; i < (int) sl.size() - 1; i++) { - for(int j = i + 1; j < sl.size(); j++) - if(sl[i] > sl[j]) - std::swap(sl[i], sl[j]); + for(int j = i + 1; j < sl.size(); j++) + if(sl[i] > sl[j]) + std::swap(sl[i], sl[j]); } } diff --git a/src/emu/netlist/solver/mat_cr.h b/src/emu/netlist/solver/mat_cr.h index 9322a74c045..4972bc21a29 100644 --- a/src/emu/netlist/solver/mat_cr.h +++ b/src/emu/netlist/solver/mat_cr.h @@ -19,7 +19,7 @@ struct mat_cr_t unsigned nz_num; unsigned ia[_storage_N + 1]; unsigned ja[_storage_N * _storage_N]; - unsigned diag[_storage_N]; /* n */ + unsigned diag[_storage_N]; /* n */ void mult_vec(const double * RESTRICT A, const double * RESTRICT x, double * RESTRICT res) { @@ -85,14 +85,14 @@ struct mat_cr_t /* * Solve a linear equation Ax = r * where - * A = L*U + * A = L*U * - * L unit lower triangular - * U upper triangular + * L unit lower triangular + * U upper triangular * * ==> LUx = r * - * ==> Ux = L⁻¹r = w + * ==> Ux = L?????r = w * * ==> r = Lw * diff --git a/src/emu/netlist/solver/nld_ms_direct.h b/src/emu/netlist/solver/nld_ms_direct.h index e8eb9898ed8..e9acd1d2415 100644 --- a/src/emu/netlist/solver/nld_ms_direct.h +++ b/src/emu/netlist/solver/nld_ms_direct.h @@ -250,7 +250,7 @@ ATTR_COLD void matrix_solver_direct_t<m_N, _storage_N>::vsetup(analog_net_t::lis } psort_list(t->m_nzrd); - t->m_nz.add(k); // add diagonal + t->m_nz.add(k); // add diagonal psort_list(t->m_nz); } @@ -388,8 +388,8 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_solve() /* The code below is 30% faster than the original * implementation which is given here for reference. * - * for (unsigned k = i + 1; k < kN; k++) - * m_A[j][k] = m_A[j][k] + m_A[i][k] * f1; + * for (unsigned k = i + 1; k < kN; k++) + * m_A[j][k] = m_A[j][k] + m_A[i][k] * f1; */ double * RESTRICT d = &m_A[j][i+1]; const double * RESTRICT s = &m_A[i][i+1]; diff --git a/src/emu/netlist/solver/nld_ms_gmres.h b/src/emu/netlist/solver/nld_ms_gmres.h index 6ed58ac4498..f3f5bf43d00 100644 --- a/src/emu/netlist/solver/nld_ms_gmres.h +++ b/src/emu/netlist/solver/nld_ms_gmres.h @@ -78,10 +78,10 @@ private: double m_c[_storage_N + 1]; /* mr + 1 */ double m_g[_storage_N + 1]; /* mr + 1 */ - double * RESTRICT m_ht[_storage_N]; /* mr, (mr + 1) */ - double m_s[_storage_N]; /* mr + 1 */ - double * RESTRICT m_v[_storage_N + 1]; /*(mr + 1), n */ - //double m_y[_storage_N]; /* mr + 1 */ + double * RESTRICT m_ht[_storage_N]; /* mr, (mr + 1) */ + double m_s[_storage_N]; /* mr + 1 */ + double * RESTRICT m_v[_storage_N + 1]; /*(mr + 1), n */ + //double m_y[_storage_N]; /* mr + 1 */ double m_accuracy_mult; @@ -234,7 +234,7 @@ ATTR_HOT inline int matrix_solver_GMRES_t<m_N, _storage_N>::vsolve_non_dynamic(c if (gsl>=failed) { //for (int k = 0; k < iN; k++) - // this->m_nets[k]->m_cur_Analog = new_V[k]; + // this->m_nets[k]->m_cur_Analog = new_V[k]; // Fallback to direct solver ... this->m_gs_fail++; return matrix_solver_direct_t<m_N, _storage_N>::vsolve_non_dynamic(newton_raphson); @@ -264,11 +264,11 @@ ATTR_HOT inline int matrix_solver_GMRES_t<m_N, _storage_N>::vsolve_non_dynamic(c static inline void givens_mult( const double c, const double s, double * RESTRICT g0, double * RESTRICT g1 ) { - const double tg0 = c * *g0 - s * *g1; - const double tg1 = s * *g0 + c * *g1; + const double tg0 = c * *g0 - s * *g1; + const double tg1 = s * *g0 + c * *g1; - *g0 = tg0; - *g1 = tg1; + *g0 = tg0; + *g1 = tg1; } template <unsigned m_N, unsigned _storage_N> @@ -289,10 +289,10 @@ int matrix_solver_GMRES_t<m_N, _storage_N>::solve_ilu_gmres (double * RESTRICT x * * Yousef Saad, * Iterative Methods for Sparse Linear Systems, - * Second Edition, - * SIAM, 20003, - * ISBN: 0898715342, - * LC: QA188.S17. + * Second Edition, + * SIAM, 20003, + * ISBN: 0898715342, + * LC: QA188.S17. * *------------------------------------------------------------------------*/ diff --git a/src/emu/netlist/solver/nld_ms_sor_mat.h b/src/emu/netlist/solver/nld_ms_sor_mat.h index dbb3c7563d4..8498633c4d9 100644 --- a/src/emu/netlist/solver/nld_ms_sor_mat.h +++ b/src/emu/netlist/solver/nld_ms_sor_mat.h @@ -175,7 +175,7 @@ ATTR_HOT inline int matrix_solver_SOR_mat_t<m_N, _storage_N>::vsolve_non_dynamic s = s + nl_math::abs(this->m_A[k][i]); akk = s / akk - 1.0; if ( akk > lambdaN) - lambdaN = akk; + lambdaN = akk; if (akk < lambda1) lambda1 = akk; #endif diff --git a/src/emu/netlist/solver/vector_base.h b/src/emu/netlist/solver/vector_base.h index 3d3a1028b2a..e0ad8139296 100644 --- a/src/emu/netlist/solver/vector_base.h +++ b/src/emu/netlist/solver/vector_base.h @@ -17,7 +17,6 @@ template <unsigned _storage_N> struct pvector { - pvector(unsigned size) : m_N(size) { } diff --git a/src/emu/netlist/tools/nl_convert.c b/src/emu/netlist/tools/nl_convert.c index 698bb6a5a4d..f1629308404 100644 --- a/src/emu/netlist/tools/nl_convert.c +++ b/src/emu/netlist/tools/nl_convert.c @@ -17,15 +17,15 @@ static plist_t<int> bubble(const pnamedlist_t<Class *> &sl) ret[i] = i; for(int i=0; i < sl.size()-1;i++) - { - for(int j=i+1; j < sl.size(); j++) - { - if(sl[ret[i]]->name() > sl[ret[j]]->name()) - { - std::swap(ret[i], ret[j]); - } - } - } + { + for(int j=i+1; j < sl.size(); j++) + { + if(sl[ret[i]]->name() > sl[ret[j]]->name()) + { + std::swap(ret[i], ret[j]); + } + } + } return ret; } @@ -179,7 +179,7 @@ nl_convert_base_t::unit_t nl_convert_base_t::m_units[] = { {"M", "CAP_M(%g)", 1.0e-3 }, {"u", "CAP_U(%g)", 1.0e-6 }, /* eagle */ {"U", "CAP_U(%g)", 1.0e-6 }, - {"µ", "CAP_U(%g)", 1.0e-6 }, + {"??", "CAP_U(%g)", 1.0e-6 }, {"N", "CAP_N(%g)", 1.0e-9 }, {"P", "CAP_P(%g)", 1.0e-12}, {"F", "%ge-15", 1.0e-15}, @@ -444,7 +444,7 @@ void nl_convert_eagle_t::convert(const pstring &contents) pstring devname = token.str(); pstring pin = tok.get_string(); add_term(netname, devname + "." + pin); - token = tok.get_token(); } + token = tok.get_token(); } } else { @@ -454,5 +454,3 @@ void nl_convert_eagle_t::convert(const pstring &contents) } } - - diff --git a/src/emu/netlist/tools/nl_convert.h b/src/emu/netlist/tools/nl_convert.h index 4a0efd020a7..d2e2d238718 100644 --- a/src/emu/netlist/tools/nl_convert.h +++ b/src/emu/netlist/tools/nl_convert.h @@ -164,7 +164,6 @@ public: class eagle_tokenizer : public ptokenizer { - public: eagle_tokenizer(nl_convert_eagle_t &convert) : ptokenizer(), m_convert(convert) diff --git a/src/emu/softlist.c b/src/emu/softlist.c index b9719d29a33..fdfd980aeea 100644 --- a/src/emu/softlist.c +++ b/src/emu/softlist.c @@ -557,13 +557,13 @@ void software_list_device::internal_validity_check(validity_checker &valid) break; } - // Did we lost the software parts? - if (swinfo->num_parts() == 0) - { - osd_printf_error("%s: %s has no part\n", filename(), swinfo->shortname()); - break; - } - + // Did we lost the software parts? + if (swinfo->num_parts() == 0) + { + osd_printf_error("%s: %s has no part\n", filename(), swinfo->shortname()); + break; + } + // Second, since the xml is fine, run additional checks: // check for duplicate names diff --git a/src/emu/sound/c352.c b/src/emu/sound/c352.c index c164bc53413..15a3ba68273 100644 --- a/src/emu/sound/c352.c +++ b/src/emu/sound/c352.c @@ -489,7 +489,7 @@ void c352_device::device_start() divider=332; break; } - + m_sample_rate_base = clock() / divider; m_stream = machine().sound().stream_alloc(*this, 0, 4, m_sample_rate_base); diff --git a/src/emu/sound/c352.h b/src/emu/sound/c352.h index 0717fd133df..75a00bbab71 100644 --- a/src/emu/sound/c352.h +++ b/src/emu/sound/c352.h @@ -26,7 +26,7 @@ enum #define MCFG_C352_DIVIDER(_setting) \ c352_device::static_set_divider(*device, _setting); - + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -43,7 +43,7 @@ public: // inline configuration helpers static void static_set_divider(device_t &device, int setting); - + DECLARE_READ16_MEMBER(read); DECLARE_WRITE16_MEMBER(write); @@ -108,7 +108,7 @@ private: c352_ch_t m_c352_ch[32]; int m_sample_rate_base; int m_divider; - + long m_channel_l[2048*2]; long m_channel_r[2048*2]; long m_channel_l2[2048*2]; diff --git a/src/emu/sound/n63701x.c b/src/emu/sound/n63701x.c index db90445f0cf..a1308c36713 100644 --- a/src/emu/sound/n63701x.c +++ b/src/emu/sound/n63701x.c @@ -47,7 +47,7 @@ namco_63701x_device::namco_63701x_device(const machine_config &mconfig, const ch void namco_63701x_device::device_start() { m_stream = stream_alloc(0, 2, clock()/1000); - + for (int i = 0; i < 2; i++) { save_item(NAME(m_voices[i].select), i); diff --git a/src/emu/sound/st0016.c b/src/emu/sound/st0016.c index d62332496cb..99328a93b4d 100644 --- a/src/emu/sound/st0016.c +++ b/src/emu/sound/st0016.c @@ -45,7 +45,7 @@ void st0016_device::device_start() { m_stream = stream_alloc(0, 2, 44100); m_ram_read_cb.resolve_safe(0); - + save_item(NAME(m_vpos)); save_item(NAME(m_frac)); save_item(NAME(m_lponce)); diff --git a/src/emu/sound/tms5110r.inc b/src/emu/sound/tms5110r.inc index 40ec66b8f4d..41abe5caea4 100644 --- a/src/emu/sound/tms5110r.inc +++ b/src/emu/sound/tms5110r.inc @@ -39,19 +39,19 @@ */ /* Chip types based on die marks from decap: - chip type - |||||| rom number - |||||| ||||| - VVVVVV VVVVV - T0280A 0281 = 1978 speak & spell, unknown difference to below, assumed same? uses old chirp - T0280B 0281A = 1979 speak & spell, also == TMS5100, uses old chirp - ?????? ????? (no decap; likely 'T0280D 0281D') = 1980 speak & spell, 1981 speak & spell compact, changed energy table, otherwise same as above, uses old chirp - T0280F 2801A = 1980 speak & math, 1980 speak and read, uses old chirp - ?????? ????? (no decap; likely 'T0280F 2802') = touch and tell, language translator; uses a unique chirp rom. - ?????? ????? = TMS5110 - T0280F 5110A = TMS5110AN2L - - + chip type + |||||| rom number + |||||| ||||| + VVVVVV VVVVV + T0280A 0281 = 1978 speak & spell, unknown difference to below, assumed same? uses old chirp + T0280B 0281A = 1979 speak & spell, also == TMS5100, uses old chirp + ?????? ????? (no decap; likely 'T0280D 0281D') = 1980 speak & spell, 1981 speak & spell compact, changed energy table, otherwise same as above, uses old chirp + T0280F 2801A = 1980 speak & math, 1980 speak and read, uses old chirp + ?????? ????? (no decap; likely 'T0280F 2802') = touch and tell, language translator; uses a unique chirp rom. + ?????? ????? = TMS5110 + T0280F 5110A = TMS5110AN2L + + */ /* chip rom contents defines */ @@ -111,9 +111,9 @@ struct tms5100_coeffs #define TI_0280_2801_PATENT_PITCH \ /* P */\ { 0, 41, 43, 45, 47, 49, 51, 53, \ - 55, 58, 60, 63, 66, 70, 73, 76, \ - 79, 83, 87, 90, 94, 99, 103, 107, \ - 112, 118, 123, 129, 134, 140, 147, 153 }, + 55, 58, 60, 63, 66, 70, 73, 76, \ + 79, 83, 87, 90, 94, 99, 103, 107, \ + 112, 118, 123, 129, 134, 140, 147, 153 }, #define TI_2802_PITCH \ /* P */\ @@ -155,14 +155,14 @@ struct tms5100_coeffs #define TI_0280_PATENT_LPC \ /* K1 */\ { -501, -497, -493, -488, -480, -471, -460, -446,\ - -427, -405, -378, -344, -305, -259, -206, -148,\ - -86, -21, 45, 110, 171, 227, 277, 320,\ - 357, 388, 413, 434, 451, 464, 474, 498 },\ + -427, -405, -378, -344, -305, -259, -206, -148,\ + -86, -21, 45, 110, 171, 227, 277, 320,\ + 357, 388, 413, 434, 451, 464, 474, 498 },\ /* K2 */\ { -349, -328, -305, -280, -252, -223, -192, -158,\ - -124, -88, -51, -14, 23, 60, 97, 133,\ - 167, 199, 230, 259, 286, 310, 333, 354,\ - 372, 389, 404, 417, 429, 439, 449, 506 },\ + -124, -88, -51, -14, 23, 60, 97, 133,\ + 167, 199, 230, 259, 286, 310, 333, 354,\ + 372, 389, 404, 417, 429, 439, 449, 506 },\ /* K3 */\ { -397, -365, -327, -282, -229, -170, -104, -36,\ 35, 104, 169, 228, 281, 326, 364, 396 },\ @@ -188,17 +188,17 @@ struct tms5100_coeffs #define TI_2801_2501E_LPC \ /* K1 */\ { -501, -498, -495, -490, -485, -478, -469, -459,\ - -446, -431, -412, -389, -362, -331, -295, -253,\ - -207, -156, -102, -45, 13, 70, 126, 179,\ - 228, 272, 311, 345, 374, 399, 420, 437 },\ + -446, -431, -412, -389, -362, -331, -295, -253,\ + -207, -156, -102, -45, 13, 70, 126, 179,\ + 228, 272, 311, 345, 374, 399, 420, 437 },\ /* K2 */\ { -376, -357, -335, -312, -286, -258, -227, -195,\ - -161, -124, -87, -49, -10, 29, 68, 106,\ - 143, 178, 212, 243, 272, 299, 324, 346,\ - 366, 384, 400, 414, 427, 438, 448, 506 },\ + -161, -124, -87, -49, -10, 29, 68, 106,\ + 143, 178, 212, 243, 272, 299, 324, 346,\ + 366, 384, 400, 414, 427, 438, 448, 506 },\ /* K3 */\ { -407, -381, -349, -311, -268, -218, -162, -102,\ - -39, 25, 89, 149, 206, 257, 302, 341 },\ + -39, 25, 89, 149, 206, 257, 302, 341 },\ /* K4 */\ { -290, -252, -209, -163, -114, -62, -9, 44,\ 97, 147, 194, 238, 278, 313, 344, 371 },\ @@ -207,7 +207,7 @@ struct tms5100_coeffs 49, 101, 150, 196, 239, 278, 313, 344 },\ /* K6 */\ { -193, -152, -109, -65, -20, 26, 71, 115,\ - 158, 198, 235, 270, 301, 330, 355, 377 },\ + 158, 198, 235, 270, 301, 330, 355, 377 },\ /* K7 */\ { -254, -218, -180, -140, -97, -53, -8, 36,\ 81, 124, 165, 204, 240, 274, 304, 332 },\ @@ -222,26 +222,26 @@ struct tms5100_coeffs #define TI_2802_LPC \ /* K1 */\ { -501, -498, -495, -490, -485, -478, -469, -459,\ - -446, -431, -412, -389, -362, -331, -295, -253,\ - -207, -156, -102, -45, 13, 70, 126, 179,\ - 228, 272, 311, 345, 374, 399, 420, 437},\ + -446, -431, -412, -389, -362, -331, -295, -253,\ + -207, -156, -102, -45, 13, 70, 126, 179,\ + 228, 272, 311, 345, 374, 399, 420, 437},\ /* K2 */\ { -376, -357, -335, -312, -286, -258, -227, -195,\ - -161, -124, -87, -49, -10, 29, 68, 106,\ - 143, 178, 212, 243, 272, 299, 324, 346,\ - 366, 384, 400, 414, 427, 438, 448, 506},\ + -161, -124, -87, -49, -10, 29, 68, 106,\ + 143, 178, 212, 243, 272, 299, 324, 346,\ + 366, 384, 400, 414, 427, 438, 448, 506},\ /* K3 */\ { -407, -381, -349, -311, -268, -218, -162, -102,\ - -39, 25, 89, 149, 206, 257, 302, 341},\ + -39, 25, 89, 149, 206, 257, 302, 341},\ /* K4 */\ { -289, -248, -202, -152, -98, -43, 14, 71,\ - 125, 177, 225, 269, 307, 341, 371, 506},\ + 125, 177, 225, 269, 307, 341, 371, 506},\ /* K5 */\ { -318, -283, -245, -202, -156, -107, -56, -3,\ 49, 101, 150, 196, 239, 278, 313, 344},\ /* K6 */\ { -193, -152, -109, -65, -20, 26, 71, 115,\ - 158, 198, 235, 270, 301, 330, 355, 377},\ + 158, 198, 235, 270, 301, 330, 355, 377},\ /* K7 */\ { -254, -218, -180, -140, -97, -53, -8, 36,\ 81, 124, 165, 204, 240, 274, 304, 332},\ @@ -255,20 +255,20 @@ struct tms5100_coeffs #define TI_5110_5220_LPC \ /* K1 */\ { -501, -498, -497, -495, -493, -491, -488, -482,\ - -478, -474, -469, -464, -459, -452, -445, -437,\ - -412, -380, -339, -288, -227, -158, -81, -1,\ + -478, -474, -469, -464, -459, -452, -445, -437,\ + -412, -380, -339, -288, -227, -158, -81, -1,\ 80, 157, 226, 287, 337, 379, 411, 436 },\ /* K2 */\ { -328, -303, -274, -244, -211, -175, -138, -99,\ - -59, -18, 24, 64, 105, 143, 180, 215,\ - 248, 278, 306, 331, 354, 374, 392, 408,\ - 422, 435, 445, 455, 463, 470, 476, 506 },\ + -59, -18, 24, 64, 105, 143, 180, 215,\ + 248, 278, 306, 331, 354, 374, 392, 408,\ + 422, 435, 445, 455, 463, 470, 476, 506 },\ /* K3 */\ { -441, -387, -333, -279, -225, -171, -117, -63,\ -9, 45, 98, 152, 206, 260, 314, 368 },\ /* K4 */\ { -328, -273, -217, -161, -106, -50, 5, 61,\ - 116, 172, 228, 283, 339, 394, 450, 506 },\ + 116, 172, 228, 283, 339, 394, 450, 506 },\ /* K5 */\ { -328, -282, -235, -189, -142, -96, -50, -3,\ 43, 90, 136, 182, 229, 275, 322, 368 },\ @@ -469,7 +469,7 @@ static const struct tms5100_coeffs T0280F_2802_coeff = /* interpolation coefficients */ { 3, 3, 3, 2, 2, 1, 1, 0 } }; - + /* TMS5110A: (1984-90 era? early chips may be called TMS5110C; later chips past 1988 or so may be called TSP5110A) The TMS5110A LPC coefficients were originally read from an actual TMS5110A diff --git a/src/emu/sound/x1_010.c b/src/emu/sound/x1_010.c index 0d2abed892a..5d8377569bb 100644 --- a/src/emu/sound/x1_010.c +++ b/src/emu/sound/x1_010.c @@ -22,7 +22,7 @@ Registers: Reg: Bits: Meaning: 0 7--- ---- Frequency divider flag (only downtown seems to set this) - -654 3--- + -654 3--- ---- -2-- PCM/Waveform repeat flag (0:Ones 1:Repeat) (*1) ---- --1- Sound out select (0:PCM 1:Waveform) ---- ---0 Key on / off diff --git a/src/emu/video/clgd542x.c b/src/emu/video/clgd542x.c index aee97491ef1..854611d1c80 100644 --- a/src/emu/video/clgd542x.c +++ b/src/emu/video/clgd542x.c @@ -296,7 +296,7 @@ void cirrus_gd5428_device::start_bitblt() else { UINT8 pixel = (vga.memory[m_blt_source_current % vga.svga_intf.vram_size] >> (7-(x % 8)) & 0x01) ? vga.gc.enable_set_reset : vga.gc.set_reset; // use GR0/1/10/11 background/foreground regs - + copy_pixel(pixel, vga.memory[m_blt_dest_current % vga.svga_intf.vram_size]); if((x % 8) == 7 && !(m_blt_mode & 0x40)) // don't increment if a pattern (it's only 8 bits) m_blt_source_current++; @@ -1403,7 +1403,7 @@ WRITE8_MEMBER(cirrus_gd5428_device::mem_w) if(svga.rgb8_en) { if(data & (0x01 << (7-i))) - vga.memory[((addr+offset)*8+i) % vga.svga_intf.vram_size] = vga.gc.enable_set_reset; + vga.memory[((addr+offset)*8+i) % vga.svga_intf.vram_size] = vga.gc.enable_set_reset; } else if(svga.rgb15_en || svga.rgb16_en) { diff --git a/src/emu/video/rgbsse.h b/src/emu/video/rgbsse.h index 47716fd19e6..bc8251d5833 100644 --- a/src/emu/video/rgbsse.h +++ b/src/emu/video/rgbsse.h @@ -23,10 +23,10 @@ extern const struct _rgbsse_statics { __m128 dummy_for_alignment; INT16 maxbyte[8]; - INT16 alpha_mask[8]; - INT16 red_mask[8]; - INT16 green_mask[8]; - INT16 blue_mask[8]; + INT16 alpha_mask[8]; + INT16 red_mask[8]; + INT16 green_mask[8]; + INT16 blue_mask[8]; INT16 scale_table[256][8]; } rgbsse_statics; @@ -434,7 +434,7 @@ public: } protected: - __m128i m_value; + __m128i m_value; }; #endif /* __RGBSSE__ */ diff --git a/src/emu/video/rgbvmx.h b/src/emu/video/rgbvmx.h index 5f1cb71acdb..3a85059c9a8 100644 --- a/src/emu/video/rgbvmx.h +++ b/src/emu/video/rgbvmx.h @@ -487,19 +487,19 @@ public: } protected: - typedef vector unsigned char VECU8; - typedef vector signed short VECS16; - typedef vector unsigned short VECU16; - typedef vector signed int VECS32; - typedef vector unsigned int VECU32; - - vector VECU32 m_value; - - static const VECU8 alpha_perm; - static const VECU8 red_perm; - static const VECU8 green_perm; - static const VECU8 blue_perm; - static const VECS16 scale_table[256]; + typedef vector unsigned char VECU8; + typedef vector signed short VECS16; + typedef vector unsigned short VECU16; + typedef vector signed int VECS32; + typedef vector unsigned int VECU32; + + vector VECU32 m_value; + + static const VECU8 alpha_perm; + static const VECU8 red_perm; + static const VECU8 green_perm; + static const VECU8 blue_perm; + static const VECS16 scale_table[256]; }; diff --git a/src/emu/video/vooddefs.h b/src/emu/video/vooddefs.h index a45640143d1..ff6b39bf478 100644 --- a/src/emu/video/vooddefs.h +++ b/src/emu/video/vooddefs.h @@ -1,4 +1,4 @@ - // license:BSD-3-Clause + // license:BSD-3-Clause // copyright-holders:Aaron Giles /*************************************************************************** @@ -2212,13 +2212,13 @@ INLINE UINT32 clampARGB(INT32 iterr, INT32 iterg, INT32 iterb, INT32 itera, UINT //if (r == 0xfff) rgbaint_t temp(colorint); temp.cmpeq_imm(0xfff); - // result.rgb.r = 0; + // result.rgb.r = 0; temp.xor_imm(0xffffffff); colorint.and_reg(temp); //else if (r == 0x100) temp.set(colorint); temp.cmpeq_imm(0x100); - // result.rgb.r = 0xff; + // result.rgb.r = 0xff; colorint.or_reg(temp); return colorint.to_rgba(); } @@ -3842,15 +3842,15 @@ INLINE bool depthTest(UINT16 zaColorReg, stats_block *stats, INT32 destDepth, UI \ /* perform alpha blending */ \ APPLY_ALPHA_BLEND(FBZMODE, ALPHAMODE, XX, DITHER, r, g, b, a); \ - } else { \ + } else { \ /* perform fogging */ \ rgb_union preFog; \ preFog.u = color.u; \ applyFogging(VV, FOGMODE, FBZCOLORPATH, XX, DITHER4, fogdepth, color, ITERZ, ITERW, ITERAXXX); \ /* perform alpha blending */ \ alphaBlend(FBZMODE, ALPHAMODE, XX, DITHER, dest[XX], depth, preFog, color); \ - a = color.rgb.a; r = color.rgb.r; g = color.rgb.g; b = color.rgb.b; \ - } \ + a = color.rgb.a; r = color.rgb.r; g = color.rgb.g; b = color.rgb.b; \ + } \ /* modify the pixel for debugging purposes */ \ MODIFY_PIXEL(VV); \ \ @@ -4589,7 +4589,7 @@ static void raster_##name(void *destbase, INT32 y, const poly_extent *extent, co } \ \ /* colorpath pipeline selects source colors and does blending */ \ - iterargb.u = clampARGB(iterr, iterg, iterb, itera, FBZCOLORPATH); \ + iterargb.u = clampARGB(iterr, iterg, iterb, itera, FBZCOLORPATH); \ if (!combineColor(v, stats, FBZCOLORPATH, FBZMODE, ALPHAMODE, texel, iterz, iterw, iterargb, color)) \ goto skipdrawdepth; \ } \ |
