diff options
| author | TSRBerry <20988865+TSRBerry@users.noreply.github.com> | 2023-07-01 04:18:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-01 02:18:52 +0000 |
| commit | 79a1314ee45ea346efc0078d9338ae88e12d07a5 (patch) | |
| tree | 32a9d565db19399eaec1fc270a33726f8af55b8a /src/Ryujinx.Cpu/MemoryHelper.cs | |
| parent | e9848339ddac3d6fe32a0ce0fbe6029c4ad40429 (diff) | |
[Ryujinx.Cpu] Address dotnet-format issues (#5365)1.1.944
* dotnet format style --severity info
Some changes were manually reverted.
* dotnet format analyzers --serverity info
Some changes have been minimally adapted.
* Restore a few unused methods and variables
* Silence dotnet format IDE0060 warnings
* Silence dotnet format IDE0052 warnings
* Silence dotnet format IDE0059 warnings
* Address or silence dotnet format IDE1006 warnings
* Address dotnet format CA1816 warnings
* Address most dotnet format whitespace warnings
* Run dotnet format after rebase and remove unused usings
- analyzers
- style
- whitespace
* Add comments to disabled warnings
* Remove a few unused parameters
* Adjust namespaces
* Simplify properties and array initialization, Use const when possible, Remove trailing commas
* Start working on disabled warnings
* Fix and silence a few dotnet-format warnings again
* Address a few disabled IDE0060 warnings
* Silence IDE0060 in .editorconfig
* Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas"
This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e.
* dotnet format whitespace after rebase
* Address review feedback
* Remove redundant unsafe modifiers
* Fix build issues
* Add GC.SuppressFinalize() call
* Add trailing commas and fix naming rule violations
* Remove unused members and assignments
Diffstat (limited to 'src/Ryujinx.Cpu/MemoryHelper.cs')
| -rw-r--r-- | src/Ryujinx.Cpu/MemoryHelper.cs | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/src/Ryujinx.Cpu/MemoryHelper.cs b/src/Ryujinx.Cpu/MemoryHelper.cs index 194a0c35..ee14ee95 100644 --- a/src/Ryujinx.Cpu/MemoryHelper.cs +++ b/src/Ryujinx.Cpu/MemoryHelper.cs @@ -2,7 +2,6 @@ using Ryujinx.Common.Memory; using Ryujinx.Memory; using System; -using System.IO; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Text; @@ -26,12 +25,12 @@ namespace Ryujinx.Cpu } } - public unsafe static T Read<T>(IVirtualMemoryManager memory, ulong position) where T : unmanaged + public static T Read<T>(IVirtualMemoryManager memory, ulong position) where T : unmanaged { return MemoryMarshal.Cast<byte, T>(memory.GetSpan(position, Unsafe.SizeOf<T>()))[0]; } - public unsafe static ulong Write<T>(IVirtualMemoryManager memory, ulong position, T value) where T : unmanaged + public static ulong Write<T>(IVirtualMemoryManager memory, ulong position, T value) where T : unmanaged { ReadOnlySpan<byte> data = MemoryMarshal.Cast<T, byte>(MemoryMarshal.CreateReadOnlySpan(ref value, 1)); @@ -42,22 +41,21 @@ namespace Ryujinx.Cpu public static string ReadAsciiString(IVirtualMemoryManager memory, ulong position, long maxSize = -1) { - using (RecyclableMemoryStream ms = MemoryStreamManager.Shared.GetStream()) - { - for (long offs = 0; offs < maxSize || maxSize == -1; offs++) - { - byte value = memory.Read<byte>(position + (ulong)offs); + using RecyclableMemoryStream ms = MemoryStreamManager.Shared.GetStream(); - if (value == 0) - { - break; - } + for (long offs = 0; offs < maxSize || maxSize == -1; offs++) + { + byte value = memory.Read<byte>(position + (ulong)offs); - ms.WriteByte(value); + if (value == 0) + { + break; } - return Encoding.ASCII.GetString(ms.GetReadOnlySequence()); + ms.WriteByte(value); } + + return Encoding.ASCII.GetString(ms.GetReadOnlySequence()); } } -}
\ No newline at end of file +} |