summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-02-07 03:51:46 +0100
committerGitHub <noreply@github.com>2019-02-07 03:51:46 +0100
commitca482997fed867ba1fb4db009924249c8d51fafb (patch)
tree7b005044837b862c1024f7f24e00c43637a04ca1
parentMerge pull request #2021 from ReinUsesLisp/disk-cache (diff)
parentgdbstub: only let Execute breakpoints write/restore BKPT opcodes into target memory (diff)
downloadyuzu-ca482997fed867ba1fb4db009924249c8d51fafb.tar
yuzu-ca482997fed867ba1fb4db009924249c8d51fafb.tar.gz
yuzu-ca482997fed867ba1fb4db009924249c8d51fafb.tar.bz2
yuzu-ca482997fed867ba1fb4db009924249c8d51fafb.tar.lz
yuzu-ca482997fed867ba1fb4db009924249c8d51fafb.tar.xz
yuzu-ca482997fed867ba1fb4db009924249c8d51fafb.tar.zst
yuzu-ca482997fed867ba1fb4db009924249c8d51fafb.zip
-rw-r--r--src/core/gdbstub/gdbstub.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp
index a1cad4fcb..dafb32aae 100644
--- a/src/core/gdbstub/gdbstub.cpp
+++ b/src/core/gdbstub/gdbstub.cpp
@@ -507,8 +507,11 @@ static void RemoveBreakpoint(BreakpointType type, VAddr addr) {
LOG_DEBUG(Debug_GDBStub, "gdb: removed a breakpoint: {:016X} bytes at {:016X} of type {}",
bp->second.len, bp->second.addr, static_cast<int>(type));
- Memory::WriteBlock(bp->second.addr, bp->second.inst.data(), bp->second.inst.size());
- Core::System::GetInstance().InvalidateCpuInstructionCaches();
+
+ if (type == BreakpointType::Execute) {
+ Memory::WriteBlock(bp->second.addr, bp->second.inst.data(), bp->second.inst.size());
+ Core::System::GetInstance().InvalidateCpuInstructionCaches();
+ }
p.erase(addr);
}
@@ -1057,9 +1060,12 @@ static bool CommitBreakpoint(BreakpointType type, VAddr addr, u64 len) {
breakpoint.addr = addr;
breakpoint.len = len;
Memory::ReadBlock(addr, breakpoint.inst.data(), breakpoint.inst.size());
+
static constexpr std::array<u8, 4> btrap{0x00, 0x7d, 0x20, 0xd4};
- Memory::WriteBlock(addr, btrap.data(), btrap.size());
- Core::System::GetInstance().InvalidateCpuInstructionCaches();
+ if (type == BreakpointType::Execute) {
+ Memory::WriteBlock(addr, btrap.data(), btrap.size());
+ Core::System::GetInstance().InvalidateCpuInstructionCaches();
+ }
p.insert({addr, breakpoint});
LOG_DEBUG(Debug_GDBStub, "gdb: added {} breakpoint: {:016X} bytes at {:016X}",