diff options
| author | 2020-11-27 19:29:59 -0300 | |
|---|---|---|
| committer | 2020-11-27 19:29:59 -0300 | |
| commit | 1dbe39f7a25357b40541ca536698cb09bb7df4ff (patch) | |
| tree | 285ffb3801aa773cb3537f77153a9e432390f6b8 /src/core/arm | |
| parent | Merge pull request #5023 from lioncash/save-global (diff) | |
| parent | core: Eliminate remaining usages of the global system instance (diff) | |
| download | yuzu-1dbe39f7a25357b40541ca536698cb09bb7df4ff.tar.gz yuzu-1dbe39f7a25357b40541ca536698cb09bb7df4ff.tar.xz yuzu-1dbe39f7a25357b40541ca536698cb09bb7df4ff.zip | |
Merge pull request #5028 from lioncash/final-system
core: Eliminate remaining usages of the global system instance
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_64.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp index 9f170a224..5c2060d78 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include "core/arm/dynarmic/arm_exclusive_monitor.h" | 14 | #include "core/arm/dynarmic/arm_exclusive_monitor.h" |
| 15 | #include "core/core.h" | 15 | #include "core/core.h" |
| 16 | #include "core/core_timing.h" | 16 | #include "core/core_timing.h" |
| 17 | #include "core/gdbstub/gdbstub.h" | ||
| 18 | #include "core/hardware_properties.h" | 17 | #include "core/hardware_properties.h" |
| 19 | #include "core/hle/kernel/process.h" | 18 | #include "core/hle/kernel/process.h" |
| 20 | #include "core/hle/kernel/scheduler.h" | 19 | #include "core/hle/kernel/scheduler.h" |
| @@ -96,16 +95,6 @@ public: | |||
| 96 | case Dynarmic::A64::Exception::Yield: | 95 | case Dynarmic::A64::Exception::Yield: |
| 97 | return; | 96 | return; |
| 98 | case Dynarmic::A64::Exception::Breakpoint: | 97 | case Dynarmic::A64::Exception::Breakpoint: |
| 99 | if (GDBStub::IsServerEnabled()) { | ||
| 100 | parent.jit->HaltExecution(); | ||
| 101 | parent.SetPC(pc); | ||
| 102 | Kernel::Thread* const thread = parent.system.CurrentScheduler().GetCurrentThread(); | ||
| 103 | parent.SaveContext(thread->GetContext64()); | ||
| 104 | GDBStub::Break(); | ||
| 105 | GDBStub::SendTrap(thread, 5); | ||
| 106 | return; | ||
| 107 | } | ||
| 108 | [[fallthrough]]; | ||
| 109 | default: | 98 | default: |
| 110 | ASSERT_MSG(false, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})", | 99 | ASSERT_MSG(false, "ExceptionRaised(exception = {}, pc = {:08X}, code = {:08X})", |
| 111 | static_cast<std::size_t>(exception), pc, MemoryReadCode(pc)); | 100 | static_cast<std::size_t>(exception), pc, MemoryReadCode(pc)); |