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/core.cpp | |
| 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/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 7ca3652af..f4bbc9ec3 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include "core/file_sys/sdmc_factory.h" | 25 | #include "core/file_sys/sdmc_factory.h" |
| 26 | #include "core/file_sys/vfs_concat.h" | 26 | #include "core/file_sys/vfs_concat.h" |
| 27 | #include "core/file_sys/vfs_real.h" | 27 | #include "core/file_sys/vfs_real.h" |
| 28 | #include "core/gdbstub/gdbstub.h" | ||
| 29 | #include "core/hardware_interrupt_manager.h" | 28 | #include "core/hardware_interrupt_manager.h" |
| 30 | #include "core/hle/kernel/client_port.h" | 29 | #include "core/hle/kernel/client_port.h" |
| 31 | #include "core/hle/kernel/kernel.h" | 30 | #include "core/hle/kernel/kernel.h" |
| @@ -186,11 +185,8 @@ struct System::Impl { | |||
| 186 | } | 185 | } |
| 187 | 186 | ||
| 188 | service_manager = std::make_shared<Service::SM::ServiceManager>(kernel); | 187 | service_manager = std::make_shared<Service::SM::ServiceManager>(kernel); |
| 189 | |||
| 190 | services = std::make_unique<Service::Services>(service_manager, system); | 188 | services = std::make_unique<Service::Services>(service_manager, system); |
| 191 | GDBStub::DeferStart(); | 189 | interrupt_manager = std::make_unique<Hardware::InterruptManager>(system); |
| 192 | |||
| 193 | interrupt_manager = std::make_unique<Core::Hardware::InterruptManager>(system); | ||
| 194 | 190 | ||
| 195 | // Initialize time manager, which must happen after kernel is created | 191 | // Initialize time manager, which must happen after kernel is created |
| 196 | time_manager.Initialize(); | 192 | time_manager.Initialize(); |
| @@ -297,7 +293,6 @@ struct System::Impl { | |||
| 297 | } | 293 | } |
| 298 | 294 | ||
| 299 | // Shutdown emulation session | 295 | // Shutdown emulation session |
| 300 | GDBStub::Shutdown(); | ||
| 301 | services.reset(); | 296 | services.reset(); |
| 302 | service_manager.reset(); | 297 | service_manager.reset(); |
| 303 | cheat_engine.reset(); | 298 | cheat_engine.reset(); |