mchapman/Ryujinx-greemdev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Ryujinx.HLE] Address dotnet-format issues (#5380)

Browse Source 
* 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

* Address or silence dotnet format IDE1006 warnings

* Address dotnet format CA1816 warnings

* Address or silence dotnet format CA2208 warnings

* Address or silence dotnet format CA1806 and a few CA1854 warnings

* Address dotnet format CA2211 warnings

* Address dotnet format CA1822 warnings

* Address or silence dotnet format CA1069 warnings

* Make dotnet format succeed in style mode

* Address or silence dotnet format CA2211 warnings

* Address review comments

* Address dotnet format CA2208 warnings properly

* Make ProcessResult readonly

* Address most dotnet format whitespace warnings

* Apply dotnet format whitespace formatting

A few of them have been manually reverted and the corresponding warning was silenced

* Add previously silenced warnings back

I have no clue how these disappeared

* Revert formatting changes for while and for-loops

* Format if-blocks correctly

* Run dotnet format style after rebase

* Run dotnet format whitespace after rebase

* Run dotnet format style after rebase

* Run dotnet format analyzers after rebase

* Run dotnet format after rebase and remove unused usings

- analyzers
- style
- whitespace

* Disable 'prefer switch expression' rule

* Add comments to disabled warnings

* Fix a few disabled warnings

* Fix naming rule violation, Convert shader properties to auto-property and convert values to const

* 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

* Run dotnet format after rebase

* Use using declaration instead of block syntax

* Address IDE0251 warnings

* 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

* First dotnet format pass

* Fix naming rule violations

* Fix typo

* Add trailing commas, use targeted new and use array initializer

* Fix build issues

* Fix remaining build issues

* Remove SuppressMessage for CA1069 where possible

* Address dotnet format issues

* Address formatting issues

Co-authored-by: Ac_K <acoustik666@gmail.com>

* Add GetHashCode implementation for RenderingSurfaceInfo

* Explicitly silence CA1822 for every affected method in Syscall

* Address formatting issues in Demangler.cs

* Address review feedback

Co-authored-by: Ac_K <acoustik666@gmail.com>

* Revert marking service methods as static

* Next dotnet format pass

* Address review feedback

---------

Co-authored-by: Ac_K <acoustik666@gmail.com>
This commit is contained in:
TSRBerry
2023-07-16 19:31:14 +02:00
committed by GitHub
parent fec8291c17
commit 326749498b
1015 changed files with 8173 additions and 7615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Ryujinx.HLE/Loaders/Executables/IExecutable.cs
View File

@@ -6,13 +6,13 @@ namespace Ryujinx.HLE.Loaders.Executables
{
byte[] Program { get; }
Span<byte> Text { get; }
Span<byte> Ro { get; }
Span<byte> Ro { get; }
Span<byte> Data { get; }
uint TextOffset { get; }
uint RoOffset { get; }
uint RoOffset { get; }
uint DataOffset { get; }
uint BssOffset { get; }
uint BssSize { get; }
uint BssOffset { get; }
uint BssSize { get; }
}
}
}

52
src/Ryujinx.HLE/Loaders/Executables/KipExecutable.cs
View File

@@ -9,53 +9,53 @@ namespace Ryujinx.HLE.Loaders.Executables
{
public byte[] Program { get; }
public Span<byte> Text => Program.AsSpan((int)TextOffset, (int)TextSize);
public Span<byte> Ro => Program.AsSpan((int)RoOffset, (int)RoSize);
public Span<byte> Ro => Program.AsSpan((int)RoOffset, (int)RoSize);
public Span<byte> Data => Program.AsSpan((int)DataOffset, (int)DataSize);
public uint TextOffset { get; }
public uint RoOffset { get; }
public uint RoOffset { get; }
public uint DataOffset { get; }
public uint BssOffset { get; }
public uint BssOffset { get; }
public uint TextSize { get; }
public uint RoSize { get; }
public uint RoSize { get; }
public uint DataSize { get; }
public uint BssSize { get; }
public uint BssSize { get; }
public uint[] Capabilities { get; }
public bool UsesSecureMemory { get; }
public uint[] Capabilities { get; }
public bool UsesSecureMemory { get; }
public bool Is64BitAddressSpace { get; }
public bool Is64Bit { get; }
public ulong ProgramId { get; }
public byte Priority { get; }
public int StackSize { get; }
public byte IdealCoreId { get; }
public int Version { get; }
public string Name { get; }
public bool Is64Bit { get; }
public ulong ProgramId { get; }
public byte Priority { get; }
public int StackSize { get; }
public byte IdealCoreId { get; }
public int Version { get; }
public string Name { get; }
public KipExecutable(in SharedRef<IStorage> inStorage)
{
KipReader reader = new KipReader();
KipReader reader = new();
reader.Initialize(in inStorage).ThrowIfFailure();
TextOffset = (uint)reader.Segments[0].MemoryOffset;
RoOffset = (uint)reader.Segments[1].MemoryOffset;
RoOffset = (uint)reader.Segments[1].MemoryOffset;
DataOffset = (uint)reader.Segments[2].MemoryOffset;
BssOffset = (uint)reader.Segments[3].MemoryOffset;
BssSize = (uint)reader.Segments[3].Size;
BssOffset = (uint)reader.Segments[3].MemoryOffset;
BssSize = (uint)reader.Segments[3].Size;
StackSize = reader.StackSize;
UsesSecureMemory = reader.UsesSecureMemory;
UsesSecureMemory = reader.UsesSecureMemory;
Is64BitAddressSpace = reader.Is64BitAddressSpace;
Is64Bit = reader.Is64Bit;
Is64Bit = reader.Is64Bit;
ProgramId = reader.ProgramId;
Priority = reader.Priority;
ProgramId = reader.ProgramId;
Priority = reader.Priority;
IdealCoreId = reader.IdealCoreId;
Version = reader.Version;
Name = reader.Name.ToString();
Version = reader.Version;
Name = reader.Name.ToString();
Capabilities = new uint[32];
@@ -68,7 +68,7 @@ namespace Ryujinx.HLE.Loaders.Executables
Program = new byte[DataOffset + uncompressedSize];
TextSize = DecompressSection(reader, KipReader.SegmentType.Text, TextOffset, Program);
RoSize = DecompressSection(reader, KipReader.SegmentType.Ro, RoOffset, Program);
RoSize = DecompressSection(reader, KipReader.SegmentType.Ro, RoOffset, Program);
DataSize = DecompressSection(reader, KipReader.SegmentType.Data, DataOffset, Program);
}
@@ -83,4 +83,4 @@ namespace Ryujinx.HLE.Loaders.Executables
return (uint)uncompressedSize;
}
}
}
}

18
src/Ryujinx.HLE/Loaders/Executables/NroExecutable.cs
View File

@@ -8,31 +8,31 @@ namespace Ryujinx.HLE.Loaders.Executables
{
public byte[] Program { get; }
public Span<byte> Text => Program.AsSpan((int)TextOffset, (int)Header.NroSegments[0].Size);
public Span<byte> Ro => Program.AsSpan((int)RoOffset, (int)Header.NroSegments[1].Size);
public Span<byte> Ro => Program.AsSpan((int)RoOffset, (int)Header.NroSegments[1].Size);
public Span<byte> Data => Program.AsSpan((int)DataOffset, (int)Header.NroSegments[2].Size);
public uint TextOffset => Header.NroSegments[0].FileOffset;
public uint RoOffset => Header.NroSegments[1].FileOffset;
public uint RoOffset => Header.NroSegments[1].FileOffset;
public uint DataOffset => Header.NroSegments[2].FileOffset;
public uint BssOffset => DataOffset + (uint)Data.Length;
public uint BssSize => Header.BssSize;
public uint BssOffset => DataOffset + (uint)Data.Length;
public uint BssSize => Header.BssSize;
public uint Mod0Offset => (uint)Start.Mod0Offset;
public uint FileSize => Header.Size;
public uint FileSize => Header.Size;
public ulong SourceAddress { get; private set; }
public ulong BssAddress { get; private set; }
public ulong BssAddress { get; private set; }
public NroExecutable(IStorage inStorage, ulong sourceAddress = 0, ulong bssAddress = 0) : base(inStorage)
{
Program = new byte[FileSize];
SourceAddress = sourceAddress;
BssAddress = bssAddress;
BssAddress = bssAddress;
OpenNroSegment(NroSegmentType.Text, false).Read(0, Text);
OpenNroSegment(NroSegmentType.Ro , false).Read(0, Ro);
OpenNroSegment(NroSegmentType.Ro, false).Read(0, Ro);
OpenNroSegment(NroSegmentType.Data, false).Read(0, Data);
}
}
}
}

30
src/Ryujinx.HLE/Loaders/Executables/NsoExecutable.cs
View File

@@ -13,20 +13,20 @@ namespace Ryujinx.HLE.Loaders.Executables
{
public byte[] Program { get; }
public Span<byte> Text => Program.AsSpan((int)TextOffset, (int)TextSize);
public Span<byte> Ro => Program.AsSpan((int)RoOffset, (int)RoSize);
public Span<byte> Ro => Program.AsSpan((int)RoOffset, (int)RoSize);
public Span<byte> Data => Program.AsSpan((int)DataOffset, (int)DataSize);
public uint TextOffset { get; }
public uint RoOffset { get; }
public uint RoOffset { get; }
public uint DataOffset { get; }
public uint BssOffset => DataOffset + (uint)Data.Length;
public uint TextSize { get; }
public uint RoSize { get; }
public uint RoSize { get; }
public uint DataSize { get; }
public uint BssSize { get; }
public uint BssSize { get; }
public string Name;
public string Name;
public Array32<byte> BuildId;
[GeneratedRegex(@"[a-z]:[\\/][ -~]{5,}\.nss", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
@@ -38,24 +38,24 @@ namespace Ryujinx.HLE.Loaders.Executables
public NsoExecutable(IStorage inStorage, string name = null)
{
NsoReader reader = new NsoReader();
NsoReader reader = new();
reader.Initialize(inStorage.AsFile(OpenMode.Read)).ThrowIfFailure();
TextOffset = reader.Header.Segments[0].MemoryOffset;
RoOffset = reader.Header.Segments[1].MemoryOffset;
RoOffset = reader.Header.Segments[1].MemoryOffset;
DataOffset = reader.Header.Segments[2].MemoryOffset;
BssSize = reader.Header.BssSize;
BssSize = reader.Header.BssSize;
reader.GetSegmentSize(NsoReader.SegmentType.Data, out uint uncompressedSize).ThrowIfFailure();
Program = new byte[DataOffset + uncompressedSize];
TextSize = DecompressSection(reader, NsoReader.SegmentType.Text, TextOffset);
RoSize = DecompressSection(reader, NsoReader.SegmentType.Ro, RoOffset);
RoSize = DecompressSection(reader, NsoReader.SegmentType.Ro, RoOffset);
DataSize = DecompressSection(reader, NsoReader.SegmentType.Data, DataOffset);
Name = name;
Name = name;
BuildId = reader.Header.ModuleId;
PrintRoSectionInfo();
@@ -74,12 +74,12 @@ namespace Ryujinx.HLE.Loaders.Executables
private void PrintRoSectionInfo()
{
string rawTextBuffer = Encoding.ASCII.GetString(Ro);
StringBuilder stringBuilder = new StringBuilder();
string rawTextBuffer = Encoding.ASCII.GetString(Ro);
StringBuilder stringBuilder = new();
string modulePath = null;
if (BitConverter.ToInt32(Ro.Slice(0, 4)) == 0)
if (BitConverter.ToInt32(Ro[..4]) == 0)
{
int length = BitConverter.ToInt32(Ro.Slice(4, 4));
if (length > 0)
@@ -108,7 +108,7 @@ namespace Ryujinx.HLE.Loaders.Executables
MatchCollection sdkMwMatches = SdkMwRegex().Matches(rawTextBuffer);
if (sdkMwMatches.Count != 0)
{
string libHeader = " SDK Libraries: ";
string libHeader = " SDK Libraries: ";
string libContent = string.Join($"\n{new string(' ', libHeader.Length)}", sdkMwMatches);
stringBuilder.AppendLine($"{libHeader}{libContent}");
@@ -120,4 +120,4 @@ namespace Ryujinx.HLE.Loaders.Executables
}
}
}
}
}