summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author smf- <smf-@users.noreply.github.com>2017-07-25 11:08:10 +0100
committer Vas Crabb <vas@vastheman.com>2017-07-25 20:14:53 +1000
commit9b4b422ade102249c2ddccfca9cbdb011d964c0d (patch)
tree58e1e518e068caa753fda4bcbc299dcdf5b10458
parenta7e7d31c18371ebf0358e29c5e00f8f40c9c6790 (diff)
Don't assume a watch point exists for the address space passed to watchpoint_update_flags(), which fixes the hotspot command. (nw)
-rw-r--r--src/emu/debug/debugcpu.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp
index e682cbdafc6..43f1f60cd5c 100644
--- a/src/emu/debug/debugcpu.cpp
+++ b/src/emu/debug/debugcpu.cpp
@@ -2715,14 +2715,15 @@ void device_debug::watchpoint_update_flags(address_space &space)
// see if there are any enabled breakpoints
bool enablewrite = false;
- for (watchpoint *wp = m_wplist[space.spacenum()]; wp != nullptr; wp = wp->m_next)
- if (wp->m_enabled)
- {
- if (wp->m_type & WATCHPOINT_READ)
- enableread = true;
- if (wp->m_type & WATCHPOINT_WRITE)
- enablewrite = true;
- }
+ if (space.spacenum() < int(m_wplist.size()))
+ for (watchpoint *wp = m_wplist[space.spacenum()]; wp != nullptr; wp = wp->m_next)
+ if (wp->m_enabled)
+ {
+ if (wp->m_type & WATCHPOINT_READ)
+ enableread = true;
+ if (wp->m_type & WATCHPOINT_WRITE)
+ enablewrite = true;
+ }
// push the flags out globally
space.enable_read_watchpoints(enableread);