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/AddressSpace.cs | |
| 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/AddressSpace.cs')
| -rw-r--r-- | src/Ryujinx.Cpu/AddressSpace.cs | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/Ryujinx.Cpu/AddressSpace.cs b/src/Ryujinx.Cpu/AddressSpace.cs index e051244d..c467eb62 100644 --- a/src/Ryujinx.Cpu/AddressSpace.cs +++ b/src/Ryujinx.Cpu/AddressSpace.cs @@ -7,15 +7,13 @@ namespace Ryujinx.Cpu { public class AddressSpace : IDisposable { - private const ulong PageSize = 0x1000; - private const int DefaultBlockAlignment = 1 << 20; private enum MappingType : byte { None, Private, - Shared + Shared, } private class Mapping : IntrusiveRedBlackTreeNode<Mapping>, IComparable<Mapping> @@ -37,7 +35,7 @@ namespace Ryujinx.Cpu ulong leftSize = splitAddress - Address; ulong rightSize = EndAddress - splitAddress; - Mapping left = new Mapping(Address, leftSize, Type); + Mapping left = new(Address, leftSize, Type); Address = splitAddress; Size = rightSize; @@ -93,7 +91,7 @@ namespace Ryujinx.Cpu (var leftAllocation, PrivateAllocation) = PrivateAllocation.Split(leftSize); - PrivateMapping left = new PrivateMapping(Address, leftSize, leftAllocation); + PrivateMapping left = new(Address, leftSize, leftAllocation); Address = splitAddress; Size = rightSize; @@ -181,7 +179,7 @@ namespace Ryujinx.Cpu { addressSpace = null; - MemoryAllocationFlags asFlags = MemoryAllocationFlags.Reserve | MemoryAllocationFlags.ViewCompatible; + const MemoryAllocationFlags asFlags = MemoryAllocationFlags.Reserve | MemoryAllocationFlags.ViewCompatible; ulong minAddressSpaceSize = Math.Min(asSize, 1UL << 36); @@ -391,8 +389,6 @@ namespace Ryujinx.Cpu ulong vaAligned = BitUtils.AlignDown(va, alignment); ulong endAddressAligned = BitUtils.AlignUp(endAddress, alignment); - ulong sizeAligned = endAddressAligned - vaAligned; - PrivateMapping map = _privateTree.GetNode(new PrivateMapping(va, 1UL, default)); for (; map != null; map = map.Successor) @@ -436,8 +432,6 @@ namespace Ryujinx.Cpu return; } - ulong alignedSize = endAddressAligned - vaAligned; - PrivateMapping map = _privateTree.GetNode(new PrivateMapping(va, 1UL, default)); for (; map != null; map = map.Successor) @@ -495,9 +489,11 @@ namespace Ryujinx.Cpu public void Dispose() { + GC.SuppressFinalize(this); + _privateMemoryAllocator?.Dispose(); Base.Dispose(); Mirror.Dispose(); } } -}
\ No newline at end of file +} |
