aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/HOS/Services
diff options
context:
space:
mode:
authorMary <me@thog.eu>2021-11-01 23:38:13 +0100
committerGitHub <noreply@github.com>2021-11-01 19:38:13 -0300
commitf41687f4c1948e9e111afd70e979e98ea5de52fa (patch)
treee7e34e4f8a986c7165cb3eb2fb3e216329d1c04d /Ryujinx.HLE/HOS/Services
parente48530e9d9f0bbaeb8fa5978d1a66c99e6fecbac (diff)
hle: Make Ryujinx.HLE project entirely safe (#2789)
* Remove a bit of unsafety around * Regenerate StructArrayHelpers with a max element value of 256 * hle: remove unsafe marker from all struct that had it * hle: make SoftwareKeyboardRenderer.TryCopyTo safe * hle: remove unsafety in NpadDevice and remove AllowUnsafeBlocks from csproj * Revert "Regenerate StructArrayHelpers with a max element value of 256" This reverts commit f32a6e5be094f50571970eb1116b65c080781d05. * Introduce ByteArray of various size and use that instead of ArrayXXX to avoid stackoverflow in .NET runtime type resolution * Use ByteArray more * Add some missing spaces on Pack = 1 for various structs * Fix broken logic for TryCopyTo * Address gdkchan's comment * Address gdkchan's comment
Diffstat (limited to 'Ryujinx.HLE/HOS/Services')
-rw-r--r--Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs24
-rw-r--r--Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/Npad/NpadInternalState.cs6
-rw-r--r--Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs12
-rw-r--r--Ryujinx.HLE/HOS/Services/Ro/Types/NRRCertification.cs20
-rw-r--r--Ryujinx.HLE/HOS/Services/Ro/Types/NrrHeader.cs46
5 files changed, 31 insertions, 77 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs b/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs
index 55f8070a..ff93204c 100644
--- a/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs
+++ b/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs
@@ -328,17 +328,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid
private void UpdateUnusedInputIfNotEqual(ref RingLifo<NpadCommonState> currentlyUsed, ref RingLifo<NpadCommonState> possiblyUnused)
{
- bool isEquals;
-
- unsafe
- {
- var aPointer = Unsafe.AsPointer(ref currentlyUsed);
- var bPointer = Unsafe.AsPointer(ref possiblyUnused);
-
- isEquals = aPointer == bPointer;
- }
-
- if (!isEquals)
+ if (!Unsafe.AreSame(ref currentlyUsed, ref possiblyUnused))
{
NpadCommonState newState = new NpadCommonState();
@@ -357,17 +347,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid
private void UpdateUnusedSixInputIfNotEqual(ref RingLifo<SixAxisSensorState> currentlyUsed, ref RingLifo<SixAxisSensorState> possiblyUnused)
{
- bool isEquals;
-
- unsafe
- {
- var aPointer = Unsafe.AsPointer(ref currentlyUsed);
- var bPointer = Unsafe.AsPointer(ref possiblyUnused);
-
- isEquals = aPointer == bPointer;
- }
-
- if (!isEquals)
+ if (!Unsafe.AreSame(ref currentlyUsed, ref possiblyUnused))
{
SixAxisSensorState newState = new SixAxisSensorState();
diff --git a/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/Npad/NpadInternalState.cs b/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/Npad/NpadInternalState.cs
index 5ef5f48d..b009f95e 100644
--- a/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/Npad/NpadInternalState.cs
+++ b/Ryujinx.HLE/HOS/Services/Hid/Types/SharedMemory/Npad/NpadInternalState.cs
@@ -1,4 +1,5 @@
using Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Common;
+using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Npad
{
@@ -30,13 +31,16 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Types.SharedMemory.Npad
public NpadBatteryLevel BatteryLevelJoyRight;
public uint AppletFooterUiAttributes;
public AppletFooterUiType AppletFooterUiType;
- private unsafe fixed byte _reserved2[0x7B];
+ private Reserved2Struct _reserved2;
public RingLifo<NpadGcTriggerState> GcTrigger;
public NpadLarkType LarkTypeLeftAndMain;
public NpadLarkType LarkTypeRight;
public NpadLuciaType LuciaType;
public uint Unknown43EC;
+ [StructLayout(LayoutKind.Sequential, Size = 123, Pack = 1)]
+ private struct Reserved2Struct {}
+
public static NpadInternalState Create()
{
return new NpadInternalState
diff --git a/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs b/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs
index 4097eddf..7a91ce1e 100644
--- a/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs
@@ -59,23 +59,23 @@ namespace Ryujinx.HLE.HOS.Services.Ro
{
return ResultCode.InvalidNrr;
}
- else if (header.NrrSize != nrrSize)
+ else if (header.Size != nrrSize)
{
return ResultCode.InvalidSize;
}
List<byte[]> hashes = new List<byte[]>();
- for (int i = 0; i < header.HashCount; i++)
+ for (int i = 0; i < header.HashesCount; i++)
{
- byte[] temp = new byte[0x20];
+ byte[] hash = new byte[0x20];
- _owner.CpuMemory.Read(nrrAddress + header.HashOffset + (uint)(i * 0x20), temp);
+ _owner.CpuMemory.Read(nrrAddress + header.HashesOffset + (uint)(i * 0x20), hash);
- hashes.Add(temp);
+ hashes.Add(hash);
}
- nrrInfo = new NrrInfo((ulong)nrrAddress, header, hashes);
+ nrrInfo = new NrrInfo(nrrAddress, header, hashes);
return ResultCode.Success;
}
diff --git a/Ryujinx.HLE/HOS/Services/Ro/Types/NRRCertification.cs b/Ryujinx.HLE/HOS/Services/Ro/Types/NRRCertification.cs
index a95f44f8..8c56adb9 100644
--- a/Ryujinx.HLE/HOS/Services/Ro/Types/NRRCertification.cs
+++ b/Ryujinx.HLE/HOS/Services/Ro/Types/NRRCertification.cs
@@ -1,23 +1,15 @@
+using Ryujinx.Common.Memory;
using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Ro
{
- [StructLayout(LayoutKind.Explicit, Size = 0x220)]
- unsafe struct NRRCertification
+ [StructLayout(LayoutKind.Sequential, Size = 0x220)]
+ struct NRRCertification
{
- [FieldOffset(0)]
public ulong ApplicationIdMask;
-
- [FieldOffset(0x8)]
public ulong ApplicationIdPattern;
-
- [FieldOffset(0x10)]
- public fixed byte Reserved[0x10];
-
- [FieldOffset(0x20)]
- public fixed byte Modulus[0x100];
-
- [FieldOffset(0x120)]
- public fixed byte Signature[0x100];
+ private Array16<byte> _reserved;
+ public ByteArray256 Modulus;
+ public ByteArray256 Signature;
}
}
diff --git a/Ryujinx.HLE/HOS/Services/Ro/Types/NrrHeader.cs b/Ryujinx.HLE/HOS/Services/Ro/Types/NrrHeader.cs
index af692628..dbbcb151 100644
--- a/Ryujinx.HLE/HOS/Services/Ro/Types/NrrHeader.cs
+++ b/Ryujinx.HLE/HOS/Services/Ro/Types/NrrHeader.cs
@@ -1,44 +1,22 @@
+using Ryujinx.Common.Memory;
using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Ro
{
- [StructLayout(LayoutKind.Explicit, Size = 0x350)]
- unsafe struct NrrHeader
+ [StructLayout(LayoutKind.Sequential, Size = 0x350)]
+ struct NrrHeader
{
- [FieldOffset(0)]
public uint Magic;
-
- [FieldOffset(0x4)]
- public uint CertificationSignatureKeyGeneration; // 9.0.0+
-
- [FieldOffset(0x8)]
- public ulong Reserved;
-
- [FieldOffset(0x10)]
+ public uint KeyGeneration; // 9.0.0+
+ private Array8<byte> _reserved;
public NRRCertification Certification;
-
- [FieldOffset(0x230)]
- public fixed byte NrrSignature[0x100];
-
- [FieldOffset(0x330)]
+ public ByteArray256 Signature;
public ulong TitleId;
-
- [FieldOffset(0x338)]
- public uint NrrSize;
-
- [FieldOffset(0x33C)]
- public byte Type; // 7.0.0+
-
- [FieldOffset(0x33D)]
- public fixed byte Reserved2[0x3];
-
- [FieldOffset(0x340)]
- public uint HashOffset;
-
- [FieldOffset(0x344)]
- public uint HashCount;
-
- [FieldOffset(0x348)]
- public ulong Reserved3;
+ public uint Size;
+ public byte Kind; // 7.0.0+
+ private Array3<byte> _reserved2;
+ public uint HashesOffset;
+ public uint HashesCount;
+ private Array8<byte> _reserved3;
}
}