From 3b4a1582309bf064101b479591c9f3f299bce582 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Wed, 19 Sep 2018 20:40:31 +0100 Subject: arm_dynarmic: Support BKPT instruction --- src/core/arm/dynarmic/arm_dynarmic.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/core') diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 3f072c51f..8b450dc54 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,16 @@ public: case Dynarmic::A64::Exception::SendEventLocal: case Dynarmic::A64::Exception::Yield: return; + case Dynarmic::A64::Exception::Breakpoint: + if (GDBStub::IsServerEnabled()) { + 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(exception), pc); -- cgit v1.2.3 From ef31487624ed3b73ceaae50aa78b9bd6a915ce2e Mon Sep 17 00:00:00 2001 From: MerryMage Date: Thu, 20 Sep 2018 19:12:42 +0100 Subject: arm_dynarmic: Halt when BRK encountered --- src/core/arm/dynarmic/arm_dynarmic.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/core') diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 8b450dc54..32cd5746e 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -82,6 +82,7 @@ public: return; case Dynarmic::A64::Exception::Breakpoint: if (GDBStub::IsServerEnabled()) { + parent.jit->HaltExecution(); parent.SetPC(pc); Kernel::Thread* thread = Kernel::GetCurrentThread(); parent.SaveContext(thread->context); -- cgit v1.2.3