Skip to content

Commit 835ace0

Browse files
aaronsgilesaaronsgiles
committed
Cleanups and version bump.
1 parent ed893fe commit 835ace0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+501
-501
lines changed

‎src/emu/clifront.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ int cli_info_listclones(core_options *options, const char *gamename)
435435

436436

437437
/*-------------------------------------------------
438-
cli_info_listbrothers - output the name and
438+
cli_info_listbrothers - output the name and
439439
source filename of one or more games
440440
-------------------------------------------------*/
441441

@@ -444,15 +444,15 @@ int cli_info_listbrothers(core_options *options, const char *gamename)
444444
UINT8 *didit = malloc_or_die(driver_list_get_count(drivers));
445445
astring *filename = astring_alloc();
446446
int drvindex, count = 0;
447-
447+
448448
memset(didit, 0, driver_list_get_count(drivers));
449449

450450
/* iterate over drivers */
451451
for (drvindex = 0; drivers[drvindex] != NULL; drvindex++)
452452
if (!didit[drvindex] && mame_strwildcmp(gamename, drivers[drvindex]->name) == 0)
453453
{
454454
int matchindex;
455-
455+
456456
didit[drvindex] = TRUE;
457457
if (count > 0)
458458
mame_printf_info("\n");
@@ -464,7 +464,7 @@ int cli_info_listbrothers(core_options *options, const char *gamename)
464464
{
465465
const char *matchstring = (mame_strwildcmp(gamename, drivers[matchindex]->name) == 0) ? "-> " : " ";
466466
const game_driver *clone_of = driver_get_clone(drivers[matchindex]);
467-
467+
468468
if (clone_of != NULL && (clone_of->flags & GAME_IS_BIOS_ROOT) == 0)
469469
mame_printf_info("%s%-8s [%s]\n", matchstring, drivers[matchindex]->name, clone_of->name);
470470
else

‎src/emu/cpu/esrip/esrip.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
***************************************************************************/
6363

6464
typedef struct
65-
{
65+
{
6666
UINT16 ram[32];
6767
UINT16 acc;
6868
UINT16 d_latch;
@@ -74,7 +74,7 @@ typedef struct
7474
UINT8 immflag;
7575
UINT8 ct;
7676
UINT8 t;
77-
77+
7878
/* Instruction latches - current and previous values */
7979
UINT8 l1, pl1;
8080
UINT8 l2, pl2;
@@ -139,7 +139,7 @@ static STATE_POSTLOAD( esrip_postload )
139139

140140
//static void esrip_state_register(int index, const char *type)
141141
//{
142-
// state_save_register_item_pointer(type, index, cpustate->ipt_ram, IPT_RAM_SIZE / 2);
142+
// state_save_register_item_pointer(type, index, cpustate->ipt_ram, IPT_RAM_SIZE / 2);
143143
//}
144144

145145

@@ -261,9 +261,9 @@ static CPU_INIT( esrip )
261261
cpustate->draw = _config->draw;
262262

263263
cpustate->ipt_ram = auto_malloc(IPT_RAM_SIZE);
264-
//state_save_register_global_pointer(cpustate->ipt_ram, IPT_RAM_SIZE / 2); // TODO
264+
//state_save_register_global_pointer(cpustate->ipt_ram, IPT_RAM_SIZE / 2); // TODO
265265

266-
// esrip_state_register(index, "esrip");
266+
// esrip_state_register(index, "esrip");
267267
cpustate->device = device;
268268
cpustate->program = memory_find_address_space(device, ADDRESS_SPACE_PROGRAM);
269269

@@ -1667,7 +1667,7 @@ static CPU_EXECUTE( esrip )
16671667
am29116_execute(cpustate, (cpustate->l7 << 8) | cpustate->l6, BIT(cpustate->l5, 2));
16681668

16691669
y_bus = cpustate->result;
1670-
1670+
16711671
if (BIT(cpustate->l5, 0))
16721672
cpustate->d_latch = y_bus;
16731673
}
@@ -1741,7 +1741,7 @@ static CPU_EXECUTE( esrip )
17411741
cpustate->l6 = (in_h >> 16);
17421742
cpustate->l7 = (in_h >> 24);
17431743

1744-
// if (RISING_EDGE(cpustate->pl7, cpustate->l2, 7))
1744+
// if (RISING_EDGE(cpustate->pl7, cpustate->l2, 7))
17451745

17461746
/* Colour latch */
17471747
if (RISING_EDGE(cpustate->pl3, cpustate->l3, 0))
@@ -1773,7 +1773,7 @@ static CPU_EXECUTE( esrip )
17731773
cpustate->y_scale = x_bus & 0xff;
17741774

17751775
/* Unknown */
1776-
// if (RISING_EDGE(cpustate->pl4, cpustate->l4, 7))
1776+
// if (RISING_EDGE(cpustate->pl4, cpustate->l4, 7))
17771777

17781778
/* Image ROM address */
17791779
if (RISING_EDGE(cpustate->pl3, cpustate->l3, 5))
@@ -1821,7 +1821,7 @@ static CPU_EXECUTE( esrip )
18211821
static CPU_DISASSEMBLE( esrip )
18221822
{
18231823
#if 0
1824-
static const char* const jmp_types[] =
1824+
static const char* const jmp_types[] =
18251825
{
18261826
"JCT",
18271827
"JT1",
@@ -1833,7 +1833,7 @@ static CPU_DISASSEMBLE( esrip )
18331833
"JMP",
18341834
};
18351835

1836-
static const char* const njmp_types[] =
1836+
static const char* const njmp_types[] =
18371837
{
18381838
"JNCT",
18391839
"JNT1",
@@ -1967,7 +1967,7 @@ CPU_GET_INFO( esrip )
19671967
case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break;
19681968
case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Philip J Bennett"); break;
19691969

1970-
case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c%c",
1970+
case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c%c",
19711971
cpustate->status & 0x80 ? '3' : '.',
19721972
cpustate->status & 0x40 ? '2' : '.',
19731973
cpustate->status & 0x20 ? '1' : '.',

‎src/emu/cpu/i860/i860.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ CPU_GET_INFO( i860 )
106106
case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "0.1"); break;
107107
case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break;
108108
case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Jason Eckhardt and Andrew Gardner"); break;
109-
109+
110110
case CPUINFO_INT_PC: info->i = i860->pc; break;
111111
case CPUINFO_INT_PREVIOUSPC: info->i = i860->ppc; break;
112112
}

‎src/emu/cpu/i860/i860dasm.c

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ CPU_DISASSEMBLE( i860 )
4848

4949
/* Little Endian */
5050
const UINT32 op = (oprom[3] << 24) | (oprom[2] << 16) | (oprom[1] << 8) | (oprom[0] << 0);
51-
//const UINT32 op = (oprom[2] << 24) | (oprom[3] << 16) | (oprom[0] << 8) | (oprom[1] << 0); /* Mixed Endian */
52-
//const UINT32 op = (oprom[0] << 24) | (oprom[1] << 16) | (oprom[2] << 8) | (oprom[3] << 0); /* Big Endian */
53-
//const UINT32 op = (oprom[1] << 24) | (oprom[0] << 16) | (oprom[3] << 8) | (oprom[2] << 0); /* Mixed Endian */
51+
//const UINT32 op = (oprom[2] << 24) | (oprom[3] << 16) | (oprom[0] << 8) | (oprom[1] << 0); /* Mixed Endian */
52+
//const UINT32 op = (oprom[0] << 24) | (oprom[1] << 16) | (oprom[2] << 8) | (oprom[3] << 0); /* Big Endian */
53+
//const UINT32 op = (oprom[1] << 24) | (oprom[0] << 16) | (oprom[3] << 8) | (oprom[2] << 0); /* Mixed Endian */
5454

5555
/* The opcode is the top 6 bits */
5656
UINT8 opcode = (op >> 26) & 0x3f;
@@ -61,53 +61,53 @@ CPU_DISASSEMBLE( i860 )
6161
/* Main decode */
6262
switch (opcode)
6363
{
64-
case 0x00:
64+
case 0x00:
6565
case 0x01:
6666
case 0x04:
6767
case 0x05: i860_dasm_ldx(op, tempB); break;
68-
68+
6969
case 0x03:
7070
case 0x07: i860_dasm_stx(op, tempB); break;
71-
71+
7272
case 0x02: i860_dasm_ixfr(op, tempB); break;
73-
73+
7474
case 0x06: sprintf(tempB, "(reserved)"); break;
75-
75+
7676
case 0x08:
7777
case 0x09:
7878
case 0x0a:
7979
case 0x0b: i860_dasm_fid_fst(op, tempB); break;
80-
80+
8181
case 0x0d: i860_dasm_flush(op, tempB); break;
82-
82+
8383
case 0x0f: i860_dasm_pstd(op, tempB); break;
84-
84+
8585
case 0x0c:
8686
case 0x0e: i860_dasm_ldc_sdc(op, tempB); break;
87-
87+
8888
case 0x10: i860_dasm_bri(op, tempB); break;
89-
89+
9090
case 0x11: i860_dasm_trap(op, tempB); break;
91-
91+
9292
case 0x12: i860_dasm_floating_point_dasm(op, tempB); break; /* Floating point operation sub-group */
93-
93+
9494
case 0x13: i860_dasm_core_dasm(op, tempB); break; /* Core operation sub-group */
95-
95+
9696
case 0x14:
9797
case 0x15:
9898
case 0x16:
9999
case 0x17: i860_dasm_bte_btne(op, tempB); break;
100-
100+
101101
case 0x18:
102102
case 0x19: i860_dasm_pfidy(op, tempB); break;
103-
103+
104104
case 0x1a:
105105
case 0x1b:
106106
case 0x1c:
107107
case 0x1d:
108108
case 0x1e:
109109
case 0x1f: i860_dasm_CTRL_dasm(op, tempB); break; /* CTRL operation sub-group */
110-
110+
111111
case 0x20:
112112
case 0x21:
113113
case 0x22:
@@ -116,39 +116,39 @@ CPU_DISASSEMBLE( i860 )
116116
case 0x25:
117117
case 0x26:
118118
case 0x27: i860_dasm_addu_subu(op, tempB); break;
119-
119+
120120
case 0x28:
121121
case 0x29:
122122
case 0x2a:
123123
case 0x2b: i860_dasm_shl_shr(op, tempB); break;
124-
124+
125125
case 0x2c: i860_dasm_shrd(op, tempB); break;
126-
126+
127127
case 0x2d: i860_dasm_bla(op, tempB); break;
128-
128+
129129
case 0x2e:
130130
case 0x2f: i860_dasm_shra(op, tempB); break;
131-
131+
132132
case 0x30:
133133
case 0x31:
134134
case 0x32:
135135
case 0x33: i860_dasm_and_andh(op, tempB); break;
136-
136+
137137
case 0x34:
138138
case 0x35:
139139
case 0x36:
140140
case 0x37: i860_dasm_andnot_andnoth(op, tempB); break;
141-
141+
142142
case 0x38:
143143
case 0x39:
144144
case 0x3a:
145145
case 0x3b: i860_dasm_or_orh(op, tempB); break;
146-
146+
147147
case 0x3c:
148148
case 0x3d:
149149
case 0x3e:
150150
case 0x3f: i860_dasm_xor_xorh(op, tempB); break;
151-
151+
152152
default: sprintf(tempB, "(reserved)"); break;
153153
}
154154

@@ -228,11 +228,11 @@ static void i860_dasm_stx(const UINT32 op, char* buffer)
228228

229229
static void i860_dasm_ixfr(const UINT32 op, char* buffer)
230230
{
231-
// UINT16 val = op & 0x7ff;
232-
// UINT8 opc = (op >> 26) & 0x3f;
233-
// UINT8 src2 = (op >> 21) & 0x1f;
234-
// UINT8 dest = (op >> 16) & 0x1f;
235-
// UINT8 src1 = (op >> 11) & 0x1f;
231+
// UINT16 val = op & 0x7ff;
232+
// UINT8 opc = (op >> 26) & 0x3f;
233+
// UINT8 src2 = (op >> 21) & 0x1f;
234+
// UINT8 dest = (op >> 16) & 0x1f;
235+
// UINT8 src1 = (op >> 11) & 0x1f;
236236

237237
sprintf(buffer, "ixfr");
238238
}

‎src/emu/cpu/m68000/m68000.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ enum
5555
M68K_SFC, M68K_DFC, M68K_CACR, M68K_CAAR, M68K_PREF_ADDR, M68K_PREF_DATA,
5656
M68K_D0, M68K_D1, M68K_D2, M68K_D3, M68K_D4, M68K_D5, M68K_D6, M68K_D7,
5757
M68K_A0, M68K_A1, M68K_A2, M68K_A3, M68K_A4, M68K_A5, M68K_A6, M68K_A7,
58-
58+
5959
M68K_GENPC = REG_GENPC,
6060
M68K_GENSP = REG_GENSP,
6161
M68K_GENPCBASE = REG_GENPCBASE

‎src/emu/cpu/m68000/m68kcpu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ static CPU_IMPORT_STATE( m68k )
669669
case M68K_SR:
670670
m68ki_set_sr(m68k, m68k->iotemp);
671671
break;
672-
672+
673673
case M68K_ISP:
674674
if (m68k->s_flag && !m68k->m_flag)
675675
REG_SP = m68k->iotemp;
@@ -707,7 +707,7 @@ static CPU_EXPORT_STATE( m68k )
707707
case M68K_SR:
708708
m68k->iotemp = m68ki_get_sr(m68k);
709709
break;
710-
710+
711711
case M68K_ISP:
712712
m68k->iotemp = (m68k->s_flag && !m68k->m_flag) ? REG_SP : REG_ISP;
713713
break;

‎src/emu/cpu/m68000/m68kcpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ struct _m68ki_cpu_core
591591
m68k_memory_interface memory;
592592
offs_t encrypted_start;
593593
offs_t encrypted_end;
594-
594+
595595
cpu_state_table state;
596596
UINT32 iotemp;
597597

0 commit comments

Comments
 (0)