[PATCH 11/28] aarch64: Remove pseudo opcodes from decode lists

Alice Carlotti alice.carlotti@arm.com
Wed Nov 4 18:44:02 GMT 2026


We never disassemble to a pseudo instruction, so there's no reason to
ever return them from aarch64_find_next_alias_opcode.


diff --git a/opcodes/aarch64-dis-2.c b/opcodes/aarch64-dis-2.c
index 6253b200425ca38a93903678eee766034d7e2925..bd38b5ee2363bb2b5992236cd892a43969e84a70 100644
--- a/opcodes/aarch64-dis-2.c
+++ b/opcodes/aarch64-dis-2.c
@@ -36810,102 +36810,6 @@ aarch64_find_next_alias_opcode (const aarch64_opcode *opcode)
     case A64_OPID_53000000_ubfx_Rd_Rn_IMM_WIDTH:
       value = A64_OPID_53000000_ubfiz_Rd_Rn_IMM_WIDTH;
       break;
-    case A64_OPID_54000000_b_c_ADDR_PCREL19:
-      value = A64_OPID_5400000d_ble_ADDR_PCREL19;
-      break;
-    case A64_OPID_5400000d_ble_ADDR_PCREL19:
-      value = A64_OPID_5400000c_bgt_ADDR_PCREL19;
-      break;
-    case A64_OPID_5400000c_bgt_ADDR_PCREL19:
-      value = A64_OPID_5400000b_blt_ADDR_PCREL19;
-      break;
-    case A64_OPID_5400000b_blt_ADDR_PCREL19:
-      value = A64_OPID_5400000a_bge_ADDR_PCREL19;
-      break;
-    case A64_OPID_5400000a_bge_ADDR_PCREL19:
-      value = A64_OPID_54000009_bls_ADDR_PCREL19;
-      break;
-    case A64_OPID_54000009_bls_ADDR_PCREL19:
-      value = A64_OPID_54000008_bhi_ADDR_PCREL19;
-      break;
-    case A64_OPID_54000008_bhi_ADDR_PCREL19:
-      value = A64_OPID_54000007_bvc_ADDR_PCREL19;
-      break;
-    case A64_OPID_54000007_bvc_ADDR_PCREL19:
-      value = A64_OPID_54000006_bvs_ADDR_PCREL19;
-      break;
-    case A64_OPID_54000006_bvs_ADDR_PCREL19:
-      value = A64_OPID_54000005_bpl_ADDR_PCREL19;
-      break;
-    case A64_OPID_54000005_bpl_ADDR_PCREL19:
-      value = A64_OPID_54000004_bmi_ADDR_PCREL19;
-      break;
-    case A64_OPID_54000004_bmi_ADDR_PCREL19:
-      value = A64_OPID_54000003_blo_ADDR_PCREL19;
-      break;
-    case A64_OPID_54000003_blo_ADDR_PCREL19:
-      value = A64_OPID_54000003_bcc_ADDR_PCREL19;
-      break;
-    case A64_OPID_54000003_bcc_ADDR_PCREL19:
-      value = A64_OPID_54000002_bhs_ADDR_PCREL19;
-      break;
-    case A64_OPID_54000002_bhs_ADDR_PCREL19:
-      value = A64_OPID_54000002_bcs_ADDR_PCREL19;
-      break;
-    case A64_OPID_54000002_bcs_ADDR_PCREL19:
-      value = A64_OPID_54000001_bne_ADDR_PCREL19;
-      break;
-    case A64_OPID_54000001_bne_ADDR_PCREL19:
-      value = A64_OPID_54000000_beq_ADDR_PCREL19;
-      break;
-    case A64_OPID_74000000_cbgt_Rt_Rm_ADDR_PCREL9:
-      value = A64_OPID_74000000_cblt_Rm_Rt_ADDR_PCREL9;
-      break;
-    case A64_OPID_74200000_cbge_Rt_Rm_ADDR_PCREL9:
-      value = A64_OPID_74200000_cble_Rm_Rt_ADDR_PCREL9;
-      break;
-    case A64_OPID_74400000_cbhi_Rt_Rm_ADDR_PCREL9:
-      value = A64_OPID_74400000_cblo_Rm_Rt_ADDR_PCREL9;
-      break;
-    case A64_OPID_74600000_cbhs_Rt_Rm_ADDR_PCREL9:
-      value = A64_OPID_74600000_cbls_Rm_Rt_ADDR_PCREL9;
-      break;
-    case A64_OPID_75000000_cbgt_Rt_IMM_2_ADDR_PCREL9:
-      value = A64_OPID_75000000_cbge_Rt_IMMP1_2_ADDR_PCREL9;
-      break;
-    case A64_OPID_75200000_cblt_Rt_IMM_2_ADDR_PCREL9:
-      value = A64_OPID_75200000_cble_Rt_IMMS1_2_ADDR_PCREL9;
-      break;
-    case A64_OPID_75400000_cbhi_Rt_IMM_2_ADDR_PCREL9:
-      value = A64_OPID_75400000_cbhs_Rt_IMMP1_2_ADDR_PCREL9;
-      break;
-    case A64_OPID_75600000_cblo_Rt_IMM_2_ADDR_PCREL9:
-      value = A64_OPID_75600000_cbls_Rt_IMMS1_2_ADDR_PCREL9;
-      break;
-    case A64_OPID_74008000_cbbgt_Rt_Rm_ADDR_PCREL9:
-      value = A64_OPID_74008000_cbblt_Rm_Rt_ADDR_PCREL9;
-      break;
-    case A64_OPID_74208000_cbbge_Rt_Rm_ADDR_PCREL9:
-      value = A64_OPID_74208000_cbble_Rm_Rt_ADDR_PCREL9;
-      break;
-    case A64_OPID_74408000_cbbhi_Rt_Rm_ADDR_PCREL9:
-      value = A64_OPID_74408000_cbblo_Rm_Rt_ADDR_PCREL9;
-      break;
-    case A64_OPID_74608000_cbbhs_Rt_Rm_ADDR_PCREL9:
-      value = A64_OPID_74608000_cbbls_Rm_Rt_ADDR_PCREL9;
-      break;
-    case A64_OPID_7400c000_cbhgt_Rt_Rm_ADDR_PCREL9:
-      value = A64_OPID_7400c000_cbhlt_Rm_Rt_ADDR_PCREL9;
-      break;
-    case A64_OPID_7420c000_cbhge_Rt_Rm_ADDR_PCREL9:
-      value = A64_OPID_7420c000_cbhle_Rm_Rt_ADDR_PCREL9;
-      break;
-    case A64_OPID_7440c000_cbhhi_Rt_Rm_ADDR_PCREL9:
-      value = A64_OPID_7440c000_cbhlo_Rm_Rt_ADDR_PCREL9;
-      break;
-    case A64_OPID_7460c000_cbhhs_Rt_Rm_ADDR_PCREL9:
-      value = A64_OPID_7460c000_cbhls_Rm_Rt_ADDR_PCREL9;
-      break;
     case A64_OPID_1a800400_csinc_Rd_Rn_Rm_COND:
       value = A64_OPID_1a9f07e0_cset_Rd_COND1;
       break;
@@ -36921,9 +36825,6 @@ aarch64_find_next_alias_opcode (const aarch64_opcode *opcode)
     case A64_OPID_5a800400_csneg_Rd_Rn_Rm_COND:
       value = A64_OPID_5a800400_cneg_Rd_Rn_COND1;
       break;
-    case A64_OPID_dac00c00_rev_Rd_Rn:
-      value = A64_OPID_dac00c00_rev64_Rd_Rn;
-      break;
     case A64_OPID_1ac02000_lslv_Rd_Rn_Rm:
       value = A64_OPID_1ac02000_lsl_Rd_Rn_Rm;
       break;
@@ -36960,9 +36861,6 @@ aarch64_find_next_alias_opcode (const aarch64_opcode *opcode)
     case A64_OPID_13800000_extr_Rd_Rn_Rm_IMMS:
       value = A64_OPID_13800000_ror_Rd_Rm_IMMS;
       break;
-    case A64_OPID_12000000_and_Rd_SP_Rn_LIMM:
-      value = A64_OPID_12000000_bic_Rd_SP_Rn_LIMM;
-      break;
     case A64_OPID_32000000_orr_Rd_SP_Rn_LIMM:
       value = A64_OPID_320003e0_mov_Rd_SP_IMM_MOV;
       break;
@@ -36970,9 +36868,6 @@ aarch64_find_next_alias_opcode (const aarch64_opcode *opcode)
       value = A64_OPID_7200001f_tst_Rn_LIMM;
       break;
     case A64_OPID_2a000000_orr_Rd_Rn_Rm_SFT:
-      value = A64_OPID_2a0003e0_uxtw_Rd_Rm;
-      break;
-    case A64_OPID_2a0003e0_uxtw_Rd_Rm:
       value = A64_OPID_2a0003e0_mov_Rd_Rm_SFT;
       break;
     case A64_OPID_2a200000_orn_Rd_Rn_Rm_SFT:
@@ -37192,9 +37087,6 @@ aarch64_find_next_alias_opcode (const aarch64_opcode *opcode)
       value = A64_OPID_d503227f_gcsb_BARRIER_GCSB;
       break;
     case A64_OPID_d503227f_gcsb_BARRIER_GCSB:
-      value = A64_OPID_d50322df_clearbhb;
-      break;
-    case A64_OPID_d50322df_clearbhb:
       value = A64_OPID_d503225f_tsb_BARRIER_PSB;
       break;
     case A64_OPID_d503225f_tsb_BARRIER_PSB:
@@ -37335,27 +37227,12 @@ aarch64_find_next_alias_opcode (const aarch64_opcode *opcode)
     case A64_OPID_d52b7720_gcspopm_Rt:
       value = A64_OPID_d52b7760_gcsss2_Rt;
       break;
-    case A64_OPID_05800000_and_SVE_Zd_SVE_Zd_SVE_LIMM:
-      value = A64_OPID_05800000_bic_SVE_Zd_SVE_Zd_SVE_INV_LIMM;
-      break;
     case A64_OPID_25004000_and_SVE_Pd_SVE_Pg4_10_SVE_Pn_SVE_Pm:
       value = A64_OPID_25004000_mov_SVE_Pd_SVE_Pg4_10_SVE_Pn;
       break;
     case A64_OPID_25404000_ands_SVE_Pd_SVE_Pg4_10_SVE_Pn_SVE_Pm:
       value = A64_OPID_25404000_movs_SVE_Pd_SVE_Pg4_10_SVE_Pn;
       break;
-    case A64_OPID_24008000_cmpge_SVE_Pd_SVE_Pg3_SVE_Zn_SVE_Zm_16:
-      value = A64_OPID_24008000_cmple_SVE_Pd_SVE_Pg3_SVE_Zm_16_SVE_Zn;
-      break;
-    case A64_OPID_24008010_cmpgt_SVE_Pd_SVE_Pg3_SVE_Zn_SVE_Zm_16:
-      value = A64_OPID_24008010_cmplt_SVE_Pd_SVE_Pg3_SVE_Zm_16_SVE_Zn;
-      break;
-    case A64_OPID_24000010_cmphi_SVE_Pd_SVE_Pg3_SVE_Zn_SVE_Zm_16:
-      value = A64_OPID_24000010_cmplo_SVE_Pd_SVE_Pg3_SVE_Zm_16_SVE_Zn;
-      break;
-    case A64_OPID_24000000_cmphs_SVE_Pd_SVE_Pg3_SVE_Zn_SVE_Zm_16:
-      value = A64_OPID_24000000_cmpls_SVE_Pd_SVE_Pg3_SVE_Zm_16_SVE_Zn;
-      break;
     case A64_OPID_05208000_cpy_SVE_Zd_SVE_Pg3_SVE_Vn:
       value = A64_OPID_05208000_mov_SVE_Zd_SVE_Pg3_SVE_Vn;
       break;
@@ -37363,9 +37240,6 @@ aarch64_find_next_alias_opcode (const aarch64_opcode *opcode)
       value = A64_OPID_0528a000_mov_SVE_Zd_SVE_Pg3_Rn_SP;
       break;
     case A64_OPID_05100000_cpy_SVE_Zd_SVE_Pg4_16_SVE_ASIMM:
-      value = A64_OPID_05104000_fmov_SVE_Zd_SVE_Pg4_16_FPIMM0;
-      break;
-    case A64_OPID_05104000_fmov_SVE_Zd_SVE_Pg4_16_FPIMM0:
       value = A64_OPID_05100000_mov_SVE_Zd_SVE_Pg4_16_SVE_ASIMM;
       break;
     case A64_OPID_05203800_dup_SVE_Zd_Rn_SP:
@@ -37378,80 +37252,44 @@ aarch64_find_next_alias_opcode (const aarch64_opcode *opcode)
       value = A64_OPID_05202000_mov_SVE_Zd_SVE_Zn_INDEX;
       break;
     case A64_OPID_2538c000_dup_SVE_Zd_SVE_ASIMM:
-      value = A64_OPID_2538c000_fmov_SVE_Zd_FPIMM0;
-      break;
-    case A64_OPID_2538c000_fmov_SVE_Zd_FPIMM0:
       value = A64_OPID_2538c000_mov_SVE_Zd_SVE_ASIMM;
       break;
     case A64_OPID_05c00000_dupm_SVE_Zd_SVE_LIMM:
       value = A64_OPID_05c00000_mov_SVE_Zd_SVE_LIMM_MOV;
       break;
-    case A64_OPID_05400000_eor_SVE_Zd_SVE_Zd_SVE_LIMM:
-      value = A64_OPID_05400000_eon_SVE_Zd_SVE_Zd_SVE_INV_LIMM;
-      break;
     case A64_OPID_25004200_eor_SVE_Pd_SVE_Pg4_10_SVE_Pn_SVE_Pm:
       value = A64_OPID_25004200_not_SVE_Pd_SVE_Pg4_10_SVE_Pn;
       break;
     case A64_OPID_25404200_eors_SVE_Pd_SVE_Pg4_10_SVE_Pn_SVE_Pm:
       value = A64_OPID_25404200_nots_SVE_Pd_SVE_Pg4_10_SVE_Pn;
       break;
-    case A64_OPID_6500c010_facge_SVE_Pd_SVE_Pg3_SVE_Zn_SVE_Zm_16:
-      value = A64_OPID_6500c010_facle_SVE_Pd_SVE_Pg3_SVE_Zm_16_SVE_Zn;
-      break;
-    case A64_OPID_6500e010_facgt_SVE_Pd_SVE_Pg3_SVE_Zn_SVE_Zm_16:
-      value = A64_OPID_6500e010_faclt_SVE_Pd_SVE_Pg3_SVE_Zm_16_SVE_Zn;
-      break;
-    case A64_OPID_65004000_fcmge_SVE_Pd_SVE_Pg3_SVE_Zn_SVE_Zm_16:
-      value = A64_OPID_65004000_fcmle_SVE_Pd_SVE_Pg3_SVE_Zm_16_SVE_Zn;
-      break;
-    case A64_OPID_65004010_fcmgt_SVE_Pd_SVE_Pg3_SVE_Zn_SVE_Zm_16:
-      value = A64_OPID_65004010_fcmlt_SVE_Pd_SVE_Pg3_SVE_Zm_16_SVE_Zn;
-      break;
     case A64_OPID_0510c000_fcpy_SVE_Zd_SVE_Pg4_16_SVE_FPIMM8:
       value = A64_OPID_0510c000_fmov_SVE_Zd_SVE_Pg4_16_SVE_FPIMM8;
       break;
     case A64_OPID_2539c000_fdup_SVE_Zd_SVE_FPIMM8:
       value = A64_OPID_2539c000_fmov_SVE_Zd_SVE_FPIMM8;
       break;
-    case A64_OPID_85800000_ldr_SVE_Pt_SVE_ADDR_RI_S9xVL:
-      value = A64_OPID_85800000_ldr_SVE_PNt_SVE_ADDR_RI_S9xVL;
-      break;
     case A64_OPID_04603000_orr_SVE_Zd_SVE_Zn_SVE_Zm_16:
       value = A64_OPID_04603000_mov_SVE_Zd_SVE_Zn;
       break;
-    case A64_OPID_05000000_orr_SVE_Zd_SVE_Zd_SVE_LIMM:
-      value = A64_OPID_05000000_orn_SVE_Zd_SVE_Zd_SVE_INV_LIMM;
-      break;
     case A64_OPID_25804000_orr_SVE_Pd_SVE_Pg4_10_SVE_Pn_SVE_Pm:
-      value = A64_OPID_25804000_mov_SVE_PNd_SVE_PNn;
-      break;
-    case A64_OPID_25804000_mov_SVE_PNd_SVE_PNn:
       value = A64_OPID_25804000_mov_SVE_Pd_SVE_Pn;
       break;
     case A64_OPID_25c04000_orrs_SVE_Pd_SVE_Pg4_10_SVE_Pn_SVE_Pm:
       value = A64_OPID_25c04000_movs_SVE_Pd_SVE_Pn;
       break;
-    case A64_OPID_2518e400_pfalse_SVE_Pd:
-      value = A64_OPID_2518e400_pfalse_SVE_PNd;
-      break;
     case A64_OPID_0520c000_sel_SVE_Zd_SVE_Pg4_10_SVE_Zn_SVE_Zm_16:
       value = A64_OPID_0520c000_mov_SVE_Zd_SVE_Pg4_10_SVE_Zn;
       break;
     case A64_OPID_25004210_sel_SVE_Pd_SVE_Pg4_10_SVE_Pn_SVE_Pm:
       value = A64_OPID_25004210_mov_SVE_Pd_SVE_Pg4_10_SVE_Pn;
       break;
-    case A64_OPID_e5800000_str_SVE_Pt_SVE_ADDR_RI_S9xVL:
-      value = A64_OPID_e5800000_str_SVE_PNt_SVE_ADDR_RI_S9xVL;
-      break;
     case A64_OPID_c0020000_mova_SVE_Zd_SVE_Pg3_SME_ZA_HV_idx_src:
       value = A64_OPID_c0020000_mov_SVE_Zd_SVE_Pg3_SME_ZA_HV_idx_src;
       break;
     case A64_OPID_c0000000_mova_SME_ZA_HV_idx_dest_SVE_Pg3_SVE_Zn:
       value = A64_OPID_c0000000_mov_SME_ZA_HV_idx_dest_SVE_Pg3_SVE_Zn;
       break;
-    case A64_OPID_25204000_psel_SVE_Pd_SVE_Pg4_10_SME_PnT_Wm_imm:
-      value = A64_OPID_25204000_psel_SVE_PNd_SVE_PNg4_10_SME_PnT_Wm_imm;
-      break;
     case A64_OPID_c0060800_mova_SME_Zdnx2_SME_ZA_array_off3_5:
       value = A64_OPID_c0060800_mov_SME_Zdnx2_SME_ZA_array_off3_5;
       break;
diff --git a/opcodes/aarch64-dis.c b/opcodes/aarch64-dis.c
index 4901e86fc063e8161cdf6bb38855fb46870225c4..7c14ca230ffb6a38b866c277f03fb138ceb4412d 100644
--- a/opcodes/aarch64-dis.c
+++ b/opcodes/aarch64-dis.c
@@ -3386,7 +3386,6 @@ determine_disassembling_preference (struct aarch64_inst *inst,
     return;
 
   alias = aarch64_find_next_alias_opcode (opcode);
-  assert (alias);
 
 #ifdef DEBUG_AARCH64
   if (debug_dump)
@@ -3407,15 +3406,6 @@ determine_disassembling_preference (struct aarch64_inst *inst,
       DEBUG_TRACE ("try %s", alias->name);
       assert (alias_opcode_p (alias));
 
-      /* An alias can be a pseudo opcode which will never be used in the
-	 disassembly, e.g. BIC logical immediate is such a pseudo opcode
-	 aliasing AND.  */
-      if (pseudo_opcode_p (alias))
-	{
-	  DEBUG_TRACE ("skip pseudo %s", alias->name);
-	  continue;
-	}
-
       if ((inst->value & alias->mask) != alias->opcode)
 	{
 	  DEBUG_TRACE ("skip %s as base opcode not match", alias->name);
diff --git a/opcodes/aarch64-gen.c b/opcodes/aarch64-gen.c
index d0905123050227b7fa87d46bb7b9edb0ef30cd2f..56657e3cb00ebb29dace86d273b53099873fd4e5 100644
--- a/opcodes/aarch64-gen.c
+++ b/opcodes/aarch64-gen.c
@@ -733,7 +733,6 @@ print_find_next_alias_opcode (const opcode_node *table, int num)
   for (i = 0; i < num; ++i)
     {
       const opcode_node *node = table + i;
-      assert (node->next);
       while (node->next)
 	{
 	  printf ("    case %s:\n      value = %s;\n      break;\n",
@@ -832,6 +831,11 @@ find_alias_opcode (const aarch64_opcode *opcode)
   while (i >= 0)
     {
       const aarch64_opcode *alias = preferred [i];
+      if (pseudo_opcode_p (alias))
+	{
+	  --i;
+	  continue;
+	}
       opcode_node *node = new_opcode_node ();
 
       if (debug)
@@ -890,7 +894,6 @@ create_alias_info (int *num_ptr)
       assert (ent->name != NULL);
       node->index = ent - aarch64_opcode_table;
       node->next = find_alias_opcode (ent);
-      assert (node->next);
     }
   assert (i == num);
 
@@ -910,12 +913,12 @@ release_resource_alias_info (opcode_node *alias_info, int num)
   for (; i < num; ++i, ++node)
     {
       opcode_node *list = node->next;
-      do
+      while (list != NULL)
 	{
 	  opcode_node *next = list->next;
 	  free (list);
 	  list = next;
-	} while (list != NULL);
+	}
     }
 
   /* Free opcode_node array.  */


More information about the Binutils mailing list