diff options
| author | Mary <me@thog.eu> | 2021-11-01 23:38:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 19:38:13 -0300 |
| commit | f41687f4c1948e9e111afd70e979e98ea5de52fa (patch) | |
| tree | e7e34e4f8a986c7165cb3eb2fb3e216329d1c04d /Ryujinx.Common/Memory/StructByteArrayHelpers.cs | |
| parent | e48530e9d9f0bbaeb8fa5978d1a66c99e6fecbac (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.Common/Memory/StructByteArrayHelpers.cs')
| -rw-r--r-- | Ryujinx.Common/Memory/StructByteArrayHelpers.cs | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/Ryujinx.Common/Memory/StructByteArrayHelpers.cs b/Ryujinx.Common/Memory/StructByteArrayHelpers.cs new file mode 100644 index 00000000..0c17dc10 --- /dev/null +++ b/Ryujinx.Common/Memory/StructByteArrayHelpers.cs @@ -0,0 +1,77 @@ +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 ToSpan()[index]; + public Span<byte> ToSpan() => 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 ToSpan()[index]; + public Span<byte> ToSpan() => 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 ToSpan()[index]; + public Span<byte> ToSpan() => 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 ToSpan()[index]; + public Span<byte> ToSpan() => 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 ToSpan()[index]; + public Span<byte> ToSpan() => 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 ToSpan()[index]; + public Span<byte> ToSpan() => MemoryMarshal.CreateSpan(ref _element, Size); + } +} |