Skip to content

Commit 0523e9f

Browse files
aaronsgilesaaronsgiles
committed
Cleanups and version bump.
1 parent e959018 commit 0523e9f

File tree

30 files changed

+297
-296
lines changed

30 files changed

+297
-296
lines changed

‎src/emu/cheat.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1645,7 +1645,7 @@ static UINT64 execute_frombcd(void *ref, UINT32 params, const UINT64 *param)
16451645
UINT64 value = param[0];
16461646
UINT64 multiplier = 1;
16471647
UINT64 result = 0;
1648-
1648+
16491649
while (value != 0)
16501650
{
16511651
result += (value & 0x0f) * multiplier;
@@ -1665,7 +1665,7 @@ static UINT64 execute_tobcd(void *ref, UINT32 params, const UINT64 *param)
16651665
UINT64 value = param[0];
16661666
UINT64 result = 0;
16671667
UINT8 shift = 0;
1668-
1668+
16691669
while (value != 0)
16701670
{
16711671
result += (value % 10) << shift;

‎src/emu/cpu/cpu.mak‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ $(CPUOBJ)/jaguar/jaguar.o: $(CPUSRC)/jaguar/jaguar.c \
258258
#-------------------------------------------------
259259

260260
CPUDEFS += -DHAS_CUBEQCPU=$(if $(filter CUBEQCPU,$(CPUS)),1,0)
261-
261+
262262
ifneq ($(filter CUBEQCPU,$(CPUS)),)
263263
OBJDIRS += $(CPUOBJ)/cubeqcpu
264264
CPUOBJS += $(CPUOBJ)/cubeqcpu/cubeqcpu.o

‎src/emu/cpu/cubeqcpu/cubeqcpu.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
Implementation of the Cube Quest AM2901-based CPUs
66
7-
TODO:
7+
TODO:
88
99
* Tidy up diassembly (split into different files?)
1010
@@ -19,7 +19,7 @@
1919
***************************************************************************/
2020

2121
/* Am2901 Instruction Fields */
22-
static const char* ins[] =
22+
static const char* ins[] =
2323
{
2424
"ADD ",
2525
"SUBR ",
@@ -43,7 +43,7 @@ static const char* src[] =
4343
"D,0",
4444
};
4545

46-
static const char* dst[] =
46+
static const char* dst[] =
4747
{
4848
"QREG ",
4949
"NOP ",
@@ -409,7 +409,7 @@ static void cquestrot_init(int index, int clock, const void *_config, int (*irqc
409409
cquestrot_state_register(index, "cquestrot");
410410

411411
/* Allocate RAM */
412-
cquestrot.dram = malloc(16384 * sizeof(UINT16)); /* Shared with 68000 */
412+
cquestrot.dram = malloc(16384 * sizeof(UINT16)); /* Shared with 68000 */
413413
cquestrot.sram = malloc(2048 * sizeof(UINT16)); /* Private */
414414
}
415415

@@ -748,7 +748,7 @@ static int cquestsnd_execute(int cycles)
748748

749749
static offs_t cquestsnd_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
750750
{
751-
static const char* jmps[] =
751+
static const char* jmps[] =
752752
{
753753
"JUMP ",
754754
" ",
@@ -761,7 +761,7 @@ static offs_t cquestsnd_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const
761761
};
762762

763763

764-
static const char* latches[] =
764+
static const char* latches[] =
765765
{
766766
"PLTCH ",
767767
"DAC ",
@@ -880,7 +880,7 @@ static int cquestrot_execute(int cycles)
880880

881881
/* Core execution loop */
882882
do
883-
{
883+
{
884884
/* Decode the instruction */
885885
UINT64 inst = cpu_readop64(ROT_PC << 3);
886886

@@ -1084,7 +1084,7 @@ static int cquestrot_execute(int cycles)
10841084
r15 = (cquestrot.vflag ^ BIT(cquestrot.f, 15)) << 15;
10851085
break;
10861086
}
1087-
1087+
10881088
cquestrot.ram[b] = r15 | (cquestrot.f >> 1);
10891089
cquestrot.y = cquestrot.f;
10901090
break;
@@ -1201,7 +1201,7 @@ static int cquestrot_execute(int cycles)
12011201

12021202
static offs_t cquestrot_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
12031203
{
1204-
static const char* jmps[] =
1204+
static const char* jmps[] =
12051205
{
12061206
" ",
12071207
"JSEQ ",
@@ -1234,7 +1234,7 @@ static offs_t cquestrot_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const
12341234
"Y2D ",
12351235
};
12361236

1237-
static const char* spfs[] =
1237+
static const char* spfs[] =
12381238
{
12391239
" ",
12401240
" ",
@@ -1262,16 +1262,16 @@ static offs_t cquestrot_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const
12621262
int t = (inshig >> 20) & 0xfff;
12631263
int jmp = (inshig >> 16) & 0xf;
12641264
int spf = (inshig >> 12) & 0xf;
1265-
// int rsrc = (inshig >> 11) & 0x1;
1265+
// int rsrc = (inshig >> 11) & 0x1;
12661266
int yout = (inshig >> 8) & 0x7;
12671267
int sel = (inshig >> 6) & 0x3;
1268-
// int dsrc = (inshig >> 4) & 0x3;
1268+
// int dsrc = (inshig >> 4) & 0x3;
12691269
int b = (inshig >> 0) & 0xf;
12701270
int a = (inslow >> 28) & 0xf;
12711271
int i8_6 = (inslow >> 24) & 0x7;
12721272
int ci = (inslow >> 23) & 0x1;
12731273
int i5_3 = (inslow >> 20) & 0x7;
1274-
// int _sex = (inslow >> 19) & 0x1;
1274+
// int _sex = (inslow >> 19) & 0x1;
12751275
int i2_0 = (inslow >> 16) & 0x7;
12761276

12771277
sprintf(buffer, "%s %s,%s %x,%x,%c %d %s %s %s %.2x\n",
@@ -1613,7 +1613,7 @@ static int cquestlin_execute(int cycles)
16131613
cquestlin.pc[prog] = (cquestlin.pc[prog] + 1) & 0x7f;
16141614

16151615
if (prog == BACKGROUND)
1616-
cquestlin.pc[prog] |= 0x80;
1616+
cquestlin.pc[prog] |= 0x80;
16171617
else
16181618
{
16191619
/* Handle events that happen during FG execution */
@@ -1643,7 +1643,7 @@ static int cquestlin_execute(int cycles)
16431643
{
16441644
int _ycet;
16451645
int mux_sel = (BIT(cquestlin.sreg, SREG_DX_DY) << 1) | (BIT(cquestlin.sreg, SREG_DX) ^ BIT(cquestlin.sreg, SREG_DY));
1646-
1646+
16471647
if (mux_sel == 0)
16481648
_ycet = !(cquestlin.gt0reg && (spf == LSPF_BRES));
16491649
else if (mux_sel == 1)
@@ -1712,7 +1712,7 @@ static int cquestlin_execute(int cycles)
17121712
{
17131713
int _lpwrt = BIT(cquestlin.bglatch, 5);
17141714

1715-
cquestlin.bglatch =
1715+
cquestlin.bglatch =
17161716
(!(spf == LSPF_PWRT) << 5)
17171717
| (_lpwrt << 4)
17181718
| ((!_lpwrt || (!(spf == LSPF_PWRT) && (latch == LLATCH_BADLATCH))) << 2);
@@ -1759,7 +1759,7 @@ static int cquestlin_execute(int cycles)
17591759

17601760
static offs_t cquestlin_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram)
17611761
{
1762-
static const char* jmps[] =
1762+
static const char* jmps[] =
17631763
{
17641764
" ",
17651765
"JMSB ",
@@ -1780,7 +1780,7 @@ static offs_t cquestlin_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const
17801780
"?????",
17811781
};
17821782

1783-
static const char* latches[] =
1783+
static const char* latches[] =
17841784
{
17851785
" ",
17861786
"SEQLTCH",
@@ -1792,7 +1792,7 @@ static offs_t cquestlin_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const
17921792
"ZLTCH ",
17931793
};
17941794

1795-
static const char* spfs[] =
1795+
static const char* spfs[] =
17961796
{
17971797
" ",
17981798
"FSTOP ",

‎src/emu/cpu/sh2/sh2drc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ static void cfunc_checkirqs(void *param)
293293
-------------------------------------------------*/
294294
static void cfunc_fastirq(void *param)
295295
{
296-
sh2_exception("fastirq",sh2->irqline);
296+
sh2_exception("fastirq",sh2->irqline);
297297
}
298298

299299
/*-------------------------------------------------
@@ -1422,7 +1422,7 @@ static void generate_update_cycles(drcuml_block *block, compiler_state *compiler
14221422

14231423
UML_MOV(block, MEM(&sh2->pending_nmi), IMM(0)); // zap pending_nmi
14241424
UML_JMP(block, skip+1); // and then go take it (evec is already set)
1425-
1425+
14261426
UML_LABEL(block, skip+2); // skip+2:
14271427
UML_MOV(block, MEM(&sh2->evec), IMM(0xffffffff)); // mov evec, -1
14281428
UML_MOV(block, IREG(0), IMM(0xffffffff)); // mov r0, -1 (r0 = irq)

‎src/emu/machine/68681.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -383,15 +383,15 @@ READ8_DEVICE_HANDLER(duart68681_r)
383383
{
384384
r = 0xff;
385385
/*
386-
if (input_code_pressed(KEYCODE_1)) r ^= 0x0001;
387-
if (input_code_pressed(KEYCODE_2)) r ^= 0x0002;
388-
if (input_code_pressed(KEYCODE_3)) r ^= 0x0004;
389-
if (input_code_pressed(KEYCODE_4)) r ^= 0x0008;
390-
if (input_code_pressed(KEYCODE_5)) r ^= 0x0010;
391-
if (input_code_pressed(KEYCODE_6)) r ^= 0x0020;
392-
if (input_code_pressed(KEYCODE_7)) r ^= 0x0040;
393-
if (input_code_pressed(KEYCODE_8)) r ^= 0x0080;
394-
*/
386+
if (input_code_pressed(KEYCODE_1)) r ^= 0x0001;
387+
if (input_code_pressed(KEYCODE_2)) r ^= 0x0002;
388+
if (input_code_pressed(KEYCODE_3)) r ^= 0x0004;
389+
if (input_code_pressed(KEYCODE_4)) r ^= 0x0008;
390+
if (input_code_pressed(KEYCODE_5)) r ^= 0x0010;
391+
if (input_code_pressed(KEYCODE_6)) r ^= 0x0020;
392+
if (input_code_pressed(KEYCODE_7)) r ^= 0x0040;
393+
if (input_code_pressed(KEYCODE_8)) r ^= 0x0080;
394+
*/
395395
}
396396
break;
397397
case 0x0e: /* Start counter command */

0 commit comments

Comments
 (0)