From 08e1e0c985251241d459f8142901d79b57893c8a Mon Sep 17 00:00:00 2001
From: merry <git@mary.rs>
Date: Thu, 10 Feb 2022 16:42:27 +0000
Subject: [PATCH] OpCodeTable: Remove existing thumb instruction
 implementations

---
 ARMeilleure/Decoders/OpCodeT16AluImm8.cs      | 22 -------------------
 ARMeilleure/Decoders/OpCodeT16BReg.cs         | 14 ------------
 ARMeilleure/Decoders/OpCodeTable.cs           |  4 +---
 ARMeilleure/Instructions/InstEmitAluHelper.cs |  2 --
 4 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 ARMeilleure/Decoders/OpCodeT16AluImm8.cs
 delete mode 100644 ARMeilleure/Decoders/OpCodeT16BReg.cs

diff --git a/ARMeilleure/Decoders/OpCodeT16AluImm8.cs b/ARMeilleure/Decoders/OpCodeT16AluImm8.cs
deleted file mode 100644
index d31f37a27..000000000
--- a/ARMeilleure/Decoders/OpCodeT16AluImm8.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace ARMeilleure.Decoders
-{
-    class OpCodeT16AluImm8 : OpCodeT16, IOpCode32Alu
-    {
-        private int _rdn;
-
-        public int Rd => _rdn;
-        public int Rn => _rdn;
-
-        public bool SetFlags => false;
-
-        public int Immediate { get; }
-
-        public new static OpCode Create(InstDescriptor inst, ulong address, int opCode) => new OpCodeT16AluImm8(inst, address, opCode);
-
-        public OpCodeT16AluImm8(InstDescriptor inst, ulong address, int opCode) : base(inst, address, opCode)
-        {
-            Immediate = (opCode >> 0) & 0xff;
-            _rdn      = (opCode >> 8) & 0x7;
-        }
-    }
-}
\ No newline at end of file
diff --git a/ARMeilleure/Decoders/OpCodeT16BReg.cs b/ARMeilleure/Decoders/OpCodeT16BReg.cs
deleted file mode 100644
index 38c074800..000000000
--- a/ARMeilleure/Decoders/OpCodeT16BReg.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace ARMeilleure.Decoders
-{
-    class OpCodeT16BReg : OpCodeT16, IOpCode32BReg
-    {
-        public int Rm { get; }
-
-        public new static OpCode Create(InstDescriptor inst, ulong address, int opCode) => new OpCodeT16BReg(inst, address, opCode);
-
-        public OpCodeT16BReg(InstDescriptor inst, ulong address, int opCode) : base(inst, address, opCode)
-        {
-            Rm = (opCode >> 3) & 0xf;
-        }
-    }
-}
\ No newline at end of file
diff --git a/ARMeilleure/Decoders/OpCodeTable.cs b/ARMeilleure/Decoders/OpCodeTable.cs
index e469f91fc..181f2037b 100644
--- a/ARMeilleure/Decoders/OpCodeTable.cs
+++ b/ARMeilleure/Decoders/OpCodeTable.cs
@@ -627,7 +627,7 @@ namespace ARMeilleure.Decoders
             SetA64("0>001110<<0xxxxx011110xxxxxxxxxx", InstName.Zip2_V,          InstEmit.Zip2_V,          OpCodeSimdReg.Create);
 #endregion
 
-#region "OpCode Table (AArch32)"
+#region "OpCode Table (AArch32, A32)"
             // Base
             SetA32("<<<<0010101xxxxxxxxxxxxxxxxxxxxx", InstName.Adc,     InstEmit32.Adc,     OpCode32AluImm.Create);
             SetA32("<<<<0000101xxxxxxxxxxxxxxxx0xxxx", InstName.Adc,     InstEmit32.Adc,     OpCode32AluRsImm.Create);
@@ -648,7 +648,6 @@ namespace ARMeilleure.Decoders
             SetA32("1111101xxxxxxxxxxxxxxxxxxxxxxxxx", InstName.Blx,     InstEmit32.Blx,     OpCode32BImm.Create);
             SetA32("<<<<000100101111111111110011xxxx", InstName.Blx,     InstEmit32.Blxr,    OpCode32BReg.Create);
             SetA32("<<<<000100101111111111110001xxxx", InstName.Bx,      InstEmit32.Bx,      OpCode32BReg.Create);
-            SetT32("xxxxxxxxxxxxxxxx010001110xxxx000", InstName.Bx,      InstEmit32.Bx,      OpCodeT16BReg.Create);
             SetA32("11110101011111111111000000011111", InstName.Clrex,   InstEmit32.Clrex,   OpCode32.Create);
             SetA32("<<<<000101101111xxxx11110001xxxx", InstName.Clz,     InstEmit32.Clz,     OpCode32AluReg.Create);
             SetA32("<<<<00110111xxxx0000xxxxxxxxxxxx", InstName.Cmn,     InstEmit32.Cmn,     OpCode32AluImm.Create);
@@ -701,7 +700,6 @@ namespace ARMeilleure.Decoders
             SetA32("<<<<0001101x0000xxxxxxxxxxx0xxxx", InstName.Mov,     InstEmit32.Mov,     OpCode32AluRsImm.Create);
             SetA32("<<<<0001101x0000xxxxxxxx0xx1xxxx", InstName.Mov,     InstEmit32.Mov,     OpCode32AluRsReg.Create);
             SetA32("<<<<00110000xxxxxxxxxxxxxxxxxxxx", InstName.Mov,     InstEmit32.Mov,     OpCode32AluImm16.Create);
-            SetT32("xxxxxxxxxxxxxxxx00100xxxxxxxxxxx", InstName.Mov,     InstEmit32.Mov,     OpCodeT16AluImm8.Create);
             SetA32("<<<<00110100xxxxxxxxxxxxxxxxxxxx", InstName.Movt,    InstEmit32.Movt,    OpCode32AluImm16.Create);
             SetA32("<<<<1110xxx1xxxxxxxx111xxxx1xxxx", InstName.Mrc,     InstEmit32.Mrc,     OpCode32System.Create);
             SetA32("<<<<11000101xxxxxxxx111xxxxxxxxx", InstName.Mrrc,    InstEmit32.Mrrc,    OpCode32System.Create);
diff --git a/ARMeilleure/Instructions/InstEmitAluHelper.cs b/ARMeilleure/Instructions/InstEmitAluHelper.cs
index 32440283f..f5951a3e9 100644
--- a/ARMeilleure/Instructions/InstEmitAluHelper.cs
+++ b/ARMeilleure/Instructions/InstEmitAluHelper.cs
@@ -198,8 +198,6 @@ namespace ARMeilleure.Instructions
                 case OpCode32AluRsImm op: return GetMShiftedByImmediate(context, op, setCarry);
                 case OpCode32AluRsReg op: return GetMShiftedByReg(context, op, setCarry);
 
-                case OpCodeT16AluImm8 op: return Const(op.Immediate);
-
                 case IOpCode32AluReg op: return GetIntA32(context, op.Rm);
 
                 // ARM64.