diff options
| author | 2018-09-19 20:40:31 +0100 | |
|---|---|---|
| committer | 2018-09-19 21:00:38 +0100 | |
| commit | 3b4a1582309bf064101b479591c9f3f299bce582 (patch) | |
| tree | 133b63ee9b0506346086ceefd8d0f19f9a8e6aac | |
| parent | externals: Update dynarmic to 171d116 (diff) | |
| download | yuzu-3b4a1582309bf064101b479591c9f3f299bce582.tar.gz yuzu-3b4a1582309bf064101b479591c9f3f299bce582.tar.xz yuzu-3b4a1582309bf064101b479591c9f3f299bce582.zip | |
arm_dynarmic: Support BKPT instruction
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
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 @@ | |||
| 12 | #include "core/core.h" | 12 | #include "core/core.h" |
| 13 | #include "core/core_cpu.h" | 13 | #include "core/core_cpu.h" |
| 14 | #include "core/core_timing.h" | 14 | #include "core/core_timing.h" |
| 15 | #include "core/gdbstub/gdbstub.h" | ||
| 15 | #include "core/hle/kernel/process.h" | 16 | #include "core/hle/kernel/process.h" |
| 16 | #include "core/hle/kernel/svc.h" | 17 | #include "core/hle/kernel/svc.h" |
| 17 | #include "core/memory.h" | 18 | #include "core/memory.h" |
| @@ -79,6 +80,16 @@ public: | |||
| 79 | case Dynarmic::A64::Exception::SendEventLocal: | 80 | case Dynarmic::A64::Exception::SendEventLocal: |
| 80 | case Dynarmic::A64::Exception::Yield: | 81 | case Dynarmic::A64::Exception::Yield: |
| 81 | return; | 82 | return; |
| 83 | case Dynarmic::A64::Exception::Breakpoint: | ||
| 84 | if (GDBStub::IsServerEnabled()) { | ||
| 85 | parent.SetPC(pc); | ||
| 86 | Kernel::Thread* thread = Kernel::GetCurrentThread(); | ||
| 87 | parent.SaveContext(thread->context); | ||
| 88 | GDBStub::Break(); | ||
| 89 | GDBStub::SendTrap(thread, 5); | ||
| 90 | return; | ||
| 91 | } | ||
| 92 | [[fallthrough]]; | ||
| 82 | default: | 93 | default: |
| 83 | ASSERT_MSG(false, "ExceptionRaised(exception = {}, pc = {:X})", | 94 | ASSERT_MSG(false, "ExceptionRaised(exception = {}, pc = {:X})", |
| 84 | static_cast<std::size_t>(exception), pc); | 95 | static_cast<std::size_t>(exception), pc); |