aboutsummaryrefslogtreecommitdiff
path: root/src/Ryujinx.HLE/HOS/Tamper/MemoryHelper.cs
diff options
context:
space:
mode:
authorTSRBerry <20988865+TSRBerry@users.noreply.github.com>2023-07-16 19:31:14 +0200
committerGitHub <noreply@github.com>2023-07-16 19:31:14 +0200
commit326749498bed4360e5a4b11fc67d5ec7cb9a3076 (patch)
treeae21fb26f99b401ca4e9efaab72b679a81c22369 /src/Ryujinx.HLE/HOS/Tamper/MemoryHelper.cs
parentfec8291c17fa106c28f58b56419e90d49a41a1ea (diff)
[Ryujinx.HLE] Address dotnet-format issues (#5380)1.1.962
* 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>
Diffstat (limited to 'src/Ryujinx.HLE/HOS/Tamper/MemoryHelper.cs')
-rw-r--r--src/Ryujinx.HLE/HOS/Tamper/MemoryHelper.cs41
1 files changed, 18 insertions, 23 deletions
diff --git a/src/Ryujinx.HLE/HOS/Tamper/MemoryHelper.cs b/src/Ryujinx.HLE/HOS/Tamper/MemoryHelper.cs
index 1260ed9a..52e12bfe 100644
--- a/src/Ryujinx.HLE/HOS/Tamper/MemoryHelper.cs
+++ b/src/Ryujinx.HLE/HOS/Tamper/MemoryHelper.cs
@@ -7,23 +7,18 @@ namespace Ryujinx.HLE.HOS.Tamper
{
public static ulong GetAddressShift(MemoryRegion source, CompilationContext context)
{
- switch (source)
+ return source switch
{
- case MemoryRegion.NSO:
- // Memory address is relative to the code start.
- return context.ExeAddress;
- case MemoryRegion.Heap:
- // Memory address is relative to the heap.
- return context.HeapAddress;
- case MemoryRegion.Alias:
- // Memory address is relative to the alias region.
- return context.AliasAddress;
- case MemoryRegion.Asrl:
- // Memory address is relative to the asrl region, which matches the code region.
- return context.AslrAddress;
- default:
- throw new TamperCompilationException($"Invalid memory source {source} in Atmosphere cheat");
- }
+ // Memory address is relative to the code start.
+ MemoryRegion.NSO => context.ExeAddress,
+ // Memory address is relative to the heap.
+ MemoryRegion.Heap => context.HeapAddress,
+ // Memory address is relative to the alias region.
+ MemoryRegion.Alias => context.AliasAddress,
+ // Memory address is relative to the asrl region, which matches the code region.
+ MemoryRegion.Asrl => context.AslrAddress,
+ _ => throw new TamperCompilationException($"Invalid memory source {source} in Atmosphere cheat"),
+ };
}
private static void EmitAdd(Value<ulong> finalValue, IOperand firstOperand, IOperand secondOperand, CompilationContext context)
@@ -33,7 +28,7 @@ namespace Ryujinx.HLE.HOS.Tamper
public static Pointer EmitPointer(ulong addressImmediate, CompilationContext context)
{
- Value<ulong> addressImmediateValue = new Value<ulong>(addressImmediate);
+ Value<ulong> addressImmediateValue = new(addressImmediate);
return new Pointer(addressImmediateValue, context.Process);
}
@@ -45,8 +40,8 @@ namespace Ryujinx.HLE.HOS.Tamper
public static Pointer EmitPointer(Register addressRegister, ulong offsetImmediate, CompilationContext context)
{
- Value<ulong> offsetImmediateValue = new Value<ulong>(offsetImmediate);
- Value<ulong> finalAddressValue = new Value<ulong>(0);
+ Value<ulong> offsetImmediateValue = new(offsetImmediate);
+ Value<ulong> finalAddressValue = new(0);
EmitAdd(finalAddressValue, addressRegister, offsetImmediateValue, context);
return new Pointer(finalAddressValue, context.Process);
@@ -54,7 +49,7 @@ namespace Ryujinx.HLE.HOS.Tamper
public static Pointer EmitPointer(Register addressRegister, Register offsetRegister, CompilationContext context)
{
- Value<ulong> finalAddressValue = new Value<ulong>(0);
+ Value<ulong> finalAddressValue = new(0);
EmitAdd(finalAddressValue, addressRegister, offsetRegister, context);
return new Pointer(finalAddressValue, context.Process);
@@ -62,10 +57,10 @@ namespace Ryujinx.HLE.HOS.Tamper
public static Pointer EmitPointer(Register addressRegister, Register offsetRegister, ulong offsetImmediate, CompilationContext context)
{
- Value<ulong> offsetImmediateValue = new Value<ulong>(offsetImmediate);
- Value<ulong> finalOffsetValue = new Value<ulong>(0);
+ Value<ulong> offsetImmediateValue = new(offsetImmediate);
+ Value<ulong> finalOffsetValue = new(0);
EmitAdd(finalOffsetValue, offsetRegister, offsetImmediateValue, context);
- Value<ulong> finalAddressValue = new Value<ulong>(0);
+ Value<ulong> finalAddressValue = new(0);
EmitAdd(finalAddressValue, addressRegister, finalOffsetValue, context);
return new Pointer(finalAddressValue, context.Process);