diff options
author | 2008-12-22 04:01:51 +0000 | |
---|---|---|
committer | 2008-12-22 04:01:51 +0000 | |
commit | c0ca96b075f9133268469bfc679197ee8ddd2481 (patch) | |
tree | c63ec58c12d821ca3539a2ba2d4e7fe8811867d7 /src/emu | |
parent | 54424acf766c9d58ecb36e30ae4f22bd1d86f81f (diff) |
Cleanups and version bump.
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/cpu/adsp2100/adsp2100.c | 12 | ||||
-rw-r--r-- | src/emu/cpu/adsp2100/adsp2100.h | 2 | ||||
-rw-r--r-- | src/emu/cpu/dsp56k/dsp56ops.c | 10 | ||||
-rw-r--r-- | src/emu/cpu/i8085/i8085.c | 66 | ||||
-rw-r--r-- | src/emu/cpu/i8085/i8085.h | 2 | ||||
-rw-r--r-- | src/emu/cpu/i86/i86.c | 16 | ||||
-rw-r--r-- | src/emu/cpu/i86/i86.h | 4 | ||||
-rw-r--r-- | src/emu/cpu/sm8500/sm8500.c | 2 | ||||
-rw-r--r-- | src/emu/cpu/sm8500/sm8500.h | 2 | ||||
-rw-r--r-- | src/emu/cpu/tms34010/tms34010.c | 8 | ||||
-rw-r--r-- | src/emu/cpu/tms34010/tms34010.h | 2 | ||||
-rw-r--r-- | src/emu/cpu/z180/z180.c | 18 | ||||
-rw-r--r-- | src/emu/cpu/z180/z180.h | 14 | ||||
-rw-r--r-- | src/emu/cpu/z80/z80.c | 8 | ||||
-rw-r--r-- | src/emu/cpu/z80/z80.h | 2 | ||||
-rw-r--r-- | src/emu/cpuexec.c | 102 | ||||
-rw-r--r-- | src/emu/debug/debugcpu.c | 2 | ||||
-rw-r--r-- | src/emu/debug/debugvw.c | 4 | ||||
-rw-r--r-- | src/emu/debugger.c | 10 | ||||
-rw-r--r-- | src/emu/devintrf.c | 24 | ||||
-rw-r--r-- | src/emu/machine/at28c16.c | 2 | ||||
-rw-r--r-- | src/emu/mconfig.c | 2 | ||||
-rw-r--r-- | src/emu/sndintrf.c | 3 |
23 files changed, 160 insertions, 157 deletions
diff --git a/src/emu/cpu/adsp2100/adsp2100.c b/src/emu/cpu/adsp2100/adsp2100.c index 91c0c2b8b89..d071dbb101c 100644 --- a/src/emu/cpu/adsp2100/adsp2100.c +++ b/src/emu/cpu/adsp2100/adsp2100.c @@ -301,7 +301,7 @@ static const cpu_state_entry state_array[] = ADSP21XX_STATE_ENTRY(PC, "%04X", pc, 0xffff, 0) ADSP21XX_STATE_ENTRY(GENPC, "%04X", pc, 0xffff, CPUSTATE_NOSHOW) ADSP21XX_STATE_ENTRY(GENPCBASE, "%04X", ppc, 0xffff, CPUSTATE_NOSHOW) - + ADSP21XX_STATE_ENTRY(AX0, "%04X", core.ax0.u, 0xffff, 0) ADSP21XX_STATE_ENTRY(AX1, "%04X", core.ax1.u, 0xffff, 0) ADSP21XX_STATE_ENTRY(AY0, "%04X", core.ay0.u, 0xffff, 0) @@ -688,7 +688,7 @@ static adsp2100_state *adsp21xx_init(const device_config *device, cpu_irq_callba adsp->program = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM); adsp->data = cpu_get_address_space(device, ADDRESS_SPACE_DATA); adsp->io = cpu_get_address_space(device, ADDRESS_SPACE_IO); - + /* copy function pointers from the config */ if (config != NULL) { @@ -1791,7 +1791,7 @@ static CPU_IMPORT_STATE( adsp21xx ) case ADSP2100_MSTAT: update_mstat(adsp); break; - + case ADSP2100_IMASK: case ADSP2100_ICNTL: case ADSP2100_IRQSTATE0: @@ -1800,7 +1800,7 @@ static CPU_IMPORT_STATE( adsp21xx ) case ADSP2100_IRQSTATE3: check_irqs(adsp); break; - + case ADSP2100_I0: case ADSP2100_I1: case ADSP2100_I2: @@ -1811,7 +1811,7 @@ static CPU_IMPORT_STATE( adsp21xx ) case ADSP2100_I7: update_i(adsp, entry->index - ADSP2100_I0); break; - + case ADSP2100_L0: case ADSP2100_L1: case ADSP2100_L2: @@ -1822,7 +1822,7 @@ static CPU_IMPORT_STATE( adsp21xx ) case ADSP2100_L7: update_l(adsp, entry->index - ADSP2100_L0); break; - + default: fatalerror("CPU_IMPORT_STATE(adsp21xx) called for unexpected value\n"); break; diff --git a/src/emu/cpu/adsp2100/adsp2100.h b/src/emu/cpu/adsp2100/adsp2100.h index 5eb13a96125..625057cbd2c 100644 --- a/src/emu/cpu/adsp2100/adsp2100.h +++ b/src/emu/cpu/adsp2100/adsp2100.h @@ -53,7 +53,7 @@ enum ADSP2100_AX0_SEC, ADSP2100_AX1_SEC, ADSP2100_AY0_SEC, ADSP2100_AY1_SEC, ADSP2100_AR_SEC, ADSP2100_AF_SEC, ADSP2100_MX0_SEC, ADSP2100_MX1_SEC, ADSP2100_MY0_SEC, ADSP2100_MY1_SEC, ADSP2100_MR0_SEC, ADSP2100_MR1_SEC, ADSP2100_MR2_SEC, ADSP2100_MF_SEC, ADSP2100_SI_SEC, ADSP2100_SE_SEC, ADSP2100_SB_SEC, ADSP2100_SR0_SEC, ADSP2100_SR1_SEC, - + ADSP2100_GENPC = REG_GENPC, ADSP2100_GENSP = REG_GENSP, ADSP2100_GENPCBASE = REG_GENPCBASE diff --git a/src/emu/cpu/dsp56k/dsp56ops.c b/src/emu/cpu/dsp56k/dsp56ops.c index da293b6d33a..167f8f287fe 100644 --- a/src/emu/cpu/dsp56k/dsp56ops.c +++ b/src/emu/cpu/dsp56k/dsp56ops.c @@ -17,11 +17,11 @@ /* TODO: - - 0x01ee: should this move sign extend? otherwise the test-against-minus means nothing. - - Restore only the proper bits upon loop termination! - - BFCLR has some errata in the docs that may need to be applied. - - *_bit_set(0) is difficult to read. maybe make it *_bit_chg(0). - - Potentially "better" reporting for unimplemented opcodes. + - 0x01ee: should this move sign extend? otherwise the test-against-minus means nothing. + - Restore only the proper bits upon loop termination! + - BFCLR has some errata in the docs that may need to be applied. + - *_bit_set(0) is difficult to read. maybe make it *_bit_chg(0). + - Potentially "better" reporting for unimplemented opcodes. */ /************************/ diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c index 8fb26b28bae..d65fad4b0c1 100644 --- a/src/emu/cpu/i8085/i8085.c +++ b/src/emu/cpu/i8085/i8085.c @@ -156,7 +156,7 @@ struct _i8085_state UINT8 trap_pending; /* TRAP interrupt latched? */ UINT8 trap_im_copy; /* copy of IM register when TRAP was taken */ UINT8 sod_state; /* state of the SOD line */ - + UINT8 ietemp; /* import/export temp space */ cpu_irq_callback irq_callback; @@ -180,11 +180,11 @@ static const cpu_state_entry state_array[] = { I8085_STATE_ENTRY(PC, "%04X", PC.w.l, 0xffff, 0) I8085_STATE_ENTRY(GENPC, "%04X", PC.w.l, 0xffff, CPUSTATE_NOSHOW) -// I8085_STATE_ENTRY(GENPCBASE, "%04X", prvpc.w.l, 0xffff, CPUSTATE_NOSHOW) - +// I8085_STATE_ENTRY(GENPCBASE, "%04X", prvpc.w.l, 0xffff, CPUSTATE_NOSHOW) + I8085_STATE_ENTRY(SP, "%04X", PC.w.l, 0xffff, 0) I8085_STATE_ENTRY(GENSP, "%04X", PC.w.l, 0xffff, CPUSTATE_NOSHOW) - + I8085_STATE_ENTRY(A, "%02X", AF.b.l, 0xff, CPUSTATE_NOSHOW) I8085_STATE_ENTRY(B, "%02X", BC.b.h, 0xff, CPUSTATE_NOSHOW) I8085_STATE_ENTRY(C, "%02X", BC.b.l, 0xff, CPUSTATE_NOSHOW) @@ -289,14 +289,14 @@ INLINE void set_status(i8085_state *cpustate, UINT8 status) INLINE UINT8 get_rim_value(i8085_state *cpustate) { UINT8 result = cpustate->IM; - + /* copy live RST5.5 and RST6.5 states */ result &= ~(IM_I65 | IM_I55); if (cpustate->irq_state[I8085_RST65_LINE] && !(cpustate->IM & IM_M65)) result |= IM_I65; if (cpustate->irq_state[I8085_RST55_LINE] && !(cpustate->IM & IM_M55)) result |= IM_I55; - + /* fetch the SID bit if we have a callback */ if (cpustate->config.sid != NULL) result = (result & 0x7f) | ((*cpustate->config.sid)(cpustate->device) ? 0x80 : 0); @@ -314,7 +314,7 @@ INLINE void break_halt_for_interrupt(i8085_state *cpustate) set_status(cpustate, 0x26); /* int ack while halt */ } else - set_status(cpustate, 0x23); /* int ack */ + set_status(cpustate, 0x23); /* int ack */ } @@ -358,9 +358,9 @@ static void check_for_interrupts(i8085_state *cpustate) if (cpustate->trap_pending) { /* the first RIM after a TRAP reflects the original IE state; remember it here, - setting the high bit to indicate it is valid */ + setting the high bit to indicate it is valid */ cpustate->trap_im_copy = cpustate->IM | 0x80; - + /* reset the pending state */ cpustate->trap_pending = FALSE; @@ -375,7 +375,7 @@ static void check_for_interrupts(i8085_state *cpustate) cpustate->PC.w.l = ADDR_TRAP; cpustate->icount -= 11; } - + /* followed by RST7.5 */ else if ((cpustate->IM & IM_I75) && !(cpustate->IM & IM_M75) && (cpustate->IM & IM_IE)) { @@ -387,13 +387,13 @@ static void check_for_interrupts(i8085_state *cpustate) if (cpustate->irq_callback != NULL) (*cpustate->irq_callback)(cpustate->device, I8085_RST75_LINE); - /* push the PC and jump to $003C */ + /* push the PC and jump to $003C */ M_PUSH(PC); cpustate->IM &= ~IM_IE; cpustate->PC.w.l = ADDR_RST75; cpustate->icount -= 11; } - + /* followed by RST6.5 */ else if (cpustate->irq_state[I8085_RST65_LINE] && !(cpustate->IM & IM_M65) && (cpustate->IM & IM_IE)) { @@ -402,13 +402,13 @@ static void check_for_interrupts(i8085_state *cpustate) if (cpustate->irq_callback != NULL) (*cpustate->irq_callback)(cpustate->device, I8085_RST65_LINE); - /* push the PC and jump to $0034 */ + /* push the PC and jump to $0034 */ M_PUSH(PC); cpustate->IM &= ~IM_IE; cpustate->PC.w.l = ADDR_RST65; cpustate->icount -= 11; } - + /* followed by RST5.5 */ else if (cpustate->irq_state[I8085_RST55_LINE] && !(cpustate->IM & IM_M55) && (cpustate->IM & IM_IE)) { @@ -417,7 +417,7 @@ static void check_for_interrupts(i8085_state *cpustate) if (cpustate->irq_callback != NULL) (*cpustate->irq_callback)(cpustate->device, I8085_RST55_LINE); - /* push the PC and jump to $002C */ + /* push the PC and jump to $002C */ M_PUSH(PC); cpustate->IM &= ~IM_IE; cpustate->PC.w.l = ADDR_RST55; @@ -428,7 +428,7 @@ static void check_for_interrupts(i8085_state *cpustate) else if (cpustate->irq_state[I8085_INTR_LINE] && (cpustate->IM & IM_IE)) { UINT32 vector = 0; - + /* break out of HALT state and call the IRQ ack callback */ break_halt_for_interrupt(cpustate); if (cpustate->irq_callback != NULL) @@ -599,7 +599,7 @@ static void execute_one(i8085_state *cpustate, int opcode) if (IS_8085(cpustate)) { cpustate->icount -= 7; /* RIM */ cpustate->AF.b.h = get_rim_value(cpustate); - + /* if we have remembered state from taking a TRAP, fix up the IE flag here */ if (cpustate->trap_im_copy & 0x80) cpustate->AF.b.h = (cpustate->AF.b.h & ~IM_IE) | (cpustate->trap_im_copy & IM_IE); @@ -695,24 +695,24 @@ static void execute_one(i8085_state *cpustate, int opcode) if (IS_8085(cpustate)) { cpustate->icount -= 7; /* SIM */ - + /* if bit 3 is set, bits 0-2 become the new masks */ if (cpustate->AF.b.h & 0x08) { cpustate->IM &= ~(IM_M55 | IM_M65 | IM_M75 | IM_I55 | IM_I65); cpustate->IM |= cpustate->AF.b.h & (IM_M55 | IM_M65 | IM_M75); - + /* update live state based on the new masks */ if ((cpustate->IM & IM_M55) == 0 && cpustate->irq_state[I8085_RST55_LINE]) cpustate->IM |= IM_I55; if ((cpustate->IM & IM_M65) == 0 && cpustate->irq_state[I8085_RST65_LINE]) cpustate->IM |= IM_I65; } - + /* bit if 4 is set, the 7.5 flip-flop is cleared */ if (cpustate->AF.b.h & 0x10) cpustate->IM &= ~IM_I75; - + /* if bit 6 is set, then bit 7 is the new SOD state */ if (cpustate->AF.b.h & 0x40) set_sod(cpustate, cpustate->AF.b.h >> 7); @@ -1460,7 +1460,7 @@ static void execute_one(i8085_state *cpustate, int opcode) static CPU_EXECUTE( i808x ) { i8085_state *cpustate = device->token; - + cpustate->icount = cycles; /* check for TRAPs before diving in (can't do others because of after_ei) */ @@ -1472,7 +1472,7 @@ static CPU_EXECUTE( i808x ) debugger_instruction_hook(device, cpustate->PC.d); /* the instruction after an EI does not take an interrupt, so - we cannot check immediately; handle post-EI behavior here */ + we cannot check immediately; handle post-EI behavior here */ if (cpustate->after_ei != 0 && --cpustate->after_ei == 0) check_for_interrupts(cpustate); @@ -1533,7 +1533,7 @@ static void init_808x_common(const device_config *device, cpu_irq_callback irqca cpustate->program = memory_find_address_space(device, ADDRESS_SPACE_PROGRAM); cpustate->io = memory_find_address_space(device, ADDRESS_SPACE_IO); - + state_save_register_device_item(device, 0, cpustate->PC.w.l); state_save_register_device_item(device, 0, cpustate->SP.w.l); state_save_register_device_item(device, 0, cpustate->AF.w.l); @@ -1570,7 +1570,7 @@ static CPU_INIT( i8085 ) static CPU_RESET( i808x ) { i8085_state *cpustate = device->token; - + cpustate->PC.d = 0; cpustate->HALT = 0; cpustate->IM &= ~IM_I75; @@ -1600,14 +1600,14 @@ static CPU_IMPORT_STATE( i808x ) else cpustate->IM &= ~IM_SID; break; - + case I8085_INTE: if (cpustate->ietemp) cpustate->IM |= IM_IE; else cpustate->IM &= ~IM_IE; break; - + default: fatalerror("CPU_IMPORT_STATE(i808x) called for unexpected value\n"); break; @@ -1626,11 +1626,11 @@ static CPU_EXPORT_STATE( i808x ) if (cpustate->config.sid != NULL) cpustate->ietemp = ((*cpustate->config.sid)(cpustate->device) != 0); break; - + case I8085_INTE: cpustate->ietemp = ((cpustate->IM & IM_IE) != 0); break; - + default: fatalerror("CPU_EXPORT_STATE(i808x) called for unexpected value\n"); break; @@ -1646,7 +1646,7 @@ static CPU_EXPORT_STATE( i808x ) static void i808x_set_irq_line(i8085_state *cpustate, int irqline, int state) { int newstate = (state != CLEAR_LINE); - + /* NMI is edge-triggered */ if (irqline == INPUT_LINE_NMI) { @@ -1662,7 +1662,7 @@ static void i808x_set_irq_line(i8085_state *cpustate, int irqline, int state) cpustate->IM |= IM_I75; cpustate->irq_state[I8085_RST75_LINE] = newstate; } - + /* remaining sources are level triggered */ else if (irqline < ARRAY_LENGTH(cpustate->irq_state)) cpustate->irq_state[irqline] = state; @@ -1680,7 +1680,7 @@ static CPU_SET_INFO( i808x ) case CPUINFO_INT_INPUT_STATE + I8085_RST65_LINE: case CPUINFO_INT_INPUT_STATE + I8085_RST75_LINE: case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: - i808x_set_irq_line(cpustate, state - CPUINFO_INT_INPUT_STATE, info->i); + i808x_set_irq_line(cpustate, state - CPUINFO_INT_INPUT_STATE, info->i); break; } } @@ -1721,7 +1721,7 @@ CPU_GET_INFO( i8085 ) case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(i808x); break; case CPUINFO_FCT_EXECUTE: info->execute = CPU_EXECUTE_NAME(i808x); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i8085); break; - case CPUINFO_FCT_IMPORT_STATE: info->import_state = CPU_IMPORT_STATE_NAME(i808x); break; + case CPUINFO_FCT_IMPORT_STATE: info->import_state = CPU_IMPORT_STATE_NAME(i808x); break; case CPUINFO_FCT_EXPORT_STATE: info->export_state = CPU_EXPORT_STATE_NAME(i808x); break; /* --- the following bits of info are returned as pointers --- */ diff --git a/src/emu/cpu/i8085/i8085.h b/src/emu/cpu/i8085/i8085.h index e93e6c10b2f..6db8ecfa82f 100644 --- a/src/emu/cpu/i8085/i8085.h +++ b/src/emu/cpu/i8085/i8085.h @@ -14,7 +14,7 @@ enum I8085_A, I8085_B, I8085_C, I8085_D, I8085_E, I8085_H, I8085_L, I8085_STATUS, I8085_SOD, I8085_SID, I8085_INTE, I8085_HALT, I8085_IM, - + I8085_GENPC = REG_GENPC, I8085_GENSP = REG_GENSP, I8085_GENPCBASE = REG_GENPCBASE diff --git a/src/emu/cpu/i86/i86.c b/src/emu/cpu/i86/i86.c index 11c84f7c911..785df17e764 100644 --- a/src/emu/cpu/i86/i86.c +++ b/src/emu/cpu/i86/i86.c @@ -50,7 +50,7 @@ struct _i8086_state INT8 irq_state; INT8 test_state; /* PJB 03/05 */ INT32 extra_cycles; /* extra cycles for interrupts */ - + UINT16 ip; UINT32 sp; @@ -81,7 +81,7 @@ static const cpu_state_entry state_array[] = I86_STATE_ENTRY(GENPC, "%9s", pc, 0xfffff, CPUSTATE_IMPORT) I86_STATE_ENTRY(GENPCBASE, "%08X", pc, 0xfffff, CPUSTATE_NOSHOW) /* not implemented */ I86_STATE_ENTRY(IP, "%04X", ip, 0xffff, CPUSTATE_IMPORT | CPUSTATE_EXPORT) - + I86_STATE_ENTRY(FLAGS, "%04X", flags, 0xffff, CPUSTATE_NOSHOW | CPUSTATE_IMPORT | CPUSTATE_EXPORT) I86_STATE_ENTRY(AX, "%04X", regs.w[AX], 0xffff, 0) @@ -408,7 +408,7 @@ static CPU_IMPORT_STATE( i8086 ) case I8086_FLAGS: ExpandFlags(cpustate->flags); break; - + case I8086_ES: cpustate->base[ES] = SegBase(ES); break; @@ -424,7 +424,7 @@ static CPU_IMPORT_STATE( i8086 ) case I8086_DS: cpustate->base[DS] = SegBase(DS); break; - + default: fatalerror("CPU_IMPORT_STATE(i8086) called for unexpected value\n"); break; @@ -449,7 +449,7 @@ static CPU_EXPORT_STATE( i8086 ) case I8086_GENSP: cpustate->sp = cpustate->base[SS] + cpustate->regs.w[SP]; break; - + default: fatalerror("CPU_EXPORT_STATE(i8086) called for unexpected value\n"); break; @@ -466,11 +466,11 @@ static CPU_EXPORT_STRING( i8086 ) case I8086_GENPC: sprintf(string, "%04X:%04X", cpustate->sregs[CS] & 0xffff, (cpustate->pc - cpustate->base[CS]) & 0xffff); break; - + case I8086_GENSP: sprintf(string, "%04X:%04X", cpustate->sregs[SS] & 0xffff, cpustate->regs.w[SP] & 0xffff); break; - + default: fatalerror("CPU_EXPORT_STRING(i8086) called for unexpected value\n"); break; @@ -546,7 +546,7 @@ CPU_GET_INFO( i8086 ) case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i8086); break; case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; case CPUINFO_PTR_STATE_TABLE: info->state_table = &cpustate->state; break; - case CPUINFO_FCT_IMPORT_STATE: info->import_state = CPU_IMPORT_STATE_NAME(i8086); break; + case CPUINFO_FCT_IMPORT_STATE: info->import_state = CPU_IMPORT_STATE_NAME(i8086); break; case CPUINFO_FCT_EXPORT_STATE: info->export_state = CPU_EXPORT_STATE_NAME(i8086); break; case CPUINFO_FCT_EXPORT_STRING: info->export_string = CPU_EXPORT_STRING_NAME(i8086);break; diff --git a/src/emu/cpu/i86/i86.h b/src/emu/cpu/i86/i86.h index be66b5da320..893df00ad73 100644 --- a/src/emu/cpu/i86/i86.h +++ b/src/emu/cpu/i86/i86.h @@ -33,10 +33,10 @@ enum I8086_SS,
I8086_DS,
I8086_VECTOR,
-
+
I8086_GENPC = REG_GENPC,
I8086_GENSP = REG_GENSP,
- I8086_GENPCBASE = REG_GENPCBASE
+ I8086_GENPCBASE = REG_GENPCBASE
};
/* Public functions */
diff --git a/src/emu/cpu/sm8500/sm8500.c b/src/emu/cpu/sm8500/sm8500.c index c2ace20a592..9e010859eed 100644 --- a/src/emu/cpu/sm8500/sm8500.c +++ b/src/emu/cpu/sm8500/sm8500.c @@ -84,7 +84,7 @@ INLINE void sm85cpu_mem_writeword( sm8500_state *cpustate, UINT32 address, UINT1 sm85cpu_mem_writebyte( cpustate, ( address + 1 ) & 0xffff, value & 0xff ); } -static CPU_INIT( sm8500 ) +static CPU_INIT( sm8500 ) { sm8500_state *cpustate = device->token; diff --git a/src/emu/cpu/sm8500/sm8500.h b/src/emu/cpu/sm8500/sm8500.h index cf2d975127c..444addbe408 100644 --- a/src/emu/cpu/sm8500/sm8500.h +++ b/src/emu/cpu/sm8500/sm8500.h @@ -27,7 +27,7 @@ enum { CPUINFO_PTR_SM8500_INTERNAL_RAM = CPUINFO_PTR_CPU_SPECIFIC }; - + enum { diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c index a039fcd3371..42ca8e2517b 100644 --- a/src/emu/cpu/tms34010/tms34010.c +++ b/src/emu/cpu/tms34010/tms34010.c @@ -78,7 +78,7 @@ struct _tms34010_state } regs[31]; UINT16 IOregs[64]; - + cpu_state_table state; }; @@ -203,12 +203,12 @@ static const cpu_state_entry state_array[] = TMS340X0_STATE_ENTRY(PC, "%08X", pc, 0xffffffff, 0) TMS340X0_STATE_ENTRY(GENPC, "%08X", pc, 0xffffffff, CPUSTATE_NOSHOW) TMS340X0_STATE_ENTRY(GENPCBASE, "%08X", ppc, 0xffffffff, CPUSTATE_NOSHOW) - + TMS340X0_STATE_ENTRY(SP, "%08X", regs[15].reg, 0xffffffff, 0) TMS340X0_STATE_ENTRY(GENSP, "%08X", regs[15].reg, 0xffffffff, CPUSTATE_NOSHOW) - + TMS340X0_STATE_ENTRY(ST, "%08X", st, 0xffffffff, 0) - + TMS340X0_STATE_ENTRY(A0, "%08X", regs[0].reg, 0xffffffff, 0) TMS340X0_STATE_ENTRY(A1, "%08X", regs[1].reg, 0xffffffff, 0) TMS340X0_STATE_ENTRY(A2, "%08X", regs[2].reg, 0xffffffff, 0) diff --git a/src/emu/cpu/tms34010/tms34010.h b/src/emu/cpu/tms34010/tms34010.h index 7a3499aed90..3aaf6f00b00 100644 --- a/src/emu/cpu/tms34010/tms34010.h +++ b/src/emu/cpu/tms34010/tms34010.h @@ -52,7 +52,7 @@ enum TMS34010_B12, TMS34010_B13, TMS34010_B14, - + TMS34010_GENPC = REG_GENPC, TMS34010_GENSP = REG_GENSP, TMS34010_GENPCBASE = REG_GENPCBASE diff --git a/src/emu/cpu/z180/z180.c b/src/emu/cpu/z180/z180.c index 225e836c698..0dac61cdad1 100644 --- a/src/emu/cpu/z180/z180.c +++ b/src/emu/cpu/z180/z180.c @@ -778,10 +778,10 @@ static const cpu_state_entry state_array[] = Z180_STATE_ENTRY(PC, "%04X", PC.w.l, 0xffff, 0) Z180_STATE_ENTRY(GENPC, "%04X", _PCD, 0xffff, CPUSTATE_NOSHOW) Z180_STATE_ENTRY(GENPCBASE, "%04X", PREPC.w.l, 0xffff, CPUSTATE_NOSHOW) - + Z180_STATE_ENTRY(SP, "%04X", _SPD, 0xffff, 0) Z180_STATE_ENTRY(GENSP, "%04X", SP.w.l, 0xffff, CPUSTATE_NOSHOW) - + Z180_STATE_ENTRY(A, "%02X", _A, 0xff, CPUSTATE_NOSHOW) Z180_STATE_ENTRY(B, "%02X", _B, 0xff, CPUSTATE_NOSHOW) Z180_STATE_ENTRY(C, "%02X", _C, 0xff, CPUSTATE_NOSHOW) @@ -2053,7 +2053,7 @@ static CPU_RESET( z180 ) z180_state *cpustate = device->token; z80_daisy_state *save_daisy; cpu_irq_callback save_irqcallback; - cpu_state_table save_table; + cpu_state_table save_table; int i, p; int oldval, newval, val; UINT8 *padd, *padc, *psub, *psbc; @@ -2455,17 +2455,17 @@ static CPU_IMPORT_STATE( z180 ) cpustate->R = cpustate->rtemp & 0x7f; cpustate->R2 = cpustate->rtemp & 0x80; break; - + case Z180_CBR: case Z180_BBR: case Z180_CBAR: z180_mmu(cpustate); break; - + case Z180_IOLINES: z180_write_iolines(cpustate, cpustate->ioltemp); break; - + default: fatalerror("CPU_IMPORT_STATE(z80) called for unexpected value\n"); break; @@ -2482,7 +2482,7 @@ static CPU_EXPORT_STATE( z180 ) case Z180_R: cpustate->rtemp = (cpustate->R & 0x7f) | (cpustate->R2 & 0x80); break; - + case Z180_IOLINES: cpustate->ioltemp = cpustate->iol; break; @@ -2559,13 +2559,13 @@ CPU_GET_INFO( z180 ) case CPUINFO_FCT_BURN: info->burn = CPU_BURN_NAME(z180); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(z180); break; case CPUINFO_FCT_TRANSLATE: info->translate = CPU_TRANSLATE_NAME(z180); break; - case CPUINFO_FCT_IMPORT_STATE: info->import_state = CPU_IMPORT_STATE_NAME(z180); break; + case CPUINFO_FCT_IMPORT_STATE: info->import_state = CPU_IMPORT_STATE_NAME(z180); break; case CPUINFO_FCT_EXPORT_STATE: info->export_state = CPU_EXPORT_STATE_NAME(z180); break; /* --- the following bits of info are returned as pointers to functions --- */ case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; case CPUINFO_PTR_STATE_TABLE: info->state_table = &cpustate->state; break; - + case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_op: info->p = (void *)cc[Z180_TABLE_op]; break; case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_cb: info->p = (void *)cc[Z180_TABLE_cb]; break; case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_ed: info->p = (void *)cc[Z180_TABLE_ed]; break; diff --git a/src/emu/cpu/z180/z180.h b/src/emu/cpu/z180/z180.h index fcd98591007..0d154f5c0c4 100644 --- a/src/emu/cpu/z180/z180.h +++ b/src/emu/cpu/z180/z180.h @@ -15,12 +15,12 @@ enum Z180_HL, Z180_IX, Z180_IY, - Z180_A, - Z180_B, - Z180_C, - Z180_D, - Z180_E, - Z180_H, + Z180_A, + Z180_B, + Z180_C, + Z180_D, + Z180_E, + Z180_H, Z180_L, Z180_AF2, Z180_BC2, @@ -101,7 +101,7 @@ enum Z180_OMCR, /* 3e operation mode control register */ Z180_IOCR, /* 3f I/O control register */ Z180_IOLINES, /* read/write I/O lines */ - + Z180_GENPC = REG_GENPC, Z180_GENSP = REG_GENSP, Z180_GENPCBASE = REG_GENPCBASE diff --git a/src/emu/cpu/z80/z80.c b/src/emu/cpu/z80/z80.c index 7c18dd57790..dbac35387e9 100644 --- a/src/emu/cpu/z80/z80.c +++ b/src/emu/cpu/z80/z80.c @@ -206,10 +206,10 @@ static const cpu_state_entry state_array[] = Z80_STATE_ENTRY(PC, "%04X", PCD, 0xffff, 0) Z80_STATE_ENTRY(GENPC, "%04X", PCD, 0xffff, CPUSTATE_NOSHOW) Z80_STATE_ENTRY(GENPCBASE, "%04X", prvpc.w.l, 0xffff, CPUSTATE_NOSHOW) - + Z80_STATE_ENTRY(SP, "%04X", SP, 0xffff, 0) Z80_STATE_ENTRY(GENSP, "%04X", SPD, 0xffff, CPUSTATE_NOSHOW) - + Z80_STATE_ENTRY(A, "%02X", A, 0xff, CPUSTATE_NOSHOW) Z80_STATE_ENTRY(B, "%02X", B, 0xff, CPUSTATE_NOSHOW) Z80_STATE_ENTRY(C, "%02X", C, 0xff, CPUSTATE_NOSHOW) @@ -3585,7 +3585,7 @@ static CPU_IMPORT_STATE( z80 ) cpustate->r = cpustate->rtemp & 0x7f; cpustate->r2 = cpustate->rtemp & 0x80; break; - + default: fatalerror("CPU_IMPORT_STATE(z80) called for unexpected value\n"); break; @@ -3673,7 +3673,7 @@ CPU_GET_INFO( z80 ) case CPUINFO_FCT_EXIT: info->exit = CPU_EXIT_NAME(z80); break; case CPUINFO_FCT_EXECUTE: info->execute = CPU_EXECUTE_NAME(z80); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(z80); break; - case CPUINFO_FCT_IMPORT_STATE: info->import_state = CPU_IMPORT_STATE_NAME(z80); break; + case CPUINFO_FCT_IMPORT_STATE: info->import_state = CPU_IMPORT_STATE_NAME(z80); break; case CPUINFO_FCT_EXPORT_STATE: info->export_state = CPU_EXPORT_STATE_NAME(z80); break; /* --- the following bits of info are returned as pointers --- */ diff --git a/src/emu/cpu/z80/z80.h b/src/emu/cpu/z80/z80.h index 1e717abbb37..109fcc9e65b 100644 --- a/src/emu/cpu/z80/z80.h +++ b/src/emu/cpu/z80/z80.h @@ -13,7 +13,7 @@ enum Z80_IX, Z80_IY, Z80_AF2, Z80_BC2, Z80_DE2, Z80_HL2, Z80_R, Z80_I, Z80_IM, Z80_IFF1, Z80_IFF2, Z80_HALT, Z80_DC0, Z80_DC1, Z80_DC2, Z80_DC3, Z80_MEMPTR, - + Z80_GENPC = REG_GENPC, Z80_GENSP = REG_GENSP, Z80_GENPCBASE = REG_GENPCBASE diff --git a/src/emu/cpuexec.c b/src/emu/cpuexec.c index 1c4386c6a69..bc1ce05d5d1 100644 --- a/src/emu/cpuexec.c +++ b/src/emu/cpuexec.c @@ -60,7 +60,7 @@ typedef struct _cpu_class_data cpu_class_data; struct _cpu_class_data { /* cycle counting and executing */ - int profiler; /* profiler tag */ + int profiler; /* profiler tag */ int * icount; /* pointer to the icount */ int cycles_running; /* number of cycles we are executing */ int cycles_stolen; /* number of cycles we artificially stole */ @@ -156,7 +156,7 @@ INLINE cpu_class_data *get_class_data(const device_config *device) INLINE attoseconds_t get_minimum_quantum(const device_config *device) { attoseconds_t basetick = 0; - + /* fetch the base clock from the classdata if present */ if (device->token != NULL) basetick = get_class_data(device)->attoseconds_per_cycle; @@ -220,7 +220,7 @@ void cpuexec_init(running_machine *machine) if (cpu == NULL) fatalerror("CPU '%s' specified for perfect interleave is not present!", machine->config->perfect_cpu_quantum); cpu_quantum = attotime_make(0, get_minimum_quantum(cpu)); - min_quantum = attotime_min(cpu_quantum, min_quantum); + min_quantum = attotime_min(cpu_quantum, min_quantum); } assert(min_quantum.seconds == 0); timer_add_scheduling_quantum(machine, min_quantum.attoseconds, attotime_never); @@ -416,7 +416,7 @@ static DEVICE_START( cpu ) config = device->inline_config; header = cpu_get_class_header(device); classdata = get_class_data(device); - + /* add ourself to the global array */ if (index < ARRAY_LENGTH(device->machine->cpu)) device->machine->cpu[index] = device; @@ -425,7 +425,7 @@ static DEVICE_START( cpu ) header->debug = NULL; for (spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++) header->space[spacenum] = memory_find_address_space(device, spacenum); - + header->set_info = (cpu_set_info_func)device_get_info_fct(device, CPUINFO_FCT_SET_INFO); header->execute = (cpu_execute_func)device_get_info_fct(device, CPUINFO_FCT_EXECUTE); header->burn = (cpu_burn_func)device_get_info_fct(device, CPUINFO_FCT_BURN); @@ -462,7 +462,7 @@ static DEVICE_START( cpu ) init = (cpu_init_func)device_get_info_fct(device, CPUINFO_FCT_INIT); (*init)(device, standard_irq_callback); num_regs = state_save_get_reg_count(device->machine) - num_regs; - + /* fetch post-initialization data */ classdata->icount = cpu_get_icount_ptr(device); for (line = 0; line < ARRAY_LENGTH(classdata->input); line++) @@ -472,13 +472,13 @@ static DEVICE_START( cpu ) inputline->curvector = inputline->vector; } update_clock_information(device); - + /* fetch information about the CPU states */ classdata->state = cpu_get_state_table(device); if (classdata->state != NULL) { int stateindex; - + /* loop over all states specified, and work with any that apply */ for (stateindex = 0; stateindex < classdata->state->entrycount; stateindex++) { @@ -576,7 +576,7 @@ static DEVICE_RESET( cpu ) static DEVICE_STOP( cpu ) { cpu_exit_func exit; - + /* call the CPU's exit function if present */ exit = (cpu_exit_func)device_get_info_fct(device, CPUINFO_FCT_EXIT); if (exit != NULL) @@ -599,7 +599,7 @@ static DEVICE_SET_INFO( cpu ) set_info = header->set_info; else set_info = (cpu_set_info_func)device_get_info_fct(device, CPUINFO_FCT_SET_INFO); - + switch (state) { /* no parameters to set */ @@ -618,7 +618,7 @@ static DEVICE_SET_INFO( cpu ) } } } - + /* integer data */ if (state >= DEVINFO_INT_FIRST && state <= DEVINFO_INT_LAST) { @@ -648,14 +648,14 @@ DEVICE_GET_INFO( cpu ) { const cpu_config *config = (device != NULL) ? device->inline_config : NULL; cpuinfo cinfo = { 0 }; - + switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ case DEVINFO_INT_TOKEN_BYTES: cinfo.i = 0; (*config->type)(device, CPUINFO_INT_CONTEXT_SIZE, &cinfo); - info->i = cinfo.i + sizeof(cpu_class_data) + sizeof(cpu_class_header); + info->i = cinfo.i + sizeof(cpu_class_data) + sizeof(cpu_class_header); break; case DEVINFO_INT_INLINE_CONFIG_BYTES: info->i = sizeof(cpu_config); break; @@ -688,7 +688,7 @@ DEVICE_GET_INFO( cpu ) } } } - + /* integer data */ if (state >= DEVINFO_INT_FIRST && state <= DEVINFO_INT_LAST) { @@ -794,7 +794,7 @@ int cpu_get_clock(const device_config *device) /* if we haven't been started yet, compute it manually */ if (device->token == NULL) return (UINT64)device->clock * cpu_get_clock_multiplier(device) / cpu_get_clock_divider(device); - + /* return the current clock value */ classdata = get_class_data(device); return classdata->clock; @@ -1081,7 +1081,7 @@ void cpu_spinuntil_time(const device_config *device, attotime duration) void cpuexec_trigger(running_machine *machine, int trigger) { const device_config *cpu; - + /* look for suspended CPUs waiting for this trigger and unsuspend them */ for (cpu = machine->cpu[0]; cpu != NULL; cpu = cpu->typenext) { @@ -1316,7 +1316,7 @@ static void on_vblank(const device_config *device, void *param, int vblank_state if (vblank_state) { const device_config *cpu; - + /* find any CPUs that have this screen as their VBLANK interrupt source */ for (cpu = device->machine->cpu[0]; cpu != NULL; cpu = cpu->typenext) { @@ -1579,11 +1579,11 @@ static UINT64 get_register_value(const device_config *device, void *baseptr, con { void *dataptr; UINT64 result; - + /* NULL entry returns 0 */ if (entry == NULL || baseptr == NULL) return 0; - + /* if we have an exporter, call it now */ if ((entry->flags & CPUSTATE_EXPORT) != 0) { @@ -1591,7 +1591,7 @@ static UINT64 get_register_value(const device_config *device, void *baseptr, con assert(exportcb != NULL); (*exportcb)(device, baseptr, entry); } - + /* pick up the value */ dataptr = (UINT8 *)baseptr + entry->dataoffs; switch (entry->datasize) @@ -1607,21 +1607,21 @@ static UINT64 get_register_value(const device_config *device, void *baseptr, con /*------------------------------------------------- - set_register_value - set the value of a + set_register_value - set the value of a CPU register using the state table -------------------------------------------------*/ static void set_register_value(const device_config *device, void *baseptr, const cpu_state_entry *entry, UINT64 value) { void *dataptr; - + /* NULL entry is a no-op */ if (entry == NULL || baseptr == NULL) return; - + /* apply the mask */ value &= entry->mask; - + /* sign-extend if necessary */ if ((entry->flags & CPUSTATE_IMPORT_SEXT) != 0 && value > (entry->mask >> 1)) value |= ~entry->mask; @@ -1636,7 +1636,7 @@ static void set_register_value(const device_config *device, void *baseptr, const case 4: *(UINT32 *)dataptr = value; break; case 8: *(UINT64 *)dataptr = value; break; } - + /* if we have an importer, call it now */ if ((entry->flags & CPUSTATE_IMPORT) != 0) { @@ -1655,38 +1655,38 @@ static void set_register_value(const device_config *device, void *baseptr, const static void get_register_string_value(const device_config *device, void *baseptr, const cpu_state_entry *entry, char *dest) { - static const UINT64 decdivisor[] = { - 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000, - U64(10000000000), U64(100000000000), U64(1000000000000), - U64(10000000000000), U64(100000000000000), U64(1000000000000000), - U64(10000000000000000), U64(100000000000000000), U64(1000000000000000000), + static const UINT64 decdivisor[] = { + 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000, + U64(10000000000), U64(100000000000), U64(1000000000000), + U64(10000000000000), U64(100000000000000), U64(1000000000000000), + U64(10000000000000000), U64(100000000000000000), U64(1000000000000000000), U64(10000000000000000000) }; static const char hexchars[] = "0123456789ABCDEF"; int leadzero = 0, width = 0, percent = 0, explicitsign = 0, hitnonzero = 0, reset; const char *fptr; UINT64 result; - + /* NULL entry does nothing */ if (entry == NULL || entry->symbol == NULL || entry->format == NULL) return; /* fetch the data */ result = get_register_value(device, baseptr, entry); - + /* start with the basics */ dest += sprintf(dest, "%s%s:", (entry->flags & CPUSTATE_NOSHOW) ? "~" : "", entry->symbol); - + /* parse the format */ reset = TRUE; for (fptr = entry->format; *fptr != 0; fptr++) { int digitnum; - + /* reset any accumulated state */ if (reset) leadzero = width = percent = explicitsign = reset = 0; - + /* if we're not within a format, then anything other than a % outputs directly */ if (!percent && *fptr != '%') { @@ -1707,7 +1707,7 @@ static void get_register_string_value(const device_config *device, void *baseptr percent = FALSE; } break; - + /* 0 means insert leading 0s, unless it follows another width digit */ case '0': if (width == 0) @@ -1715,18 +1715,18 @@ static void get_register_string_value(const device_config *device, void *baseptr else width *= 10; break; - + /* 1-9 accumulate into the width */ case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': width = width * 10 + (*fptr - '0'); break; - + /* + means explicit sign */ case '+': explicitsign = TRUE; break; - + /* X outputs as hexadecimal */ case 'X': if (width == 0) @@ -1748,7 +1748,7 @@ static void get_register_string_value(const device_config *device, void *baseptr } reset = TRUE; break; - + /* d outputs as signed decimal */ case 'd': if (width == 0) @@ -1765,7 +1765,7 @@ static void get_register_string_value(const device_config *device, void *baseptr width--; } /* fall through to unsigned case */ - + /* u outputs as unsigned decimal */ case 'u': if (width == 0) @@ -1787,7 +1787,7 @@ static void get_register_string_value(const device_config *device, void *baseptr } reset = TRUE; break; - + /* s is a custom format */ case 's': { @@ -1797,7 +1797,7 @@ static void get_register_string_value(const device_config *device, void *baseptr dest += strlen(dest); break; } - + /* other formats unknown */ default: fatalerror("Unknown format character '%c'\n", *fptr); @@ -1820,7 +1820,7 @@ static int get_register_string_max_width(const device_config *device, void *base int leadzero = 0, width = 0, percent = 0, explicitsign = 0, reset; int totalwidth = 0; const char *fptr; - + /* NULL entry does nothing */ if (entry == NULL || entry->symbol == NULL || entry->format == NULL) return 0; @@ -1832,7 +1832,7 @@ static int get_register_string_max_width(const device_config *device, void *base /* reset any accumulated state */ if (reset) leadzero = width = percent = explicitsign = reset = 0; - + /* if we're not within a format, then anything other than a % outputs directly */ if (!percent && *fptr != '%') { @@ -1853,7 +1853,7 @@ static int get_register_string_max_width(const device_config *device, void *base percent = FALSE; } break; - + /* 0 means insert leading 0s, unless it follows another width digit */ case '0': if (width == 0) @@ -1861,18 +1861,18 @@ static int get_register_string_max_width(const device_config *device, void *base else width *= 10; break; - + /* 1-9 accumulate into the width */ case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': width = width * 10 + (*fptr - '0'); break; - + /* + means explicit sign */ case '+': explicitsign = TRUE; break; - + /* X outputs as hexadecimal */ /* d outputs as signed decimal */ /* u outputs as unsigned decimal */ @@ -1884,12 +1884,12 @@ static int get_register_string_max_width(const device_config *device, void *base totalwidth += width; reset = TRUE; break; - + if (width == 0) fatalerror("Width required for %%d formats\n"); totalwidth += width; break; - + /* other formats unknown */ default: fatalerror("Unknown format character '%c'\n", *fptr); diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c index d90e3723c4d..88154cbc2d8 100644 --- a/src/emu/debug/debugcpu.c +++ b/src/emu/debug/debugcpu.c @@ -242,7 +242,7 @@ void debug_cpu_init(running_machine *machine) /* add the symbol to the table */ symtable_add_register(info->symtable, symname, (void *)(FPTR)regnum, get_cpu_reg, set_cpu_reg); } - + /* if no curpc, add one */ if (symtable_find(info->symtable, "curpc") == NULL) symtable_add_register(info->symtable, "curpc", NULL, get_current_pc, 0); diff --git a/src/emu/debug/debugvw.c b/src/emu/debug/debugvw.c index 171c03f8580..4c173e4de89 100644 --- a/src/emu/debug/debugvw.c +++ b/src/emu/debug/debugvw.c @@ -2691,7 +2691,7 @@ static void memory_view_update(debug_view *view) { int ismapped; UINT64 chval; - + ismapped = memory_view_read(memdata, 1, addrbyte + ch, &chval); dest->byte = (ismapped && isprint(chval)) ? chval : '.'; } @@ -3041,7 +3041,7 @@ static int memory_view_read(debug_view_memory *memdata, UINT8 size, offs_t offs, { UINT64 data0, data1; int ismapped; - + size /= 2; ismapped = memory_view_read(memdata, size, offs + 0 * size, &data0); ismapped |= memory_view_read(memdata, size, offs + 1 * size, &data1); diff --git a/src/emu/debugger.c b/src/emu/debugger.c index 6d3f27210ec..c91c7901f2f 100644 --- a/src/emu/debugger.c +++ b/src/emu/debugger.c @@ -65,7 +65,7 @@ void debugger_init(running_machine *machine) if (machine->debug_flags & DEBUG_FLAG_ENABLED) { machine_entry *entry; - + /* initialize the submodules */ debug_cpu_init(machine); debug_command_init(machine); @@ -85,7 +85,7 @@ void debugger_init(running_machine *machine) atexit(debugger_flush_all_traces_on_abnormal_exit); atexit_registered = TRUE; - /* listen in on the errorlog */ + /* listen in on the errorlog */ add_logerror_callback(machine, debug_errorlog_write_line); } } @@ -110,7 +110,7 @@ void debugger_refresh_display(running_machine *machine) static void debugger_exit(running_machine *machine) { machine_entry **entryptr; - + /* remove this machine from the list; it came down cleanly */ for (entryptr = &machine_list; *entryptr != NULL; entryptr = &(*entryptr)->next) if ((*entryptr)->machine == machine) @@ -124,8 +124,8 @@ static void debugger_exit(running_machine *machine) /*------------------------------------------------- - debugger_flush_all_traces_on_abnormal_exit - - flush any traces in the event of an aborted + debugger_flush_all_traces_on_abnormal_exit - + flush any traces in the event of an aborted execution -------------------------------------------------*/ diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c index 36586bdb22a..5c763cb032d 100644 --- a/src/emu/devintrf.c +++ b/src/emu/devintrf.c @@ -125,7 +125,7 @@ device_config *device_list_add(device_config **listheadptr, const device_config device->tokenbytes = 0; device->region = NULL; device->regionbytes = 0; - + /* append the tag */ strcpy(device->tag, tag); @@ -253,7 +253,7 @@ int device_list_items(const device_config *listhead, device_type type) for (curdev = listhead; curdev != NULL; curdev = curdev->next) count++; } - + /* locate all devices of a given type */ else { @@ -310,7 +310,7 @@ const device_config *device_list_find_by_tag(const device_config *listhead, devi const device_config *curdev; assert(tag != NULL); - + /* locate among all devices */ if (type == DEVICE_TYPE_WILDCARD) { @@ -318,7 +318,7 @@ const device_config *device_list_find_by_tag(const device_config *listhead, devi if (strcmp(tag, curdev->tag) == 0) return curdev; } - + /* locate among all devices of a given type */ else { @@ -356,7 +356,7 @@ int device_list_index(const device_config *listhead, device_type type, const cha index++; } } - + /* locate among all devices of a given type */ else { @@ -389,7 +389,7 @@ const device_config *device_list_find_by_index(const device_config *listhead, de if (index-- == 0) return curdev; } - + /* locate among all devices of a given type */ else { @@ -465,7 +465,7 @@ const device_config *device_list_class_find_by_tag(const device_config *listhead const device_config *curdev; assert(tag != NULL); - + /* locate among all devices of a given class */ for (curdev = listhead; curdev != NULL && curdev->class != class; curdev = curdev->next) ; for ( ; curdev != NULL; curdev = curdev->classnext) @@ -529,7 +529,7 @@ const device_config *device_list_class_find_by_index(const device_config *listhe ***************************************************************************/ /*------------------------------------------------- - device_list_attach_machine - "attach" a + device_list_attach_machine - "attach" a running_machine to its list of devices -------------------------------------------------*/ @@ -687,14 +687,14 @@ void device_reset(const device_config *device) /*------------------------------------------------- - device_set_clock - change the clock on a + device_set_clock - change the clock on a device -------------------------------------------------*/ void device_set_clock(const device_config *device, UINT32 clock) { device_config *devicerw = (device_config *)device; - + /* not much for now */ devicerw->clock = clock; } @@ -811,8 +811,8 @@ INT64 devtype_get_info_int(device_type type, UINT32 state) /*------------------------------------------------- - devtype_get_info_int - return a function - pointer from a device type (does not need to + devtype_get_info_int - return a function + pointer from a device type (does not need to be allocated) -------------------------------------------------*/ diff --git a/src/emu/machine/at28c16.c b/src/emu/machine/at28c16.c index c96a8aa1ace..c8dada83fd1 100644 --- a/src/emu/machine/at28c16.c +++ b/src/emu/machine/at28c16.c @@ -124,7 +124,7 @@ static DEVICE_START(at28c16) /* validate some basic stuff */ assert(device != NULL); // assert(device->static_config != NULL); -// assert(device->inline_config == NULL); +// assert(device->inline_config == NULL); assert(device->machine != NULL); assert(device->machine->config != NULL); diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c index 4e9e8b2b66d..7ba4cff9917 100644 --- a/src/emu/mconfig.c +++ b/src/emu/mconfig.c @@ -156,7 +156,7 @@ static void machine_config_detokenize(machine_config *config, const machine_conf astring *tempstring = astring_alloc(); device_config *device = NULL; sound_config *sound = NULL; - + /* loop over tokens until we hit the end */ while (entrytype != MCONFIG_TOKEN_END) { diff --git a/src/emu/sndintrf.c b/src/emu/sndintrf.c index 31512ab96d2..0bad67a56b6 100644 --- a/src/emu/sndintrf.c +++ b/src/emu/sndintrf.c @@ -320,6 +320,9 @@ static const struct #if (HAS_OKIM6295) { SOUND_OKIM6295, SND_GET_INFO_NAME( okim6295 ) }, #endif +#if (HAS_OKIM6258) + { SOUND_OKIM6258, SND_GET_INFO_NAME( okim6258 ) }, +#endif #if (HAS_MSM5205) { SOUND_MSM5205, SND_GET_INFO_NAME( msm5205 ) }, #endif |