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/Jit | |
| parent | e9848339ddac3d6fe32a0ce0fbe6029c4ad40429 (diff) | |
[Ryujinx.Cpu] Address dotnet-format issues (#5365)
* 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/Jit')
| -rw-r--r-- | src/Ryujinx.Cpu/Jit/JitDiskCacheLoadState.cs | 4 | ||||
| -rw-r--r-- | src/Ryujinx.Cpu/Jit/JitEngine.cs | 2 | ||||
| -rw-r--r-- | src/Ryujinx.Cpu/Jit/JitExecutionContext.cs | 2 | ||||
| -rw-r--r-- | src/Ryujinx.Cpu/Jit/JitMemoryBlock.cs | 8 | ||||
| -rw-r--r-- | src/Ryujinx.Cpu/Jit/MemoryManager.cs | 17 | ||||
| -rw-r--r-- | src/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs | 8 |
6 files changed, 24 insertions, 17 deletions
diff --git a/src/Ryujinx.Cpu/Jit/JitDiskCacheLoadState.cs b/src/Ryujinx.Cpu/Jit/JitDiskCacheLoadState.cs index 7a4b670b..08534599 100644 --- a/src/Ryujinx.Cpu/Jit/JitDiskCacheLoadState.cs +++ b/src/Ryujinx.Cpu/Jit/JitDiskCacheLoadState.cs @@ -23,7 +23,7 @@ namespace Ryujinx.Cpu.Jit PtcLoadingState.Start => LoadState.Unloaded, PtcLoadingState.Loading => LoadState.Loading, PtcLoadingState.Loaded => LoadState.Loaded, - _ => throw new ArgumentException($"Invalid load state \"{newState}\".") + _ => throw new ArgumentException($"Invalid load state \"{newState}\"."), }; StateChanged?.Invoke(state, current, total); @@ -35,4 +35,4 @@ namespace Ryujinx.Cpu.Jit _loadState.Continue(); } } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Cpu/Jit/JitEngine.cs b/src/Ryujinx.Cpu/Jit/JitEngine.cs index b158074f..deebb8b9 100644 --- a/src/Ryujinx.Cpu/Jit/JitEngine.cs +++ b/src/Ryujinx.Cpu/Jit/JitEngine.cs @@ -17,4 +17,4 @@ namespace Ryujinx.Cpu.Jit return new JitCpuContext(_tickSource, memoryManager, for64Bit); } } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Cpu/Jit/JitExecutionContext.cs b/src/Ryujinx.Cpu/Jit/JitExecutionContext.cs index e1a527b1..f15486e6 100644 --- a/src/Ryujinx.Cpu/Jit/JitExecutionContext.cs +++ b/src/Ryujinx.Cpu/Jit/JitExecutionContext.cs @@ -120,4 +120,4 @@ namespace Ryujinx.Cpu.Jit _impl.Dispose(); } } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Cpu/Jit/JitMemoryBlock.cs b/src/Ryujinx.Cpu/Jit/JitMemoryBlock.cs index 61e27eaf..ed160680 100644 --- a/src/Ryujinx.Cpu/Jit/JitMemoryBlock.cs +++ b/src/Ryujinx.Cpu/Jit/JitMemoryBlock.cs @@ -19,6 +19,10 @@ namespace Ryujinx.Cpu.Jit public void MapAsRx(ulong offset, ulong size) => _impl.Reprotect(offset, size, MemoryPermission.ReadAndExecute); public void MapAsRwx(ulong offset, ulong size) => _impl.Reprotect(offset, size, MemoryPermission.ReadWriteExecute); - public void Dispose() => _impl.Dispose(); + public void Dispose() + { + GC.SuppressFinalize(this); + _impl.Dispose(); + } } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Cpu/Jit/MemoryManager.cs b/src/Ryujinx.Cpu/Jit/MemoryManager.cs index 6da11fb8..1c27e97f 100644 --- a/src/Ryujinx.Cpu/Jit/MemoryManager.cs +++ b/src/Ryujinx.Cpu/Jit/MemoryManager.cs @@ -84,7 +84,6 @@ namespace Ryujinx.Cpu.Jit ulong remainingSize = size; ulong oVa = va; - ulong oPa = pa; while (remainingSize != 0) { _pageTable.Write((va / PageSize) * PteSize, PaToPte(pa)); @@ -246,7 +245,7 @@ namespace Ryujinx.Cpu.Jit size = Math.Min(data.Length, PageSize - (int)(va & PageMask)); - data.Slice(0, size).CopyTo(_backingMemory.GetSpan(pa, size)); + data[..size].CopyTo(_backingMemory.GetSpan(pa, size)); offset += size; } @@ -298,7 +297,7 @@ namespace Ryujinx.Cpu.Jit } /// <inheritdoc/> - public unsafe WritableRegion GetWritableRegion(ulong va, int size, bool tracked = false) + public WritableRegion GetWritableRegion(ulong va, int size, bool tracked = false) { if (size == 0) { @@ -345,7 +344,7 @@ namespace Ryujinx.Cpu.Jit /// <param name="startVa">The virtual address of the beginning of the first page</param> /// <remarks>This function does not differentiate between allocated and unallocated pages.</remarks> [MethodImpl(MethodImplOptions.AggressiveInlining)] - private int GetPagesCount(ulong va, uint size, out ulong startVa) + private static int GetPagesCount(ulong va, uint size, out ulong startVa) { // WARNING: Always check if ulong does not overflow during the operations. startVa = va & ~(ulong)PageMask; @@ -482,7 +481,7 @@ namespace Ryujinx.Cpu.Jit size = Math.Min(data.Length, PageSize - (int)(va & PageMask)); - _backingMemory.GetSpan(pa, size).CopyTo(data.Slice(0, size)); + _backingMemory.GetSpan(pa, size).CopyTo(data[..size]); offset += size; } @@ -576,6 +575,7 @@ namespace Ryujinx.Cpu.Jit } } +#pragma warning disable IDE0051 // Remove unused private member private ulong GetPhysicalAddress(ulong va) { // We return -1L if the virtual address is invalid or unmapped. @@ -586,6 +586,7 @@ namespace Ryujinx.Cpu.Jit return GetPhysicalAddressInternal(va); } +#pragma warning restore IDE0051 private ulong GetPhysicalAddressInternal(ulong va) { @@ -604,7 +605,7 @@ namespace Ryujinx.Cpu.Jit { MemoryPermission.None => 0L, MemoryPermission.Write => 2L << PointerTagBit, - _ => 3L << PointerTagBit + _ => 3L << PointerTagBit, }; int pages = GetPagesCount(va, (uint)size, out va); @@ -698,6 +699,8 @@ namespace Ryujinx.Cpu.Jit /// </summary> protected override void Destroy() => _pageTable.Dispose(); - private void ThrowInvalidMemoryRegionException(string message) => throw new InvalidMemoryRegionException(message); +#pragma warning disable IDE0051 // Remove unused private member + private static void ThrowInvalidMemoryRegionException(string message) => throw new InvalidMemoryRegionException(message); +#pragma warning restore IDE0051 } } diff --git a/src/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs b/src/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs index 3686eb08..010a0bc2 100644 --- a/src/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs +++ b/src/Ryujinx.Cpu/Jit/MemoryManagerHostMapped.cs @@ -31,7 +31,7 @@ namespace Ryujinx.Cpu.Jit MappedReplicated = 0x5555555555555555, WriteTrackedReplicated = 0xaaaaaaaaaaaaaaaa, - ReadWriteTrackedReplicated = ulong.MaxValue + ReadWriteTrackedReplicated = ulong.MaxValue, } private readonly InvalidAccessHandler _invalidAccessHandler; @@ -404,7 +404,7 @@ namespace Ryujinx.Cpu.Jit } [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void GetPageBlockRange(ulong pageStart, ulong pageEnd, out ulong startMask, out ulong endMask, out int pageIndex, out int pageEndIndex) + private static void GetPageBlockRange(ulong pageStart, ulong pageEnd, out ulong startMask, out ulong endMask, out int pageIndex, out int pageEndIndex) { startMask = ulong.MaxValue << ((int)(pageStart & 31) << 1); endMask = ulong.MaxValue >> (64 - ((int)(pageEnd & 31) << 1)); @@ -606,7 +606,7 @@ namespace Ryujinx.Cpu.Jit /// <param name="startVa">The virtual address of the beginning of the first page</param> /// <remarks>This function does not differentiate between allocated and unallocated pages.</remarks> [MethodImpl(MethodImplOptions.AggressiveInlining)] - private int GetPagesCount(ulong va, ulong size, out ulong startVa) + private static int GetPagesCount(ulong va, ulong size, out ulong startVa) { // WARNING: Always check if ulong does not overflow during the operations. startVa = va & ~(ulong)PageMask; @@ -697,7 +697,7 @@ namespace Ryujinx.Cpu.Jit { MemoryPermission.None => MemoryPermission.ReadAndWrite, MemoryPermission.Write => MemoryPermission.Read, - _ => MemoryPermission.None + _ => MemoryPermission.None, }; _addressSpace.Base.Reprotect(va, size, protection, false); |
