summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2020-02-11 16:14:32 -0500
committer AJR <ajrhacker@users.noreply.github.com>2020-02-11 16:14:32 -0500
commit690da61f2c748d9f9e76c3130d793a09cffd0daf (patch)
treecf4999c33084954f24208ad33f421fd20ad77417
parent31ec471cf6aa5a157e9d1d4297b4aed14555f4d6 (diff)
upd78k1d: Various subtle fixes (nw)
cit1500: Note pin count (nw)
-rw-r--r--src/devices/cpu/upd78k/upd78k1d.cpp17
-rw-r--r--src/mame/drivers/cit1500.cpp4
2 files changed, 10 insertions, 11 deletions
diff --git a/src/devices/cpu/upd78k/upd78k1d.cpp b/src/devices/cpu/upd78k/upd78k1d.cpp
index e6581d48986..d9e6c04f66d 100644
--- a/src/devices/cpu/upd78k/upd78k1d.cpp
+++ b/src/devices/cpu/upd78k/upd78k1d.cpp
@@ -106,7 +106,7 @@ offs_t upd78k1_disassembler::dasm_02xx(std::ostream &stream, u8 op1, u8 op2, off
util::stream_format(stream, "%s", s_psw_bits[op2 & 0x07]);
return 2 | SUPPORTED;
}
- else if (op2 < (BIT(op2, 3) ? 0xa0 : 0x80))
+ else if (op2 < 0xa0)
{
util::stream_format(stream, "%-8s", op2 < 0x80 ? "NOT1" : BIT(op2, 4) ? "CLR1" : "SET1");
if (BIT(op1, 0))
@@ -551,15 +551,14 @@ offs_t upd78k1_disassembler::disassemble(std::ostream &stream, offs_t pc, const
else
{
u8 n = opcodes.r8(pc + 1);
- util::stream_format(stream, "%-8s", s_shift_ops[op & 0x01][(n & 0xc0) >> 6]);
- if (n < 0xc0)
+ if ((n & 0xc0) != 0xc1)
{
- util::stream_format(stream, "%s,%d", s_r_names[n & 0x07], (n & 0x38) >> 3);
- return 2 | SUPPORTED;
- }
- else if (!BIT(n, 0))
- {
- util::stream_format(stream, "%s,%d", s_rp_names[(n & 0x06) >> 1], (n & 0x38) >> 3);
+ util::stream_format(stream, "%-8s", s_shift_ops[op & 0x01][(n & 0xc0) >> 6]);
+ if (n >= 0xc0)
+ stream << s_rp_names[(n & 0x06) >> 1];
+ else
+ stream << s_r_names[n & 0x07];
+ util::stream_format(stream, ",%d", (n & 0x38) >> 3);
return 2 | SUPPORTED;
}
else
diff --git a/src/mame/drivers/cit1500.cpp b/src/mame/drivers/cit1500.cpp
index 0979c1539df..b8b1e30badc 100644
--- a/src/mame/drivers/cit1500.cpp
+++ b/src/mame/drivers/cit1500.cpp
@@ -7,7 +7,7 @@
Components (trmavia):
Parts side:
-CIT1500 (78K/0 MCU): NEC CITESA ICS1 7CE52872AA 0143H8L01
+CIT1500 (80-pin 78K/0 MCU): NEC CITESA ICS1 7CE52872AA 0143H8L01
CIT1200: ST HCF4067 Analog Multiplexer/demultiplexer
CIT500: Philips TEA1067AT Telephone Transmission Circuit With Dialler Interface
CIT1400 (display?) NEC D7225GB 0119EY002
@@ -23,7 +23,7 @@ Philips 74HC573D (behind the LCD)
Components (teletup):
Parts side:
-CIT1500 (78K/0 MCU): NEC CITESA ICS1 7CE52872AA 0143H8L01
+CIT1500 (80-pin 78K/0 MCU): NEC CITESA ICS1 7CE52872AA 0143H8L01
CIT1200: ST HCF4067 Analog Multiplexer/demultiplexer
CIT500: Philips TEA1067AT Telephone Transmission Circuit With Dialler Interface
CIT1400: (display?) NEC D7225GB 0119EY002