summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Olivier Galibert <olivier.galibert@lne.fr>2020-02-10 15:20:32 +0100
committer Olivier Galibert <olivier.galibert@lne.fr>2020-02-10 15:20:32 +0100
commit0d93f5038406d2fc2bf53634977cafab4854b367 (patch)
tree6e10bb1c8dbb949d379d895a23a4f120c34bf27d
parent209a097492e80cac2055fcc5eb68776cc27fe121 (diff)
xavix2: Finish the branches, hopefully [O. Galibert, N. Gilbert]
-rw-r--r--src/devices/cpu/xavix2/xavix2.cpp8
-rw-r--r--src/devices/cpu/xavix2/xavix2d.cpp10
2 files changed, 10 insertions, 8 deletions
diff --git a/src/devices/cpu/xavix2/xavix2.cpp b/src/devices/cpu/xavix2/xavix2.cpp
index 6bc9786884b..073e9de1efb 100644
--- a/src/devices/cpu/xavix2/xavix2.cpp
+++ b/src/devices/cpu/xavix2/xavix2.cpp
@@ -190,18 +190,20 @@ void xavix2_device::execute_run()
case 0xac: case 0xad: m_r[r1(opcode)] = do_lsr(m_r[r2(opcode)], m_r[r3(opcode)]); break;
case 0xae: case 0xaf: m_r[r1(opcode)] = do_lsl(m_r[r2(opcode)], m_r[r3(opcode)]); break;
- // d0-d1
+ case 0xd0: if(m_f & F_V) npc = m_pc + val8s(opcode); break;
+ case 0xd1: if(((m_f & F_N) && !(m_f & F_V)) || ((m_f & F_V) && !(m_f & F_N))) npc = m_pc + val8s(opcode); break;
case 0xd2: if(m_f & F_Z) npc = m_pc + val8s(opcode); break;
case 0xd3: if((m_f & F_Z) || ((m_f & F_N) && !(m_f & F_V)) || ((m_f & F_V) && !(m_f & F_N))) npc = m_pc + val8s(opcode); break;
case 0xd4: if(m_f & F_N) npc = m_pc + val8s(opcode); break;
case 0xd5: npc = m_pc + val8s(opcode); break;
case 0xd6: if(m_f & F_C) npc = m_pc + val8s(opcode); break;
case 0xd7: if((m_f & F_Z) || (m_f & F_C)) npc = m_pc + val8s(opcode); break;
- // d8-d9
+ case 0xd8: if(!(m_f & F_V)) npc = m_pc + val8s(opcode); break;
+ case 0xd9: if(((m_f & F_N) && (m_f & F_V)) || (!(m_f & F_V) && !(m_f & F_N))) npc = m_pc + val8s(opcode); break;
case 0xda: if(!(m_f & F_Z)) npc = m_pc + val8s(opcode); break;
case 0xdb: if((!(m_f & F_Z) && (m_f & F_N) && (m_f & F_V)) || (!(m_f & F_Z) && !(m_f & F_V) && !(m_f & F_N))) npc = m_pc + val8s(opcode); break;
case 0xdc: if(!(m_f & F_N)) npc = m_pc + val8s(opcode); break;
- // dd
+ case 0xdd: break;
case 0xde: if(!(m_f & F_C)) npc = m_pc + val8s(opcode); break;
case 0xdf: if(!(m_f & F_Z) && !(m_f & F_C)) npc = m_pc + val8s(opcode); break;
diff --git a/src/devices/cpu/xavix2/xavix2d.cpp b/src/devices/cpu/xavix2/xavix2d.cpp
index 57de7933fa7..8356a5a1085 100644
--- a/src/devices/cpu/xavix2/xavix2d.cpp
+++ b/src/devices/cpu/xavix2/xavix2d.cpp
@@ -246,20 +246,20 @@ offs_t xavix2_disassembler::disassemble(std::ostream &stream, offs_t pc, const d
case 0xb2: case 0xb3: util::stream_format(stream, "?b2 %s %s %s", r1(), r2(), r3()); break;
// b4-cf
- case 0xd0: util::stream_format(stream, "b?0 %s", rel8()); break;
- case 0xd1: util::stream_format(stream, "b?1 %s", rel8()); break;
+ case 0xd0: util::stream_format(stream, "bvs %s", rel8()); break;
+ case 0xd1: util::stream_format(stream, "blts %s", rel8()); break;
case 0xd2: util::stream_format(stream, "beq %s", rel8()); break;
case 0xd3: util::stream_format(stream, "bles %s", rel8()); break;
case 0xd4: util::stream_format(stream, "bmi %s", rel8()); break;
case 0xd5: util::stream_format(stream, "bra %s", rel8()); break;
case 0xd6: util::stream_format(stream, "bltu %s", rel8()); break;
case 0xd7: util::stream_format(stream, "bleu %s", rel8()); break;
- case 0xd8: util::stream_format(stream, "b?8 %s", rel8()); break;
- case 0xd9: util::stream_format(stream, "b?9 %s", rel8()); break;
+ case 0xd8: util::stream_format(stream, "bvc %s", rel8()); break;
+ case 0xd9: util::stream_format(stream, "bges %s", rel8()); break;
case 0xda: util::stream_format(stream, "bne %s", rel8()); break;
case 0xdb: util::stream_format(stream, "bgts %s", rel8()); break;
case 0xdc: util::stream_format(stream, "bpl %s", rel8()); break;
- case 0xdd: util::stream_format(stream, "b?d %s", rel8()); break;
+ case 0xdd: util::stream_format(stream, "bnv %s", rel8()); break;
case 0xde: util::stream_format(stream, "bgeu %s", rel8()); break;
case 0xdf: util::stream_format(stream, "bgtu %s", rel8()); break;