diff options
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/clifront.c | 8 | ||||
| -rw-r--r-- | src/emu/cpu/esrip/esrip.c | 22 | ||||
| -rw-r--r-- | src/emu/cpu/i860/i860.c | 2 | ||||
| -rw-r--r-- | src/emu/cpu/i860/i860dasm.c | 66 | ||||
| -rw-r--r-- | src/emu/cpu/m68000/m68000.h | 2 | ||||
| -rw-r--r-- | src/emu/cpu/m68000/m68kcpu.c | 4 | ||||
| -rw-r--r-- | src/emu/cpu/m68000/m68kcpu.h | 2 | ||||
| -rw-r--r-- | src/emu/cpu/mcs48/mcs48.c | 110 | ||||
| -rw-r--r-- | src/emu/cpu/mcs48/mcs48.h | 2 | ||||
| -rw-r--r-- | src/emu/cpu/mcs48/mcs48dsm.c | 4 | ||||
| -rw-r--r-- | src/emu/cpu/powerpc/ppcfe.c | 2 | ||||
| -rw-r--r-- | src/emu/cpuexec.c | 16 | ||||
| -rw-r--r-- | src/emu/debug/debugcpu.c | 4 | ||||
| -rw-r--r-- | src/emu/machine/i8243.c | 14 | ||||
| -rw-r--r-- | src/emu/machine/ldcore.c | 4 | ||||
| -rw-r--r-- | src/emu/profiler.c | 24 | ||||
| -rw-r--r-- | src/emu/profiler.h | 12 | ||||
| -rw-r--r-- | src/emu/restrack.c | 2 | ||||
| -rw-r--r-- | src/emu/romload.c | 16 | ||||
| -rw-r--r-- | src/emu/timer.c | 4 |
20 files changed, 160 insertions, 160 deletions
diff --git a/src/emu/clifront.c b/src/emu/clifront.c index 416a62f81c2..27722ae5638 100644 --- a/src/emu/clifront.c +++ b/src/emu/clifront.c @@ -435,7 +435,7 @@ int cli_info_listclones(core_options *options, const char *gamename) /*------------------------------------------------- - cli_info_listbrothers - output the name and + cli_info_listbrothers - output the name and source filename of one or more games -------------------------------------------------*/ @@ -444,7 +444,7 @@ int cli_info_listbrothers(core_options *options, const char *gamename) UINT8 *didit = malloc_or_die(driver_list_get_count(drivers)); astring *filename = astring_alloc(); int drvindex, count = 0; - + memset(didit, 0, driver_list_get_count(drivers)); /* iterate over drivers */ @@ -452,7 +452,7 @@ int cli_info_listbrothers(core_options *options, const char *gamename) if (!didit[drvindex] && mame_strwildcmp(gamename, drivers[drvindex]->name) == 0) { int matchindex; - + didit[drvindex] = TRUE; if (count > 0) mame_printf_info("\n"); @@ -464,7 +464,7 @@ int cli_info_listbrothers(core_options *options, const char *gamename) { const char *matchstring = (mame_strwildcmp(gamename, drivers[matchindex]->name) == 0) ? "-> " : " "; const game_driver *clone_of = driver_get_clone(drivers[matchindex]); - + if (clone_of != NULL && (clone_of->flags & GAME_IS_BIOS_ROOT) == 0) mame_printf_info("%s%-8s [%s]\n", matchstring, drivers[matchindex]->name, clone_of->name); else diff --git a/src/emu/cpu/esrip/esrip.c b/src/emu/cpu/esrip/esrip.c index 6cc28ab7d00..36b0597bc53 100644 --- a/src/emu/cpu/esrip/esrip.c +++ b/src/emu/cpu/esrip/esrip.c @@ -62,7 +62,7 @@ ***************************************************************************/ typedef struct -{ +{ UINT16 ram[32]; UINT16 acc; UINT16 d_latch; @@ -74,7 +74,7 @@ typedef struct UINT8 immflag; UINT8 ct; UINT8 t; - + /* Instruction latches - current and previous values */ UINT8 l1, pl1; UINT8 l2, pl2; @@ -139,7 +139,7 @@ static STATE_POSTLOAD( esrip_postload ) //static void esrip_state_register(int index, const char *type) //{ -// state_save_register_item_pointer(type, index, cpustate->ipt_ram, IPT_RAM_SIZE / 2); +// state_save_register_item_pointer(type, index, cpustate->ipt_ram, IPT_RAM_SIZE / 2); //} @@ -261,9 +261,9 @@ static CPU_INIT( esrip ) cpustate->draw = _config->draw; cpustate->ipt_ram = auto_malloc(IPT_RAM_SIZE); -//state_save_register_global_pointer(cpustate->ipt_ram, IPT_RAM_SIZE / 2); // TODO +//state_save_register_global_pointer(cpustate->ipt_ram, IPT_RAM_SIZE / 2); // TODO -// esrip_state_register(index, "esrip"); +// esrip_state_register(index, "esrip"); cpustate->device = device; cpustate->program = memory_find_address_space(device, ADDRESS_SPACE_PROGRAM); @@ -1667,7 +1667,7 @@ static CPU_EXECUTE( esrip ) am29116_execute(cpustate, (cpustate->l7 << 8) | cpustate->l6, BIT(cpustate->l5, 2)); y_bus = cpustate->result; - + if (BIT(cpustate->l5, 0)) cpustate->d_latch = y_bus; } @@ -1741,7 +1741,7 @@ static CPU_EXECUTE( esrip ) cpustate->l6 = (in_h >> 16); cpustate->l7 = (in_h >> 24); -// if (RISING_EDGE(cpustate->pl7, cpustate->l2, 7)) +// if (RISING_EDGE(cpustate->pl7, cpustate->l2, 7)) /* Colour latch */ if (RISING_EDGE(cpustate->pl3, cpustate->l3, 0)) @@ -1773,7 +1773,7 @@ static CPU_EXECUTE( esrip ) cpustate->y_scale = x_bus & 0xff; /* Unknown */ -// if (RISING_EDGE(cpustate->pl4, cpustate->l4, 7)) +// if (RISING_EDGE(cpustate->pl4, cpustate->l4, 7)) /* Image ROM address */ if (RISING_EDGE(cpustate->pl3, cpustate->l3, 5)) @@ -1821,7 +1821,7 @@ static CPU_EXECUTE( esrip ) static CPU_DISASSEMBLE( esrip ) { #if 0 - static const char* const jmp_types[] = + static const char* const jmp_types[] = { "JCT", "JT1", @@ -1833,7 +1833,7 @@ static CPU_DISASSEMBLE( esrip ) "JMP", }; - static const char* const njmp_types[] = + static const char* const njmp_types[] = { "JNCT", "JNT1", @@ -1967,7 +1967,7 @@ CPU_GET_INFO( esrip ) case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Philip J Bennett"); break; - case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c%c", + case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c%c", cpustate->status & 0x80 ? '3' : '.', cpustate->status & 0x40 ? '2' : '.', cpustate->status & 0x20 ? '1' : '.', diff --git a/src/emu/cpu/i860/i860.c b/src/emu/cpu/i860/i860.c index 7157171687c..68fc190fcff 100644 --- a/src/emu/cpu/i860/i860.c +++ b/src/emu/cpu/i860/i860.c @@ -106,7 +106,7 @@ CPU_GET_INFO( i860 ) case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "0.1"); break; case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Jason Eckhardt and Andrew Gardner"); break; - + case CPUINFO_INT_PC: info->i = i860->pc; break; case CPUINFO_INT_PREVIOUSPC: info->i = i860->ppc; break; } diff --git a/src/emu/cpu/i860/i860dasm.c b/src/emu/cpu/i860/i860dasm.c index 8bc3dcd90f5..c4b457474f2 100644 --- a/src/emu/cpu/i860/i860dasm.c +++ b/src/emu/cpu/i860/i860dasm.c @@ -48,9 +48,9 @@ CPU_DISASSEMBLE( i860 ) /* Little Endian */ const UINT32 op = (oprom[3] << 24) | (oprom[2] << 16) | (oprom[1] << 8) | (oprom[0] << 0); - //const UINT32 op = (oprom[2] << 24) | (oprom[3] << 16) | (oprom[0] << 8) | (oprom[1] << 0); /* Mixed Endian */ - //const UINT32 op = (oprom[0] << 24) | (oprom[1] << 16) | (oprom[2] << 8) | (oprom[3] << 0); /* Big Endian */ - //const UINT32 op = (oprom[1] << 24) | (oprom[0] << 16) | (oprom[3] << 8) | (oprom[2] << 0); /* Mixed Endian */ + //const UINT32 op = (oprom[2] << 24) | (oprom[3] << 16) | (oprom[0] << 8) | (oprom[1] << 0); /* Mixed Endian */ + //const UINT32 op = (oprom[0] << 24) | (oprom[1] << 16) | (oprom[2] << 8) | (oprom[3] << 0); /* Big Endian */ + //const UINT32 op = (oprom[1] << 24) | (oprom[0] << 16) | (oprom[3] << 8) | (oprom[2] << 0); /* Mixed Endian */ /* The opcode is the top 6 bits */ UINT8 opcode = (op >> 26) & 0x3f; @@ -61,53 +61,53 @@ CPU_DISASSEMBLE( i860 ) /* Main decode */ switch (opcode) { - case 0x00: + case 0x00: case 0x01: case 0x04: case 0x05: i860_dasm_ldx(op, tempB); break; - + case 0x03: case 0x07: i860_dasm_stx(op, tempB); break; - + case 0x02: i860_dasm_ixfr(op, tempB); break; - + case 0x06: sprintf(tempB, "(reserved)"); break; - + case 0x08: case 0x09: case 0x0a: case 0x0b: i860_dasm_fid_fst(op, tempB); break; - + case 0x0d: i860_dasm_flush(op, tempB); break; - + case 0x0f: i860_dasm_pstd(op, tempB); break; - + case 0x0c: case 0x0e: i860_dasm_ldc_sdc(op, tempB); break; - + case 0x10: i860_dasm_bri(op, tempB); break; - + case 0x11: i860_dasm_trap(op, tempB); break; - + case 0x12: i860_dasm_floating_point_dasm(op, tempB); break; /* Floating point operation sub-group */ - + case 0x13: i860_dasm_core_dasm(op, tempB); break; /* Core operation sub-group */ - + case 0x14: case 0x15: case 0x16: case 0x17: i860_dasm_bte_btne(op, tempB); break; - + case 0x18: case 0x19: i860_dasm_pfidy(op, tempB); break; - + case 0x1a: case 0x1b: case 0x1c: case 0x1d: case 0x1e: case 0x1f: i860_dasm_CTRL_dasm(op, tempB); break; /* CTRL operation sub-group */ - + case 0x20: case 0x21: case 0x22: @@ -116,39 +116,39 @@ CPU_DISASSEMBLE( i860 ) case 0x25: case 0x26: case 0x27: i860_dasm_addu_subu(op, tempB); break; - + case 0x28: case 0x29: case 0x2a: case 0x2b: i860_dasm_shl_shr(op, tempB); break; - + case 0x2c: i860_dasm_shrd(op, tempB); break; - + case 0x2d: i860_dasm_bla(op, tempB); break; - + case 0x2e: case 0x2f: i860_dasm_shra(op, tempB); break; - + case 0x30: case 0x31: case 0x32: case 0x33: i860_dasm_and_andh(op, tempB); break; - + case 0x34: case 0x35: case 0x36: case 0x37: i860_dasm_andnot_andnoth(op, tempB); break; - + case 0x38: case 0x39: case 0x3a: case 0x3b: i860_dasm_or_orh(op, tempB); break; - + case 0x3c: case 0x3d: case 0x3e: case 0x3f: i860_dasm_xor_xorh(op, tempB); break; - + default: sprintf(tempB, "(reserved)"); break; } @@ -228,11 +228,11 @@ static void i860_dasm_stx(const UINT32 op, char* buffer) static void i860_dasm_ixfr(const UINT32 op, char* buffer) { -// UINT16 val = op & 0x7ff; -// UINT8 opc = (op >> 26) & 0x3f; -// UINT8 src2 = (op >> 21) & 0x1f; -// UINT8 dest = (op >> 16) & 0x1f; -// UINT8 src1 = (op >> 11) & 0x1f; +// UINT16 val = op & 0x7ff; +// UINT8 opc = (op >> 26) & 0x3f; +// UINT8 src2 = (op >> 21) & 0x1f; +// UINT8 dest = (op >> 16) & 0x1f; +// UINT8 src1 = (op >> 11) & 0x1f; sprintf(buffer, "ixfr"); } diff --git a/src/emu/cpu/m68000/m68000.h b/src/emu/cpu/m68000/m68000.h index 31c6d2af570..b4add1b1030 100644 --- a/src/emu/cpu/m68000/m68000.h +++ b/src/emu/cpu/m68000/m68000.h @@ -55,7 +55,7 @@ enum M68K_SFC, M68K_DFC, M68K_CACR, M68K_CAAR, M68K_PREF_ADDR, M68K_PREF_DATA, M68K_D0, M68K_D1, M68K_D2, M68K_D3, M68K_D4, M68K_D5, M68K_D6, M68K_D7, M68K_A0, M68K_A1, M68K_A2, M68K_A3, M68K_A4, M68K_A5, M68K_A6, M68K_A7, - + M68K_GENPC = REG_GENPC, M68K_GENSP = REG_GENSP, M68K_GENPCBASE = REG_GENPCBASE diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c index 947db875b84..fb07ab08602 100644 --- a/src/emu/cpu/m68000/m68kcpu.c +++ b/src/emu/cpu/m68000/m68kcpu.c @@ -669,7 +669,7 @@ static CPU_IMPORT_STATE( m68k ) case M68K_SR: m68ki_set_sr(m68k, m68k->iotemp); break; - + case M68K_ISP: if (m68k->s_flag && !m68k->m_flag) REG_SP = m68k->iotemp; @@ -707,7 +707,7 @@ static CPU_EXPORT_STATE( m68k ) case M68K_SR: m68k->iotemp = m68ki_get_sr(m68k); break; - + case M68K_ISP: m68k->iotemp = (m68k->s_flag && !m68k->m_flag) ? REG_SP : REG_ISP; break; diff --git a/src/emu/cpu/m68000/m68kcpu.h b/src/emu/cpu/m68000/m68kcpu.h index fb253964933..737e656367c 100644 --- a/src/emu/cpu/m68000/m68kcpu.h +++ b/src/emu/cpu/m68000/m68kcpu.h @@ -591,7 +591,7 @@ struct _m68ki_cpu_core m68k_memory_interface memory; offs_t encrypted_start; offs_t encrypted_end; - + cpu_state_table state; UINT32 iotemp; diff --git a/src/emu/cpu/mcs48/mcs48.c b/src/emu/cpu/mcs48/mcs48.c index 5e7d3aad0f8..0bba6dd122f 100644 --- a/src/emu/cpu/mcs48/mcs48.c +++ b/src/emu/cpu/mcs48/mcs48.c @@ -40,27 +40,27 @@ T0 output clock **************************************************************************** - UPI-41/42 chips are MCS-48 derived, with some opcode changes: - - MCS-48 opcode UPI-41/42 opcode - ------------- ---------------- - 02: OUTL BUS,A OUT DBB,A - 08: INS BUS,A <illegal> - 22: <illegal> IN DBB,A - 75: ENT0 CLK <illegal> - 80: MOVX A,@R0 <illegal> - 81: MOVX A,@R1 <illegal> - 86: JNI <dest> JOBF <dest> - 88: ORL BUS,#n <illegal> - 90: MOVX @R0,A MOV STS,A - 91: MOVX @R1,A <illegal> - 98: ANL BUS,#n <illegal> - D6: <illegal> JNIBF <dest> - E5: SEL MB0 EN DMA - F5: SEL MB1 EN FLAGS - - Chip numbers are similar to the MCS-48 series: - + UPI-41/42 chips are MCS-48 derived, with some opcode changes: + + MCS-48 opcode UPI-41/42 opcode + ------------- ---------------- + 02: OUTL BUS,A OUT DBB,A + 08: INS BUS,A <illegal> + 22: <illegal> IN DBB,A + 75: ENT0 CLK <illegal> + 80: MOVX A,@R0 <illegal> + 81: MOVX A,@R1 <illegal> + 86: JNI <dest> JOBF <dest> + 88: ORL BUS,#n <illegal> + 90: MOVX @R0,A MOV STS,A + 91: MOVX @R1,A <illegal> + 98: ANL BUS,#n <illegal> + D6: <illegal> JNIBF <dest> + E5: SEL MB0 EN DMA + F5: SEL MB1 EN FLAGS + + Chip numbers are similar to the MCS-48 series: + Chip RAM ROM I/O ---- --- --- --- 8041 128 1k @@ -160,7 +160,7 @@ struct _mcs48_state UINT8 feature_mask; /* processor feature flags */ UINT16 int_rom_size; /* internal rom size */ - + cpu_state_table state; /* state table */ UINT8 rtemp; /* temporary for import/export */ }; @@ -195,7 +195,7 @@ static const cpu_state_entry state_array[] = MCS48_STATE_ENTRY(P1, "%02X", p1, 0xff, 0) MCS48_STATE_ENTRY(P2, "%02X", p2, 0xff, 0) - + MCS48_STATE_ENTRY(R0, "%02X", rtemp, 0xff, CPUSTATE_IMPORT | CPUSTATE_EXPORT) MCS48_STATE_ENTRY(R1, "%02X", rtemp, 0xff, CPUSTATE_IMPORT | CPUSTATE_EXPORT) MCS48_STATE_ENTRY(R2, "%02X", rtemp, 0xff, CPUSTATE_IMPORT | CPUSTATE_EXPORT) @@ -332,7 +332,7 @@ INLINE void pull_pc_psw(mcs48_state *cpustate) /*------------------------------------------------- - pull_pc - pull the PC value from the stack, + pull_pc - pull the PC value from the stack, leaving the upper part of PSW intact -------------------------------------------------*/ @@ -437,7 +437,7 @@ INLINE UINT8 p2_mask(mcs48_state *cpustate) /*------------------------------------------------- - expander_operation - perform an operation via + expander_operation - perform an operation via the 8243 expander chip -------------------------------------------------*/ @@ -445,10 +445,10 @@ INLINE void expander_operation(mcs48_state *cpustate, UINT8 operation, UINT8 por { /* put opcode/data on low 4 bits of P2 */ port_w(2, cpustate->p2 = (cpustate->p2 & 0xf0) | (operation << 2) | (port & 3)); - + /* generate high-to-low transition on PROG line */ prog_w(0); - + /* put data on low 4 bits of P2 */ if (operation != 0) port_w(2, cpustate->p2 = (cpustate->p2 & 0xf0) | (cpustate->a & 0x0f)); @@ -737,7 +737,7 @@ OPHANDLER( out_dbb_a ) /* copy to the DBBO and update the bit in STS */ cpustate->dbbo = cpustate->a; cpustate->sts |= STS_OBF; - + /* if P2 flags are enabled, update the state of P2 */ if (cpustate->flags_enabled && (cpustate->p2 & P2_OBF) == 0) port_w(2, cpustate->p2 |= P2_OBF); @@ -824,37 +824,37 @@ SPLIT_OPHANDLER( split_f5, sel_mb1, en_flags ) static const mcs48_ophandler opcode_table[256]= { nop, illegal, split_02, add_a_n, jmp_0, en_i, illegal, dec_a, /* 00 */ - split_08, in_a_p1, in_a_p2, illegal, movd_a_p4, movd_a_p5, movd_a_p6, movd_a_p7, + split_08, in_a_p1, in_a_p2, illegal, movd_a_p4, movd_a_p5, movd_a_p6, movd_a_p7, inc_xr0, inc_xr1, jb_0, adc_a_n, call_0, dis_i, jtf, inc_a, /* 10 */ - inc_r0, inc_r1, inc_r2, inc_r3, inc_r4, inc_r5, inc_r6, inc_r7, + inc_r0, inc_r1, inc_r2, inc_r3, inc_r4, inc_r5, inc_r6, inc_r7, xch_a_xr0, xch_a_xr1, split_22, mov_a_n, jmp_1, en_tcnti, jnt_0, clr_a, /* 20 */ - xch_a_r0, xch_a_r1, xch_a_r2, xch_a_r3, xch_a_r4, xch_a_r5, xch_a_r6, xch_a_r7, + xch_a_r0, xch_a_r1, xch_a_r2, xch_a_r3, xch_a_r4, xch_a_r5, xch_a_r6, xch_a_r7, xchd_a_xr0, xchd_a_xr1, jb_1, illegal, call_1, dis_tcnti, jt_0, cpl_a, /* 30 */ - illegal, outl_p1_a, outl_p2_a, illegal, movd_p4_a, movd_p5_a, movd_p6_a, movd_p7_a, + illegal, outl_p1_a, outl_p2_a, illegal, movd_p4_a, movd_p5_a, movd_p6_a, movd_p7_a, orl_a_xr0, orl_a_xr1, mov_a_t, orl_a_n, jmp_2, strt_cnt, jnt_1, swap_a, /* 40 */ - orl_a_r0, orl_a_r1, orl_a_r2, orl_a_r3, orl_a_r4, orl_a_r5, orl_a_r6, orl_a_r7, + orl_a_r0, orl_a_r1, orl_a_r2, orl_a_r3, orl_a_r4, orl_a_r5, orl_a_r6, orl_a_r7, anl_a_xr0, anl_a_xr1, jb_2, anl_a_n, call_2, strt_t, jt_1, da_a, /* 50 */ - anl_a_r0, anl_a_r1, anl_a_r2, anl_a_r3, anl_a_r4, anl_a_r5, anl_a_r6, anl_a_r7, + anl_a_r0, anl_a_r1, anl_a_r2, anl_a_r3, anl_a_r4, anl_a_r5, anl_a_r6, anl_a_r7, add_a_xr0, add_a_xr1, mov_t_a, illegal, jmp_3, stop_tcnt, illegal, rrc_a, /* 60 */ - add_a_r0, add_a_r1, add_a_r2, add_a_r3, add_a_r4, add_a_r5, add_a_r6, add_a_r7, + add_a_r0, add_a_r1, add_a_r2, add_a_r3, add_a_r4, add_a_r5, add_a_r6, add_a_r7, adc_a_xr0, adc_a_xr1, jb_3, illegal, call_3, split_75, jf1, rr_a, /* 70 */ - adc_a_r0, adc_a_r1, adc_a_r2, adc_a_r3, adc_a_r4, adc_a_r5, adc_a_r6, adc_a_r7, + adc_a_r0, adc_a_r1, adc_a_r2, adc_a_r3, adc_a_r4, adc_a_r5, adc_a_r6, adc_a_r7, split_80, split_81, illegal, ret, jmp_4, clr_f0, split_86, illegal, /* 80 */ - split_88, orl_p1_n, orl_p2_n, illegal, orld_p4_a, orld_p5_a, orld_p6_a, orld_p7_a, + split_88, orl_p1_n, orl_p2_n, illegal, orld_p4_a, orld_p5_a, orld_p6_a, orld_p7_a, split_90, split_91, jb_4, retr, call_4, cpl_f0, jnz, clr_c, /* 90 */ - split_98, anl_p1_n, anl_p2_n, illegal, anld_p4_a, anld_p5_a, anld_p6_a, anld_p7_a, + split_98, anl_p1_n, anl_p2_n, illegal, anld_p4_a, anld_p5_a, anld_p6_a, anld_p7_a, mov_xr0_a, mov_xr1_a, illegal, movp_a_xa, jmp_5, clr_f1, illegal, cpl_c, /* A0 */ - mov_r0_a, mov_r1_a, mov_r2_a, mov_r3_a, mov_r4_a, mov_r5_a, mov_r6_a, mov_r7_a, + mov_r0_a, mov_r1_a, mov_r2_a, mov_r3_a, mov_r4_a, mov_r5_a, mov_r6_a, mov_r7_a, mov_xr0_n, mov_xr1_n, jb_5, jmpp_xa, call_5, cpl_f1, jf0, illegal, /* B0 */ - mov_r0_n, mov_r1_n, mov_r2_n, mov_r3_n, mov_r4_n, mov_r5_n, mov_r6_n, mov_r7_n, + mov_r0_n, mov_r1_n, mov_r2_n, mov_r3_n, mov_r4_n, mov_r5_n, mov_r6_n, mov_r7_n, illegal, illegal, illegal, illegal, jmp_6, sel_rb0, jz, mov_a_psw, /* C0 */ - dec_r0, dec_r1, dec_r2, dec_r3, dec_r4, dec_r5, dec_r6, dec_r7, + dec_r0, dec_r1, dec_r2, dec_r3, dec_r4, dec_r5, dec_r6, dec_r7, xrl_a_xr0, xrl_a_xr1, jb_6, xrl_a_n, call_6, sel_rb1, split_d6, mov_psw_a, /* D0 */ - xrl_a_r0, xrl_a_r1, xrl_a_r2, xrl_a_r3, xrl_a_r4, xrl_a_r5, xrl_a_r6, xrl_a_r7, + xrl_a_r0, xrl_a_r1, xrl_a_r2, xrl_a_r3, xrl_a_r4, xrl_a_r5, xrl_a_r6, xrl_a_r7, illegal, illegal, illegal, movp3_a_xa,jmp_7, split_e5, jnc, rl_a, /* E0 */ - djnz_r0, djnz_r1, djnz_r2, djnz_r3, djnz_r4, djnz_r5, djnz_r6, djnz_r7, + djnz_r0, djnz_r1, djnz_r2, djnz_r3, djnz_r4, djnz_r5, djnz_r6, djnz_r7, mov_a_xr0, mov_a_xr1, jb_7, illegal, call_7, split_f5, jc, rlc_a, /* F0 */ - mov_a_r0, mov_a_r1, mov_a_r2, mov_a_r3, mov_a_r4, mov_a_r5, mov_a_r6, mov_a_r7 + mov_a_r0, mov_a_r1, mov_a_r2, mov_a_r3, mov_a_r4, mov_a_r5, mov_a_r6, mov_a_r7 }; @@ -926,7 +926,7 @@ static void mcs48_init(const device_config *device, cpu_irq_callback irqcallback /*------------------------------------------------- - mcs48_norom_init - initialization for systems + mcs48_norom_init - initialization for systems with no internal ROM -------------------------------------------------*/ @@ -937,7 +937,7 @@ static CPU_INIT( mcs48_norom ) /*------------------------------------------------- - mcs48_1k_rom_init - initialization for systems + mcs48_1k_rom_init - initialization for systems with 1k of internal ROM -------------------------------------------------*/ @@ -948,7 +948,7 @@ static CPU_INIT( mcs48_1k_rom ) /*------------------------------------------------- - mcs48_2k_rom - initialization for systems + mcs48_2k_rom - initialization for systems with 2k of internal ROM -------------------------------------------------*/ @@ -959,7 +959,7 @@ static CPU_INIT( mcs48_2k_rom ) /*------------------------------------------------- - mcs48_4k_rom - initialization for systems + mcs48_4k_rom - initialization for systems with 2k of internal ROM -------------------------------------------------*/ @@ -970,7 +970,7 @@ static CPU_INIT( mcs48_4k_rom ) /*------------------------------------------------- - upi41_1k_rom_init - initialization for systems + upi41_1k_rom_init - initialization for systems with 1k of internal ROM -------------------------------------------------*/ @@ -981,7 +981,7 @@ static CPU_INIT( upi41_1k_rom ) /*------------------------------------------------- - upi41_2k_rom_init - initialization for systems + upi41_2k_rom_init - initialization for systems with 2k of internal ROM -------------------------------------------------*/ @@ -1136,7 +1136,7 @@ static CPU_EXECUTE( mcs48 ) do { unsigned opcode; - + /* fetch next opcode */ cpustate->prevpc = cpustate->pc; debugger_instruction_hook(device, cpustate->pc); @@ -1169,7 +1169,7 @@ static CPU_EXECUTE( mcs48 ) UINT8 upi41_master_r(const device_config *device, UINT8 a0) { mcs48_state *cpustate = device->token; - + /* if just reading the status, return it */ if ((a0 & 1) != 0) return cpustate->sts; @@ -1196,10 +1196,10 @@ static TIMER_CALLBACK( master_callback ) mcs48_state *cpustate = device->token; UINT8 a0 = (param >> 8) & 1; UINT8 data = param; - + /* data always goes to the input buffer */ cpustate->dbbi = data; - + /* set the appropriate flags */ if ((cpustate->sts & STS_IBF) == 0) { @@ -1207,7 +1207,7 @@ static TIMER_CALLBACK( master_callback ) if (cpustate->flags_enabled) port_w(2, cpustate->p2 &= ~P2_NIBF); } - + /* set F1 accordingly */ if (a0 == 0) cpustate->sts &= ~STS_F1; diff --git a/src/emu/cpu/mcs48/mcs48.h b/src/emu/cpu/mcs48/mcs48.h index 50d7616a6d1..f0a5458cf2f 100644 --- a/src/emu/cpu/mcs48/mcs48.h +++ b/src/emu/cpu/mcs48/mcs48.h @@ -44,7 +44,7 @@ enum MCS48_STS, /* UPI-41 systems only */ MCS48_DBBO, /* UPI-41 systems only */ MCS48_DBBI, /* UPI-41 systems only */ - + MCS48_GENPC = REG_GENPC, MCS48_GENSP = REG_GENSP, MCS48_GENPCBASE = REG_GENPCBASE diff --git a/src/emu/cpu/mcs48/mcs48dsm.c b/src/emu/cpu/mcs48/mcs48dsm.c index eba82f8c7bd..1eeafa8186c 100644 --- a/src/emu/cpu/mcs48/mcs48dsm.c +++ b/src/emu/cpu/mcs48/mcs48dsm.c @@ -14,7 +14,7 @@ static UINT32 common_dasm(const device_config *device, char *buffer, offs_t pc, { const UINT8 *startram = opram; UINT32 flags = 0; - + opram++; switch (*oprom++) { @@ -293,7 +293,7 @@ static UINT32 common_dasm(const device_config *device, char *buffer, offs_t pc, case 0xfe: sprintf(buffer, "mov a,r6"); break; case 0xff: sprintf(buffer, "mov a,r7"); break; } - + return (opram - startram) | flags | DASMFLAG_SUPPORTED; } diff --git a/src/emu/cpu/powerpc/ppcfe.c b/src/emu/cpu/powerpc/ppcfe.c index 195cadc39a1..c3337d45de8 100644 --- a/src/emu/cpu/powerpc/ppcfe.c +++ b/src/emu/cpu/powerpc/ppcfe.c @@ -1191,7 +1191,7 @@ static int describe_instruction_1f(powerpc_state *ppc, UINT32 op, opcode_desc *d if (op & MSR_EE) desc->flags |= OPFLAG_CAN_EXPOSE_EXTERNAL_INT; return TRUE; - + case 0x254: /* ESA */ case 0x274: /* DSA */ if (!is_602_class(ppc)) diff --git a/src/emu/cpuexec.c b/src/emu/cpuexec.c index 87c3a5188b7..dcc808c0869 100644 --- a/src/emu/cpuexec.c +++ b/src/emu/cpuexec.c @@ -256,18 +256,18 @@ void cpuexec_timeslice(running_machine *machine) timer_execution_state *timerexec = timer_get_execution_state(machine); cpuexec_private *global = machine->cpuexec_data; int ran; - + /* build the execution list if we don't have one yet */ if (global->executelist == NULL) rebuild_execute_list(machine); - + /* loop until we hit the next timer */ while (ATTOTIME_LT(timerexec->basetime, timerexec->nextfire)) { cpu_class_data *classdata; UINT32 suspendchanged; attotime target; - + /* by default, assume our target is the end of the next quantum */ target.seconds = timerexec->basetime.seconds; target.attoseconds = timerexec->basetime.attoseconds + timerexec->curquantum; @@ -290,7 +290,7 @@ void cpuexec_timeslice(running_machine *machine) classdata->nextsuspend &= ~SUSPEND_REASON_TIMESLICE; classdata->eatcycles = classdata->nexteatcycles; } - + /* recompute the execute list if any CPUs changed their suspension state */ if (suspendchanged != 0) rebuild_execute_list(machine); @@ -302,7 +302,7 @@ void cpuexec_timeslice(running_machine *machine) if (target.seconds >= classdata->localtime.seconds) { attoseconds_t delta, actualdelta; - + /* compute how many attoseconds to execute this CPU */ delta = target.attoseconds - classdata->localtime.attoseconds; if (delta < 0 && target.seconds > classdata->localtime.seconds) @@ -340,10 +340,10 @@ void cpuexec_timeslice(running_machine *machine) ran -= classdata->cycles_stolen; profiler_mark(PROFILER_END); } - + /* account for these cycles */ classdata->totalcycles += ran; - + /* update the local time for this CPU */ actualdelta = classdata->attoseconds_per_cycle * ran; classdata->localtime.attoseconds += actualdelta; @@ -355,7 +355,7 @@ void cpuexec_timeslice(running_machine *machine) { assert(attotime_compare(classdata->localtime, target) < 0); target = classdata->localtime; - + /* however, if this puts us before the base, clamp to the base as a minimum */ if (ATTOTIME_LT(target, timerexec->basetime)) { diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c index df6a44abe19..d4f43bb8e23 100644 --- a/src/emu/debug/debugcpu.c +++ b/src/emu/debug/debugcpu.c @@ -382,7 +382,7 @@ int debug_cpu_translate(const address_space *space, int intention, offs_t *addre /*------------------------------------------------- - debug_cpu_disassemble - disassemble a line at + debug_cpu_disassemble - disassemble a line at a given PC on a given CPU -------------------------------------------------*/ @@ -441,7 +441,7 @@ offs_t debug_cpu_disassemble(const device_config *device, char *buffer, offs_t p /*------------------------------------------------- - debug_cpu_set_dasm_override - set an override + debug_cpu_set_dasm_override - set an override handler for disassembly -------------------------------------------------*/ diff --git a/src/emu/machine/i8243.c b/src/emu/machine/i8243.c index 71d086087f4..9f0b9035946 100644 --- a/src/emu/machine/i8243.c +++ b/src/emu/machine/i8243.c @@ -83,7 +83,7 @@ WRITE8_DEVICE_HANDLER( i8243_prog_w ) { i8243_state *i8243 = get_safe_token(device); i8243_config *config = get_safe_config(device); - + /* only care about low bit */ data &= 1; @@ -91,7 +91,7 @@ WRITE8_DEVICE_HANDLER( i8243_prog_w ) if (i8243->prog && !data) { i8243->opcode = i8243->p2; - + /* if this is a read opcode, copy result to p2out */ if ((i8243->opcode >> 2) == MCS48_EXPANDER_OP_READ) { @@ -100,7 +100,7 @@ WRITE8_DEVICE_HANDLER( i8243_prog_w ) i8243->p2out = i8243->p[i8243->opcode & 3] & 0x0f; } } - + /* on low->high transition state, act on opcode */ else if (!i8243->prog && data) { @@ -111,13 +111,13 @@ WRITE8_DEVICE_HANDLER( i8243_prog_w ) if (config->writehandler != NULL) (*config->writehandler)(device, i8243->opcode & 3, i8243->p[i8243->opcode & 3]); break; - + case MCS48_EXPANDER_OP_OR: i8243->p[i8243->opcode & 3] |= i8243->p2 & 0x0f; if (config->writehandler != NULL) (*config->writehandler)(device, i8243->opcode & 3, i8243->p[i8243->opcode & 3]); break; - + case MCS48_EXPANDER_OP_AND: i8243->p[i8243->opcode & 3] &= i8243->p2 & 0x0f; if (config->writehandler != NULL) @@ -125,7 +125,7 @@ WRITE8_DEVICE_HANDLER( i8243_prog_w ) break; } } - + /* remember the state */ i8243->prog = data; } @@ -153,7 +153,7 @@ static DEVICE_START( i8243 ) static DEVICE_RESET( i8243 ) { i8243_state *i8243 = get_safe_token(device); - + i8243->p2 = 0x0f; i8243->p2out = 0x0f; i8243->prog = 1; diff --git a/src/emu/machine/ldcore.c b/src/emu/machine/ldcore.c index 39aae515ad9..ed09b6359d5 100644 --- a/src/emu/machine/ldcore.c +++ b/src/emu/machine/ldcore.c @@ -1287,7 +1287,7 @@ static void init_disc(const device_config *device) laserdisc_state *ld = get_safe_token(device); ldcore_data *ldcore = ld->core; chd_error err; - + /* get a handle to the disc to play */ if (config->getdisc != NULL) ldcore->disc = (*config->getdisc)(device); @@ -1456,7 +1456,7 @@ static DEVICE_START( laserdisc ) assert(ld->screen != NULL); if (!ld->screen->started) return DEVICE_START_MISSING_DEPENDENCY; - + /* save a copy of the device pointer */ ld->device = device; diff --git a/src/emu/profiler.c b/src/emu/profiler.c index 59297978195..83c56ff6764 100644 --- a/src/emu/profiler.c +++ b/src/emu/profiler.c @@ -41,7 +41,7 @@ profiler_state global_profiler; ***************************************************************************/ /*------------------------------------------------- - _profiler_mark - mark the beginning/end of a + _profiler_mark - mark the beginning/end of a profiler entry -------------------------------------------------*/ @@ -70,21 +70,21 @@ void _profiler_mark(int type) profiler_filo_entry *preventry = entry - 1; data->duration[preventry->type] += curticks - preventry->start; } - + /* fill in this entry */ entry->type = type; entry->start = curticks; } - + /* if we're ending an existing bucket, update the time */ else if (global_profiler.filoindex > 0) { int index = --global_profiler.filoindex; profiler_filo_entry *entry = &global_profiler.filo[index]; - + /* account for the time taken */ data->duration[entry->type] += curticks - entry->start; - + /* if we have a previous entry, restart his time now */ if (index != 0) { @@ -96,7 +96,7 @@ void _profiler_mark(int type) /*------------------------------------------------- - _profiler_get_text - return the current text + _profiler_get_text - return the current text in an astring -------------------------------------------------*/ @@ -130,13 +130,13 @@ astring *_profiler_get_text(running_machine *machine, astring *string) int curtype, curmem, switches; profiler_mark(PROFILER_PROFILER); - + /* compute the total time for all bits, not including profiler or idle */ computed = 0; for (curtype = 0; curtype < PROFILER_PROFILER; curtype++) for (curmem = 0; curmem < ARRAY_LENGTH(global_profiler.data); curmem++) computed += global_profiler.data[curmem].duration[curtype]; - + /* save that result in normalize, and continue adding the rest */ normalize = computed; for ( ; curtype < PROFILER_TOTAL; curtype++) @@ -161,14 +161,14 @@ astring *_profiler_get_text(running_machine *machine, astring *string) if (global_profiler.dataready && computed != 0) { int nameindex; - + /* start with the un-normalized percentage */ astring_catprintf(string, "%02d%% ", (int)((computed * 100 + total/2) / total)); - + /* followed by the normalized percentage for everything but profiler and idle */ if (curtype < PROFILER_PROFILER) astring_catprintf(string, "%02d%% ", (int)((computed * 100 + normalize/2) / normalize)); - + /* and then the text */ if (curtype >= PROFILER_CPU_FIRST && curtype <= PROFILER_CPU_MAX) astring_catprintf(string, "CPU '%s'", device_list_find_by_index(machine->config->devicelist, CPU, curtype - PROFILER_CPU_FIRST)->tag); @@ -179,7 +179,7 @@ astring *_profiler_get_text(running_machine *machine, astring *string) astring_catc(string, names[nameindex].string); break; } - + /* followed by a carriage return */ astring_catc(string, "\n"); } diff --git a/src/emu/profiler.h b/src/emu/profiler.h index 6f22e181c7a..8fdc58d5c08 100644 --- a/src/emu/profiler.h +++ b/src/emu/profiler.h @@ -9,14 +9,14 @@ **************************************************************************** - To start profiling a certain section, e.g. video: - profiler_mark(PROFILER_VIDEO); + To start profiling a certain section, e.g. video: + profiler_mark(PROFILER_VIDEO); - to end profiling the current section: - profiler_mark(PROFILER_END); + to end profiling the current section: + profiler_mark(PROFILER_END); + + the profiler handles a FILO list so calls may be nested. - the profiler handles a FILO list so calls may be nested. - ***************************************************************************/ #pragma once diff --git a/src/emu/restrack.c b/src/emu/restrack.c index 85c7c6c8d0f..360438d5bbc 100644 --- a/src/emu/restrack.c +++ b/src/emu/restrack.c @@ -277,7 +277,7 @@ bitmap_t *auto_bitmap_alloc_file_line(int width, int height, bitmap_format forma /*------------------------------------------------- validate_auto_malloc_memory - validate that a - block of memory has been allocated by + block of memory has been allocated by auto_malloc() -------------------------------------------------*/ diff --git a/src/emu/romload.c b/src/emu/romload.c index a942ffe93fc..b2d8f457f36 100644 --- a/src/emu/romload.c +++ b/src/emu/romload.c @@ -278,7 +278,7 @@ astring *rom_region_name(astring *result, const game_driver *drv, const rom_sour /*------------------------------------------------- - rom_file_size - return the expected size of a + rom_file_size - return the expected size of a file given the ROM description -------------------------------------------------*/ @@ -300,7 +300,7 @@ UINT32 rom_file_size(const rom_entry *romp) maxlength = MAX(maxlength, curlength); } while (ROMENTRY_ISRELOAD(romp)); - + return maxlength; } @@ -338,9 +338,9 @@ static void determine_bios_rom(rom_load_data *romdata) const rom_entry *rom; int default_no = 1; int bios_count = 0; - + romdata->system_bios = 0; - + /* first determine the default BIOS name */ for (rom = romdata->machine->gamedrv->rom; !ROMENTRY_ISEND(rom); rom++) if (ROMENTRY_ISDEFAULT_BIOS(rom)) @@ -837,7 +837,7 @@ static int read_rom_data(rom_load_data *romdata, const rom_entry *romp) } } free(tempbuf); - + LOG((" All done\n")); return ROM_GETLENGTH(romp); } @@ -1010,8 +1010,8 @@ chd_error open_disk_image(const game_driver *gamedrv, const rom_entry *romp, mam /*------------------------------------------------- - open_disk_image_options - open a disk image, - searching up the parent and loading by + open_disk_image_options - open a disk image, + searching up the parent and loading by checksum -------------------------------------------------*/ @@ -1338,7 +1338,7 @@ void rom_init(running_machine *machine) memset(&romdata, 0, sizeof(romdata)); romdata.machine = machine; romdata.errorstring = astring_alloc(); - + /* figure out which BIOS we are using */ determine_bios_rom(&romdata); diff --git a/src/emu/timer.c b/src/emu/timer.c index fc8a310d59e..00df5405eed 100644 --- a/src/emu/timer.c +++ b/src/emu/timer.c @@ -95,7 +95,7 @@ struct _timer_private emu_timer * activelist; /* head of the active list */ emu_timer * freelist; /* head of the free list */ emu_timer * freelist_tail; /* tail of the free list */ - + /* execution state */ timer_execution_state exec; /* current global execution state */ @@ -361,7 +361,7 @@ timer_execution_state *timer_get_execution_state(running_machine *machine) /*------------------------------------------------- - timer_execute_timers - execute timers and + timer_execute_timers - execute timers and update scheduling quanta -------------------------------------------------*/ |
