VERY experimental Nintendo Switch 2 emulator
C++
gdbstub: fixup replaced instruction bytes in memory reads
Liamefa3409a302a
diff --git a/src/core/debugger/gdbstub.cpp b/src/core/debugger/gdbstub.cppindex 0f839d5b4c..e55831f27d 100644--- a/src/core/debugger/gdbstub.cpp+++ b/src/core/debugger/gdbstub.cpp@@ -263,6 +263,23 @@ void GDBStub::ExecuteCommand(std::string_view packet, std::vector<DebuggerActionstd::vector<u8> mem(size);if (system.ApplicationMemory().ReadBlock(addr, mem.data(), size)) {+ // Restore any bytes belonging to replaced instructions.+ auto it = replaced_instructions.lower_bound(addr);+ for (; it != replaced_instructions.end() && it->first < addr + size; it++) {+ // Get the bytes of the instruction we previously replaced.+ const u32 original_bytes = it->second;++ // Calculate where to start writing to the output buffer.+ const size_t output_offset = it->first - addr;++ // Calculate how many bytes to write.+ // The loop condition ensures output_offset < size.+ const size_t n = std::min<size_t>(size - output_offset, sizeof(u32));++ // Write the bytes to the output buffer.+ std::memcpy(mem.data() + output_offset, &original_bytes, n);+ }+SendReply(Common::HexToString(mem));} else {SendReply(GDB_STUB_REPLY_ERR);