From 0c87bf9ea4b0655fc6b90b4ab20e93f237e7549b Mon Sep 17 00:00:00 2001 From: gdkchan Date: Tue, 31 May 2022 16:29:35 -0300 Subject: Refactor CPU interface to allow the implementation of other CPU emulators (#3362) * 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 --- .../HOS/Services/Time/Clock/SystemClockCore.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Ryujinx.HLE/HOS/Services/Time/Clock/SystemClockCore.cs') diff --git a/Ryujinx.HLE/HOS/Services/Time/Clock/SystemClockCore.cs b/Ryujinx.HLE/HOS/Services/Time/Clock/SystemClockCore.cs index 865b1c09..f4bbaa60 100644 --- a/Ryujinx.HLE/HOS/Services/Time/Clock/SystemClockCore.cs +++ b/Ryujinx.HLE/HOS/Services/Time/Clock/SystemClockCore.cs @@ -1,4 +1,4 @@ -using System; +using Ryujinx.Cpu; using Ryujinx.HLE.HOS.Kernel.Threading; namespace Ryujinx.HLE.HOS.Services.Time.Clock @@ -25,13 +25,13 @@ namespace Ryujinx.HLE.HOS.Services.Time.Clock return _steadyClockCore; } - public ResultCode GetCurrentTime(KThread thread, out long posixTime) + public ResultCode GetCurrentTime(ITickSource tickSource, out long posixTime) { posixTime = 0; - SteadyClockTimePoint currentTimePoint = _steadyClockCore.GetCurrentTimePoint(thread); + SteadyClockTimePoint currentTimePoint = _steadyClockCore.GetCurrentTimePoint(tickSource); - ResultCode result = GetClockContext(thread, out SystemClockContext clockContext); + ResultCode result = GetClockContext(tickSource, out SystemClockContext clockContext); if (result == ResultCode.Success) { @@ -48,9 +48,9 @@ namespace Ryujinx.HLE.HOS.Services.Time.Clock return result; } - public ResultCode SetCurrentTime(KThread thread, long posixTime) + public ResultCode SetCurrentTime(ITickSource tickSource, long posixTime) { - SteadyClockTimePoint currentTimePoint = _steadyClockCore.GetCurrentTimePoint(thread); + SteadyClockTimePoint currentTimePoint = _steadyClockCore.GetCurrentTimePoint(tickSource); SystemClockContext clockContext = new SystemClockContext() { @@ -68,7 +68,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.Clock return result; } - public virtual ResultCode GetClockContext(KThread thread, out SystemClockContext context) + public virtual ResultCode GetClockContext(ITickSource tickSource, out SystemClockContext context) { context = _context; @@ -127,13 +127,13 @@ namespace Ryujinx.HLE.HOS.Services.Time.Clock _isInitialized = true; } - public bool IsClockSetup(KThread thread) + public bool IsClockSetup(ITickSource tickSource) { - ResultCode result = GetClockContext(thread, out SystemClockContext context); + ResultCode result = GetClockContext(tickSource, out SystemClockContext context); if (result == ResultCode.Success) { - SteadyClockTimePoint steadyClockTimePoint = _steadyClockCore.GetCurrentTimePoint(thread); + SteadyClockTimePoint steadyClockTimePoint = _steadyClockCore.GetCurrentTimePoint(tickSource); return steadyClockTimePoint.ClockSourceId == context.SteadyTimePoint.ClockSourceId; } -- cgit v1.2.3