summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2021-08-27 11:47:49 -0400
committer AJR <ajrhacker@users.noreply.github.com>2021-08-27 11:47:49 -0400
commitaef90f0db9ae60be5d03e86b4418c57f10f6b06b (patch)
tree87ad35ee86589f54052109e3db0e7b9cf5609d4d
parentaa4ca64ecbf3c364da3e8aa50ff5e5235ae32217 (diff)
Octalize watchpoint hit message for memory spaces defined as octal
-rw-r--r--src/emu/debug/points.cpp28
1 files changed, 19 insertions, 9 deletions
diff --git a/src/emu/debug/points.cpp b/src/emu/debug/points.cpp
index 5bb85fa2ea2..ac0dc293324 100644
--- a/src/emu/debug/points.cpp
+++ b/src/emu/debug/points.cpp
@@ -371,19 +371,29 @@ void debug_watchpoint::triggered(read_or_write type, offs_t address, u64 data, u
{
std::string buffer;
- buffer = string_format(type == read_or_write::READ ?
- "Stopped at watchpoint %X reading %0*X from %08X" :
- "Stopped at watchpoint %X writing %0*X to %08X",
- m_index,
- size * unit_size / 4,
- data,
- address);
+ if (m_space.is_octal())
+ buffer = string_format(type == read_or_write::READ ?
+ "Stopped at watchpoint %X reading %0*o from %0*o" :
+ "Stopped at watchpoint %X writing %0*o to %0*o",
+ m_index,
+ (size * unit_size + 2) / 3,
+ data,
+ (m_space.addr_width() + 2) / 3,
+ address);
+ else
+ buffer = string_format(type == read_or_write::READ ?
+ "Stopped at watchpoint %X reading %0*X from %0*X" :
+ "Stopped at watchpoint %X writing %0*X to %0*X",
+ m_index,
+ size * unit_size / 4,
+ data,
+ m_space.addr_width() / 4,
+ address);
const device_state_interface *state;
if (debug.cpu().live_cpu() == &m_debugInterface->device() && m_debugInterface->device().interface(state))
{
- offs_t pc = state->pcbase();
- debug.console().printf("%s (PC=%X)\n", buffer, pc);
+ debug.console().printf("%s (PC=%s)\n", buffer, state->state_string(STATE_GENPCBASE));
m_debugInterface->compute_debug_flags();
}
else if (!was_stopped)