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/Services/Time/StaticService/ISystemClock.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/Services/Time/StaticService/ISystemClock.cs')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Time/StaticService/ISystemClock.cs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Time/StaticService/ISystemClock.cs b/Ryujinx.HLE/HOS/Services/Time/StaticService/ISystemClock.cs index 1d9f7873..085cc71d 100644 --- a/Ryujinx.HLE/HOS/Services/Time/StaticService/ISystemClock.cs +++ b/Ryujinx.HLE/HOS/Services/Time/StaticService/ISystemClock.cs @@ -1,4 +1,5 @@ using Ryujinx.Common; +using Ryujinx.Cpu; using Ryujinx.HLE.HOS.Ipc; using Ryujinx.HLE.HOS.Kernel.Common; using Ryujinx.HLE.HOS.Kernel.Threading; @@ -31,7 +32,9 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return ResultCode.UninitializedClock; } - ResultCode result = _clockCore.GetCurrentTime(context.Thread, out long posixTime); + ITickSource tickSource = context.Device.System.TickSource; + + ResultCode result = _clockCore.GetCurrentTime(tickSource, out long posixTime); if (result == ResultCode.Success) { @@ -57,7 +60,9 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService long posixTime = context.RequestData.ReadInt64(); - return _clockCore.SetCurrentTime(context.Thread, posixTime); + ITickSource tickSource = context.Device.System.TickSource; + + return _clockCore.SetCurrentTime(tickSource, posixTime); } [CommandHipc(2)] @@ -69,7 +74,9 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return ResultCode.UninitializedClock; } - ResultCode result = _clockCore.GetClockContext(context.Thread, out SystemClockContext clockContext); + ITickSource tickSource = context.Device.System.TickSource; + + ResultCode result = _clockCore.GetClockContext(tickSource, out SystemClockContext clockContext); if (result == ResultCode.Success) { |