diff options
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Time/TimeSharedMemory.cs')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Time/TimeSharedMemory.cs | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Time/TimeSharedMemory.cs b/Ryujinx.HLE/HOS/Services/Time/TimeSharedMemory.cs index f714c662..e3683076 100644 --- a/Ryujinx.HLE/HOS/Services/Time/TimeSharedMemory.cs +++ b/Ryujinx.HLE/HOS/Services/Time/TimeSharedMemory.cs @@ -1,4 +1,5 @@ using System; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Threading; using Ryujinx.HLE.HOS.Kernel.Memory; @@ -13,7 +14,7 @@ namespace Ryujinx.HLE.HOS.Services.Time { private Switch _device; private KSharedMemory _sharedMemory; - private long _timeSharedMemoryAddress; + private ulong _timeSharedMemoryAddress; private int _timeSharedMemorySize; private const uint SteadyClockContextOffset = 0x00; @@ -21,7 +22,7 @@ namespace Ryujinx.HLE.HOS.Services.Time private const uint NetworkSystemClockContextOffset = 0x80; private const uint AutomaticCorrectionEnabledOffset = 0xC8; - public void Initialize(Switch device, KSharedMemory sharedMemory, long timeSharedMemoryAddress, int timeSharedMemorySize) + public void Initialize(Switch device, KSharedMemory sharedMemory, ulong timeSharedMemoryAddress, int timeSharedMemorySize) { _device = device; _sharedMemory = sharedMemory; @@ -29,7 +30,7 @@ namespace Ryujinx.HLE.HOS.Services.Time _timeSharedMemorySize = timeSharedMemorySize; // Clean the shared memory - _device.Memory.FillWithZeros(_timeSharedMemoryAddress, _timeSharedMemorySize); + _device.Memory.ZeroFill(_timeSharedMemoryAddress, (ulong)_timeSharedMemorySize); } public KSharedMemory GetSharedMemory() @@ -86,9 +87,9 @@ namespace Ryujinx.HLE.HOS.Services.Time WriteObjectToSharedMemory(NetworkSystemClockContextOffset, 4, context); } - private T ReadObjectFromSharedMemory<T>(long offset, long padding) + private T ReadObjectFromSharedMemory<T>(ulong offset, ulong padding) where T : unmanaged { - long indexOffset = _timeSharedMemoryAddress + offset; + ulong indexOffset = _timeSharedMemoryAddress + offset; T result; uint index; @@ -96,31 +97,31 @@ namespace Ryujinx.HLE.HOS.Services.Time do { - index = _device.Memory.ReadUInt32(indexOffset); + index = _device.Memory.Read<uint>(indexOffset); - long objectOffset = indexOffset + 4 + padding + (index & 1) * Marshal.SizeOf<T>(); + ulong objectOffset = indexOffset + 4 + padding + (ulong)((index & 1) * Unsafe.SizeOf<T>()); - result = _device.Memory.ReadStruct<T>(objectOffset); + result = _device.Memory.Read<T>(objectOffset); Thread.MemoryBarrier(); - possiblyNewIndex = _device.Memory.ReadUInt32(indexOffset); + possiblyNewIndex = _device.Memory.Read<uint>(indexOffset); } while (index != possiblyNewIndex); return result; } - private void WriteObjectToSharedMemory<T>(long offset, long padding, T value) + private void WriteObjectToSharedMemory<T>(ulong offset, ulong padding, T value) where T : unmanaged { - long indexOffset = _timeSharedMemoryAddress + offset; - uint newIndex = _device.Memory.ReadUInt32(indexOffset) + 1; - long objectOffset = indexOffset + 4 + padding + (newIndex & 1) * Marshal.SizeOf<T>(); + ulong indexOffset = _timeSharedMemoryAddress + offset; + uint newIndex = _device.Memory.Read<uint>(indexOffset) + 1; + ulong objectOffset = indexOffset + 4 + padding + (ulong)((newIndex & 1) * Unsafe.SizeOf<T>()); - _device.Memory.WriteStruct(objectOffset, value); + _device.Memory.Write(objectOffset, value); Thread.MemoryBarrier(); - _device.Memory.WriteUInt32(indexOffset, newIndex); + _device.Memory.Write(indexOffset, newIndex); } } } |