diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2022-05-31 16:29:35 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-31 16:29:35 -0300 |
| commit | 0c87bf9ea4b0655fc6b90b4ab20e93f237e7549b (patch) | |
| tree | 0fe100d5cd958bfb8f5974f1b614b94c09e89a26 /Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs | |
| parent | 9827dc35e14cb704cb4adcb894e0efbac893080c (diff) | |
Refactor CPU interface to allow the implementation of other CPU emulators (#3362)1.1.134
* Refactor CPU interface
* Use IExecutionContext interface on SVC handler, change how CPU interrupts invokes the handlers
* Make CpuEngine take a ITickSource rather than returning one
The previous implementation had the scenario where the CPU engine had to implement the tick source in mind, like for example, when we have a hypervisor and the game can read CNTPCT on the host directly. However given that we need to do conversion due to different frequencies anyway, it's not worth it. It's better to just let the user pass the tick source and redirect any reads to CNTPCT to the user tick source
* XML docs for the public interfaces
* PPTC invalidation due to NativeInterface function name changes
* Fix build of the CPU tests
* PR feedback
Diffstat (limited to 'Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs')
| -rw-r--r-- | Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs b/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs index ee701a69..b9dd91ef 100644 --- a/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs +++ b/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs @@ -23,7 +23,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading public Thread HostThread { get; private set; } - public ARMeilleure.State.ExecutionContext Context { get; private set; } + public IExecutionContext Context { get; private set; } public KThreadContext ThreadContext { get; private set; } @@ -115,9 +115,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading public bool WaitingInArbitration { get; set; } - public long LastPc { get; set; } - - private object ActivityOperationLock = new object(); + private object _activityOperationLock; public KThread(KernelContext context) : base(context) { @@ -128,6 +126,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading _mutexWaiters = new LinkedList<KThread>(); _pinnedWaiters = new LinkedList<KThread>(); + + _activityOperationLock = new object(); } public KernelResult Initialize( @@ -192,7 +192,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading HostThread = new Thread(ThreadStart); - Context = CpuContext.CreateExecutionContext(); + Context = owner?.CreateExecutionContext() ?? new ProcessExecutionContext(); Context.IsAarch32 = !is64Bits; @@ -208,8 +208,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading Context.SetX(13, (uint)stackTop); } - Context.CntfrqEl0 = 19200000; - Context.Tpidr = (long)_tlsAddress; + Context.TpidrroEl0 = (long)_tlsAddress; ThreadUid = KernelContext.NewThreadUid(); @@ -221,7 +220,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading if (owner != null) { - owner.SubscribeThreadEventHandlers(Context); owner.AddThread(this); if (owner.IsPaused) @@ -538,7 +536,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading public KernelResult SetActivity(bool pause) { - lock (ActivityOperationLock) + lock (_activityOperationLock) { KernelResult result = KernelResult.Success; @@ -634,7 +632,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading { context = default; - lock (ActivityOperationLock) + lock (_activityOperationLock) { KernelContext.CriticalSection.Enter(); @@ -656,7 +654,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading return KernelResult.Success; } - private static uint GetPsr(ARMeilleure.State.ExecutionContext context) + private static uint GetPsr(IExecutionContext context) { return context.Pstate & 0xFF0FFE20; } @@ -683,9 +681,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading context.Fp = Context.GetX(29); context.Lr = Context.GetX(30); context.Sp = Context.GetX(31); - context.Pc = (ulong)LastPc; + context.Pc = Context.Pc; context.Pstate = GetPsr(Context); - context.Tpidr = (ulong)Context.Tpidr; + context.Tpidr = (ulong)Context.TpidrroEl0; } else { @@ -699,9 +697,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading context.FpuRegisters[i] = Context.GetV(i); } - context.Pc = (uint)LastPc; + context.Pc = (uint)Context.Pc; context.Pstate = GetPsr(Context); - context.Tpidr = (uint)Context.Tpidr; + context.Tpidr = (uint)Context.TpidrroEl0; } context.Fpcr = (uint)Context.Fpcr; @@ -743,7 +741,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading public KernelResult SetCoreAndAffinityMask(int newCore, ulong newAffinityMask) { - lock (ActivityOperationLock) + lock (_activityOperationLock) { KernelContext.CriticalSection.Enter(); |