franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1399 from lioncash/sched

Browse Source 
kernel/scheduler: Take ARM_Interface instances by reference
This commit is contained in:
bunnei 2018-09-26 16:17:18 -04:00 committed by GitHub
commit c0445006af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/core_cpu.cpp
View File

@ -55,16 +55,16 @@ Cpu::Cpu(std::shared_ptr<ExclusiveMonitor> exclusive_monitor,
if (Settings::values.use_cpu_jit) { if (Settings::values.use_cpu_jit) {
#ifdef ARCHITECTURE_x86_64 #ifdef ARCHITECTURE_x86_64
arm_interface = std::make_shared<ARM_Dynarmic>(exclusive_monitor, core_index); arm_interface = std::make_unique<ARM_Dynarmic>(exclusive_monitor, core_index);
#else #else
arm_interface = std::make_shared<ARM_Unicorn>(); arm_interface = std::make_unique<ARM_Unicorn>();
LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available"); LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available");
#endif #endif
} else { } else {
arm_interface = std::make_shared<ARM_Unicorn>(); arm_interface = std::make_unique<ARM_Unicorn>();
} }
scheduler = std::make_shared<Kernel::Scheduler>(arm_interface.get()); scheduler = std::make_shared<Kernel::Scheduler>(*arm_interface);
} }
Cpu::~Cpu() = default; Cpu::~Cpu() = default;

2
src/core/core_cpu.h
View File

@ -76,7 +76,7 @@ public:
private: private:
void Reschedule(); void Reschedule();
std::shared_ptr<ARM_Interface> arm_interface; std::unique_ptr<ARM_Interface> arm_interface;
std::shared_ptr<CpuBarrier> cpu_barrier; std::shared_ptr<CpuBarrier> cpu_barrier;
std::shared_ptr<Kernel::Scheduler> scheduler; std::shared_ptr<Kernel::Scheduler> scheduler;

14
src/core/hle/kernel/scheduler.cpp
View File

@ -17,7 +17,7 @@ namespace Kernel {
std::mutex Scheduler::scheduler_mutex; std::mutex Scheduler::scheduler_mutex;
Scheduler::Scheduler(Core::ARM_Interface* cpu_core) : cpu_core(cpu_core) {} Scheduler::Scheduler(Core::ARM_Interface& cpu_core) : cpu_core(cpu_core) {}
Scheduler::~Scheduler() { Scheduler::~Scheduler() {
for (auto& thread : thread_list) { for (auto& thread : thread_list) {
@ -59,9 +59,9 @@ void Scheduler::SwitchContext(Thread* new_thread) {
// Save context for previous thread // Save context for previous thread
if (previous_thread) { if (previous_thread) {
previous_thread->last_running_ticks = CoreTiming::GetTicks(); previous_thread->last_running_ticks = CoreTiming::GetTicks();
cpu_core->SaveContext(previous_thread->context); cpu_core.SaveContext(previous_thread->context);
// Save the TPIDR_EL0 system register in case it was modified. // Save the TPIDR_EL0 system register in case it was modified.
previous_thread->tpidr_el0 = cpu_core->GetTPIDR_EL0(); previous_thread->tpidr_el0 = cpu_core.GetTPIDR_EL0();
if (previous_thread->status == ThreadStatus::Running) { if (previous_thread->status == ThreadStatus::Running) {
// This is only the case when a reschedule is triggered without the current thread // This is only the case when a reschedule is triggered without the current thread
@ -91,10 +91,10 @@ void Scheduler::SwitchContext(Thread* new_thread) {
SetCurrentPageTable(&Core::CurrentProcess()->vm_manager.page_table); SetCurrentPageTable(&Core::CurrentProcess()->vm_manager.page_table);
} }
cpu_core->LoadContext(new_thread->context); cpu_core.LoadContext(new_thread->context);
cpu_core->SetTlsAddress(new_thread->GetTLSAddress()); cpu_core.SetTlsAddress(new_thread->GetTLSAddress());
cpu_core->SetTPIDR_EL0(new_thread->GetTPIDR_EL0()); cpu_core.SetTPIDR_EL0(new_thread->GetTPIDR_EL0());
cpu_core->ClearExclusiveState(); cpu_core.ClearExclusiveState();
} else { } else {
current_thread = nullptr; current_thread = nullptr;
// Note: We do not reset the current process and current page table when idling because // Note: We do not reset the current process and current page table when idling because

4
src/core/hle/kernel/scheduler.h
View File

@ -19,7 +19,7 @@ namespace Kernel {
class Scheduler final { class Scheduler final {
public: public:
explicit Scheduler(Core::ARM_Interface* cpu_core); explicit Scheduler(Core::ARM_Interface& cpu_core);
~Scheduler(); ~Scheduler();
/// Returns whether there are any threads that are ready to run. /// Returns whether there are any threads that are ready to run.
@ -72,7 +72,7 @@ private:
SharedPtr<Thread> current_thread = nullptr; SharedPtr<Thread> current_thread = nullptr;
Core::ARM_Interface* cpu_core; Core::ARM_Interface& cpu_core;
static std::mutex scheduler_mutex; static std::mutex scheduler_mutex;
}; };