From 15d1cc806b1b978bab83d8bb426a124d9f0f788c Mon Sep 17 00:00:00 2001 From: gdkchan <gab.dark.100@gmail.com> Date: Mon, 4 May 2020 00:41:29 -0300 Subject: Move kernel state out of the Horizon class (#1107) * Move kernel state from Horizon to KernelContext * Merge syscalls partial classes, split 32 and 64-bit variants * Sort usings --- Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs') diff --git a/Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs b/Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs index dd5422b8..e07477ae 100644 --- a/Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs +++ b/Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs @@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading private const int PreemptionPriorityCores012 = 59; private const int PreemptionPriorityCore3 = 63; - private Horizon _system; + private readonly KernelContext _context; public KSchedulingData SchedulingData { get; private set; } @@ -21,9 +21,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading public bool ThreadReselectionRequested { get; set; } - public KScheduler(Horizon system) + public KScheduler(KernelContext context) { - _system = system; + _context = context; SchedulingData = new KSchedulingData(); @@ -39,14 +39,14 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading private void PreemptThreads() { - _system.CriticalSection.Enter(); + _context.CriticalSection.Enter(); PreemptThread(PreemptionPriorityCores012, 0); PreemptThread(PreemptionPriorityCores012, 1); PreemptThread(PreemptionPriorityCores012, 2); PreemptThread(PreemptionPriorityCore3, 3); - _system.CriticalSection.Leave(); + _context.CriticalSection.Leave(); } private void PreemptThread(int prio, int core) @@ -224,9 +224,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading return _dummyThread; } - KProcess dummyProcess = new KProcess(_system); + KProcess dummyProcess = new KProcess(_context); - KThread dummyThread = new KThread(_system); + KThread dummyThread = new KThread(_context); dummyThread.Initialize(0, 0, 0, 44, 0, dummyProcess, ThreadType.Dummy); -- cgit v1.2.3-70-g09d2