diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2019-05-19 12:56:47 -0400 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2019-05-19 13:06:07 -0400 |
commit | aea0a4f9662ed004541b6913470be0b804403e60 (patch) | |
tree | bbabed204c9663997d0cd9850545c9298073464d | |
parent | 788ed71261d998f167a2ef80a42831afa58e7520 (diff) |
m68kcpu: Show SR; rename ISP to SSP for pre-68020 (nw)
m68kdasm: Fix MOVEC formatting (nw)
-rw-r--r-- | src/devices/cpu/m68000/m68kcpu.cpp | 10 | ||||
-rw-r--r-- | src/devices/cpu/m68000/m68kdasm.cpp | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp index d974757c87a..fe37458425d 100644 --- a/src/devices/cpu/m68000/m68kcpu.cpp +++ b/src/devices/cpu/m68000/m68kcpu.cpp @@ -1647,14 +1647,18 @@ void m68000_base_device::define_state(void) state_add(STATE_GENPC, "PC", m_pc).mask(addrmask).callimport(); state_add(STATE_GENPCBASE, "CURPC", m_ppc).mask(addrmask).callimport().noshow(); + state_add(M68K_SR, "SR", m_iotemp).callimport().callexport().mask(m_sr_mask); + state_add(STATE_GENFLAGS, "GENFLAGS", m_iotemp).noshow().callimport().callexport().formatstr("%16s"); state_add(M68K_SP, "SP", m_dar[15]); state_add(STATE_GENSP, "GENSP", m_dar[15]).noshow(); - state_add(STATE_GENFLAGS, "GENFLAGS", m_iotemp).noshow().callimport().callexport().formatstr("%16s"); - state_add(M68K_ISP, "ISP", m_iotemp).callimport().callexport(); state_add(M68K_USP, "USP", m_iotemp).callimport().callexport(); if (m_cpu_type & MASK_020_OR_LATER) + { + state_add(M68K_ISP, "ISP", m_iotemp).callimport().callexport(); state_add(M68K_MSP, "MSP", m_iotemp).callimport().callexport(); - state_add(M68K_SR, "SR", m_iotemp).noshow().callimport().callexport(); + } + else + state_add(M68K_ISP, "SSP", m_iotemp).callimport().callexport(); for (int regnum = 0; regnum < 8; regnum++) { state_add(M68K_D0 + regnum, string_format("D%d", regnum).c_str(), m_dar[regnum]); diff --git a/src/devices/cpu/m68000/m68kdasm.cpp b/src/devices/cpu/m68000/m68kdasm.cpp index f87fdc5082c..d0cb3ac63d6 100644 --- a/src/devices/cpu/m68000/m68kdasm.cpp +++ b/src/devices/cpu/m68000/m68kdasm.cpp @@ -1897,9 +1897,9 @@ std::string m68k_disassembler::d68010_movec() } if(BIT(m_cpu_ir, 0)) - return util::string_format("movec %c%d, %s; (%s)", BIT(extension, 15) ? 'A' : 'D', (extension>>12)&7, reg_name, processor); + return util::string_format("movec %c%d, %s; (%s)", BIT(extension, 15) ? 'A' : 'D', (extension>>12)&7, reg_name, processor); else - return util::string_format("movec %s, %c%d; (%s)", reg_name, BIT(extension, 15) ? 'A' : 'D', (extension>>12)&7, processor); + return util::string_format("movec %s, %c%d; (%s)", reg_name, BIT(extension, 15) ? 'A' : 'D', (extension>>12)&7, processor); } std::string m68k_disassembler::d68000_movem_pd_16() |