diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-08-05 15:55:57 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-08-05 15:56:01 -0400 |
| commit | ca96f8db4e13e857be2f90e147c663e1277fb0e6 (patch) | |
| tree | 9be1cb67a5a33ca24b0bd4a660690a874cb95acd /src/core/gdbstub/gdbstub.cpp | |
| parent | e06953626cdf7da5855f0fceafc2643bad490a7b (diff) | |
gdbstub: Replace PAddr alias with VAddr
In all cases, a virtual address is being passed in, not a physical one.
Diffstat (limited to 'src/core/gdbstub/gdbstub.cpp')
| -rw-r--r-- | src/core/gdbstub/gdbstub.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp index 75f6b82353..ac53ba7520 100644 --- a/src/core/gdbstub/gdbstub.cpp +++ b/src/core/gdbstub/gdbstub.cpp @@ -171,7 +171,7 @@ WSADATA InitData; struct Breakpoint { bool active; - PAddr addr; + VAddr addr; u64 len; }; @@ -181,13 +181,13 @@ static std::map<u64, Breakpoint> breakpoints_write; struct Module { std::string name; - PAddr beg; - PAddr end; + VAddr beg; + VAddr end; }; static std::vector<Module> modules; -void RegisterModule(std::string name, PAddr beg, PAddr end, bool add_elf_ext) { +void RegisterModule(std::string name, VAddr beg, VAddr end, bool add_elf_ext) { Module module; if (add_elf_ext) { Common::SplitPath(name, nullptr, &module.name, nullptr); @@ -441,7 +441,7 @@ static std::map<u64, Breakpoint>& GetBreakpointList(BreakpointType type) { * @param type Type of breakpoint. * @param addr Address of breakpoint. */ -static void RemoveBreakpoint(BreakpointType type, PAddr addr) { +static void RemoveBreakpoint(BreakpointType type, VAddr addr) { std::map<u64, Breakpoint>& p = GetBreakpointList(type); auto bp = p.find(static_cast<u64>(addr)); @@ -452,7 +452,7 @@ static void RemoveBreakpoint(BreakpointType type, PAddr addr) { } } -BreakpointAddress GetNextBreakpointFromAddress(PAddr addr, BreakpointType type) { +BreakpointAddress GetNextBreakpointFromAddress(VAddr addr, BreakpointType type) { std::map<u64, Breakpoint>& p = GetBreakpointList(type); auto next_breakpoint = p.lower_bound(static_cast<u64>(addr)); BreakpointAddress breakpoint; @@ -468,7 +468,7 @@ BreakpointAddress GetNextBreakpointFromAddress(PAddr addr, BreakpointType type) return breakpoint; } -bool CheckBreakpoint(PAddr addr, BreakpointType type) { +bool CheckBreakpoint(VAddr addr, BreakpointType type) { if (!IsConnected()) { return false; } @@ -975,7 +975,7 @@ static void Continue() { * @param addr Address of breakpoint. * @param len Length of breakpoint. */ -static bool CommitBreakpoint(BreakpointType type, PAddr addr, u64 len) { +static bool CommitBreakpoint(BreakpointType type, VAddr addr, u64 len) { std::map<u64, Breakpoint>& p = GetBreakpointList(type); Breakpoint breakpoint; @@ -1015,7 +1015,7 @@ static void AddBreakpoint() { auto start_offset = command_buffer + 3; auto addr_pos = std::find(start_offset, command_buffer + command_length, ','); - PAddr addr = HexToLong(start_offset, static_cast<u64>(addr_pos - start_offset)); + VAddr addr = HexToLong(start_offset, static_cast<u64>(addr_pos - start_offset)); start_offset = addr_pos + 1; u64 len = @@ -1064,7 +1064,7 @@ static void RemoveBreakpoint() { auto start_offset = command_buffer + 3; auto addr_pos = std::find(start_offset, command_buffer + command_length, ','); - PAddr addr = HexToLong(start_offset, static_cast<u64>(addr_pos - start_offset)); + VAddr addr = HexToLong(start_offset, static_cast<u64>(addr_pos - start_offset)); if (type == BreakpointType::Access) { // Access is made up of Read and Write types, so add both breakpoints |