summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/mcs96
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2013-01-11 07:32:46 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2013-01-11 07:32:46 +0000
commit0e19f641d3186cdbf51f8ca857e2b07ab95779c2 (patch)
tree234109de1123b13f217494af4b3f8efad346d5cc /src/emu/cpu/mcs96
parent111157ca09a9ff60fe4a9ba49173c315e94314fa (diff)
Cleanups and version bumpmame0148
Diffstat (limited to 'src/emu/cpu/mcs96')
-rw-r--r--src/emu/cpu/mcs96/i8x9x.c6
-rw-r--r--src/emu/cpu/mcs96/i8xc196.h2
-rw-r--r--src/emu/cpu/mcs96/mcs96.c34
-rw-r--r--src/emu/cpu/mcs96/mcs96.h46
-rw-r--r--src/emu/cpu/mcs96/mcs96ops.lst2
5 files changed, 45 insertions, 45 deletions
diff --git a/src/emu/cpu/mcs96/i8x9x.c b/src/emu/cpu/mcs96/i8x9x.c
index 74921d2aa34..d5098086019 100644
--- a/src/emu/cpu/mcs96/i8x9x.c
+++ b/src/emu/cpu/mcs96/i8x9x.c
@@ -305,7 +305,7 @@ void i8x9x_device::serial_w(UINT8 val)
UINT16 i8x9x_device::timer_value(int timer, UINT64 current_time) const
{
if(timer == 2)
- current_time -= base_timer2;
+ current_time -= base_timer2;
return current_time >> 3;
}
@@ -346,10 +346,10 @@ void i8x9x_device::internal_update(UINT64 current_time)
UINT8 cmd = hso_info[i].command;
UINT16 t = hso_info[i].time;
if(((cmd & 0x40) && t == current_timer2) ||
- (!(cmd & 0x40) && t == current_timer1)) {
+ (!(cmd & 0x40) && t == current_timer1)) {
if(cmd != 0x18 && cmd != 0x19)
logerror("%s: hso cam %02x %04x in slot %d triggered\n",
- tag(), cmd, t, i);
+ tag(), cmd, t, i);
trigger_cam(i, current_time);
}
}
diff --git a/src/emu/cpu/mcs96/i8xc196.h b/src/emu/cpu/mcs96/i8xc196.h
index 7a7fcd2b77d..082a87c3e8a 100644
--- a/src/emu/cpu/mcs96/i8xc196.h
+++ b/src/emu/cpu/mcs96/i8xc196.h
@@ -52,7 +52,7 @@ public:
virtual void do_exec_full();
virtual void do_exec_partial();
- virtual void next(int cycles);
+ virtual void next(int cycles);
virtual void io_w8(UINT8 adr, UINT8 data);
virtual void io_w16(UINT8 adr, UINT16 data);
virtual UINT8 io_r8(UINT8 adr);
diff --git a/src/emu/cpu/mcs96/mcs96.c b/src/emu/cpu/mcs96/mcs96.c
index 224cd944e27..d63e01fc428 100644
--- a/src/emu/cpu/mcs96/mcs96.c
+++ b/src/emu/cpu/mcs96/mcs96.c
@@ -65,7 +65,7 @@ void mcs96_device::device_start()
sprintf(buf, "R%02x", i*2+0x18);
state_add(MCS96_R+i, buf, R[i]);
}
-
+
memset(R, 0, sizeof(R));
}
@@ -162,22 +162,22 @@ void mcs96_device::state_string_export(const device_state_entry &entry, astring
switch(entry.index()) {
case STATE_GENFLAGS:
case MCS96_PSW:
- string.printf("%c%c%c%c%c%c%c %c%c%c%c%c%c%c%c",
- PSW & F_Z ? 'Z' : '.',
- PSW & F_N ? 'N' : '.',
- PSW & F_V ? 'V' : '.',
- PSW & F_VT ? 'v' : '.',
- PSW & F_C ? 'C' : '.',
- PSW & F_I ? 'I' : '.',
- PSW & F_ST ? 'S' : '.',
- PSW & 0x80 ? '7' : '.',
- PSW & 0x40 ? '6' : '.',
- PSW & 0x20 ? '5' : '.',
- PSW & 0x10 ? '4' : '.',
- PSW & 0x08 ? '3' : '.',
- PSW & 0x04 ? '2' : '.',
- PSW & 0x02 ? '1' : '.',
- PSW & 0x01 ? '0' : '.');
+ string.printf("%c%c%c%c%c%c%c %c%c%c%c%c%c%c%c",
+ PSW & F_Z ? 'Z' : '.',
+ PSW & F_N ? 'N' : '.',
+ PSW & F_V ? 'V' : '.',
+ PSW & F_VT ? 'v' : '.',
+ PSW & F_C ? 'C' : '.',
+ PSW & F_I ? 'I' : '.',
+ PSW & F_ST ? 'S' : '.',
+ PSW & 0x80 ? '7' : '.',
+ PSW & 0x40 ? '6' : '.',
+ PSW & 0x20 ? '5' : '.',
+ PSW & 0x10 ? '4' : '.',
+ PSW & 0x08 ? '3' : '.',
+ PSW & 0x04 ? '2' : '.',
+ PSW & 0x02 ? '1' : '.',
+ PSW & 0x01 ? '0' : '.');
break;
}
}
diff --git a/src/emu/cpu/mcs96/mcs96.h b/src/emu/cpu/mcs96/mcs96.h
index 570a48f78a7..f4f6bb23408 100644
--- a/src/emu/cpu/mcs96/mcs96.h
+++ b/src/emu/cpu/mcs96/mcs96.h
@@ -69,29 +69,29 @@ protected:
};
enum {
- DASM_none, /* No parameters */
- DASM_nop_2, /* One ignored parameter byte */
- DASM_rel8, /* Relative, 8 bits */
- DASM_rel11, /* Relative, 11 bits */
- DASM_rel16, /* Relative, 16 bits */
- DASM_rrel8, /* Register + relative, 8 bits */
- DASM_brrel8, /* Bit test + register + relative, 8 bits */
- DASM_direct_1, /* Register-direct references, 1 operator */
- DASM_direct_2, /* Register-direct references, 2 operators */
- DASM_direct_3, /* Register-direct references, 3 operators */
- DASM_immed_1b, /* Immediate references to byte, 1 operator */
- DASM_immed_2b, /* Immediate references to byte, 2 operators */
- DASM_immed_3b, /* Immediate references to byte, 3 operators */
- DASM_immed_1w, /* Immediate references to word, 1 operator */
- DASM_immed_2w, /* Immediate references to word, 2 operators */
- DASM_immed_3w, /* Immediate references to word, 3 operators */
- DASM_indirect_1n, /* Indirect normal, 1 operator */
- DASM_indirect_1, /* Indirect, normal or auto-incrementing, 1 operator */
- DASM_indirect_2, /* Indirect, normal or auto-incrementing, 2 operators */
- DASM_indirect_3, /* Indirect, normal or auto-incrementing, 3 operators */
- DASM_indexed_1, /* Indexed, short or long, 1 operator */
- DASM_indexed_2, /* Indexed, short or long, 2 operators */
- DASM_indexed_3, /* Indexed, short or long, 3 operators */
+ DASM_none, /* No parameters */
+ DASM_nop_2, /* One ignored parameter byte */
+ DASM_rel8, /* Relative, 8 bits */
+ DASM_rel11, /* Relative, 11 bits */
+ DASM_rel16, /* Relative, 16 bits */
+ DASM_rrel8, /* Register + relative, 8 bits */
+ DASM_brrel8, /* Bit test + register + relative, 8 bits */
+ DASM_direct_1, /* Register-direct references, 1 operator */
+ DASM_direct_2, /* Register-direct references, 2 operators */
+ DASM_direct_3, /* Register-direct references, 3 operators */
+ DASM_immed_1b, /* Immediate references to byte, 1 operator */
+ DASM_immed_2b, /* Immediate references to byte, 2 operators */
+ DASM_immed_3b, /* Immediate references to byte, 3 operators */
+ DASM_immed_1w, /* Immediate references to word, 1 operator */
+ DASM_immed_2w, /* Immediate references to word, 2 operators */
+ DASM_immed_3w, /* Immediate references to word, 3 operators */
+ DASM_indirect_1n, /* Indirect normal, 1 operator */
+ DASM_indirect_1, /* Indirect, normal or auto-incrementing, 1 operator */
+ DASM_indirect_2, /* Indirect, normal or auto-incrementing, 2 operators */
+ DASM_indirect_3, /* Indirect, normal or auto-incrementing, 3 operators */
+ DASM_indexed_1, /* Indexed, short or long, 1 operator */
+ DASM_indexed_2, /* Indexed, short or long, 2 operators */
+ DASM_indexed_3, /* Indexed, short or long, 3 operators */
};
// device-level overrides
diff --git a/src/emu/cpu/mcs96/mcs96ops.lst b/src/emu/cpu/mcs96/mcs96ops.lst
index 0eefa2e2d92..02b1c331a05 100644
--- a/src/emu/cpu/mcs96/mcs96ops.lst
+++ b/src/emu/cpu/mcs96/mcs96ops.lst
@@ -1496,7 +1496,7 @@ c0 st direct_2
next(4);
c1 bmov direct_2 196
-
+
c2 st indirect_2
any_w16(OP1, reg_r16(OP2));
post_indirect 2 7 8 // +4 when external