From 8a12dd4dc6be33022fea9d54bf5abfdac21e6179 Mon Sep 17 00:00:00 2001 From: smf- Date: Tue, 25 Jul 2017 11:08:10 +0100 Subject: Don't assume a watch point exists for the address space passed to watchpoint_update_flags(), which fixes the hotspot command. (nw) --- src/emu/debug/debugcpu.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/emu/debug/debugcpu.cpp') 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); -- cgit v1.2.3