diff options
author | 2020-05-25 11:15:39 -0400 | |
---|---|---|
committer | 2020-05-25 11:15:39 -0400 | |
commit | 0fa6e7eb86d3b247c46f840ef230c9331f3cc948 (patch) | |
tree | e01509e44adcff62a7d8e087c58572fce6b90e13 /src/osd/modules/debugger/debuggdbstub.cpp | |
parent | ad7a31ad57b09e1e0e9bb1adb03767f9dd386605 (diff) |
Debugger expression and memory access overhaul
- Memory references in expressions no longer default to the console's visible CPU if no device name was specified, except when entered through the console itself. Expressions in view windows now use the context of the currently selected device instead.
- The pcatmem debug command and similar qt mouseover function now produce an error message if the initial address translation fails.
Related internal changes (nw)
- The debugger_cpu class no longer interprets memory accesses. The existing routines have been moved into symbol_table (which used to invoke them as callbacks), and reimplemented in most other places. Thecode duplication is a bit messy, but could be potentially improved in the future with new utility classes.
- The cheat engine no longer needs to hook into the debugger_cpu class or instantiate a dummy instance of it.
- The inclusion of debug/express.h within emu.h has been undone. Some debugging structures now need unique_ptr to wrap the resulting incomplete classes; hopefully the performance impact of this is negligible. Another direct consequence is that the breakpoint, watchpoint and registerpoint classes are no longer inside device_debug and have their own source file.
- The breakpoint list is now a std::multimap, using the addresses as keys to hopefully expedite lookup.
- The visible CPU pointer has been removed from the debugger_cpu class, being now considered a property of the console instead.
- Many minor bits of code have been simplified.
Diffstat (limited to 'src/osd/modules/debugger/debuggdbstub.cpp')
-rw-r--r-- | src/osd/modules/debugger/debuggdbstub.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/osd/modules/debugger/debuggdbstub.cpp b/src/osd/modules/debugger/debuggdbstub.cpp index 63dbd420184..b8c0bbe7b80 100644 --- a/src/osd/modules/debugger/debuggdbstub.cpp +++ b/src/osd/modules/debugger/debuggdbstub.cpp @@ -9,6 +9,7 @@ #include "emu.h" #include "debug/debugcon.h" #include "debug/debugcpu.h" +#include "debug/points.h" #include "debug/textbuf.h" #include "debug_module.h" #include "debugger.h" @@ -426,8 +427,8 @@ private: std::map<offs_t, uint64_t> m_address_map; - device_debug::breakpoint *m_triggered_breakpoint; - device_debug::watchpoint *m_triggered_watchpoint; + debug_breakpoint *m_triggered_breakpoint; + debug_watchpoint *m_triggered_watchpoint; std::string m_target_xml; @@ -596,7 +597,7 @@ void debug_gdbstub::wait_for_debugger(device_t &device, bool firststop) } else { - device_debug *debug = m_debugger_cpu->get_visible_cpu()->debug(); + device_debug *debug = m_debugger_console->get_visible_cpu()->debug(); m_triggered_watchpoint = debug->triggered_watchpoint(); m_triggered_breakpoint = debug->triggered_breakpoint(); if ( m_send_stop_packet ) @@ -683,7 +684,7 @@ debug_gdbstub::cmd_reply debug_gdbstub::handle_c(const char *buf) if ( *buf != '\0' ) return REPLY_UNSUPPORTED; - m_debugger_cpu->get_visible_cpu()->debug()->go(); + m_debugger_console->get_visible_cpu()->debug()->go(); m_send_stop_packet = true; return REPLY_NONE; } @@ -696,7 +697,7 @@ debug_gdbstub::cmd_reply debug_gdbstub::handle_D(const char *buf) if ( *buf != '\0' ) return REPLY_UNSUPPORTED; - m_debugger_cpu->get_visible_cpu()->debug()->go(); + m_debugger_console->get_visible_cpu()->debug()->go(); m_dettached = true; return REPLY_OK; @@ -752,7 +753,7 @@ debug_gdbstub::cmd_reply debug_gdbstub::handle_H(const char *buf) debug_gdbstub::cmd_reply debug_gdbstub::handle_k(const char *buf) { m_machine->schedule_exit(); - m_debugger_cpu->get_visible_cpu()->debug()->go(); + m_debugger_console->get_visible_cpu()->debug()->go(); m_dettached = true; m_socket.close(); return REPLY_NONE; @@ -969,7 +970,7 @@ debug_gdbstub::cmd_reply debug_gdbstub::handle_s(const char *buf) if ( *buf != '\0' ) return REPLY_UNSUPPORTED; - m_debugger_cpu->get_visible_cpu()->debug()->single_step(); + m_debugger_console->get_visible_cpu()->debug()->single_step(); m_send_stop_packet = true; return REPLY_NONE; } @@ -977,7 +978,7 @@ debug_gdbstub::cmd_reply debug_gdbstub::handle_s(const char *buf) //------------------------------------------------------------------------- static bool remove_breakpoint(device_debug *debug, uint64_t address, int /*kind*/) { - const device_debug::breakpoint *bp = debug->breakpoint_find(address); + const debug_breakpoint *bp = debug->breakpoint_find(address); if (bp != nullptr) return debug->breakpoint_clear(bp->index()); return false; @@ -1021,7 +1022,7 @@ debug_gdbstub::cmd_reply debug_gdbstub::handle_z(const char *buf) m_address_map.erase(offset); } - device_debug *debug = m_debugger_cpu->get_visible_cpu()->debug(); + device_debug *debug = m_debugger_console->get_visible_cpu()->debug(); switch ( type ) { // Note: software and hardware breakpoints are treated both the @@ -1062,7 +1063,7 @@ debug_gdbstub::cmd_reply debug_gdbstub::handle_Z(const char *buf) m_address_map[offset] = address; } - device_debug *debug = m_debugger_cpu->get_visible_cpu()->debug(); + device_debug *debug = m_debugger_console->get_visible_cpu()->debug(); switch ( type ) { // Note: software and hardware breakpoints are treated both the |