From a16e78a78b198c8cd65555e39817774f9c941beb Mon Sep 17 00:00:00 2001 From: AJR Date: Sat, 22 Jun 2019 23:41:30 -0400 Subject: [PATCH] bcpdasm: Correct some instruction decodings and formats (nw) dp8344: Tweak register display (nw) --- src/devices/cpu/bcp/bcpdasm.cpp | 5 +++-- src/devices/cpu/bcp/dp8344.cpp | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/devices/cpu/bcp/bcpdasm.cpp b/src/devices/cpu/bcp/bcpdasm.cpp index fbecb015f70..d8d11b107cf 100644 --- a/src/devices/cpu/bcp/bcpdasm.cpp +++ b/src/devices/cpu/bcp/bcpdasm.cpp @@ -263,8 +263,9 @@ offs_t dp8344_disassembler::disassemble(std::ostream &stream, offs_t pc, const d // AC00-ADFF: XORA Rs,[mIr] (3 T-states) util::stream_format(stream, "%-8s", aop_to_string((inst & 0x0e00) >> 9)); format_register(stream, inst & 0x001f); - stream << ","; + stream << ",["; format_modified_index_register(stream, (inst & 0x0060) >> 5, (inst & 0x0180) >> 7); + stream << "]"; } else if (!BIT(inst, 8)) { @@ -464,7 +465,7 @@ offs_t dp8344_disassembler::disassemble(std::ostream &stream, offs_t pc, const d // F400-F7FF: ORA Rs,Rd (2 T-states) // F800-FBFF: XORA Rs,Rd (2 T-states) // FC00-FFFF: MOVE Rs,Rd (2 T-states) - util::stream_format(stream, "%-8s", aop_to_string((inst & 0x0e00) >> 9)); + util::stream_format(stream, "%-8s", aop_to_string((inst & 0x1c00) >> 10)); format_register(stream, inst & 0x001f); stream << ","; format_register(stream, (inst & 0x03e0) >> 5); diff --git a/src/devices/cpu/bcp/dp8344.cpp b/src/devices/cpu/bcp/dp8344.cpp index 6130b5d8a2b..918e317018a 100644 --- a/src/devices/cpu/bcp/dp8344.cpp +++ b/src/devices/cpu/bcp/dp8344.cpp @@ -154,6 +154,8 @@ void dp8344_device::device_start() state_add(STATE_GENPC, "GENPC", m_pc).noshow(); state_add(STATE_GENPCBASE, "GENPCBASE", m_pc).noshow(); state_add(STATE_GENFLAGS, "GENFLAGS", m_ccr).noshow(); + state_add(BCP_BA, "BA", m_ba); + state_add(BCP_BB, "BB", m_bb); state_add(BCP_CCR, "CCR", m_ccr); state_add(BCP_NCF, "NCF", m_ncf); state_add(BCP_ICR, "ICR", m_icr); @@ -182,9 +184,6 @@ void dp8344_device::device_start() state_add(BCP_ASP, "ASP", m_asp).mask(0xf); state_add(BCP_DSP, "DSP", m_dsp).mask(0xf); - state_add(BCP_BA, "BA", m_ba); - state_add(BCP_BB, "BB", m_bb); - // save states save_item(NAME(m_pc)); save_item(NAME(m_nmi_state));