diff options
| author | 2018-03-13 17:49:59 -0400 | |
|---|---|---|
| committer | 2018-03-14 18:42:19 -0400 | |
| commit | 7d6653268f68dea8bc39288e3a27bc499b7b8154 (patch) | |
| tree | 6330442e1dacc0d850ce09c35dcee7ddd3a2bc9d /src/core/core.cpp | |
| parent | Merge pull request #213 from Hexagon12/dynarmic-default (diff) | |
| download | yuzu-7d6653268f68dea8bc39288e3a27bc499b7b8154.tar.gz yuzu-7d6653268f68dea8bc39288e3a27bc499b7b8154.tar.xz yuzu-7d6653268f68dea8bc39288e3a27bc499b7b8154.zip | |
core: Move process creation out of global state.
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 4 |
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 | |||
| 100 | return init_result; | 100 | return init_result; |
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | const Loader::ResultStatus load_result{app_loader->Load(Kernel::g_current_process)}; | 103 | const Loader::ResultStatus load_result{app_loader->Load(current_process)}; |
| 104 | if (Loader::ResultStatus::Success != load_result) { | 104 | if (Loader::ResultStatus::Success != load_result) { |
| 105 | LOG_CRITICAL(Core, "Failed to load ROM (Error %i)!", load_result); | 105 | LOG_CRITICAL(Core, "Failed to load ROM (Error %i)!", load_result); |
| 106 | System::Shutdown(); | 106 | System::Shutdown(); |
| @@ -141,6 +141,8 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) { | |||
| 141 | 141 | ||
| 142 | CoreTiming::Init(); | 142 | CoreTiming::Init(); |
| 143 | 143 | ||
| 144 | current_process = Kernel::Process::Create("main"); | ||
| 145 | |||
| 144 | switch (Settings::values.cpu_core) { | 146 | switch (Settings::values.cpu_core) { |
| 145 | case Settings::CpuCore::Unicorn: | 147 | case Settings::CpuCore::Unicorn: |
| 146 | cpu_core = std::make_shared<ARM_Unicorn>(); | 148 | cpu_core = std::make_shared<ARM_Unicorn>(); |