daniel/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android synced 2024-12-27 13:31:21 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

core: cpu_manager: Fix a typo in PreemptSingleCore, which broke many games.

Browse Source 
- We were reload'ing the old current scheduler, which may have changed.
This commit is contained in:
bunnei 2020-12-06 00:16:39 -08:00
parent 9b492430bb
commit d4ae0ae0e9
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/cpu_manager.cpp
View File

@ -254,8 +254,8 @@ void CpuManager::SingleCoreRunSuspendThread() {
} }
void CpuManager::PreemptSingleCore(bool from_running_enviroment) { void CpuManager::PreemptSingleCore(bool from_running_enviroment) {
std::size_t old_core = current_core; {
auto& scheduler = system.Kernel().Scheduler(old_core); auto& scheduler = system.Kernel().Scheduler(current_core);
Kernel::Thread* current_thread = scheduler.GetCurrentThread(); Kernel::Thread* current_thread = scheduler.GetCurrentThread();
if (idle_count >= 4 || from_running_enviroment) { if (idle_count >= 4 || from_running_enviroment) {
if (!from_running_enviroment) { if (!from_running_enviroment) {
@ -269,15 +269,20 @@ void CpuManager::PreemptSingleCore(bool from_running_enviroment) {
current_core.store((current_core + 1) % Core::Hardware::NUM_CPU_CORES); current_core.store((current_core + 1) % Core::Hardware::NUM_CPU_CORES);
system.CoreTiming().ResetTicks(); system.CoreTiming().ResetTicks();
scheduler.Unload(scheduler.GetCurrentThread()); scheduler.Unload(scheduler.GetCurrentThread());
auto& next_scheduler = system.Kernel().Scheduler(current_core); auto& next_scheduler = system.Kernel().Scheduler(current_core);
Common::Fiber::YieldTo(current_thread->GetHostContext(), next_scheduler.ControlContext()); Common::Fiber::YieldTo(current_thread->GetHostContext(), next_scheduler.ControlContext());
/// May have changed scheduler }
auto& current_scheduler = system.Kernel().Scheduler(current_core);
current_scheduler.Reload(scheduler.GetCurrentThread()); // May have changed scheduler
auto* currrent_thread2 = current_scheduler.GetCurrentThread(); {
auto& scheduler = system.Kernel().Scheduler(current_core);
scheduler.Reload(scheduler.GetCurrentThread());
auto* currrent_thread2 = scheduler.GetCurrentThread();
if (!currrent_thread2->IsIdleThread()) { if (!currrent_thread2->IsIdleThread()) {
idle_count = 0; idle_count = 0;
} }
}
} }
void CpuManager::SingleCorePause(bool paused) { void CpuManager::SingleCorePause(bool paused) {