From ff53dcf5607a82ad38388502b4cf5cc8cca77733 Mon Sep 17 00:00:00 2001
From: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
Date: Mon, 26 Jun 2023 07:25:06 +0200
Subject: [ARMeilleure] Address dotnet-format issues (#5357)

* 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 or silence dotnet format CA2208 warnings

* Address dotnet format CA1822 warnings

* Address or silence dotnet format CA1069 warnings

* Silence CA1806 and CA1834 issues

* Address dotnet format CA1401 warnings

* Fix new dotnet-format issues after rebase

* Address review comments

* Address dotnet format CA2208 warnings properly

* Fix formatting for switch expressions

* 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 OpCodeTable.cs

* Enable formatting for a few cases again

* Format if-blocks correctly

* Enable formatting for a few more cases again

* Fix inline comment alignment

* Run dotnet format after rebase and remove unused usings

- analyzers
- style
- whitespace

* Disable 'prefer switch expression' rule

* Add comments to disabled warnings

* Remove a few unused parameters

* Adjust namespaces

* 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

* 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

* Remove unnecessary formatting exclusion

* Add unsafe dotnet format changes

* Change visibility of JitSupportDarwin to internal
---
 src/ARMeilleure/Instructions/InstEmitMemoryExHelper.cs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/ARMeilleure/Instructions/InstEmitMemoryExHelper.cs')

diff --git a/src/ARMeilleure/Instructions/InstEmitMemoryExHelper.cs b/src/ARMeilleure/Instructions/InstEmitMemoryExHelper.cs
index 9a69442a..c9a99a3b 100644
--- a/src/ARMeilleure/Instructions/InstEmitMemoryExHelper.cs
+++ b/src/ARMeilleure/Instructions/InstEmitMemoryExHelper.cs
@@ -1,7 +1,6 @@
 using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.State;
 using ARMeilleure.Translation;
-
 using static ARMeilleure.Instructions.InstEmitHelper;
 using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
 
@@ -33,7 +32,7 @@ namespace ARMeilleure.Instructions
 
                 Operand arg0 = context.LoadArgument(OperandType.I64, 0);
 
-                Operand exAddrPtr  = context.Add(arg0, Const((long)NativeContext.GetExclusiveAddressOffset()));
+                Operand exAddrPtr = context.Add(arg0, Const((long)NativeContext.GetExclusiveAddressOffset()));
                 Operand exValuePtr = context.Add(arg0, Const((long)NativeContext.GetExclusiveValueOffset()));
 
                 context.Store(exAddrPtr, context.BitwiseAnd(address, Const(address.Type, GetExclusiveAddressMask())));
@@ -118,14 +117,14 @@ namespace ARMeilleure.Instructions
                     1 => context.Load16(exValuePtr),
                     2 => context.Load(OperandType.I32, exValuePtr),
                     3 => context.Load(OperandType.I64, exValuePtr),
-                    _ => context.Load(OperandType.V128, exValuePtr)
+                    _ => context.Load(OperandType.V128, exValuePtr),
                 };
 
                 Operand currValue = size switch
                 {
                     0 => context.CompareAndSwap8(physAddr, exValue, value),
                     1 => context.CompareAndSwap16(physAddr, exValue, value),
-                    _ => context.CompareAndSwap(physAddr, exValue, value)
+                    _ => context.CompareAndSwap(physAddr, exValue, value),
                 };
 
                 // STEP 3: Check if we succeeded by comparing expected and in-memory values.
@@ -133,14 +132,14 @@ namespace ARMeilleure.Instructions
 
                 if (size == 4)
                 {
-                    Operand currValueLow  = context.VectorExtract(OperandType.I64, currValue, 0);
+                    Operand currValueLow = context.VectorExtract(OperandType.I64, currValue, 0);
                     Operand currValueHigh = context.VectorExtract(OperandType.I64, currValue, 1);
 
-                    Operand exValueLow  = context.VectorExtract(OperandType.I64, exValue, 0);
+                    Operand exValueLow = context.VectorExtract(OperandType.I64, exValue, 0);
                     Operand exValueHigh = context.VectorExtract(OperandType.I64, exValue, 1);
 
                     storeFailed = context.BitwiseOr(
-                        context.ICompareNotEqual(currValueLow,  exValueLow),
+                        context.ICompareNotEqual(currValueLow, exValueLow),
                         context.ICompareNotEqual(currValueHigh, exValueHigh));
                 }
                 else
-- 
cgit v1.2.3