diff options
| author | 2020-11-27 10:50:48 -0500 | |
|---|---|---|
| committer | 2020-11-27 11:40:45 -0500 | |
| commit | 5bc4eabe36b7ef4dcd5ad8db1e944705655be432 (patch) | |
| tree | 285ffb3801aa773cb3537f77153a9e432390f6b8 /src/core/arm | |
| parent | Merge pull request #5023 from lioncash/save-global (diff) | |
| download | yuzu-5bc4eabe36b7ef4dcd5ad8db1e944705655be432.tar.gz yuzu-5bc4eabe36b7ef4dcd5ad8db1e944705655be432.tar.xz yuzu-5bc4eabe36b7ef4dcd5ad8db1e944705655be432.zip | |
core: Eliminate remaining usages of the global system instance
Removes all remaining usages of the global system instance. After this,
migration can begin to migrate to being constructed and managed entirely
by the various frontends.
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)); |