mirror of
https://git.743378673.xyz/MeloNX/MeloNX.git
synced 2025-07-21 14:27:10 +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
|
|
@ -27,7 +27,7 @@ namespace Ryujinx.HLE.HOS.Tamper.CodeEmitters
|
|||
private const byte Lsh = 3; // lhs << rhs
|
||||
private const byte Rsh = 4; // lhs >> rhs
|
||||
private const byte And = 5; // lhs & rhs
|
||||
private const byte Or = 6; // lhs | rhs
|
||||
private const byte Or = 6; // lhs | rhs
|
||||
private const byte Not = 7; // ~lhs (discards right-hand operand)
|
||||
private const byte Xor = 8; // lhs ^ rhs
|
||||
private const byte Mov = 9; // lhs (discards right-hand operand)
|
||||
|
|
@ -73,9 +73,11 @@ namespace Ryujinx.HLE.HOS.Tamper.CodeEmitters
|
|||
|
||||
void Emit(Type operationType, IOperand rhs = null)
|
||||
{
|
||||
List<IOperand> operandList = new List<IOperand>();
|
||||
operandList.Add(destinationRegister);
|
||||
operandList.Add(leftHandSideRegister);
|
||||
List<IOperand> operandList = new()
|
||||
{
|
||||
destinationRegister,
|
||||
leftHandSideRegister,
|
||||
};
|
||||
|
||||
if (rhs != null)
|
||||
{
|
||||
|
|
@ -87,16 +89,36 @@ namespace Ryujinx.HLE.HOS.Tamper.CodeEmitters
|
|||
|
||||
switch (operation)
|
||||
{
|
||||
case Add: Emit(typeof(OpAdd<>), rightHandSideOperand); break;
|
||||
case Sub: Emit(typeof(OpSub<>), rightHandSideOperand); break;
|
||||
case Mul: Emit(typeof(OpMul<>), rightHandSideOperand); break;
|
||||
case Lsh: Emit(typeof(OpLsh<>), rightHandSideOperand); break;
|
||||
case Rsh: Emit(typeof(OpRsh<>), rightHandSideOperand); break;
|
||||
case And: Emit(typeof(OpAnd<>), rightHandSideOperand); break;
|
||||
case Or: Emit(typeof(OpOr<> ), rightHandSideOperand); break;
|
||||
case Not: Emit(typeof(OpNot<>) ); break;
|
||||
case Xor: Emit(typeof(OpXor<>), rightHandSideOperand); break;
|
||||
case Mov: Emit(typeof(OpMov<>) ); break;
|
||||
case Add:
|
||||
Emit(typeof(OpAdd<>), rightHandSideOperand);
|
||||
break;
|
||||
case Sub:
|
||||
Emit(typeof(OpSub<>), rightHandSideOperand);
|
||||
break;
|
||||
case Mul:
|
||||
Emit(typeof(OpMul<>), rightHandSideOperand);
|
||||
break;
|
||||
case Lsh:
|
||||
Emit(typeof(OpLsh<>), rightHandSideOperand);
|
||||
break;
|
||||
case Rsh:
|
||||
Emit(typeof(OpRsh<>), rightHandSideOperand);
|
||||
break;
|
||||
case And:
|
||||
Emit(typeof(OpAnd<>), rightHandSideOperand);
|
||||
break;
|
||||
case Or:
|
||||
Emit(typeof(OpOr<>), rightHandSideOperand);
|
||||
break;
|
||||
case Not:
|
||||
Emit(typeof(OpNot<>));
|
||||
break;
|
||||
case Xor:
|
||||
Emit(typeof(OpXor<>), rightHandSideOperand);
|
||||
break;
|
||||
case Mov:
|
||||
Emit(typeof(OpMov<>));
|
||||
break;
|
||||
default:
|
||||
throw new TamperCompilationException($"Invalid arithmetic operation {operation} in Atmosphere cheat");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ namespace Ryujinx.HLE.HOS.Tamper.CodeEmitters
|
|||
{
|
||||
const int TerminationTypeIndex = 1;
|
||||
|
||||
private const byte End = 0; // True end of the conditional.
|
||||
private const byte End = 0; // True end of the conditional.
|
||||
private const byte Else = 1; // End of the 'then' block and beginning of 'else' block.
|
||||
|
||||
public static void Emit(byte[] instruction, CompilationContext context)
|
||||
|
|
@ -51,7 +51,7 @@ namespace Ryujinx.HLE.HOS.Tamper.CodeEmitters
|
|||
// If the else operations are already set, then the upper block must not be another end.
|
||||
if (operationsElse != null && codeType == CodeType.EndConditionalBlock)
|
||||
{
|
||||
throw new TamperCompilationException($"Expected an upper 'if' conditional instead of 'end conditional'");
|
||||
throw new TamperCompilationException("Expected an upper 'if' conditional instead of 'end conditional'");
|
||||
}
|
||||
|
||||
ICondition condition;
|
||||
|
|
@ -84,7 +84,7 @@ namespace Ryujinx.HLE.HOS.Tamper.CodeEmitters
|
|||
// Create a conditional block with the current operations and nest it in the upper
|
||||
// block of the stack.
|
||||
|
||||
IfBlock block = new IfBlock(condition, operations, operationsElse);
|
||||
IfBlock block = new(condition, operations, operationsElse);
|
||||
context.CurrentOperations.Add(block);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace Ryujinx.HLE.HOS.Tamper.CodeEmitters
|
|||
/// </summary>
|
||||
class LegacyArithmetic
|
||||
{
|
||||
const int OperationWidthIndex = 1;
|
||||
const int OperationWidthIndex = 1;
|
||||
const int DestinationRegisterIndex = 3;
|
||||
const int OperationTypeIndex = 4;
|
||||
const int ValueImmediateIndex = 8;
|
||||
|
|
@ -35,7 +35,7 @@ namespace Ryujinx.HLE.HOS.Tamper.CodeEmitters
|
|||
Register register = context.GetRegister(instruction[DestinationRegisterIndex]);
|
||||
byte operation = instruction[OperationTypeIndex];
|
||||
ulong immediate = InstructionHelper.GetImmediate(instruction, ValueImmediateIndex, ValueImmediateSize);
|
||||
Value<ulong> rightHandSideValue = new Value<ulong>(immediate);
|
||||
Value<ulong> rightHandSideValue = new(immediate);
|
||||
|
||||
void Emit(Type operationType)
|
||||
{
|
||||
|
|
@ -44,11 +44,21 @@ namespace Ryujinx.HLE.HOS.Tamper.CodeEmitters
|
|||
|
||||
switch (operation)
|
||||
{
|
||||
case Add: Emit(typeof(OpAdd<>)); break;
|
||||
case Sub: Emit(typeof(OpSub<>)); break;
|
||||
case Mul: Emit(typeof(OpMul<>)); break;
|
||||
case Lsh: Emit(typeof(OpLsh<>)); break;
|
||||
case Rsh: Emit(typeof(OpRsh<>)); break;
|
||||
case Add:
|
||||
Emit(typeof(OpAdd<>));
|
||||
break;
|
||||
case Sub:
|
||||
Emit(typeof(OpSub<>));
|
||||
break;
|
||||
case Mul:
|
||||
Emit(typeof(OpMul<>));
|
||||
break;
|
||||
case Lsh:
|
||||
Emit(typeof(OpLsh<>));
|
||||
break;
|
||||
case Rsh:
|
||||
Emit(typeof(OpRsh<>));
|
||||
break;
|
||||
default:
|
||||
throw new TamperCompilationException($"Invalid arithmetic operation {operation} in Atmosphere cheat");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ namespace Ryujinx.HLE.HOS.Tamper.CodeEmitters
|
|||
|
||||
Register destinationRegister = context.GetRegister(instruction[RegisterIndex]);
|
||||
ulong immediate = InstructionHelper.GetImmediate(instruction, ValueImmediateIndex, ValueImmediateSize);
|
||||
Value<ulong> sourceValue = new Value<ulong>(immediate);
|
||||
Value<ulong> sourceValue = new(immediate);
|
||||
|
||||
context.CurrentOperations.Add(new OpMov<ulong>(destinationRegister, sourceValue));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ namespace Ryujinx.HLE.HOS.Tamper.CodeEmitters
|
|||
|
||||
int valueSize = operationWidth <= 4 ? ValueImmediateSize4 : ValueImmediateSize8;
|
||||
ulong value = InstructionHelper.GetImmediate(instruction, ValueImmediateIndex, valueSize);
|
||||
Value<ulong> compareToValue = new Value<ulong>(value);
|
||||
Value<ulong> compareToValue = new(value);
|
||||
|
||||
return InstructionHelper.CreateCondition(comparison, operationWidth, sourceMemory, compareToValue);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ namespace Ryujinx.HLE.HOS.Tamper.CodeEmitters
|
|||
class ResumeProcess
|
||||
{
|
||||
// FF1?????
|
||||
|
||||
public static void Emit(byte[] instruction, CompilationContext context)
|
||||
{
|
||||
context.CurrentOperations.Add(new OpProcCtrl(context.Process, false));
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ namespace Ryujinx.HLE.HOS.Tamper.CodeEmitters
|
|||
// Create a loop block with the current operations and nest it in the upper
|
||||
// block of the stack.
|
||||
|
||||
ForBlock block = new ForBlock(immediate, iterationRegister, context.CurrentOperations);
|
||||
ForBlock block = new(immediate, iterationRegister, context.CurrentOperations);
|
||||
context.BlockStack.Pop();
|
||||
context.CurrentOperations.Add(block);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
int valueImmediateSize = operationWidth <= 4 ? ValueImmediateSize8 : ValueImmediateSize16;
|
||||
ulong valueImmediate = InstructionHelper.GetImmediate(instruction, ValueImmediateIndex, valueImmediateSize);
|
||||
Value<ulong> storeValue = new Value<ulong>(valueImmediate);
|
||||
Value<ulong> storeValue = new(valueImmediate);
|
||||
|
||||
InstructionHelper.EmitMov(operationWidth, context, dstMem, storeValue);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ namespace Ryujinx.HLE.HOS.Tamper.CodeEmitters
|
|||
byte incrementAddressRegister = instruction[IncrementAddressRegisterIndex];
|
||||
byte useOffsetRegister = instruction[UseOffsetRegisterIndex];
|
||||
ulong immediate = InstructionHelper.GetImmediate(instruction, ValueImmediateIndex, ValueImmediateSize);
|
||||
Value<ulong> storeValue = new Value<ulong>(immediate);
|
||||
Value<ulong> storeValue = new(immediate);
|
||||
|
||||
Pointer destinationMemory;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue