summaryrefslogtreecommitdiff
path: root/src/core/core.h
diff options
context:
space:
mode:
authorGravatar Lioncash2018-08-28 12:30:33 -0400
committerGravatar Lioncash2018-08-28 22:31:51 -0400
commit0cbcd6ec9aeeafc298fe2e6e4ac10d68bb7267c5 (patch)
tree2d7bb143d490c3984bff6deda426b818bf27d552 /src/core/core.h
parentMerge pull request #1193 from lioncash/priv (diff)
downloadyuzu-0cbcd6ec9aeeafc298fe2e6e4ac10d68bb7267c5.tar.gz
yuzu-0cbcd6ec9aeeafc298fe2e6e4ac10d68bb7267c5.tar.xz
yuzu-0cbcd6ec9aeeafc298fe2e6e4ac10d68bb7267c5.zip
kernel: Eliminate kernel global state
As means to pave the way for getting rid of global state within core, This eliminates kernel global state by removing all globals. Instead this introduces a KernelCore class which acts as a kernel instance. This instance lives in the System class, which keeps its lifetime contained to the lifetime of the System class. This also forces the kernel types to actually interact with the main kernel instance itself instead of having transient kernel state placed all over several translation units, keeping everything together. It also has a nice consequence of making dependencies much more explicit. This also makes our initialization a tad bit more correct. Previously we were creating a kernel process before the actual kernel was initialized, which doesn't really make much sense. The KernelCore class itself follows the PImpl idiom, which allows keeping all the implementation details sealed away from everything else, which forces the use of the exposed API and allows us to avoid any unnecessary inclusions within the main kernel header.
Diffstat (limited to 'src/core/core.h')
-rw-r--r--src/core/core.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/core.h b/src/core/core.h
index 321104585..2c18f7193 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -12,6 +12,7 @@
12#include "common/common_types.h" 12#include "common/common_types.h"
13#include "core/arm/exclusive_monitor.h" 13#include "core/arm/exclusive_monitor.h"
14#include "core/core_cpu.h" 14#include "core/core_cpu.h"
15#include "core/hle/kernel/kernel.h"
15#include "core/hle/kernel/object.h" 16#include "core/hle/kernel/object.h"
16#include "core/hle/kernel/scheduler.h" 17#include "core/hle/kernel/scheduler.h"
17#include "core/loader/loader.h" 18#include "core/loader/loader.h"
@@ -188,6 +189,12 @@ public:
188 return current_process; 189 return current_process;
189 } 190 }
190 191
192 /// Provides a reference to the kernel instance.
193 Kernel::KernelCore& Kernel();
194
195 /// Provides a constant reference to the kernel instance.
196 const Kernel::KernelCore& Kernel() const;
197
191 /// Gets the name of the current game 198 /// Gets the name of the current game
192 Loader::ResultStatus GetGameName(std::string& out) const { 199 Loader::ResultStatus GetGameName(std::string& out) const {
193 if (app_loader == nullptr) 200 if (app_loader == nullptr)
@@ -246,6 +253,7 @@ private:
246 */ 253 */
247 ResultStatus Init(Frontend::EmuWindow& emu_window); 254 ResultStatus Init(Frontend::EmuWindow& emu_window);
248 255
256 Kernel::KernelCore kernel;
249 /// RealVfsFilesystem instance 257 /// RealVfsFilesystem instance
250 FileSys::VirtualFilesystem virtual_filesystem; 258 FileSys::VirtualFilesystem virtual_filesystem;
251 /// AppLoader used to load the current executing application 259 /// AppLoader used to load the current executing application