mirror of
https://git.ryujinx.app/ryubing/ryujinx.git
synced 2025-07-25 08:27:11 +02:00
[Ryujinx.HLE] Address dotnet-format issues (#5380)
* 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
GitHub
parent
fec8291c17
commit
326749498b
1015 changed files with 8173 additions and 7615 deletions
|
|
@ -1,13 +1,12 @@
|
|||
using Ryujinx.Common.Logging;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
|
||||
namespace Ryujinx.HLE.Loaders.Mods
|
||||
{
|
||||
class IpsPatcher
|
||||
{
|
||||
MemPatch _patches;
|
||||
readonly MemPatch _patches;
|
||||
|
||||
public IpsPatcher(BinaryReader reader)
|
||||
{
|
||||
|
|
@ -20,15 +19,15 @@ namespace Ryujinx.HLE.Loaders.Mods
|
|||
|
||||
private static MemPatch ParseIps(BinaryReader reader)
|
||||
{
|
||||
ReadOnlySpan<byte> IpsHeaderMagic = "PATCH"u8;
|
||||
ReadOnlySpan<byte> IpsTailMagic = "EOF"u8;
|
||||
ReadOnlySpan<byte> Ips32HeaderMagic = "IPS32"u8;
|
||||
ReadOnlySpan<byte> Ips32TailMagic = "EEOF"u8;
|
||||
ReadOnlySpan<byte> ipsHeaderMagic = "PATCH"u8;
|
||||
ReadOnlySpan<byte> ipsTailMagic = "EOF"u8;
|
||||
ReadOnlySpan<byte> ips32HeaderMagic = "IPS32"u8;
|
||||
ReadOnlySpan<byte> ips32TailMagic = "EEOF"u8;
|
||||
|
||||
MemPatch patches = new MemPatch();
|
||||
var header = reader.ReadBytes(IpsHeaderMagic.Length).AsSpan();
|
||||
MemPatch patches = new();
|
||||
var header = reader.ReadBytes(ipsHeaderMagic.Length).AsSpan();
|
||||
|
||||
if (header.Length != IpsHeaderMagic.Length)
|
||||
if (header.Length != ipsHeaderMagic.Length)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
|
@ -36,15 +35,15 @@ namespace Ryujinx.HLE.Loaders.Mods
|
|||
bool is32;
|
||||
ReadOnlySpan<byte> tailSpan;
|
||||
|
||||
if (header.SequenceEqual(IpsHeaderMagic))
|
||||
if (header.SequenceEqual(ipsHeaderMagic))
|
||||
{
|
||||
is32 = false;
|
||||
tailSpan = IpsTailMagic;
|
||||
tailSpan = ipsTailMagic;
|
||||
}
|
||||
else if (header.SequenceEqual(Ips32HeaderMagic))
|
||||
else if (header.SequenceEqual(ips32HeaderMagic))
|
||||
{
|
||||
is32 = true;
|
||||
tailSpan = Ips32TailMagic;
|
||||
tailSpan = ips32TailMagic;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -114,4 +113,4 @@ namespace Ryujinx.HLE.Loaders.Mods
|
|||
patches.AddFrom(_patches);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ namespace Ryujinx.HLE.Loaders.Mods
|
|||
Normal,
|
||||
String,
|
||||
EscapeChar,
|
||||
Comment
|
||||
Comment,
|
||||
}
|
||||
|
||||
private readonly StreamReader _reader;
|
||||
|
|
@ -31,13 +31,13 @@ namespace Ryujinx.HLE.Loaders.Mods
|
|||
}
|
||||
|
||||
_reader = reader;
|
||||
BuildId = header.Substring(BidHeader.Length).TrimEnd().TrimEnd('0');
|
||||
BuildId = header[BidHeader.Length..].TrimEnd().TrimEnd('0');
|
||||
}
|
||||
|
||||
// Uncomments line and unescapes C style strings within
|
||||
private static string PreprocessLine(string line)
|
||||
{
|
||||
StringBuilder str = new StringBuilder();
|
||||
StringBuilder str = new();
|
||||
Token state = Token.Normal;
|
||||
|
||||
for (int i = 0; i < line.Length; ++i)
|
||||
|
|
@ -56,29 +56,32 @@ namespace Ryujinx.HLE.Loaders.Mods
|
|||
case Token.String:
|
||||
state = c switch
|
||||
{
|
||||
'"' => Token.Normal,
|
||||
'"' => Token.Normal,
|
||||
'\\' => Token.EscapeChar,
|
||||
_ => Token.String
|
||||
_ => Token.String,
|
||||
};
|
||||
break;
|
||||
case Token.EscapeChar:
|
||||
state = Token.String;
|
||||
c = c switch
|
||||
{
|
||||
'a' => '\a',
|
||||
'b' => '\b',
|
||||
'f' => '\f',
|
||||
'n' => '\n',
|
||||
'r' => '\r',
|
||||
't' => '\t',
|
||||
'v' => '\v',
|
||||
'a' => '\a',
|
||||
'b' => '\b',
|
||||
'f' => '\f',
|
||||
'n' => '\n',
|
||||
'r' => '\r',
|
||||
't' => '\t',
|
||||
'v' => '\v',
|
||||
'\\' => '\\',
|
||||
_ => '?'
|
||||
_ => '?',
|
||||
};
|
||||
break;
|
||||
}
|
||||
|
||||
if (state == Token.Comment) break;
|
||||
if (state == Token.Comment)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
if (state < Token.EscapeChar)
|
||||
{
|
||||
|
|
@ -112,14 +115,17 @@ namespace Ryujinx.HLE.Loaders.Mods
|
|||
// Big Endian
|
||||
static byte[] Hex2ByteArrayBE(string hexstr)
|
||||
{
|
||||
if ((hexstr.Length & 1) == 1) return null;
|
||||
if ((hexstr.Length & 1) == 1)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
byte[] bytes = new byte[hexstr.Length >> 1];
|
||||
|
||||
for (int i = 0; i < hexstr.Length; i += 2)
|
||||
{
|
||||
int high = ParseHexByte((byte)hexstr[i]);
|
||||
int low = ParseHexByte((byte)hexstr[i + 1]);
|
||||
int low = ParseHexByte((byte)hexstr[i + 1]);
|
||||
|
||||
bytes[i >> 1] = (byte)((high << 4) | low);
|
||||
}
|
||||
|
|
@ -147,11 +153,11 @@ namespace Ryujinx.HLE.Loaders.Mods
|
|||
return null;
|
||||
}
|
||||
|
||||
MemPatch patches = new MemPatch();
|
||||
MemPatch patches = new();
|
||||
|
||||
bool enabled = false;
|
||||
bool enabled = false;
|
||||
bool printValues = false;
|
||||
int offset_shift = 0;
|
||||
int offsetShift = 0;
|
||||
|
||||
string line;
|
||||
int lineNum = 0;
|
||||
|
|
@ -205,7 +211,7 @@ namespace Ryujinx.HLE.Loaders.Mods
|
|||
|
||||
if (tokens[1] == "offset_shift")
|
||||
{
|
||||
if (tokens.Length != 3 || !ParseInt(tokens[2], out offset_shift))
|
||||
if (tokens.Length != 3 || !ParseInt(tokens[2], out offsetShift))
|
||||
{
|
||||
ParseWarn();
|
||||
|
||||
|
|
@ -244,7 +250,7 @@ namespace Ryujinx.HLE.Loaders.Mods
|
|||
continue;
|
||||
}
|
||||
|
||||
offset += offset_shift;
|
||||
offset += offsetShift;
|
||||
|
||||
if (printValues)
|
||||
{
|
||||
|
|
@ -272,4 +278,4 @@ namespace Ryujinx.HLE.Loaders.Mods
|
|||
patches.AddFrom(Parse());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ namespace Ryujinx.HLE.Loaders.Mods
|
|||
{
|
||||
public class MemPatch
|
||||
{
|
||||
readonly Dictionary<uint, byte[]> _patches = new Dictionary<uint, byte[]>();
|
||||
readonly Dictionary<uint, byte[]> _patches = new();
|
||||
|
||||
/// <summary>
|
||||
/// Adds a patch to specified offset. Overwrites if already present.
|
||||
|
|
@ -69,7 +69,7 @@ namespace Ryujinx.HLE.Loaders.Mods
|
|||
foreach (var (offset, patch) in _patches.OrderBy(item => item.Key))
|
||||
{
|
||||
int patchOffset = (int)offset;
|
||||
int patchSize = patch.Length;
|
||||
int patchSize = patch.Length;
|
||||
|
||||
if (patchOffset < protectedOffset || patchOffset > memory.Length)
|
||||
{
|
||||
|
|
@ -93,4 +93,4 @@ namespace Ryujinx.HLE.Loaders.Mods
|
|||
return count;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue