summaryrefslogtreecommitdiffstats
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-03-15 00:33:27 +0100
committerGitHub <noreply@github.com>2018-03-15 00:33:27 +0100
commitcde9386e0fd9677e1a89a8dc81ea9cd65fa22c50 (patch)
tree6330442e1dacc0d850ce09c35dcee7ddd3a2bc9d /src/core/core.cpp
parentMerge pull request #213 from Hexagon12/dynarmic-default (diff)
parentcore: Move process creation out of global state. (diff)
downloadyuzu-cde9386e0fd9677e1a89a8dc81ea9cd65fa22c50.tar
yuzu-cde9386e0fd9677e1a89a8dc81ea9cd65fa22c50.tar.gz
yuzu-cde9386e0fd9677e1a89a8dc81ea9cd65fa22c50.tar.bz2
yuzu-cde9386e0fd9677e1a89a8dc81ea9cd65fa22c50.tar.lz
yuzu-cde9386e0fd9677e1a89a8dc81ea9cd65fa22c50.tar.xz
yuzu-cde9386e0fd9677e1a89a8dc81ea9cd65fa22c50.tar.zst
yuzu-cde9386e0fd9677e1a89a8dc81ea9cd65fa22c50.zip
Diffstat (limited to '')
-rw-r--r--src/core/core.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 4fb035556..ac6cb9e6e 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -100,7 +100,7 @@ System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& file
return init_result;
}
- const Loader::ResultStatus load_result{app_loader->Load(Kernel::g_current_process)};
+ const Loader::ResultStatus load_result{app_loader->Load(current_process)};
if (Loader::ResultStatus::Success != load_result) {
LOG_CRITICAL(Core, "Failed to load ROM (Error %i)!", load_result);
System::Shutdown();
@@ -141,6 +141,8 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
CoreTiming::Init();
+ current_process = Kernel::Process::Create("main");
+
switch (Settings::values.cpu_core) {
case Settings::CpuCore::Unicorn:
cpu_core = std::make_shared<ARM_Unicorn>();