summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMat M <mathew1800@gmail.com>2018-09-20 23:22:42 +0200
committerGitHub <noreply@github.com>2018-09-20 23:22:42 +0200
commit1e35d8fa8f4757f91174e1c82992b7f078cf3f91 (patch)
tree8f5b0c3ebaae6d6d7727290642706ec0135e98ff
parentMerge pull request #1358 from DarkLordZach/temp-storage (diff)
parentarm_dynarmic: Halt when BRK encountered (diff)
downloadyuzu-1e35d8fa8f4757f91174e1c82992b7f078cf3f91.tar
yuzu-1e35d8fa8f4757f91174e1c82992b7f078cf3f91.tar.gz
yuzu-1e35d8fa8f4757f91174e1c82992b7f078cf3f91.tar.bz2
yuzu-1e35d8fa8f4757f91174e1c82992b7f078cf3f91.tar.lz
yuzu-1e35d8fa8f4757f91174e1c82992b7f078cf3f91.tar.xz
yuzu-1e35d8fa8f4757f91174e1c82992b7f078cf3f91.tar.zst
yuzu-1e35d8fa8f4757f91174e1c82992b7f078cf3f91.zip
m---------externals/dynarmic0
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic.cpp12
2 files changed, 12 insertions, 0 deletions
diff --git a/externals/dynarmic b/externals/dynarmic
-Subproject 959446573f3adfcba173ef4b0011a4a280f18eb
+Subproject 171d11659d760a4d4674d3a90698fe31ea407e2
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp
index 3f072c51f..32cd5746e 100644
--- a/src/core/arm/dynarmic/arm_dynarmic.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic.cpp
@@ -12,6 +12,7 @@
#include "core/core.h"
#include "core/core_cpu.h"
#include "core/core_timing.h"
+#include "core/gdbstub/gdbstub.h"
#include "core/hle/kernel/process.h"
#include "core/hle/kernel/svc.h"
#include "core/memory.h"
@@ -79,6 +80,17 @@ public:
case Dynarmic::A64::Exception::SendEventLocal:
case Dynarmic::A64::Exception::Yield:
return;
+ case Dynarmic::A64::Exception::Breakpoint:
+ if (GDBStub::IsServerEnabled()) {
+ parent.jit->HaltExecution();
+ parent.SetPC(pc);
+ Kernel::Thread* thread = Kernel::GetCurrentThread();
+ parent.SaveContext(thread->context);
+ GDBStub::Break();
+ GDBStub::SendTrap(thread, 5);
+ return;
+ }
+ [[fallthrough]];
default:
ASSERT_MSG(false, "ExceptionRaised(exception = {}, pc = {:X})",
static_cast<std::size_t>(exception), pc);