manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-01-16 15:40:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace StructByteArrayHelpers with generated Array<byte> types

Browse source
This commit is contained in:
TSR Berry 2022-12-16 15:27:17 +01:00
parent 960c426501
commit 2502a9d00f
No known key found for this signature in database
GPG key ID: 52353C0A4CCA15E2
5 changed files with 9 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
Ryujinx.Common/Memory/StructByteArrayHelpers.cs
View file

@ -1,77 +0,0 @@
using System;
using System.Runtime.InteropServices;
namespace Ryujinx.Common.Memory
{
[StructLayout(LayoutKind.Sequential, Size = Size, Pack = 1)]
public struct ByteArray128 : IArray<byte>
{
private const int Size = 128;
byte _element;
public int Length => Size;
public ref byte this[int index] => ref AsSpan()[index];
public Span<byte> AsSpan() => MemoryMarshal.CreateSpan(ref _element, Size);
}
[StructLayout(LayoutKind.Sequential, Size = Size, Pack = 1)]
public struct ByteArray256 : IArray<byte>
{
private const int Size = 256;
byte _element;
public int Length => Size;
public ref byte this[int index] => ref AsSpan()[index];
public Span<byte> AsSpan() => MemoryMarshal.CreateSpan(ref _element, Size);
}
[StructLayout(LayoutKind.Sequential, Size = Size, Pack = 1)]
public struct ByteArray512 : IArray<byte>
{
private const int Size = 512;
byte _element;
public int Length => Size;
public ref byte this[int index] => ref AsSpan()[index];
public Span<byte> AsSpan() => MemoryMarshal.CreateSpan(ref _element, Size);
}
[StructLayout(LayoutKind.Sequential, Size = Size, Pack = 1)]
public struct ByteArray1024 : IArray<byte>
{
private const int Size = 1024;
byte _element;
public int Length => Size;
public ref byte this[int index] => ref AsSpan()[index];
public Span<byte> AsSpan() => MemoryMarshal.CreateSpan(ref _element, Size);
}
[StructLayout(LayoutKind.Sequential, Size = Size, Pack = 1)]
public struct ByteArray2048 : IArray<byte>
{
private const int Size = 2048;
byte _element;
public int Length => Size;
public ref byte this[int index] => ref AsSpan()[index];
public Span<byte> AsSpan() => MemoryMarshal.CreateSpan(ref _element, Size);
}
[StructLayout(LayoutKind.Sequential, Size = Size, Pack = 1)]
public struct ByteArray4096 : IArray<byte>
{
private const int Size = 4096;
byte _element;
public int Length => Size;
public ref byte this[int index] => ref AsSpan()[index];
public Span<byte> AsSpan() => MemoryMarshal.CreateSpan(ref _element, Size);
}
}

4
Ryujinx.HLE/HOS/Applets/Browser/WebCommonReturnValue.cs
View file

@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Applets.Browser
{ {
public WebExitReason ExitReason; public WebExitReason ExitReason;
public uint Padding; public uint Padding;
public ByteArray4096 LastUrl; public Array4096<byte> LastUrl;
public ulong LastUrlSize; public ulong LastUrlSize;
} }
} }

4
Ryujinx.HLE/HOS/Applets/Error/ApplicationErrorArg.cs
View file

@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Applets.Error
{ {
public uint ErrorNumber; public uint ErrorNumber;
public ulong LanguageCode; public ulong LanguageCode;
public ByteArray2048 MessageText; public Array2048<byte> MessageText;
public ByteArray2048 DetailsText; public Array2048<byte> DetailsText;
} }
} }

6
Ryujinx.HLE/HOS/Services/Ro/Types/NRRCertification.cs
View file

@ -9,7 +9,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro
public ulong ApplicationIdMask; public ulong ApplicationIdMask;
public ulong ApplicationIdPattern; public ulong ApplicationIdPattern;
private Array16<byte> _reserved; private Array16<byte> _reserved;
public ByteArray256 Modulus; public Array256<byte> Modulus;
public ByteArray256 Signature; public Array256<byte> Signature;
} }
} }

4
Ryujinx.HLE/HOS/Services/Ro/Types/NrrHeader.cs
View file

@ -10,7 +10,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro
public uint KeyGeneration; // 9.0.0+ public uint KeyGeneration; // 9.0.0+
private Array8<byte> _reserved; private Array8<byte> _reserved;
public NRRCertification Certification; public NRRCertification Certification;
public ByteArray256 Signature; public Array256<byte> Signature;
public ulong TitleId; public ulong TitleId;
public uint Size; public uint Size;
public byte Kind; // 7.0.0+ public byte Kind; // 7.0.0+
@ -19,4 +19,4 @@ namespace Ryujinx.HLE.HOS.Services.Ro
public uint HashesCount; public uint HashesCount;
private Array8<byte> _reserved3; private Array8<byte> _reserved3;
} }
} }