From 42928659e8d4ff4edffc36acabe3d9040dbc1326 Mon Sep 17 00:00:00 2001
From: polaris- <nagatospam@gmail.com>
Date: Sun, 4 Oct 2015 11:22:31 -0400
Subject: Use BreakpointAddress struct instead of passing address directly
---
src/core/gdbstub/gdbstub.cpp | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
(limited to 'src/core/gdbstub/gdbstub.cpp')
diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp
index ced1c54f56..25ce63b29f 100644
--- a/src/core/gdbstub/gdbstub.cpp
+++ b/src/core/gdbstub/gdbstub.cpp
@@ -231,13 +231,18 @@ static void RemoveBreakpoint(BreakpointType type, PAddr addr) {
}
}
-PAddr GetNextBreakpointFromAddress(PAddr addr, BreakpointType type) {
+BreakpointAddress GetNextBreakpointFromAddress(PAddr addr, BreakpointType type) {
std::map<u32, Breakpoint>& p = GetBreakpointList(type);
auto next_breakpoint = p.lower_bound(addr);
- u32 breakpoint = -1;
+ BreakpointAddress breakpoint;
- if (next_breakpoint != p.end())
- breakpoint = next_breakpoint->first;
+ if (next_breakpoint != p.end()) {
+ breakpoint.address = next_breakpoint->first;
+ breakpoint.type = type;
+ } else {
+ breakpoint.address = 0;
+ breakpoint.type = BreakpointType::None;
+ }
return breakpoint;
}
--
cgit v1.2.3-70-g09d2