mirror of
https://git.ryujinx.app/ryubing/ryujinx.git
synced 2025-09-10 11:55:16 +00: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:
@@ -9,29 +9,28 @@ namespace Ryujinx.HLE.HOS.Tamper
|
||||
{
|
||||
class AtmosphereCompiler
|
||||
{
|
||||
private ulong _exeAddress;
|
||||
private ulong _heapAddress;
|
||||
private ulong _aliasAddress;
|
||||
private ulong _aslrAddress;
|
||||
private ITamperedProcess _process;
|
||||
private readonly ulong _exeAddress;
|
||||
private readonly ulong _heapAddress;
|
||||
private readonly ulong _aliasAddress;
|
||||
private readonly ulong _aslrAddress;
|
||||
private readonly ITamperedProcess _process;
|
||||
|
||||
public AtmosphereCompiler(ulong exeAddress, ulong heapAddress, ulong aliasAddress, ulong aslrAddress, ITamperedProcess process)
|
||||
{
|
||||
_exeAddress = exeAddress;
|
||||
_heapAddress = heapAddress;
|
||||
_exeAddress = exeAddress;
|
||||
_heapAddress = heapAddress;
|
||||
_aliasAddress = aliasAddress;
|
||||
_aslrAddress = aslrAddress;
|
||||
_process = process;
|
||||
_aslrAddress = aslrAddress;
|
||||
_process = process;
|
||||
}
|
||||
|
||||
public ITamperProgram Compile(string name, IEnumerable<string> rawInstructions)
|
||||
{
|
||||
string[] addresses = new string[]
|
||||
{
|
||||
string[] addresses = {
|
||||
$" Executable address: 0x{_exeAddress:X16}",
|
||||
$" Heap address : 0x{_heapAddress:X16}",
|
||||
$" Alias address : 0x{_aliasAddress:X16}",
|
||||
$" Aslr address : 0x{_aslrAddress:X16}"
|
||||
$" Aslr address : 0x{_aslrAddress:X16}",
|
||||
};
|
||||
|
||||
Logger.Debug?.Print(LogClass.TamperMachine, $"Compiling Atmosphere cheat {name}...\n{string.Join('\n', addresses)}");
|
||||
@@ -40,14 +39,14 @@ namespace Ryujinx.HLE.HOS.Tamper
|
||||
{
|
||||
return CompileImpl(name, rawInstructions);
|
||||
}
|
||||
catch(TamperCompilationException exception)
|
||||
catch (TamperCompilationException ex)
|
||||
{
|
||||
// Just print the message without the stack trace.
|
||||
Logger.Error?.Print(LogClass.TamperMachine, exception.Message);
|
||||
Logger.Error?.Print(LogClass.TamperMachine, ex.Message);
|
||||
}
|
||||
catch (Exception exception)
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Error?.Print(LogClass.TamperMachine, exception.ToString());
|
||||
Logger.Error?.Print(LogClass.TamperMachine, ex.ToString());
|
||||
}
|
||||
|
||||
Logger.Error?.Print(LogClass.TamperMachine, "There was a problem while compiling the Atmosphere cheat");
|
||||
@@ -57,7 +56,7 @@ namespace Ryujinx.HLE.HOS.Tamper
|
||||
|
||||
private ITamperProgram CompileImpl(string name, IEnumerable<string> rawInstructions)
|
||||
{
|
||||
CompilationContext context = new CompilationContext(_exeAddress, _heapAddress, _aliasAddress, _aslrAddress, _process);
|
||||
CompilationContext context = new(_exeAddress, _heapAddress, _aliasAddress, _aslrAddress, _process);
|
||||
context.BlockStack.Push(new OperationBlock(null));
|
||||
|
||||
// Parse the instructions.
|
||||
@@ -132,7 +131,7 @@ namespace Ryujinx.HLE.HOS.Tamper
|
||||
|
||||
// Initialize only the registers used.
|
||||
|
||||
Value<ulong> zero = new Value<ulong>(0UL);
|
||||
Value<ulong> zero = new(0UL);
|
||||
int position = 0;
|
||||
|
||||
foreach (Register register in context.Registers.Values)
|
||||
@@ -143,7 +142,7 @@ namespace Ryujinx.HLE.HOS.Tamper
|
||||
|
||||
if (context.BlockStack.Count != 1)
|
||||
{
|
||||
throw new TamperCompilationException($"Reached end of compilation with unmatched conditional(s) or loop(s)");
|
||||
throw new TamperCompilationException("Reached end of compilation with unmatched conditional(s) or loop(s)");
|
||||
}
|
||||
|
||||
return new AtmosphereProgram(name, _process, context.PressedKeys, new Block(context.CurrentOperations));
|
||||
|
Reference in New Issue
Block a user