drashna/ryujinx
1
0
Fork 0
Code Activity Actions

HLE: Fix integer sign inconcistency accross the codebase (#2222)

Browse source 
* Make all title id instances unsigned

* Replace address and size with ulong instead of signed types

Long overdue change.
Also change some logics here and there to optimize with the new memory
manager.

* Address Ac_K's comments

* Remove uneeded cast all around

* Fixes some others misalignment
This commit is contained in:
Mary 2021-04-24 12:16:01 +02:00 • committed by GitHub
parent c46f6879ff
commit 305f06eb71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
73 changed files with 707 additions and 716 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Ryujinx.HLE/Utilities/StructReader.cs
View file

@ -1,5 +1,6 @@
using Ryujinx.Cpu;
using Ryujinx.Memory;
using System;
using System.Runtime.InteropServices;
namespace Ryujinx.HLE.Utilities
@ -8,39 +9,30 @@ namespace Ryujinx.HLE.Utilities
{
private IVirtualMemoryManager _memory;
public long Position { get; private set; }
public ulong Position { get; private set; }
public StructReader(IVirtualMemoryManager memory, long position)
public StructReader(IVirtualMemoryManager memory, ulong position)
{
_memory = memory;
Position = position;
}
public T Read<T>() where T : struct
public T Read<T>() where T : unmanaged
{
T value = MemoryHelper.Read<T>(_memory, Position);
Position += Marshal.SizeOf<T>();
Position += (uint)Marshal.SizeOf<T>();
return value;
}
public T[] Read<T>(int size) where T : struct
public ReadOnlySpan<T> Read<T>(int size) where T : unmanaged
{
int structSize = Marshal.SizeOf<T>();
ReadOnlySpan<byte> data = _memory.GetSpan(Position, size);
int count = size / structSize;
Position += (uint)size;
T[] output = new T[count];
for (int index = 0; index < count; index++)
{
output[index] = MemoryHelper.Read<T>(_memory, Position);
Position += structSize;
}
return output;
return MemoryMarshal.Cast<byte, T>(data);
}
}
}