From fe85f5902eca08978bb225dce69bdde0cccdad3f Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Thu, 13 Feb 2020 23:31:24 +0100 Subject: Branches reorg (nw) --- src/devices/cpu/xavix2/xavix2.cpp | 16 ++++++++-------- src/devices/cpu/xavix2/xavix2d.cpp | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/devices/cpu/xavix2/xavix2.cpp b/src/devices/cpu/xavix2/xavix2.cpp index b9d667f7d7b..b2dfac375c8 100644 --- a/src/devices/cpu/xavix2/xavix2.cpp +++ b/src/devices/cpu/xavix2/xavix2.cpp @@ -362,21 +362,21 @@ void xavix2_device::execute_run() case 0xca: case 0xcb: m_hr[val6u(opcode)] = m_r[r1(opcode)]; break; 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 0xd1: if(!(m_f & F_C)) 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 0xd3: if((m_f & F_Z) || (m_f & F_C)) 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; + case 0xd6: if(((m_f & F_N) && !(m_f & F_V)) || ((m_f & F_V) && !(m_f & F_N))) npc = m_pc + val8s(opcode); break; + case 0xd7: 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 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 0xd9: if(m_f & F_C) 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 0xdb: if(!(m_f & F_Z) && !(m_f & F_C)) npc = m_pc + val8s(opcode); break; case 0xdc: if(!(m_f & F_N)) npc = m_pc + val8s(opcode); break; 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; + case 0xde: if(((m_f & F_N) && (m_f & F_V)) || (!(m_f & F_V) && !(m_f & F_N))) npc = m_pc + val8s(opcode); break; + case 0xdf: 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 0xe0: npc = m_r[7]; break; case 0xe1: m_f = m_if1; npc = m_ilr1; break; diff --git a/src/devices/cpu/xavix2/xavix2d.cpp b/src/devices/cpu/xavix2/xavix2d.cpp index 7a4acfbf7b6..ef91d93bb3e 100644 --- a/src/devices/cpu/xavix2/xavix2d.cpp +++ b/src/devices/cpu/xavix2/xavix2d.cpp @@ -311,21 +311,21 @@ offs_t xavix2_disassembler::disassemble(std::ostream &stream, offs_t pc, const d // cc-cf case 0xd0: util::stream_format(stream, "bvs %s", rel8()); break; - case 0xd1: util::stream_format(stream, "blts %s", rel8()); break; + case 0xd1: util::stream_format(stream, "bgeu %s", rel8()); break; case 0xd2: util::stream_format(stream, "beq %s", rel8()); break; - case 0xd3: util::stream_format(stream, "bles %s", rel8()); break; + case 0xd3: util::stream_format(stream, "bleu %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 0xd6: util::stream_format(stream, "blts %s", rel8()); break; + case 0xd7: util::stream_format(stream, "bles %s", rel8()); break; case 0xd8: util::stream_format(stream, "bvc %s", rel8()); break; - case 0xd9: util::stream_format(stream, "bges %s", rel8()); break; + case 0xd9: util::stream_format(stream, "bltu %s", rel8()); break; case 0xda: util::stream_format(stream, "bne %s", rel8()); break; - case 0xdb: util::stream_format(stream, "bgts %s", rel8()); break; + case 0xdb: util::stream_format(stream, "bgtu %s", rel8()); break; case 0xdc: util::stream_format(stream, "bpl %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; + case 0xde: util::stream_format(stream, "bges %s", rel8()); break; + case 0xdf: util::stream_format(stream, "bgts %s", rel8()); break; case 0xe0: util::stream_format(stream, "jmp lr"); flags = STEP_OUT; break; case 0xe1: util::stream_format(stream, "rti1"); flags = STEP_OUT; break; -- cgit v1.2.3