citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #4276 from MerryMage/jit_breakpoints 

arm_dynarmic: Pass breakpoints to gdbstub
This commit is contained in:
bunnei 2018-09-30 21:42:00 -04:00 committed by GitHub
parent 27203c0d47 b4d9d9661a
commit 9f972b9f5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/dynarmic vendored

@ -1 +1 @@
Subproject commit 68ca03e8d4822c78e15315e67ddbb1d6bf4d3827
Subproject commit 4e6848d1c9e8dadc70595c15b5589f8b14aad478

17
src/core/arm/dynarmic/arm_dynarmic.cpp
View File

@ -12,6 +12,7 @@
#include "core/arm/dyncom/arm_dyncom_interpreter.h"
#include "core/core.h"
#include "core/core_timing.h"
#include "core/gdbstub/gdbstub.h"
#include "core/hle/kernel/svc.h"
#include "core/memory.h"
@ -125,6 +126,22 @@ public:
}
void ExceptionRaised(VAddr pc, Dynarmic::A32::Exception exception) override {
switch (exception) {
case Dynarmic::A32::Exception::UndefinedInstruction:
case Dynarmic::A32::Exception::UnpredictableInstruction:
break;
case Dynarmic::A32::Exception::Breakpoint:
if (GDBStub::IsConnected()) {
parent.jit->HaltExecution();
parent.SetPC(pc);
Kernel::Thread* thread = Kernel::GetCurrentThread();
parent.SaveContext(thread->context);
GDBStub::Break();
GDBStub::SendTrap(thread, 5);
return;
}
break;
}
ASSERT_MSG(false, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})",
static_cast<std::size_t>(exception), pc, MemoryReadCode(pc));
}