prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tidy up

Browse Source
This commit is contained in:
Jarek Syrylak
2018-08-06 12:43:05 +01:00
parent 5b69162612
commit 01095d8f9f
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/gdbstub/gdbstub.cpp
View File

@@ -31,10 +31,6 @@
#endif #endif
#include "common/logging/log.h" #include "common/logging/log.h"
//#undef LOG_DEBUG
//#undef LOG_INFO
//#define LOG_DEBUG LOG_ERROR
//#define LOG_INFO LOG_ERROR
#include "common/string_util.h" #include "common/string_util.h"
#include "common/swap.h" #include "common/swap.h"
#include "core/arm/arm_interface.h" #include "core/arm/arm_interface.h"
@@ -178,7 +174,7 @@ struct Breakpoint {
bool active; bool active;
VAddr addr; VAddr addr;
u64 len; u64 len;
u8 old[4]; u8 instr[4];
}; };
using BreakpointMap = std::map<VAddr, Breakpoint>; using BreakpointMap = std::map<VAddr, Breakpoint>;
@@ -459,7 +455,7 @@ static void RemoveBreakpoint(BreakpointType type, VAddr addr) {
LOG_DEBUG(Debug_GDBStub, "gdb: removed a breakpoint: {:016X} bytes at {:016X} of type {}", LOG_DEBUG(Debug_GDBStub, "gdb: removed a breakpoint: {:016X} bytes at {:016X} of type {}",
bp->second.len, bp->second.addr, static_cast<int>(type)); bp->second.len, bp->second.addr, static_cast<int>(type));
Memory::WriteBlock(bp->second.addr, bp->second.old, 4); Memory::WriteBlock(bp->second.addr, bp->second.instr, 4);
GDBStub::SetInstCacheValidity(false); GDBStub::SetInstCacheValidity(false);
p.erase(addr); p.erase(addr);
} }
@@ -999,7 +995,7 @@ static bool CommitBreakpoint(BreakpointType type, VAddr addr, u64 len) {
breakpoint.active = true; breakpoint.active = true;
breakpoint.addr = addr; breakpoint.addr = addr;
breakpoint.len = len; breakpoint.len = len;
Memory::ReadBlock(addr, breakpoint.old, 4); Memory::ReadBlock(addr, breakpoint.instr, 4);
static const u8 btrap[] = {0xd4, 0x20, 0x7d, 0x00}; static const u8 btrap[] = {0xd4, 0x20, 0x7d, 0x00};
Memory::WriteBlock(addr, btrap, 4); Memory::WriteBlock(addr, btrap, 4);
GDBStub::SetInstCacheValidity(false); GDBStub::SetInstCacheValidity(false);