summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/debug/debugcpu.cpp
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2021-09-22 17:33:08 -0400
committer AJR <ajrhacker@users.noreply.github.com>2021-09-22 17:33:27 -0400
commit3d5033cc533e9090eae3393937079d4b13b5a23b (patch)
treeeba5585dd470fe20fb2f8b581b5c4b59cb02459f /src/emu/debug/debugcpu.cpp
parent401dccf05eb2c35697eb6c7406bb689bfa864609 (diff)
Make debugger 'out' command step over return delay slots on SH architectures
Diffstat (limited to 'src/emu/debug/debugcpu.cpp')
-rw-r--r--src/emu/debug/debugcpu.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp
index 233e369433e..d28265d7b33 100644
--- a/src/emu/debug/debugcpu.cpp
+++ b/src/emu/debug/debugcpu.cpp
@@ -1607,12 +1607,20 @@ void device_debug::prepare_for_step_overout(offs_t pc)
}
// if we're stepping out and this isn't a step out instruction, reset the steps until stop to a high number
+ // (TODO: this doesn't work with conditional return instructions)
if ((m_flags & DEBUG_FLAG_STEPPING_OUT) != 0)
{
if ((dasmresult & util::disasm_interface::SUPPORTED) != 0 && (dasmresult & util::disasm_interface::STEP_OUT) == 0)
m_stepsleft = 100;
else
- m_stepsleft = 1;
+ {
+ // add extra instructions for delay slots
+ int extraskip = (dasmresult & util::disasm_interface::OVERINSTMASK) >> util::disasm_interface::OVERINSTSHIFT;
+ m_stepsleft = extraskip + 1;
+
+ // take the last few steps normally
+ m_flags = (m_flags | DEBUG_FLAG_STEPPING) & ~DEBUG_FLAG_STEPPING_OUT;
+ }
}
}