[PATCH 03/28] aarch64: Cleanup add/sub immediate decode
Alice Carlotti
alice.carlotti@arm.com
Wed Nov 4 18:41:45 GMT 2026
Add opcode bit 23 to the mask, instead of constraining it indirectly via
a bound on a wider shift operand. This allows the decode decision tree
to distinguish these opcodes from nearby by opcodes, thereby avoiding a
linear scan over 6 (add) or 2 (sub) opcode table entries.
diff --git a/opcodes/aarch64-dis-2.c b/opcodes/aarch64-dis-2.c
index 776c4ac2656f341b9370ccef294183916a6da1f8..d1fdea90565b2136d1b6686244b734dc576d9e1d 100644
--- a/opcodes/aarch64-dis-2.c
+++ b/opcodes/aarch64-dis-2.c
@@ -7981,38 +7981,98 @@ aarch64_opcode_lookup_1 (uint32_t word)
}
else
{
- if (((word >> 29) & 0x1) == 0)
+ if (((word >> 23) & 0x1) == 0)
{
- if (((word >> 30) & 0x1) == 0)
+ if (((word >> 29) & 0x1) == 0)
{
- /* 33222222222211111111110000000000
- 10987654321098765432109876543210
- x0010001xxxxxxxxxxxxxxxxxxxxxxxx. */
- return A64_OPID_11000000_add_Rd_SP_Rn_SP_AIMM;
+ if (((word >> 30) & 0x1) == 0)
+ {
+ /* 33222222222211111111110000000000
+ 10987654321098765432109876543210
+ x00100010xxxxxxxxxxxxxxxxxxxxxxx. */
+ return A64_OPID_11000000_add_Rd_SP_Rn_SP_AIMM;
+ }
+ else
+ {
+ /* 33222222222211111111110000000000
+ 10987654321098765432109876543210
+ x10100010xxxxxxxxxxxxxxxxxxxxxxx. */
+ return A64_OPID_51000000_sub_Rd_SP_Rn_SP_AIMM;
+ }
}
else
{
- /* 33222222222211111111110000000000
- 10987654321098765432109876543210
- x1010001xxxxxxxxxxxxxxxxxxxxxxxx. */
- return A64_OPID_51000000_sub_Rd_SP_Rn_SP_AIMM;
+ if (((word >> 30) & 0x1) == 0)
+ {
+ /* 33222222222211111111110000000000
+ 10987654321098765432109876543210
+ x01100010xxxxxxxxxxxxxxxxxxxxxxx. */
+ return A64_OPID_31000000_adds_Rd_Rn_SP_AIMM;
+ }
+ else
+ {
+ /* 33222222222211111111110000000000
+ 10987654321098765432109876543210
+ x11100010xxxxxxxxxxxxxxxxxxxxxxx. */
+ return A64_OPID_71000000_subs_Rd_Rn_SP_AIMM;
+ }
}
}
else
{
- if (((word >> 30) & 0x1) == 0)
+ if (((word >> 22) & 0x1) == 0)
{
- /* 33222222222211111111110000000000
- 10987654321098765432109876543210
- x0110001xxxxxxxxxxxxxxxxxxxxxxxx. */
- return A64_OPID_31000000_adds_Rd_Rn_SP_AIMM;
+ if (((word >> 30) & 0x1) == 0)
+ {
+ /* 33222222222211111111110000000000
+ 10987654321098765432109876543210
+ x0x1000110xxxxxxxxxxxxxxxxxxxxxx. */
+ return A64_OPID_91800000_addg_Rd_SP_Rn_SP_UIMM10_UIMM4_ADDG;
+ }
+ else
+ {
+ /* 33222222222211111111110000000000
+ 10987654321098765432109876543210
+ x1x1000110xxxxxxxxxxxxxxxxxxxxxx. */
+ return A64_OPID_d1800000_subg_Rd_SP_Rn_SP_UIMM10_UIMM4_ADDG;
+ }
}
else
{
- /* 33222222222211111111110000000000
- 10987654321098765432109876543210
- x1110001xxxxxxxxxxxxxxxxxxxxxxxx. */
- return A64_OPID_71000000_subs_Rd_Rn_SP_AIMM;
+ if (((word >> 18) & 0x1) == 0)
+ {
+ if (((word >> 19) & 0x1) == 0)
+ {
+ /* 33222222222211111111110000000000
+ 10987654321098765432109876543210
+ xxx1000111xx00xxxxxxxxxxxxxxxxxx. */
+ return A64_OPID_11c00000_smax_Rd_Rn_CSSC_SIMM8;
+ }
+ else
+ {
+ /* 33222222222211111111110000000000
+ 10987654321098765432109876543210
+ xxx1000111xx10xxxxxxxxxxxxxxxxxx. */
+ return A64_OPID_11c80000_smin_Rd_Rn_CSSC_SIMM8;
+ }
+ }
+ else
+ {
+ if (((word >> 19) & 0x1) == 0)
+ {
+ /* 33222222222211111111110000000000
+ 10987654321098765432109876543210
+ xxx1000111xx01xxxxxxxxxxxxxxxxxx. */
+ return A64_OPID_11c40000_umax_Rd_Rn_CSSC_UIMM8;
+ }
+ else
+ {
+ /* 33222222222211111111110000000000
+ 10987654321098765432109876543210
+ xxx1000111xx11xxxxxxxxxxxxxxxxxx. */
+ return A64_OPID_11cc0000_umin_Rd_Rn_CSSC_UIMM8;
+ }
+ }
}
}
}
@@ -35790,28 +35850,6 @@ aarch64_find_next_opcode (const aarch64_opcode *opcode)
break;
case A64_OPID_c121e400_fmul_SME_Zdnx4_SME_Znx4_SME_Zmx4:
return NULL;
- case A64_OPID_11000000_add_Rd_SP_Rn_SP_AIMM:
- value = A64_OPID_91800000_addg_Rd_SP_Rn_SP_UIMM10_UIMM4_ADDG;
- break;
- case A64_OPID_91800000_addg_Rd_SP_Rn_SP_UIMM10_UIMM4_ADDG:
- value = A64_OPID_11c00000_smax_Rd_Rn_CSSC_SIMM8;
- break;
- case A64_OPID_11c00000_smax_Rd_Rn_CSSC_SIMM8:
- value = A64_OPID_11c40000_umax_Rd_Rn_CSSC_UIMM8;
- break;
- case A64_OPID_11c40000_umax_Rd_Rn_CSSC_UIMM8:
- value = A64_OPID_11c80000_smin_Rd_Rn_CSSC_SIMM8;
- break;
- case A64_OPID_11c80000_smin_Rd_Rn_CSSC_SIMM8:
- value = A64_OPID_11cc0000_umin_Rd_Rn_CSSC_UIMM8;
- break;
- case A64_OPID_11cc0000_umin_Rd_Rn_CSSC_UIMM8:
- return NULL;
- case A64_OPID_51000000_sub_Rd_SP_Rn_SP_AIMM:
- value = A64_OPID_d1800000_subg_Rd_SP_Rn_SP_UIMM10_UIMM4_ADDG;
- break;
- case A64_OPID_d1800000_subg_Rd_SP_Rn_SP_UIMM10_UIMM4_ADDG:
- return NULL;
case A64_OPID_28000000_stnp_Rt_Rt2_ADDR_SIMM7:
value = A64_OPID_29000000_stp_Rt_Rt2_ADDR_SIMM7;
break;
diff --git a/opcodes/aarch64-dis.c b/opcodes/aarch64-dis.c
index efadc39ccb01d9421a99545ad918b07e39f18c73..3d983c7535467a8a49c9b1fc68f9d2656d188f98 100644
--- a/opcodes/aarch64-dis.c
+++ b/opcodes/aarch64-dis.c
@@ -929,12 +929,10 @@ aarch64_ext_aimm (const aarch64_operand *self ATTRIBUTE_UNUSED,
info->shifter.kind = AARCH64_MOD_LSL;
/* shift */
- value = extract_field (FLD_shift, code, 0);
- if (value >= 2)
- return false;
+ value = extract_field (self->fields[0], code, 0);
info->shifter.amount = value ? 12 : 0;
/* imm12 (unsigned) */
- info->imm.value = extract_field (FLD_imm12, code, 0);
+ info->imm.value = extract_field (self->fields[1], code, 0);
return true;
}
diff --git a/opcodes/aarch64-opc-2.c b/opcodes/aarch64-opc-2.c
index dfd0ca334255cf3c68c39249d818fb259c4861f5..2c59b9c2140b4d1f2ce1c6189c30f480f98c5158 100644
--- a/opcodes/aarch64-opc-2.c
+++ b/opcodes/aarch64-opc-2.c
@@ -109,7 +109,7 @@ const struct aarch64_operand aarch64_operands[] =
{AARCH64_OPND_CLASS_IMMEDIATE, "NOT_BALANCED_17", OPD_F_HAS_INSERTER | OPD_F_HAS_EXTRACTOR, {{1, 17, false}}, "an optional not balanced indicator (NB)"},
{AARCH64_OPND_CLASS_IMMEDIATE, "NZCV", OPD_F_HAS_INSERTER | OPD_F_HAS_EXTRACTOR, {{4, 0, false}}, "a flag bit specifier giving an alternative value for each flag"},
{AARCH64_OPND_CLASS_IMMEDIATE, "LIMM", OPD_F_HAS_INSERTER | OPD_F_HAS_EXTRACTOR, {{1, 22, false}, {6, 16, false}, {6, 10, false}}, "Logical immediate"},
- {AARCH64_OPND_CLASS_IMMEDIATE, "AIMM", OPD_F_HAS_INSERTER | OPD_F_HAS_EXTRACTOR, {{2, 22, false}, {12, 10, false}}, "a 12-bit unsigned immediate with optional left shift of 12 bits"},
+ {AARCH64_OPND_CLASS_IMMEDIATE, "AIMM", OPD_F_HAS_INSERTER | OPD_F_HAS_EXTRACTOR, {{1, 22, false}, {12, 10, false}}, "a 12-bit unsigned immediate with optional left shift of 12 bits"},
{AARCH64_OPND_CLASS_IMMEDIATE, "HALF", OPD_F_HAS_INSERTER | OPD_F_HAS_EXTRACTOR, {{16, 5, false}}, "a 16-bit immediate with optional left shift"},
{AARCH64_OPND_CLASS_IMMEDIATE, "FBITS", OPD_F_HAS_INSERTER | OPD_F_HAS_EXTRACTOR, {{6, 10, false}}, "the number of bits after the binary point in the fixed-point value"},
{AARCH64_OPND_CLASS_IMMEDIATE, "IMM_MOV", 0, {}, "an immediate"},
diff --git a/opcodes/aarch64-opc.h b/opcodes/aarch64-opc.h
index be56acb48f1ac6cb063b6f8e68d9e67cf5b7c48b..d6c5e48c7c4772385cd0ca2dc3c1119e6724a07d 100644
--- a/opcodes/aarch64-opc.h
+++ b/opcodes/aarch64-opc.h
@@ -109,7 +109,6 @@ typedef struct aarch64_field aarch64_field;
#define FLD_imm4_11 AARCH64_FIELD(11, 4)
#define FLD_imm5 AARCH64_FIELD(16, 5)
#define FLD_imm6_10 AARCH64_FIELD(10, 6)
-#define FLD_imm12 AARCH64_FIELD(10, 12)
#define FLD_immb AARCH64_FIELD(16, 3)
#define FLD_immh AARCH64_FIELD(19, 4)
#define FLD_ldst_size AARCH64_FIELD(30, 2)
diff --git a/opcodes/aarch64-tbl.h b/opcodes/aarch64-tbl.h
index 2d63d6a423a1b582d3d14741058bbc63d004a9b2..1d0cd8a01ca4c8534ab85bc46295fd69881fae3c 100644
--- a/opcodes/aarch64-tbl.h
+++ b/opcodes/aarch64-tbl.h
@@ -3757,13 +3757,13 @@ const struct aarch64_opcode aarch64_opcode_table[] =
CORE_INSN ("subs", 0x6b200000, 0x7fe00000, addsub_ext, 0, OP3 (Rd, Rn_SP, Rm_EXT), QL_I3_EXT, F_ARITH_SUB | F_HAS_ALIAS | F_SF),
CORE_INSN ("cmp", 0x6b20001f, 0x7fe0001f, addsub_ext, 0, OP2 (Rn_SP, Rm_EXT), QL_I2_EXT, F_SUBCLASS_OTHER | F_ALIAS | F_SF),
/* Add/subtract (immediate). */
- CORE_INSN ("add", 0x11000000, 0x7f000000, addsub_imm, OP_ADD, OP3 (Rd_SP, Rn_SP, AIMM), QL_R2NIL, F_ARITH_ADD | F_HAS_ALIAS | F_SF),
+ CORE_INSN ("add", 0x11000000, 0x7f800000, addsub_imm, OP_ADD, OP3 (Rd_SP, Rn_SP, AIMM), QL_R2NIL, F_ARITH_ADD | F_HAS_ALIAS | F_SF),
CORE_INSN ("mov", 0x11000000, 0x7ffffc00, addsub_imm, 0, OP2 (Rd_SP, Rn_SP), QL_I2SAME, F_ARITH_MOV | F_ALIAS | F_SF | F_REQUIRES_SP),
- CORE_INSN ("adds", 0x31000000, 0x7f000000, addsub_imm, 0, OP3 (Rd, Rn_SP, AIMM), QL_R2NIL, F_ARITH_ADD | F_HAS_ALIAS | F_SF),
- CORE_INSN ("cmn", 0x3100001f, 0x7f00001f, addsub_imm, 0, OP2 (Rn_SP, AIMM), QL_R1NIL, F_SUBCLASS_OTHER | F_ALIAS | F_SF),
- CORE_INSN ("sub", 0x51000000, 0x7f000000, addsub_imm, 0, OP3 (Rd_SP, Rn_SP, AIMM), QL_R2NIL, F_ARITH_SUB | F_SF),
- CORE_INSN ("subs", 0x71000000, 0x7f000000, addsub_imm, 0, OP3 (Rd, Rn_SP, AIMM), QL_R2NIL, F_ARITH_SUB | F_HAS_ALIAS | F_SF),
- CORE_INSN ("cmp", 0x7100001f, 0x7f00001f, addsub_imm, 0, OP2 (Rn_SP, AIMM), QL_R1NIL, F_SUBCLASS_OTHER | F_ALIAS | F_SF),
+ CORE_INSN ("adds", 0x31000000, 0x7f800000, addsub_imm, 0, OP3 (Rd, Rn_SP, AIMM), QL_R2NIL, F_ARITH_ADD | F_HAS_ALIAS | F_SF),
+ CORE_INSN ("cmn", 0x3100001f, 0x7f80001f, addsub_imm, 0, OP2 (Rn_SP, AIMM), QL_R1NIL, F_SUBCLASS_OTHER | F_ALIAS | F_SF),
+ CORE_INSN ("sub", 0x51000000, 0x7f800000, addsub_imm, 0, OP3 (Rd_SP, Rn_SP, AIMM), QL_R2NIL, F_ARITH_SUB | F_SF),
+ CORE_INSN ("subs", 0x71000000, 0x7f800000, addsub_imm, 0, OP3 (Rd, Rn_SP, AIMM), QL_R2NIL, F_ARITH_SUB | F_HAS_ALIAS | F_SF),
+ CORE_INSN ("cmp", 0x7100001f, 0x7f80001f, addsub_imm, 0, OP2 (Rn_SP, AIMM), QL_R1NIL, F_SUBCLASS_OTHER | F_ALIAS | F_SF),
MEMTAG_INSN ("addg", 0x91800000, 0xffc0c000, addsub_imm, OP4 (Rd_SP, Rn_SP, UIMM10, UIMM4_ADDG), QL_ADDG, F_SUBCLASS_OTHER),
MEMTAG_INSN ("subg", 0xd1800000, 0xffc0c000, addsub_imm, OP4 (Rd_SP, Rn_SP, UIMM10, UIMM4_ADDG), QL_ADDG, F_SUBCLASS_OTHER),
/* Add/subtract (shifted register). */
@@ -8161,7 +8161,7 @@ const struct aarch64_opcode aarch64_opcode_table[] =
"a flag bit specifier giving an alternative value for each flag") \
Y(IMMEDIATE, limm, "LIMM", 0, F(FLD(22, 1), FLD(16, 6), FLD(10, 6)), \
"Logical immediate") \
- Y(IMMEDIATE, aimm, "AIMM", 0, F(FLD(22, 2), FLD(10, 12)), \
+ Y(IMMEDIATE, aimm, "AIMM", 0, F(FLD(22, 1), FLD(10, 12)), \
"a 12-bit unsigned immediate with optional left shift of 12 bits")\
Y(IMMEDIATE, imm_half, "HALF", 0, F(FLD(5, 16)), \
"a 16-bit immediate with optional left shift") \
More information about the Binutils
mailing list