diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2023-01-04 19:15:45 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-04 23:15:45 +0100 |
| commit | 08831eecf77cedd3c4192ebab5a9c485fb15d51e (patch) | |
| tree | 6d95b921a18e9cfa477579fcecb9d041e03d682e /Ryujinx.Common | |
| parent | c6a139a6e7e3ffe1591bc14dafafed60b9bef0dc (diff) | |
IPC refactor part 3+4: New server HIPC message processor (#4188)
* IPC refactor part 3 + 4: New server HIPC message processor with source generator based serialization
* Make types match on calls to AlignUp/AlignDown
* Formatting
* Address some PR feedback
* Move BitfieldExtensions to Ryujinx.Common.Utilities and consolidate implementations
* Rename Reader/Writer to SpanReader/SpanWriter and move to Ryujinx.Common.Memory
* Implement EventType
* Address more PR feedback
* Log request processing errors since they are not normal
* Rename waitable to multiwait and add missing lock
* PR feedback
* Ac_K PR feedback
Diffstat (limited to 'Ryujinx.Common')
| -rw-r--r-- | Ryujinx.Common/Memory/SpanReader.cs | 51 | ||||
| -rw-r--r-- | Ryujinx.Common/Memory/SpanWriter.cs | 45 | ||||
| -rw-r--r-- | Ryujinx.Common/Utilities/BitfieldExtensions.cs | 57 |
3 files changed, 153 insertions, 0 deletions
diff --git a/Ryujinx.Common/Memory/SpanReader.cs b/Ryujinx.Common/Memory/SpanReader.cs new file mode 100644 index 00000000..e46649e1 --- /dev/null +++ b/Ryujinx.Common/Memory/SpanReader.cs @@ -0,0 +1,51 @@ +using System; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +namespace Ryujinx.Common.Memory +{ + public ref struct SpanReader + { + private ReadOnlySpan<byte> _input; + + public int Length => _input.Length; + + public SpanReader(ReadOnlySpan<byte> input) + { + _input = input; + } + + public T Read<T>() where T : unmanaged + { + T value = MemoryMarshal.Cast<byte, T>(_input)[0]; + + _input = _input.Slice(Unsafe.SizeOf<T>()); + + return value; + } + + public ReadOnlySpan<byte> GetSpan(int size) + { + ReadOnlySpan<byte> data = _input.Slice(0, size); + + _input = _input.Slice(size); + + return data; + } + + public T ReadAt<T>(int offset) where T : unmanaged + { + return MemoryMarshal.Cast<byte, T>(_input.Slice(offset))[0]; + } + + public ReadOnlySpan<byte> GetSpanAt(int offset, int size) + { + return _input.Slice(offset, size); + } + + public void Skip(int size) + { + _input = _input.Slice(size); + } + } +}
\ No newline at end of file diff --git a/Ryujinx.Common/Memory/SpanWriter.cs b/Ryujinx.Common/Memory/SpanWriter.cs new file mode 100644 index 00000000..5c35569d --- /dev/null +++ b/Ryujinx.Common/Memory/SpanWriter.cs @@ -0,0 +1,45 @@ +using System; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +namespace Ryujinx.Common.Memory +{ + public ref struct SpanWriter + { + private Span<byte> _output; + + public int Length => _output.Length; + + public SpanWriter(Span<byte> output) + { + _output = output; + } + + public void Write<T>(T value) where T : unmanaged + { + MemoryMarshal.Cast<byte, T>(_output)[0] = value; + _output = _output.Slice(Unsafe.SizeOf<T>()); + } + + public void Write(ReadOnlySpan<byte> data) + { + data.CopyTo(_output.Slice(0, data.Length)); + _output = _output.Slice(data.Length); + } + + public void WriteAt<T>(int offset, T value) where T : unmanaged + { + MemoryMarshal.Cast<byte, T>(_output.Slice(offset))[0] = value; + } + + public void WriteAt(int offset, ReadOnlySpan<byte> data) + { + data.CopyTo(_output.Slice(offset, data.Length)); + } + + public void Skip(int size) + { + _output = _output.Slice(size); + } + } +} diff --git a/Ryujinx.Common/Utilities/BitfieldExtensions.cs b/Ryujinx.Common/Utilities/BitfieldExtensions.cs new file mode 100644 index 00000000..ca429944 --- /dev/null +++ b/Ryujinx.Common/Utilities/BitfieldExtensions.cs @@ -0,0 +1,57 @@ +using System.Numerics; +using System.Runtime.CompilerServices; + +namespace Ryujinx.Common.Utilities +{ + public static class BitfieldExtensions + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static bool Extract<T>(this T value, int lsb) where T : IBinaryInteger<T> + { + int bitSize = Unsafe.SizeOf<T>() * 8; + lsb &= bitSize - 1; + + return !T.IsZero((value >>> lsb) & T.One); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static T Extract<T>(this T value, int lsb, int length) where T : IBinaryInteger<T> + { + int bitSize = Unsafe.SizeOf<T>() * 8; + lsb &= bitSize - 1; + + return (value >>> lsb) & (~T.Zero >>> (bitSize - length)); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static T ExtractSx<T>(this T value, int lsb, int length) where T : IBinaryInteger<T> + { + int bitSize = Unsafe.SizeOf<T>() * 8; + int shift = lsb & (bitSize - 1); + + return (value << (bitSize - (shift + length))) >> (bitSize - length); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static T Insert<T>(this T value, int lsb, bool toInsert) where T : IBinaryInteger<T> + { + int bitSize = Unsafe.SizeOf<T>() * 8; + lsb &= bitSize - 1; + + T mask = T.One << lsb; + + return (value & ~mask) | (toInsert ? mask : T.Zero); + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static T Insert<T>(this T value, int lsb, int length, T toInsert) where T : IBinaryInteger<T> + { + int bitSize = Unsafe.SizeOf<T>() * 8; + lsb &= bitSize - 1; + + T mask = (~T.Zero >>> (bitSize - length)) << lsb; + + return (value & ~mask) | ((toInsert << lsb) & mask); + } + } +}
\ No newline at end of file |
