Adjust naming conventions for Ryujinx and ChocolArm64 projects (#484)

* Change naming convention for Ryujinx project

* Change naming convention for ChocolArm64 project

* Fix NaN

* Remove unneeded this. from Ryujinx project

* Adjust naming from new PRs

* Name changes based on feedback

* How did this get removed?

* Rebasing fix

* Change FP enum case

* Remove prefix from ChocolArm64 classes - Part 1

* Remove prefix from ChocolArm64 classes - Part 2

* Fix alignment from last commit's renaming

* Rename namespaces

* Rename stragglers

* Fix alignment

* Rename OpCode class

* Missed a few

* Adjust alignment

1 files changed, 208 insertions, 0 deletions

diff --git a/ChocolArm64/Instructions/InstEmitBfm.cs b/ChocolArm64/Instructions/InstEmitBfm.cs
new file mode 100644
index 00000000..d25af8be
--- /dev/null
+++ b/ChocolArm64/Instructions/InstEmitBfm.cs
@@ -0,0 +1,208 @@
+using ChocolArm64.Decoders;
+using ChocolArm64.State;
+using ChocolArm64.Translation;
+using System.Reflection.Emit;
+
+namespace ChocolArm64.Instructions
+{
+    static partial class InstEmit
+    {
+        public static void Bfm(ILEmitterCtx context)
+        {
+            OpCodeBfm64 op = (OpCodeBfm64)context.CurrOp;
+
+            EmitBfmLoadRn(context);
+
+            context.EmitLdintzr(op.Rd);
+            context.EmitLdc_I(~op.WMask & op.TMask);
+
+            context.Emit(OpCodes.And);
+            context.Emit(OpCodes.Or);
+
+            context.EmitLdintzr(op.Rd);
+            context.EmitLdc_I(~op.TMask);
+
+            context.Emit(OpCodes.And);
+            context.Emit(OpCodes.Or);
+
+            context.EmitStintzr(op.Rd);
+        }
+
+        public static void Sbfm(ILEmitterCtx context)
+        {
+            OpCodeBfm64 op = (OpCodeBfm64)context.CurrOp;
+
+            int bitsCount = op.GetBitsCount();
+
+            if (op.Pos + 1 == bitsCount)
+            {
+                EmitSbfmShift(context);
+            }
+            else if (op.Pos < op.Shift)
+            {
+                EmitSbfiz(context);
+            }
+            else if (op.Pos == 7 && op.Shift == 0)
+            {
+                EmitSbfmCast(context, OpCodes.Conv_I1);
+            }
+            else if (op.Pos == 15 && op.Shift == 0)
+            {
+                EmitSbfmCast(context, OpCodes.Conv_I2);
+            }
+            else if (op.Pos == 31 && op.Shift == 0)
+            {
+                EmitSbfmCast(context, OpCodes.Conv_I4);
+            }
+            else
+            {
+                EmitBfmLoadRn(context);
+
+                context.EmitLdintzr(op.Rn);
+
+                context.EmitLsl(bitsCount - 1 - op.Pos);
+                context.EmitAsr(bitsCount - 1);
+
+                context.EmitLdc_I(~op.TMask);
+
+                context.Emit(OpCodes.And);
+                context.Emit(OpCodes.Or);
+
+                context.EmitStintzr(op.Rd);
+            }
+        }
+
+        public static void Ubfm(ILEmitterCtx context)
+        {
+            OpCodeBfm64 op = (OpCodeBfm64)context.CurrOp;
+
+            if (op.Pos + 1 == op.GetBitsCount())
+            {
+                EmitUbfmShift(context);
+            }
+            else if (op.Pos < op.Shift)
+            {
+                EmitUbfiz(context);
+            }
+            else if (op.Pos + 1 == op.Shift)
+            {
+                EmitBfmLsl(context);
+            }
+            else if (op.Pos == 7 && op.Shift == 0)
+            {
+                EmitUbfmCast(context, OpCodes.Conv_U1);
+            }
+            else if (op.Pos == 15 && op.Shift == 0)
+            {
+                EmitUbfmCast(context, OpCodes.Conv_U2);
+            }
+            else
+            {
+                EmitBfmLoadRn(context);
+
+                context.EmitStintzr(op.Rd);
+            }
+        }
+
+        private static void EmitSbfiz(ILEmitterCtx context) => EmitBfiz(context, true);
+        private static void EmitUbfiz(ILEmitterCtx context) => EmitBfiz(context, false);
+
+        private static void EmitBfiz(ILEmitterCtx context, bool signed)
+        {
+            OpCodeBfm64 op = (OpCodeBfm64)context.CurrOp;
+
+            int width = op.Pos + 1;
+
+            context.EmitLdintzr(op.Rn);
+
+            context.EmitLsl(op.GetBitsCount() - width);
+
+            if (signed)
+            {
+                context.EmitAsr(op.Shift - width);
+            }
+            else
+            {
+                context.EmitLsr(op.Shift - width);
+            }
+
+            context.EmitStintzr(op.Rd);
+        }
+
+        private static void EmitSbfmCast(ILEmitterCtx context, OpCode ilOp)
+        {
+            EmitBfmCast(context, ilOp, true);
+        }
+
+        private static void EmitUbfmCast(ILEmitterCtx context, OpCode ilOp)
+        {
+            EmitBfmCast(context, ilOp, false);
+        }
+
+        private static void EmitBfmCast(ILEmitterCtx context, OpCode ilOp, bool signed)
+        {
+            OpCodeBfm64 op = (OpCodeBfm64)context.CurrOp;
+
+            context.EmitLdintzr(op.Rn);
+
+            context.Emit(ilOp);
+
+            if (op.RegisterSize != RegisterSize.Int32)
+            {
+                context.Emit(signed
+                    ? OpCodes.Conv_I8
+                    : OpCodes.Conv_U8);
+            }
+
+            context.EmitStintzr(op.Rd);
+        }
+
+        private static void EmitSbfmShift(ILEmitterCtx context)
+        {
+            EmitBfmShift(context, true);
+        }
+
+        private static void EmitUbfmShift(ILEmitterCtx context)
+        {
+            EmitBfmShift(context, false);
+        }
+
+        private static void EmitBfmShift(ILEmitterCtx context, bool signed)
+        {
+            OpCodeBfm64 op = (OpCodeBfm64)context.CurrOp;
+
+            context.EmitLdintzr(op.Rn);
+            context.EmitLdc_I4(op.Shift);
+
+            context.Emit(signed
+                ? OpCodes.Shr
+                : OpCodes.Shr_Un);
+
+            context.EmitStintzr(op.Rd);
+        }
+
+        private static void EmitBfmLsl(ILEmitterCtx context)
+        {
+            OpCodeBfm64 op = (OpCodeBfm64)context.CurrOp;
+
+            context.EmitLdintzr(op.Rn);
+
+            context.EmitLsl(op.GetBitsCount() - op.Shift);
+
+            context.EmitStintzr(op.Rd);
+        }
+
+        private static void EmitBfmLoadRn(ILEmitterCtx context)
+        {
+            OpCodeBfm64 op = (OpCodeBfm64)context.CurrOp;
+
+            context.EmitLdintzr(op.Rn);
+
+            context.EmitRor(op.Shift);
+
+            context.EmitLdc_I(op.WMask & op.TMask);
+
+            context.Emit(OpCodes.And);
+        }
+    }
+}
\ No newline at end of file