octo
/
yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2230 from lioncash/global 

kernel/process: Remove use of global system accessors
This commit is contained in:
bunnei 2019-03-14 20:42:46 -04:00 committed by GitHub
parent 8bd17aa044 6eddb60db0
commit 2d9546848e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/hle/kernel/process.cpp
View File

@ -133,7 +133,7 @@ void Process::PrepareForTermination() {
if (thread->GetOwnerProcess() != this) if (thread->GetOwnerProcess() != this)
continue; continue;
if (thread == GetCurrentThread()) if (thread == system.CurrentScheduler().GetCurrentThread())
continue; continue;
// TODO(Subv): When are the other running/ready threads terminated? // TODO(Subv): When are the other running/ready threads terminated?
@ -145,7 +145,6 @@ void Process::PrepareForTermination() {
} }
}; };
const auto& system = Core::System::GetInstance();
stop_threads(system.Scheduler(0).GetThreadList()); stop_threads(system.Scheduler(0).GetThreadList());
stop_threads(system.Scheduler(1).GetThreadList()); stop_threads(system.Scheduler(1).GetThreadList());
stop_threads(system.Scheduler(2).GetThreadList()); stop_threads(system.Scheduler(2).GetThreadList());
@ -228,13 +227,11 @@ void Process::LoadModule(CodeSet module_, VAddr base_addr) {
MapSegment(module_.DataSegment(), VMAPermission::ReadWrite, MemoryState::CodeMutable); MapSegment(module_.DataSegment(), VMAPermission::ReadWrite, MemoryState::CodeMutable);
// Clear instruction cache in CPU JIT // Clear instruction cache in CPU JIT
Core::System::GetInstance().ArmInterface(0).ClearInstructionCache(); system.InvalidateCpuInstructionCaches();
Core::System::GetInstance().ArmInterface(1).ClearInstructionCache();
Core::System::GetInstance().ArmInterface(2).ClearInstructionCache();
Core::System::GetInstance().ArmInterface(3).ClearInstructionCache();
} }
Process::Process(Core::System& system) : WaitObject{system.Kernel()}, address_arbiter{system} {} Process::Process(Core::System& system)
: WaitObject{system.Kernel()}, address_arbiter{system}, system{system} {}
Process::~Process() = default; Process::~Process() = default;
void Process::Acquire(Thread* thread) { void Process::Acquire(Thread* thread) {

6
src/core/hle/kernel/process.h
View File

@ -266,7 +266,7 @@ public:
void FreeTLSSlot(VAddr tls_address); void FreeTLSSlot(VAddr tls_address);
private: private:
explicit Process(Core::System& kernel); explicit Process(Core::System& system);
~Process() override; ~Process() override;
/// Checks if the specified thread should wait until this process is available. /// Checks if the specified thread should wait until this process is available.
@ -330,6 +330,10 @@ private:
/// Random values for svcGetInfo RandomEntropy /// Random values for svcGetInfo RandomEntropy
std::array<u64, RANDOM_ENTROPY_SIZE> random_entropy; std::array<u64, RANDOM_ENTROPY_SIZE> random_entropy;
/// System context
Core::System& system;
/// Name of this process
std::string name; std::string name;
}; };