diff options
author | 2016-09-27 18:05:19 -0400 | |
---|---|---|
committer | 2016-09-27 18:05:19 -0400 | |
commit | e8d2853334d6779213352b2e7aa442d1ace45516 (patch) | |
tree | c7ede65dd03a891b33644fe2c3549aa6863cb02b /src/devices/cpu/m68000 | |
parent | 7f1bb873d19bc81907e800b2ab6ed00e82a79f28 (diff) |
Revert "Make sure all cpu's export STATE_GENPCBASE and use safe_pcbase() for everything in the debugger, which allows interruptible cpu's to work properly. [smf]"
This reverts commit 1a186c8a3a16a7ce99d7df2dd217a7552b696c92.
Diffstat (limited to 'src/devices/cpu/m68000')
-rw-r--r-- | src/devices/cpu/m68000/m68000.h | 6 | ||||
-rw-r--r-- | src/devices/cpu/m68000/m68kcpu.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h index 1ef00e16e14..6ccad0a03bd 100644 --- a/src/devices/cpu/m68000/m68000.h +++ b/src/devices/cpu/m68000/m68000.h @@ -106,7 +106,11 @@ enum M68K_D0, M68K_D1, M68K_D2, M68K_D3, M68K_D4, M68K_D5, M68K_D6, M68K_D7, M68K_A0, M68K_A1, M68K_A2, M68K_A3, M68K_A4, M68K_A5, M68K_A6, M68K_A7, M68K_FP0, M68K_FP1, M68K_FP2, M68K_FP3, M68K_FP4, M68K_FP5, M68K_FP6, M68K_FP7, - M68K_FPSR, M68K_FPCR + M68K_FPSR, M68K_FPCR, + + M68K_GENPC = STATE_GENPC, + M68K_GENSP = STATE_GENSP, + M68K_GENPCBASE = STATE_GENPCBASE }; unsigned int m68k_disassemble_raw(char* str_buff, unsigned int pc, const unsigned char* opdata, const unsigned char* argdata, unsigned int cpu_type); diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp index 053ab3d6976..18de1a02e04 100644 --- a/src/devices/cpu/m68000/m68kcpu.cpp +++ b/src/devices/cpu/m68000/m68kcpu.cpp @@ -1689,7 +1689,7 @@ void m68000_base_device::define_state(void) state_add(M68K_PC, "PC", pc).mask(addrmask); state_add(STATE_GENPC, "GENPC", pc).mask(addrmask).noshow(); - state_add(STATE_GENPCBASE, "CURPC", ppc).mask(addrmask).noshow(); + state_add(STATE_GENPCBASE, "GENPCBASE", ppc).mask(addrmask).noshow(); state_add(M68K_SP, "SP", dar[15]); state_add(STATE_GENSP, "GENSP", dar[15]).noshow(); state_add(STATE_GENFLAGS, "GENFLAGS", iotemp).noshow().callimport().callexport().formatstr("%16s"); |