diff options
author | Lioncash <mathew1800@gmail.com> | 2019-04-09 19:25:54 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-04-12 04:11:40 +0200 |
commit | f2331a804a2fa300d9a7dc0d012e3242b7accdaf (patch) | |
tree | d7f61aa201effed9e37fc07c626218759fc75288 /src/core/core.cpp | |
parent | Merge pull request #2235 from ReinUsesLisp/spirv-decompiler (diff) | |
download | yuzu-f2331a804a2fa300d9a7dc0d012e3242b7accdaf.tar yuzu-f2331a804a2fa300d9a7dc0d012e3242b7accdaf.tar.gz yuzu-f2331a804a2fa300d9a7dc0d012e3242b7accdaf.tar.bz2 yuzu-f2331a804a2fa300d9a7dc0d012e3242b7accdaf.tar.lz yuzu-f2331a804a2fa300d9a7dc0d012e3242b7accdaf.tar.xz yuzu-f2331a804a2fa300d9a7dc0d012e3242b7accdaf.tar.zst yuzu-f2331a804a2fa300d9a7dc0d012e3242b7accdaf.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/core.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index bc9e887b6..2b8ec3ca7 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -81,7 +81,7 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs, return vfs->OpenFile(path, FileSys::Mode::Read); } struct System::Impl { - explicit Impl(System& system) : kernel{system} {} + explicit Impl(System& system) : kernel{system}, cpu_core_manager{system} {} Cpu& CurrentCpuCore() { return cpu_core_manager.GetCurrentCore(); @@ -99,6 +99,7 @@ struct System::Impl { LOG_DEBUG(HW_Memory, "initialized OK"); core_timing.Initialize(); + cpu_core_manager.Initialize(); kernel.Initialize(); const auto current_time = std::chrono::duration_cast<std::chrono::seconds>( @@ -142,8 +143,6 @@ struct System::Impl { gpu_core = std::make_unique<VideoCommon::GPUSynch>(system, *renderer); } - cpu_core_manager.Initialize(system); - LOG_DEBUG(Core, "Initialized OK"); // Reset counters and set time origin to current frame @@ -188,6 +187,10 @@ struct System::Impl { static_cast<u32>(load_result)); } + // Main process has been loaded and been made current. + // Begin CPU execution. + cpu_core_manager.StartThreads(); + status = ResultStatus::Success; return status; } |