diff --git a/src/frontend/A32/decoder/arm.h b/src/frontend/A32/decoder/arm.h
index 184ae30a..49754147 100644
--- a/src/frontend/A32/decoder/arm.h
+++ b/src/frontend/A32/decoder/arm.h
@@ -27,7 +27,11 @@ std::vector<ArmMatcher<V>> GetArmDecodeTable() {
std::vector<ArmMatcher<V>> table = {
#define INST(fn, name, bitstring) Decoder::detail::detail<ArmMatcher<V>>::GetMatcher(&V::fn, name, bitstring),
+#ifdef ARCHITECTURE_Aarch64
+#include "arm_a64.inc"
+#else
#include "arm.inc"
+#endif
#undef INST
};
diff --git a/src/frontend/A32/decoder/arm_a64.inc b/src/frontend/A32/decoder/arm_a64.inc
new file mode 100644
index 00000000..a4ff3d41
--- /dev/null
+++ b/src/frontend/A32/decoder/arm_a64.inc
@@ -0,0 +1,301 @@
+// Barrier instructions
+//INST(arm_DMB, "DMB", "1111010101111111111100000101oooo") // v7
+//INST(arm_DSB, "DSB", "1111010101111111111100000100oooo") // v7
+//INST(arm_ISB, "ISB", "1111010101111111111100000110oooo") // v7
+
+// Branch instructions
+INST(arm_BLX_imm, "BLX (imm)", "1111101hvvvvvvvvvvvvvvvvvvvvvvvv") // v5
+INST(arm_BLX_reg, "BLX (reg)", "cccc000100101111111111110011mmmm") // v5
+INST(arm_B, "B", "cccc1010vvvvvvvvvvvvvvvvvvvvvvvv") // all
+INST(arm_BL, "BL", "cccc1011vvvvvvvvvvvvvvvvvvvvvvvv") // all
+INST(arm_BX, "BX", "cccc000100101111111111110001mmmm") // v4T
+INST(arm_BXJ, "BXJ", "cccc000100101111111111110010mmmm") // v5J
+
+// CRC32 instructions
+//INST(arm_CRC32, "CRC32", "cccc00010zz0nnnndddd00000100mmmm") // v8
+//INST(arm_CRC32C, "CRC32C", "cccc00010zz0nnnndddd00100100mmmm") // v8
+
+// Coprocessor instructions
+INST(arm_CDP, "CDP", "cccc1110ooooNNNNDDDDppppooo0MMMM") // v2 (CDP2: v5)
+INST(arm_LDC, "LDC", "cccc110pudw1nnnnDDDDppppvvvvvvvv") // v2 (LDC2: v5)
+INST(arm_MCR, "MCR", "cccc1110ooo0NNNNttttppppooo1MMMM") // v2 (MCR2: v5)
+INST(arm_MCRR, "MCRR", "cccc11000100uuuuttttppppooooMMMM") // v5E (MCRR2: v6)
+INST(arm_MRC, "MRC", "cccc1110ooo1NNNNttttppppooo1MMMM") // v2 (MRC2: v5)
+INST(arm_MRRC, "MRRC", "cccc11000101uuuuttttppppooooMMMM") // v5E (MRRC2: v6)
+INST(arm_STC, "STC", "cccc110pudw0nnnnDDDDppppvvvvvvvv") // v2 (STC2: v5)
+
+// Data Processing instructions
+INST(arm_ADC_imm, "ADC (imm)", "cccc0010101Snnnnddddrrrrvvvvvvvv") // all
+INST(arm_ADC_reg, "ADC (reg)", "cccc0000101Snnnnddddvvvvvrr0mmmm") // all
+INST(arm_ADC_rsr, "ADC (rsr)", "cccc0000101Snnnnddddssss0rr1mmmm") // all
+INST(arm_ADD_imm, "ADD (imm)", "cccc0010100Snnnnddddrrrrvvvvvvvv") // all
+INST(arm_ADD_reg, "ADD (reg)", "cccc0000100Snnnnddddvvvvvrr0mmmm") // all
+INST(arm_ADD_rsr, "ADD (rsr)", "cccc0000100Snnnnddddssss0rr1mmmm") // all
+INST(arm_AND_imm, "AND (imm)", "cccc0010000Snnnnddddrrrrvvvvvvvv") // all
+INST(arm_AND_reg, "AND (reg)", "cccc0000000Snnnnddddvvvvvrr0mmmm") // all
+INST(arm_AND_rsr, "AND (rsr)", "cccc0000000Snnnnddddssss0rr1mmmm") // all
+INST(arm_BIC_imm, "BIC (imm)", "cccc0011110Snnnnddddrrrrvvvvvvvv") // all
+INST(arm_BIC_reg, "BIC (reg)", "cccc0001110Snnnnddddvvvvvrr0mmmm") // all
+INST(arm_BIC_rsr, "BIC (rsr)", "cccc0001110Snnnnddddssss0rr1mmmm") // all
+INST(arm_CMN_imm, "CMN (imm)", "cccc00110111nnnn0000rrrrvvvvvvvv") // all
+INST(arm_CMN_reg, "CMN (reg)", "cccc00010111nnnn0000vvvvvrr0mmmm") // all
+INST(arm_CMN_rsr, "CMN (rsr)", "cccc00010111nnnn0000ssss0rr1mmmm") // all
+INST(arm_CMP_imm, "CMP (imm)", "cccc00110101nnnn0000rrrrvvvvvvvv") // all
+INST(arm_CMP_reg, "CMP (reg)", "cccc00010101nnnn0000vvvvvrr0mmmm") // all
+INST(arm_CMP_rsr, "CMP (rsr)", "cccc00010101nnnn0000ssss0rr1mmmm") // all
+INST(arm_EOR_imm, "EOR (imm)", "cccc0010001Snnnnddddrrrrvvvvvvvv") // all
+INST(arm_EOR_reg, "EOR (reg)", "cccc0000001Snnnnddddvvvvvrr0mmmm") // all
+INST(arm_EOR_rsr, "EOR (rsr)", "cccc0000001Snnnnddddssss0rr1mmmm") // all
+INST(arm_MOV_imm, "MOV (imm)", "cccc0011101S0000ddddrrrrvvvvvvvv") // all
+INST(arm_MOV_reg, "MOV (reg)", "cccc0001101S0000ddddvvvvvrr0mmmm") // all
+INST(arm_MOV_rsr, "MOV (rsr)", "cccc0001101S0000ddddssss0rr1mmmm") // all
+INST(arm_MVN_imm, "MVN (imm)", "cccc0011111S0000ddddrrrrvvvvvvvv") // all
+INST(arm_MVN_reg, "MVN (reg)", "cccc0001111S0000ddddvvvvvrr0mmmm") // all
+INST(arm_MVN_rsr, "MVN (rsr)", "cccc0001111S0000ddddssss0rr1mmmm") // all
+INST(arm_ORR_imm, "ORR (imm)", "cccc0011100Snnnnddddrrrrvvvvvvvv") // all
+INST(arm_ORR_reg, "ORR (reg)", "cccc0001100Snnnnddddvvvvvrr0mmmm") // all
+INST(arm_ORR_rsr, "ORR (rsr)", "cccc0001100Snnnnddddssss0rr1mmmm") // all
+INST(arm_RSB_imm, "RSB (imm)", "cccc0010011Snnnnddddrrrrvvvvvvvv") // all
+INST(arm_RSB_reg, "RSB (reg)", "cccc0000011Snnnnddddvvvvvrr0mmmm") // all
+INST(arm_RSB_rsr, "RSB (rsr)", "cccc0000011Snnnnddddssss0rr1mmmm") // all
+INST(arm_RSC_imm, "RSC (imm)", "cccc0010111Snnnnddddrrrrvvvvvvvv") // all
+INST(arm_RSC_reg, "RSC (reg)", "cccc0000111Snnnnddddvvvvvrr0mmmm") // all
+INST(arm_RSC_rsr, "RSC (rsr)", "cccc0000111Snnnnddddssss0rr1mmmm") // all
+INST(arm_SBC_imm, "SBC (imm)", "cccc0010110Snnnnddddrrrrvvvvvvvv") // all
+INST(arm_SBC_reg, "SBC (reg)", "cccc0000110Snnnnddddvvvvvrr0mmmm") // all
+INST(arm_SBC_rsr, "SBC (rsr)", "cccc0000110Snnnnddddssss0rr1mmmm") // all
+INST(arm_SUB_imm, "SUB (imm)", "cccc0010010Snnnnddddrrrrvvvvvvvv") // all
+INST(arm_SUB_reg, "SUB (reg)", "cccc0000010Snnnnddddvvvvvrr0mmmm") // all
+INST(arm_SUB_rsr, "SUB (rsr)", "cccc0000010Snnnnddddssss0rr1mmmm") // all
+INST(arm_TEQ_imm, "TEQ (imm)", "cccc00110011nnnn0000rrrrvvvvvvvv") // all
+INST(arm_TEQ_reg, "TEQ (reg)", "cccc00010011nnnn0000vvvvvrr0mmmm") // all
+INST(arm_TEQ_rsr, "TEQ (rsr)", "cccc00010011nnnn0000ssss0rr1mmmm") // all
+INST(arm_TST_imm, "TST (imm)", "cccc00110001nnnn0000rrrrvvvvvvvv") // all
+INST(arm_TST_reg, "TST (reg)", "cccc00010001nnnn0000vvvvvrr0mmmm") // all
+INST(arm_TST_rsr, "TST (rsr)", "cccc00010001nnnn0000ssss0rr1mmmm") // all
+
+// Exception Generating instructions
+INST(arm_BKPT, "BKPT", "cccc00010010vvvvvvvvvvvv0111vvvv") // v5
+INST(arm_SVC, "SVC", "cccc1111vvvvvvvvvvvvvvvvvvvvvvvv") // all
+INST(arm_UDF, "UDF", "111001111111------------1111----") // all
+
+// Extension instructions
+INST(arm_SXTB, "SXTB", "cccc011010101111ddddrr000111mmmm") // v6
+INST(arm_SXTB16, "SXTB16", "cccc011010001111ddddrr000111mmmm") // v6
+INST(arm_SXTH, "SXTH", "cccc011010111111ddddrr000111mmmm") // v6
+INST(arm_SXTAB, "SXTAB", "cccc01101010nnnnddddrr000111mmmm") // v6
+//INST(arm_SXTAB16, "SXTAB16", "cccc01101000nnnnddddrr000111mmmm") // v6
+INST(arm_SXTAH, "SXTAH", "cccc01101011nnnnddddrr000111mmmm") // v6
+INST(arm_UXTB, "UXTB", "cccc011011101111ddddrr000111mmmm") // v6
+INST(arm_UXTB16, "UXTB16", "cccc011011001111ddddrr000111mmmm") // v6
+INST(arm_UXTH, "UXTH", "cccc011011111111ddddrr000111mmmm") // v6
+INST(arm_UXTAB, "UXTAB", "cccc01101110nnnnddddrr000111mmmm") // v6
+//INST(arm_UXTAB16, "UXTAB16", "cccc01101100nnnnddddrr000111mmmm") // v6
+INST(arm_UXTAH, "UXTAH", "cccc01101111nnnnddddrr000111mmmm") // v6
+
+// Hint instructions
+INST(arm_PLD_imm, "PLD (imm)", "11110101uz01nnnn1111iiiiiiiiiiii") // v5E for PLD; v7 for PLDW
+INST(arm_PLD_reg, "PLD (reg)", "11110111uz01nnnn1111iiiiitt0mmmm") // v5E for PLD; v7 for PLDW
+INST(arm_SEV, "SEV", "----0011001000001111000000000100") // v6K
+INST(arm_SEVL, "SEVL", "----0011001000001111000000000101") // v8
+INST(arm_WFE, "WFE", "----0011001000001111000000000010") // v6K
+INST(arm_WFI, "WFI", "----0011001000001111000000000011") // v6K
+INST(arm_YIELD, "YIELD", "----0011001000001111000000000001") // v6K
+INST(arm_NOP, "Reserved Hint", "----0011001000001111------------")
+INST(arm_NOP, "Reserved Hint", "----001100100000111100000000----")
+
+// Synchronization Primitive instructions
+INST(arm_CLREX, "CLREX", "11110101011111111111000000011111") // v6K
+INST(arm_LDREX, "LDREX", "cccc00011001nnnndddd111110011111") // v6
+INST(arm_LDREXB, "LDREXB", "cccc00011101nnnndddd111110011111") // v6K
+INST(arm_LDREXD, "LDREXD", "cccc00011011nnnndddd111110011111") // v6K
+INST(arm_LDREXH, "LDREXH", "cccc00011111nnnndddd111110011111") // v6K
+INST(arm_STREX, "STREX", "cccc00011000nnnndddd11111001mmmm") // v6
+INST(arm_STREXB, "STREXB", "cccc00011100nnnndddd11111001mmmm") // v6K
+INST(arm_STREXD, "STREXD", "cccc00011010nnnndddd11111001mmmm") // v6K
+INST(arm_STREXH, "STREXH", "cccc00011110nnnndddd11111001mmmm") // v6K
+INST(arm_SWP, "SWP", "cccc00010000nnnntttt00001001uuuu") // v2S (v6: Deprecated)
+INST(arm_SWPB, "SWPB", "cccc00010100nnnntttt00001001uuuu") // v2S (v6: Deprecated)
+
+// Load/Store instructions
+INST(arm_LDRBT, "LDRBT (A1)", "----0100-111--------------------")
+INST(arm_LDRBT, "LDRBT (A2)", "----0110-111---------------0----")
+INST(arm_LDRHT, "LDRHT (A1)", "----0000-111------------1011----")
+INST(arm_LDRHT, "LDRHT (A2)", "----0000-011--------00001011----")
+INST(arm_LDRSBT, "LDRSBT (A1)", "----0000-111------------1101----")
+INST(arm_LDRSBT, "LDRSBT (A2)", "----0000-011--------00001101----")
+INST(arm_LDRSHT, "LDRSHT (A1)", "----0000-111------------1111----")
+INST(arm_LDRSHT, "LDRSHT (A2)", "----0000-011--------00001111----")
+INST(arm_LDRT, "LDRT (A1)", "----0100-011--------------------")
+INST(arm_LDRT, "LDRT (A2)", "----0110-011---------------0----")
+INST(arm_STRBT, "STRBT (A1)", "----0100-110--------------------")
+INST(arm_STRBT, "STRBT (A2)", "----0110-110---------------0----")
+INST(arm_STRHT, "STRHT (A1)", "----0000-110------------1011----")
+INST(arm_STRHT, "STRHT (A2)", "----0000-010--------00001011----")
+INST(arm_STRT, "STRT (A1)", "----0100-010--------------------")
+INST(arm_STRT, "STRT (A2)", "----0110-010---------------0----")
+INST(arm_LDR_lit, "LDR (lit)", "cccc0101u0011111ttttvvvvvvvvvvvv")
+INST(arm_LDR_imm, "LDR (imm)", "cccc010pu0w1nnnnttttvvvvvvvvvvvv")
+INST(arm_LDR_reg, "LDR (reg)", "cccc011pu0w1nnnnttttvvvvvrr0mmmm")
+INST(arm_LDRB_lit, "LDRB (lit)", "cccc0101u1011111ttttvvvvvvvvvvvv")
+INST(arm_LDRB_imm, "LDRB (imm)", "cccc010pu1w1nnnnttttvvvvvvvvvvvv")
+INST(arm_LDRB_reg, "LDRB (reg)", "cccc011pu1w1nnnnttttvvvvvrr0mmmm")
+INST(arm_LDRD_lit, "LDRD (lit)", "cccc0001u1001111ttttvvvv1101vvvv")
+INST(arm_LDRD_imm, "LDRD (imm)", "cccc000pu1w0nnnnttttvvvv1101vvvv") // v5E
+INST(arm_LDRD_reg, "LDRD (reg)", "cccc000pu0w0nnnntttt00001101mmmm") // v5E
+INST(arm_LDRH_lit, "LDRH (lit)", "cccc000pu1w11111ttttvvvv1011vvvv")
+INST(arm_LDRH_imm, "LDRH (imm)", "cccc000pu1w1nnnnttttvvvv1011vvvv")
+INST(arm_LDRH_reg, "LDRH (reg)", "cccc000pu0w1nnnntttt00001011mmmm")
+INST(arm_LDRSB_lit, "LDRSB (lit)", "cccc0001u1011111ttttvvvv1101vvvv")
+INST(arm_LDRSB_imm, "LDRSB (imm)", "cccc000pu1w1nnnnttttvvvv1101vvvv")
+INST(arm_LDRSB_reg, "LDRSB (reg)", "cccc000pu0w1nnnntttt00001101mmmm")
+INST(arm_LDRSH_lit, "LDRSH (lit)", "cccc0001u1011111ttttvvvv1111vvvv")
+INST(arm_LDRSH_imm, "LDRSH (imm)", "cccc000pu1w1nnnnttttvvvv1111vvvv")
+INST(arm_LDRSH_reg, "LDRSH (reg)", "cccc000pu0w1nnnntttt00001111mmmm")
+INST(arm_STR_imm, "STR (imm)", "cccc010pu0w0nnnnttttvvvvvvvvvvvv")
+INST(arm_STR_reg, "STR (reg)", "cccc011pu0w0nnnnttttvvvvvrr0mmmm")
+INST(arm_STRB_imm, "STRB (imm)", "cccc010pu1w0nnnnttttvvvvvvvvvvvv")
+INST(arm_STRB_reg, "STRB (reg)", "cccc011pu1w0nnnnttttvvvvvrr0mmmm")
+INST(arm_STRD_imm, "STRD (imm)", "cccc000pu1w0nnnnttttvvvv1111vvvv") // v5E
+INST(arm_STRD_reg, "STRD (reg)", "cccc000pu0w0nnnntttt00001111mmmm") // v5E
+INST(arm_STRH_imm, "STRH (imm)", "cccc000pu1w0nnnnttttvvvv1011vvvv")
+INST(arm_STRH_reg, "STRH (reg)", "cccc000pu0w0nnnntttt00001011mmmm")
+
+// Load/Store Multiple instructions
+INST(arm_LDM, "LDM", "cccc100010w1nnnnxxxxxxxxxxxxxxxx") // all
+INST(arm_LDMDA, "LDMDA", "cccc100000w1nnnnxxxxxxxxxxxxxxxx") // all
+INST(arm_LDMDB, "LDMDB", "cccc100100w1nnnnxxxxxxxxxxxxxxxx") // all
+INST(arm_LDMIB, "LDMIB", "cccc100110w1nnnnxxxxxxxxxxxxxxxx") // all
+INST(arm_LDM_usr, "LDM (usr reg)", "----100--101--------------------") // all
+INST(arm_LDM_eret, "LDM (exce ret)", "----100--1-1----1---------------") // all
+INST(arm_STM, "STM", "cccc100010w0nnnnxxxxxxxxxxxxxxxx") // all
+INST(arm_STMDA, "STMDA", "cccc100000w0nnnnxxxxxxxxxxxxxxxx") // all
+INST(arm_STMDB, "STMDB", "cccc100100w0nnnnxxxxxxxxxxxxxxxx") // all
+INST(arm_STMIB, "STMIB", "cccc100110w0nnnnxxxxxxxxxxxxxxxx") // all
+INST(arm_STM_usr, "STM (usr reg)", "----100--100--------------------") // all
+
+// Miscellaneous instructions
+INST(arm_BFC, "BFC", "cccc0111110vvvvvddddvvvvv0011111") // v6T2
+INST(arm_BFI, "BFI", "cccc0111110vvvvvddddvvvvv001nnnn") // v6T2
+INST(arm_CLZ, "CLZ", "cccc000101101111dddd11110001mmmm") // v5
+INST(arm_MOVT, "MOVT", "cccc00110100vvvvddddvvvvvvvvvvvv") // v6T2
+INST(arm_MOVW, "MOVW", "cccc00110000vvvvddddvvvvvvvvvvvv") // v6T2
+INST(arm_NOP, "NOP", "----0011001000001111000000000000") // v6K
+INST(arm_SBFX, "SBFX", "cccc0111101wwwwwddddvvvvv101nnnn") // v6T2
+INST(arm_SEL, "SEL", "cccc01101000nnnndddd11111011mmmm") // v6
+INST(arm_UBFX, "UBFX", "cccc0111111wwwwwddddvvvvv101nnnn") // v6T2
+
+// Unsigned Sum of Absolute Differences instructions
+//INST(arm_USAD8, "USAD8", "cccc01111000dddd1111mmmm0001nnnn") // v6
+//INST(arm_USADA8, "USADA8", "cccc01111000ddddaaaammmm0001nnnn") // v6
+
+// Packing instructions
+//INST(arm_PKHBT, "PKHBT", "cccc01101000nnnnddddvvvvv001mmmm") // v6K
+//INST(arm_PKHTB, "PKHTB", "cccc01101000nnnnddddvvvvv101mmmm") // v6K
+
+// Reversal instructions
+INST(arm_RBIT, "RBIT", "cccc011011111111dddd11110011mmmm") // v6T2
+INST(arm_REV, "REV", "cccc011010111111dddd11110011mmmm") // v6
+INST(arm_REV16, "REV16", "cccc011010111111dddd11111011mmmm") // v6
+INST(arm_REVSH, "REVSH", "cccc011011111111dddd11111011mmmm") // v6
+
+// Saturation instructions
+//INST(arm_SSAT, "SSAT", "cccc0110101vvvvvddddvvvvvr01nnnn") // v6
+//INST(arm_SSAT16, "SSAT16", "cccc01101010vvvvdddd11110011nnnn") // v6
+//INST(arm_USAT, "USAT", "cccc0110111vvvvvddddvvvvvr01nnnn") // v6
+//INST(arm_USAT16, "USAT16", "cccc01101110vvvvdddd11110011nnnn") // v6
+
+// Divide instructions
+//INST(arm_SDIV, "SDIV", "cccc01110001dddd1111mmmm0001nnnn") // v7a
+//INST(arm_UDIV, "UDIV", "cccc01110011dddd1111mmmm0001nnnn") // v7a
+
+// Multiply (Normal) instructions
+INST(arm_MLA, "MLA", "cccc0000001Sddddaaaammmm1001nnnn") // v2
+INST(arm_MLS, "MLS", "cccc00000110ddddaaaammmm1001nnnn") // v6T2
+INST(arm_MUL, "MUL", "cccc0000000Sdddd0000mmmm1001nnnn") // v2
+
+// Multiply (Long) instructions
+INST(arm_SMLAL, "SMLAL", "cccc0000111Sddddaaaammmm1001nnnn") // v3M
+INST(arm_SMULL, "SMULL", "cccc0000110Sddddaaaammmm1001nnnn") // v3M
+INST(arm_UMAAL, "UMAAL", "cccc00000100ddddaaaammmm1001nnnn") // v6
+INST(arm_UMLAL, "UMLAL", "cccc0000101Sddddaaaammmm1001nnnn") // v3M
+INST(arm_UMULL, "UMULL", "cccc0000100Sddddaaaammmm1001nnnn") // v3M
+
+// Multiply (Halfword) instructions
+INST(arm_SMLALxy, "SMLALXY", "cccc00010100ddddaaaammmm1xy0nnnn") // v5xP
+INST(arm_SMLAxy, "SMLAXY", "cccc00010000ddddaaaammmm1xy0nnnn") // v5xP
+INST(arm_SMULxy, "SMULXY", "cccc00010110dddd0000mmmm1xy0nnnn") // v5xP
+
+// Multiply (Word by Halfword) instructions
+INST(arm_SMLAWy, "SMLAWY", "cccc00010010ddddaaaammmm1y00nnnn") // v5xP
+INST(arm_SMULWy, "SMULWY", "cccc00010010dddd0000mmmm1y10nnnn") // v5xP
+
+// Multiply (Most Significant Word) instructions
+INST(arm_SMMUL, "SMMUL", "cccc01110101dddd1111mmmm00R1nnnn") // v6
+INST(arm_SMMLA, "SMMLA", "cccc01110101ddddaaaammmm00R1nnnn") // v6
+INST(arm_SMMLS, "SMMLS", "cccc01110101ddddaaaammmm11R1nnnn") // v6
+
+// Multiply (Dual) instructions
+INST(arm_SMLAD, "SMLAD", "cccc01110000ddddaaaammmm00M1nnnn") // v6
+INST(arm_SMLALD, "SMLALD", "cccc01110100ddddaaaammmm00M1nnnn") // v6
+INST(arm_SMLSD, "SMLSD", "cccc01110000ddddaaaammmm01M1nnnn") // v6
+INST(arm_SMLSLD, "SMLSLD", "cccc01110100ddddaaaammmm01M1nnnn") // v6
+INST(arm_SMUAD, "SMUAD", "cccc01110000dddd1111mmmm00M1nnnn") // v6
+INST(arm_SMUSD, "SMUSD", "cccc01110000dddd1111mmmm01M1nnnn") // v6
+
+// Parallel Add/Subtract (Modulo) instructions
+//INST(arm_SADD8, "SADD8", "cccc01100001nnnndddd11111001mmmm") // v6
+//INST(arm_SADD16, "SADD16", "cccc01100001nnnndddd11110001mmmm") // v6
+//INST(arm_SASX, "SASX", "cccc01100001nnnndddd11110011mmmm") // v6
+//INST(arm_SSAX, "SSAX", "cccc01100001nnnndddd11110101mmmm") // v6
+//INST(arm_SSUB8, "SSUB8", "cccc01100001nnnndddd11111111mmmm") // v6
+//INST(arm_SSUB16, "SSUB16", "cccc01100001nnnndddd11110111mmmm") // v6
+//INST(arm_UADD8, "UADD8", "cccc01100101nnnndddd11111001mmmm") // v6
+//INST(arm_UADD16, "UADD16", "cccc01100101nnnndddd11110001mmmm") // v6
+//INST(arm_UASX, "UASX", "cccc01100101nnnndddd11110011mmmm") // v6
+//INST(arm_USAX, "USAX", "cccc01100101nnnndddd11110101mmmm") // v6
+//INST(arm_USUB8, "USUB8", "cccc01100101nnnndddd11111111mmmm") // v6
+//INST(arm_USUB16, "USUB16", "cccc01100101nnnndddd11110111mmmm") // v6
+
+// Parallel Add/Subtract (Saturating) instructions
+//INST(arm_QADD8, "QADD8", "cccc01100010nnnndddd11111001mmmm") // v6
+//INST(arm_QADD16, "QADD16", "cccc01100010nnnndddd11110001mmmm") // v6
+//INST(arm_QASX, "QASX", "cccc01100010nnnndddd11110011mmmm") // v6
+//INST(arm_QSAX, "QSAX", "cccc01100010nnnndddd11110101mmmm") // v6
+//INST(arm_QSUB8, "QSUB8", "cccc01100010nnnndddd11111111mmmm") // v6
+//INST(arm_QSUB16, "QSUB16", "cccc01100010nnnndddd11110111mmmm") // v6
+//INST(arm_UQADD8, "UQADD8", "cccc01100110nnnndddd11111001mmmm") // v6
+//INST(arm_UQADD16, "UQADD16", "cccc01100110nnnndddd11110001mmmm") // v6
+//INST(arm_UQASX, "UQASX", "cccc01100110nnnndddd11110011mmmm") // v6
+//INST(arm_UQSAX, "UQSAX", "cccc01100110nnnndddd11110101mmmm") // v6
+//INST(arm_UQSUB8, "UQSUB8", "cccc01100110nnnndddd11111111mmmm") // v6
+//INST(arm_UQSUB16, "UQSUB16", "cccc01100110nnnndddd11110111mmmm") // v6
+
+// Parallel Add/Subtract (Halving) instructions
+//INST(arm_SHADD8, "SHADD8", "cccc01100011nnnndddd11111001mmmm") // v6
+//INST(arm_SHADD16, "SHADD16", "cccc01100011nnnndddd11110001mmmm") // v6
+//INST(arm_SHASX, "SHASX", "cccc01100011nnnndddd11110011mmmm") // v6
+//INST(arm_SHSAX, "SHSAX", "cccc01100011nnnndddd11110101mmmm") // v6
+//INST(arm_SHSUB8, "SHSUB8", "cccc01100011nnnndddd11111111mmmm") // v6
+//INST(arm_SHSUB16, "SHSUB16", "cccc01100011nnnndddd11110111mmmm") // v6
+//INST(arm_UHADD8, "UHADD8", "cccc01100111nnnndddd11111001mmmm") // v6
+//INST(arm_UHADD16, "UHADD16", "cccc01100111nnnndddd11110001mmmm") // v6
+//INST(arm_UHASX, "UHASX", "cccc01100111nnnndddd11110011mmmm") // v6
+//INST(arm_UHSAX, "UHSAX", "cccc01100111nnnndddd11110101mmmm") // v6
+//INST(arm_UHSUB8, "UHSUB8", "cccc01100111nnnndddd11111111mmmm") // v6
+//INST(arm_UHSUB16, "UHSUB16", "cccc01100111nnnndddd11110111mmmm") // v6
+
+// Saturated Add/Subtract instructions
+//INST(arm_QADD, "QADD", "cccc00010000nnnndddd00000101mmmm") // v5xP
+//INST(arm_QSUB, "QSUB", "cccc00010010nnnndddd00000101mmmm") // v5xP
+//INST(arm_QDADD, "QDADD", "cccc00010100nnnndddd00000101mmmm") // v5xP
+//INST(arm_QDSUB, "QDSUB", "cccc00010110nnnndddd00000101mmmm") // v5xP
+
+// Status Register Access instructions
+INST(arm_CPS, "CPS", "111100010000---00000000---0-----") // v6
+INST(arm_SETEND, "SETEND", "1111000100000001000000e000000000") // v6
+INST(arm_MRS, "MRS", "cccc000100001111dddd000000000000") // v3
+INST(arm_MSR_imm, "MSR (imm)", "cccc00110010mmmm1111rrrrvvvvvvvv") // v3
+INST(arm_MSR_reg, "MSR (reg)", "cccc00010010mmmm111100000000nnnn") // v3
+INST(arm_RFE, "RFE", "1111100--0-1----0000101000000000") // v6
+INST(arm_SRS, "SRS", "1111100--1-0110100000101000-----") // v6
\ No newline at end of file
diff --git a/src/frontend/A32/decoder/vfp.h b/src/frontend/A32/decoder/vfp.h
index ac63f54c..660ef50a 100644
--- a/src/frontend/A32/decoder/vfp.h
+++ b/src/frontend/A32/decoder/vfp.h
@@ -25,7 +25,11 @@ std::optional<std::reference_wrapper<const VFPMatcher<V>>> DecodeVFP(u32 instruc
static const std::vector<VFPMatcher<V>> table = {
#define INST(fn, name, bitstring) Decoder::detail::detail<VFPMatcher<V>>::GetMatcher(&V::fn, name, bitstring),
+#ifdef ARCHITECTURE_Aarch64
+#include "vfp2_a64.inc"
+#else
#include "vfp.inc"
+#endif
#undef INST
};
diff --git a/src/frontend/A32/decoder/vfp2_a64.inc b/src/frontend/A32/decoder/vfp2_a64.inc
new file mode 100644
index 00000000..c1a42494
--- /dev/null
+++ b/src/frontend/A32/decoder/vfp2_a64.inc
@@ -0,0 +1,47 @@
+// cccc1110________----101-__-0----
+
+// Floating-point three-register data processing instructions
+//INST(vfp_VMLA, "VMLA", "cccc11100D00nnnndddd101zN0M0mmmm") // VFPv2
+//INST(vfp_VMLS, "VMLS", "cccc11100D00nnnndddd101zN1M0mmmm") // VFPv2
+//INST(vfp_VNMLS, "VNMLS", "cccc11100D01nnnndddd101zN0M0mmmm") // VFPv2
+//INST(vfp_VNMLA, "VNMLA", "cccc11100D01nnnndddd101zN1M0mmmm") // VFPv2
+//INST(vfp_VMUL, "VMUL", "cccc11100D10nnnndddd101zN0M0mmmm") // VFPv2
+//INST(vfp_VNMUL, "VNMUL", "cccc11100D10nnnndddd101zN1M0mmmm") // VFPv2
+//INST(vfp_VADD, "VADD", "cccc11100D11nnnndddd101zN0M0mmmm") // VFPv2
+//INST(vfp_VSUB, "VSUB", "cccc11100D11nnnndddd101zN1M0mmmm") // VFPv2
+//INST(vfp_VDIV, "VDIV", "cccc11101D00nnnndddd101zN0M0mmmm") // VFPv2
+
+// Floating-point move instructions
+//INST(vfp_VMOV_u32_f64, "VMOV (core to f64)", "cccc11100000ddddtttt1011D0010000") // VFPv2
+//INST(vfp_VMOV_f64_u32, "VMOV (f64 to core)", "cccc11100001nnnntttt1011N0010000") // VFPv2
+//INST(vfp_VMOV_u32_f32, "VMOV (core to f32)", "cccc11100000nnnntttt1010N0010000") // VFPv2
+//INST(vfp_VMOV_f32_u32, "VMOV (f32 to core)", "cccc11100001nnnntttt1010N0010000") // VFPv2
+//INST(vfp_VMOV_2u32_2f32, "VMOV (2xcore to 2xf32)", "cccc11000100uuuutttt101000M1mmmm") // VFPv2
+//INST(vfp_VMOV_2f32_2u32, "VMOV (2xf32 to 2xcore)", "cccc11000101uuuutttt101000M1mmmm") // VFPv2
+//INST(vfp_VMOV_2u32_f64, "VMOV (2xcore to f64)", "cccc11000100uuuutttt101100M1mmmm") // VFPv2
+//INST(vfp_VMOV_f64_2u32, "VMOV (f64 to 2xcore)", "cccc11000101uuuutttt101100M1mmmm") // VFPv2
+//INST(vfp_VMOV_reg, "VMOV (reg)", "cccc11101D110000dddd101z01M0mmmm") // VFPv2
+
+// Floating-point other instructions
+//INST(vfp_VABS, "VABS", "cccc11101D110000dddd101z11M0mmmm") // VFPv2
+//INST(vfp_VNEG, "VNEG", "cccc11101D110001dddd101z01M0mmmm") // VFPv2
+//INST(vfp_VSQRT, "VSQRT", "cccc11101D110001dddd101z11M0mmmm") // VFPv2
+//INST(vfp_VCVT_f_to_f, "VCVT (f32<->f64)", "cccc11101D110111dddd101z11M0mmmm") // VFPv2
+//INST(vfp_VCVT_to_float, "VCVT (to float)", "cccc11101D111000dddd101zs1M0mmmm") // VFPv2
+//INST(vfp_VCVT_to_u32, "VCVT (to u32)", "cccc11101D111100dddd101zr1M0mmmm") // VFPv2
+//INST(vfp_VCVT_to_s32, "VCVT (to s32)", "cccc11101D111101dddd101zr1M0mmmm") // VFPv2
+//INST(vfp_VCMP, "VCMP", "cccc11101D110100dddd101zE1M0mmmm") // VFPv2
+//INST(vfp_VCMP_zero, "VCMP (with zero)", "cccc11101D110101dddd101zE1000000") // VFPv2
+
+// Floating-point system register access
+//INST(vfp_VMSR, "VMSR", "cccc111011100001tttt101000010000") // VFPv2
+//INST(vfp_VMRS, "VMRS", "cccc111011110001tttt101000010000") // VFPv2
+
+// Extension register load-store instructions
+//INST(vfp_VPUSH, "VPUSH", "cccc11010D101101dddd101zvvvvvvvv") // VFPv2
+//INST(vfp_VPOP, "VPOP", "cccc11001D111101dddd101zvvvvvvvv") // VFPv2
+//INST(vfp_VLDR, "VLDR", "cccc1101UD01nnnndddd101zvvvvvvvv") // VFPv2
+//INST(vfp_VSTR, "VSTR", "cccc1101UD00nnnndddd101zvvvvvvvv") // VFPv2
+//INST(vfp_VSTM_a1, "VSTM (A1)", "cccc110puDw0nnnndddd1011vvvvvvvv") // VFPv2
+//INST(vfp_VSTM_a2, "VSTM (A2)", "cccc110puDw0nnnndddd1010vvvvvvvv") // VFPv2
+//INST(vfp_VLDM_a2, "VLDM (A2)", "cccc110puDw1nnnndddd1010vvvvvvvv") // VFPv2