diff options
author | Lord-Nightmare <Lord-Nightmare@users.noreply.github.com> | 2016-09-27 18:05:19 -0400 |
---|---|---|
committer | Lord-Nightmare <Lord-Nightmare@users.noreply.github.com> | 2016-09-27 18:05:19 -0400 |
commit | e8d2853334d6779213352b2e7aa442d1ace45516 (patch) | |
tree | c7ede65dd03a891b33644fe2c3549aa6863cb02b /src/emu | |
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/emu')
-rw-r--r-- | src/emu/debug/debugcmd.cpp | 2 | ||||
-rw-r--r-- | src/emu/debug/debugcpu.cpp | 6 | ||||
-rw-r--r-- | src/emu/debug/dvdisasm.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/debug/debugcmd.cpp b/src/emu/debug/debugcmd.cpp index 9fd4d1a860b..99cdefb3b36 100644 --- a/src/emu/debug/debugcmd.cpp +++ b/src/emu/debug/debugcmd.cpp @@ -2628,7 +2628,7 @@ void debugger_commands::execute_trackpc(int ref, int params, const char *param[] // Insert current pc if (m_cpu.get_visible_cpu() == cpu) { - const offs_t pc = cpu->safe_pcbase(); + const offs_t pc = cpu->safe_pc(); cpu->debug()->set_track_pc_visited(pc); } m_console.printf("PC tracking enabled\n"); diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp index 5e6535a9fb4..7fbcb29b3ea 100644 --- a/src/emu/debug/debugcpu.cpp +++ b/src/emu/debug/debugcpu.cpp @@ -1939,7 +1939,7 @@ void device_debug::instruction_hook(offs_t curpc) // handle step out/over on the instruction we are about to execute if ((m_flags & (DEBUG_FLAG_STEPPING_OVER | DEBUG_FLAG_STEPPING_OUT)) != 0 && m_stepaddr == ~0) - prepare_for_step_overout(m_device.safe_pcbase()); + prepare_for_step_overout(m_device.safe_pc()); // no longer in debugger code debugcpu.set_within_instruction(false); @@ -2955,7 +2955,7 @@ void debugger_cpu::watchpoint_check(address_space& space, int type, offs_t addre { "0bytes", "byte", "word", "3bytes", "dword", "5bytes", "6bytes", "7bytes", "qword" }; - offs_t pc = space.device().safe_pcbase(); + offs_t pc = space.device().safe_pc(); std::string buffer; if (type & WATCHPOINT_WRITE) @@ -2985,7 +2985,7 @@ void debugger_cpu::watchpoint_check(address_space& space, int type, offs_t addre void device_debug::hotspot_check(address_space &space, offs_t address) { - offs_t curpc = m_device.safe_pcbase(); + offs_t curpc = m_device.safe_pc(); // see if we have a match in our list unsigned int hotindex; diff --git a/src/emu/debug/dvdisasm.cpp b/src/emu/debug/dvdisasm.cpp index b793a7a553e..bc7ca2a2300 100644 --- a/src/emu/debug/dvdisasm.cpp +++ b/src/emu/debug/dvdisasm.cpp @@ -167,7 +167,7 @@ void debug_view_disasm::view_char(int chval) case DCH_HOME: // set the active column to the PC { const debug_view_disasm_source &source = downcast<const debug_view_disasm_source &>(*m_source); - offs_t pc = source.m_space.address_to_byte(source.device()->safe_pcbase()) & source.m_space.logbytemask(); + offs_t pc = source.m_space.address_to_byte(source.device()->safe_pc()) & source.m_space.logbytemask(); // figure out which row the pc is on for (unsigned int curline = 0; curline < m_byteaddress.size(); curline++) |