[PATCH 10/28] aarch64: Eliminate aarch64_find_alias_opcode

Alice Carlotti alice.carlotti@arm.com
Wed Nov 4 18:43:45 GMT 2026


Merge the initial alias mappings into aarch64_find_next_alias_opcode,
since there's no need for these to be in a separate function.


diff --git a/opcodes/aarch64-dis-2.c b/opcodes/aarch64-dis-2.c
index fd0731cd085947bbca7a7e4e5b85fb5b8922c882..6253b200425ca38a93903678eee766034d7e2925 100644
--- a/opcodes/aarch64-dis-2.c
+++ b/opcodes/aarch64-dis-2.c
@@ -36695,9 +36695,9 @@ aarch64_find_next_opcode (const aarch64_opcode *opcode)
 }
 
 const aarch64_opcode *
-aarch64_find_alias_opcode (const aarch64_opcode *opcode)
+aarch64_find_next_alias_opcode (const aarch64_opcode *opcode)
 {
-  /* Use the index as the key to locate the alias opcode.  */
+  /* Use the index as the key to locate the next opcode.  */
   enum aarch64_opcode_idx key = opcode - aarch64_opcode_table;
   enum aarch64_opcode_idx value;
   switch (key)
@@ -36732,6 +36732,9 @@ aarch64_find_alias_opcode (const aarch64_opcode *opcode)
     case A64_OPID_6b000000_subs_Rd_Rn_Rm_SFT:
       value = A64_OPID_6b00001f_cmp_Rn_Rm_SFT;
       break;
+    case A64_OPID_6b00001f_cmp_Rn_Rm_SFT:
+      value = A64_OPID_6b0003e0_negs_Rd_Rm_SFT;
+      break;
     case A64_OPID_0e003c00_umov_Rd_En:
       value = A64_OPID_0e003c00_mov_Rd_En;
       break;
@@ -36765,15 +36768,96 @@ aarch64_find_alias_opcode (const aarch64_opcode *opcode)
     case A64_OPID_13000000_sbfm_Rd_Rn_IMMR_IMMS:
       value = A64_OPID_93407c00_sxtw_Rd_Rn;
       break;
+    case A64_OPID_93407c00_sxtw_Rd_Rn:
+      value = A64_OPID_13003c00_sxth_Rd_Rn;
+      break;
+    case A64_OPID_13003c00_sxth_Rd_Rn:
+      value = A64_OPID_13001c00_sxtb_Rd_Rn;
+      break;
+    case A64_OPID_13001c00_sxtb_Rd_Rn:
+      value = A64_OPID_13000000_asr_Rd_Rn_IMM;
+      break;
+    case A64_OPID_13000000_asr_Rd_Rn_IMM:
+      value = A64_OPID_13000000_sbfx_Rd_Rn_IMM_WIDTH;
+      break;
+    case A64_OPID_13000000_sbfx_Rd_Rn_IMM_WIDTH:
+      value = A64_OPID_13000000_sbfiz_Rd_Rn_IMM_WIDTH;
+      break;
     case A64_OPID_33000000_bfm_Rd_Rn_IMMR_IMMS:
       value = A64_OPID_330003e0_bfc_Rd_IMM_WIDTH;
       break;
+    case A64_OPID_330003e0_bfc_Rd_IMM_WIDTH:
+      value = A64_OPID_33000000_bfxil_Rd_Rn_IMM_WIDTH;
+      break;
+    case A64_OPID_33000000_bfxil_Rd_Rn_IMM_WIDTH:
+      value = A64_OPID_33000000_bfi_Rd_Rn_IMM_WIDTH;
+      break;
     case A64_OPID_53000000_ubfm_Rd_Rn_IMMR_IMMS:
       value = A64_OPID_53000000_lsr_Rd_Rn_IMM;
       break;
+    case A64_OPID_53000000_lsr_Rd_Rn_IMM:
+      value = A64_OPID_53003c00_uxth_Rd_Rn;
+      break;
+    case A64_OPID_53003c00_uxth_Rd_Rn:
+      value = A64_OPID_53001c00_uxtb_Rd_Rn;
+      break;
+    case A64_OPID_53001c00_uxtb_Rd_Rn:
+      value = A64_OPID_53000000_lsl_Rd_Rn_IMM;
+      break;
+    case A64_OPID_53000000_lsl_Rd_Rn_IMM:
+      value = A64_OPID_53000000_ubfx_Rd_Rn_IMM_WIDTH;
+      break;
+    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;
@@ -36825,9 +36909,15 @@ aarch64_find_alias_opcode (const aarch64_opcode *opcode)
     case A64_OPID_1a800400_csinc_Rd_Rn_Rm_COND:
       value = A64_OPID_1a9f07e0_cset_Rd_COND1;
       break;
+    case A64_OPID_1a9f07e0_cset_Rd_COND1:
+      value = A64_OPID_1a800400_cinc_Rd_Rn_COND1;
+      break;
     case A64_OPID_5a800000_csinv_Rd_Rn_Rm_COND:
       value = A64_OPID_5a9f03e0_csetm_Rd_COND1;
       break;
+    case A64_OPID_5a9f03e0_csetm_Rd_COND1:
+      value = A64_OPID_5a800000_cinv_Rd_Rn_COND1;
+      break;
     case A64_OPID_5a800400_csneg_Rd_Rn_Rm_COND:
       value = A64_OPID_5a800400_cneg_Rd_Rn_COND1;
       break;
@@ -36882,6 +36972,9 @@ aarch64_find_alias_opcode (const aarch64_opcode *opcode)
     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:
       value = A64_OPID_2a2003e0_mvn_Rd_Rm_SFT;
       break;
@@ -37059,257 +37152,6 @@ aarch64_find_alias_opcode (const aarch64_opcode *opcode)
     case A64_OPID_d500401f_msr_PSTATEFIELD_UIMM4:
       value = A64_OPID_d503407f_smstop_SME_SM_ZA;
       break;
-    case A64_OPID_d503201f_hint_UIMM7:
-      value = A64_OPID_d50322df_clrbhb;
-      break;
-    case A64_OPID_d503309f_dsb_BARRIER:
-      value = A64_OPID_d503349f_pssbb;
-      break;
-    case A64_OPID_d5080000_sys_UIMM3_OP1_CRn_CRm_UIMM3_OP2_Rt:
-      value = A64_OPID_d5080000_plbi_SYSREG_PLBI_Rt_SYS;
-      break;
-    case A64_OPID_d5480000_sysp_UIMM3_OP1_CRn_CRm_UIMM3_OP2_Rt_PAIRREG_OR_XZR:
-      value = A64_OPID_d5480000_tlbip_SYSREG_TLBIP_Rt_SYS_PAIRREG_OR_XZR;
-      break;
-    case A64_OPID_d5280000_sysl_Rt_UIMM3_OP1_CRn_CRm_UIMM3_OP2:
-      value = A64_OPID_d52b7720_gcspopm_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;
-    case A64_OPID_0528a000_cpy_SVE_Zd_SVE_Pg3_Rn_SP:
-      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_05203800_dup_SVE_Zd_Rn_SP:
-      value = A64_OPID_05203800_mov_SVE_Zd_Rn_SP;
-      break;
-    case A64_OPID_05202000_dup_SVE_Zd_SVE_Zn_INDEX:
-      value = A64_OPID_05202000_mov_SVE_Zd_SVE_VZn;
-      break;
-    case A64_OPID_2538c000_dup_SVE_Zd_SVE_ASIMM:
-      value = A64_OPID_2538c000_fmov_SVE_Zd_FPIMM0;
-      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_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;
-    case A64_OPID_c0060c00_mova_SME_Zdnx4_SME_ZA_array_off3_5:
-      value = A64_OPID_c0060c00_mov_SME_Zdnx4_SME_ZA_array_off3_5;
-      break;
-    case A64_OPID_c0060000_mova_SME_Zdnx2_SME_ZA_HV_idx_srcxN:
-      value = A64_OPID_c0060000_mov_SME_Zdnx2_SME_ZA_HV_idx_srcxN;
-      break;
-    case A64_OPID_c0060400_mova_SME_Zdnx4_SME_ZA_HV_idx_srcxN:
-      value = A64_OPID_c0060400_mov_SME_Zdnx4_SME_ZA_HV_idx_srcxN;
-      break;
-    case A64_OPID_c0040800_mova_SME_ZA_array_off3_0_SME_Znx2:
-      value = A64_OPID_c0040800_mov_SME_ZA_array_off3_0_SME_Znx2;
-      break;
-    case A64_OPID_c0040c00_mova_SME_ZA_array_off3_0_SME_Znx4:
-      value = A64_OPID_c0040c00_mov_SME_ZA_array_off3_0_SME_Znx4;
-      break;
-    case A64_OPID_c0040000_mova_SME_ZA_HV_idx_destxN_SME_Znx2:
-      value = A64_OPID_c0040000_mov_SME_ZA_HV_idx_destxN_SME_Znx2;
-      break;
-    case A64_OPID_c0040400_mova_SME_ZA_HV_idx_destxN_SME_Znx4:
-      value = A64_OPID_c0040400_mov_SME_ZA_HV_idx_destxN_SME_Znx4;
-      break;
-    default: return NULL;
-    }
-
-  return aarch64_opcode_table + value;
-}
-
-const aarch64_opcode *
-aarch64_find_next_alias_opcode (const aarch64_opcode *opcode)
-{
-  /* Use the index as the key to locate the next opcode.  */
-  enum aarch64_opcode_idx key = opcode - aarch64_opcode_table;
-  enum aarch64_opcode_idx value;
-  switch (key)
-    {
-    case A64_OPID_6b00001f_cmp_Rn_Rm_SFT:
-      value = A64_OPID_6b0003e0_negs_Rd_Rm_SFT;
-      break;
-    case A64_OPID_93407c00_sxtw_Rd_Rn:
-      value = A64_OPID_13003c00_sxth_Rd_Rn;
-      break;
-    case A64_OPID_13003c00_sxth_Rd_Rn:
-      value = A64_OPID_13001c00_sxtb_Rd_Rn;
-      break;
-    case A64_OPID_13001c00_sxtb_Rd_Rn:
-      value = A64_OPID_13000000_asr_Rd_Rn_IMM;
-      break;
-    case A64_OPID_13000000_asr_Rd_Rn_IMM:
-      value = A64_OPID_13000000_sbfx_Rd_Rn_IMM_WIDTH;
-      break;
-    case A64_OPID_13000000_sbfx_Rd_Rn_IMM_WIDTH:
-      value = A64_OPID_13000000_sbfiz_Rd_Rn_IMM_WIDTH;
-      break;
-    case A64_OPID_330003e0_bfc_Rd_IMM_WIDTH:
-      value = A64_OPID_33000000_bfxil_Rd_Rn_IMM_WIDTH;
-      break;
-    case A64_OPID_33000000_bfxil_Rd_Rn_IMM_WIDTH:
-      value = A64_OPID_33000000_bfi_Rd_Rn_IMM_WIDTH;
-      break;
-    case A64_OPID_53000000_lsr_Rd_Rn_IMM:
-      value = A64_OPID_53003c00_uxth_Rd_Rn;
-      break;
-    case A64_OPID_53003c00_uxth_Rd_Rn:
-      value = A64_OPID_53001c00_uxtb_Rd_Rn;
-      break;
-    case A64_OPID_53001c00_uxtb_Rd_Rn:
-      value = A64_OPID_53000000_lsl_Rd_Rn_IMM;
-      break;
-    case A64_OPID_53000000_lsl_Rd_Rn_IMM:
-      value = A64_OPID_53000000_ubfx_Rd_Rn_IMM_WIDTH;
-      break;
-    case A64_OPID_53000000_ubfx_Rd_Rn_IMM_WIDTH:
-      value = A64_OPID_53000000_ubfiz_Rd_Rn_IMM_WIDTH;
-      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_1a9f07e0_cset_Rd_COND1:
-      value = A64_OPID_1a800400_cinc_Rd_Rn_COND1;
-      break;
-    case A64_OPID_5a9f03e0_csetm_Rd_COND1:
-      value = A64_OPID_5a800000_cinv_Rd_Rn_COND1;
-      break;
-    case A64_OPID_2a0003e0_uxtw_Rd_Rm:
-      value = A64_OPID_2a0003e0_mov_Rd_Rm_SFT;
-      break;
     case A64_OPID_d503407f_smstop_SME_SM_ZA:
       value = A64_OPID_d503417f_smstart_SME_SM_ZA;
       break;
@@ -37319,6 +37161,9 @@ aarch64_find_next_alias_opcode (const aarch64_opcode *opcode)
     case A64_OPID_d503467f_smstop:
       value = A64_OPID_d503477f_smstart;
       break;
+    case A64_OPID_d503201f_hint_UIMM7:
+      value = A64_OPID_d50322df_clrbhb;
+      break;
     case A64_OPID_d50322df_clrbhb:
       value = A64_OPID_d50323ff_autibsp;
       break;
@@ -37415,12 +37260,18 @@ aarch64_find_next_alias_opcode (const aarch64_opcode *opcode)
     case A64_OPID_d503261f_stshh_STSHH_POLICY:
       value = A64_OPID_d503251f_chkfeat_X16;
       break;
+    case A64_OPID_d503309f_dsb_BARRIER:
+      value = A64_OPID_d503349f_pssbb;
+      break;
     case A64_OPID_d503349f_pssbb:
       value = A64_OPID_d503309f_ssbb;
       break;
     case A64_OPID_d503309f_ssbb:
       value = A64_OPID_d5033c9f_dfb;
       break;
+    case A64_OPID_d5080000_sys_UIMM3_OP1_CRn_CRm_UIMM3_OP2_Rt:
+      value = A64_OPID_d5080000_plbi_SYSREG_PLBI_Rt_SYS;
+      break;
     case A64_OPID_d5080000_plbi_SYSREG_PLBI_Rt_SYS:
       value = A64_OPID_d508001f_gsb_GSB;
       break;
@@ -37475,21 +37326,156 @@ aarch64_find_next_alias_opcode (const aarch64_opcode *opcode)
     case A64_OPID_d50877df_gcspopx:
       value = A64_OPID_d508779f_gcspushx;
       break;
+    case A64_OPID_d5480000_sysp_UIMM3_OP1_CRn_CRm_UIMM3_OP2_Rt_PAIRREG_OR_XZR:
+      value = A64_OPID_d5480000_tlbip_SYSREG_TLBIP_Rt_SYS_PAIRREG_OR_XZR;
+      break;
+    case A64_OPID_d5280000_sysl_Rt_UIMM3_OP1_CRn_CRm_UIMM3_OP2:
+      value = A64_OPID_d52b7720_gcspopm_Rt;
+      break;
     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;
+    case A64_OPID_0528a000_cpy_SVE_Zd_SVE_Pg3_Rn_SP:
+      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:
+      value = A64_OPID_05203800_mov_SVE_Zd_Rn_SP;
+      break;
+    case A64_OPID_05202000_dup_SVE_Zd_SVE_Zn_INDEX:
+      value = A64_OPID_05202000_mov_SVE_Zd_SVE_VZn;
+      break;
     case A64_OPID_05202000_mov_SVE_Zd_SVE_VZn:
       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;
+    case A64_OPID_c0060c00_mova_SME_Zdnx4_SME_ZA_array_off3_5:
+      value = A64_OPID_c0060c00_mov_SME_Zdnx4_SME_ZA_array_off3_5;
+      break;
+    case A64_OPID_c0060000_mova_SME_Zdnx2_SME_ZA_HV_idx_srcxN:
+      value = A64_OPID_c0060000_mov_SME_Zdnx2_SME_ZA_HV_idx_srcxN;
+      break;
+    case A64_OPID_c0060400_mova_SME_Zdnx4_SME_ZA_HV_idx_srcxN:
+      value = A64_OPID_c0060400_mov_SME_Zdnx4_SME_ZA_HV_idx_srcxN;
+      break;
+    case A64_OPID_c0040800_mova_SME_ZA_array_off3_0_SME_Znx2:
+      value = A64_OPID_c0040800_mov_SME_ZA_array_off3_0_SME_Znx2;
+      break;
+    case A64_OPID_c0040c00_mova_SME_ZA_array_off3_0_SME_Znx4:
+      value = A64_OPID_c0040c00_mov_SME_ZA_array_off3_0_SME_Znx4;
+      break;
+    case A64_OPID_c0040000_mova_SME_ZA_HV_idx_destxN_SME_Znx2:
+      value = A64_OPID_c0040000_mov_SME_ZA_HV_idx_destxN_SME_Znx2;
+      break;
+    case A64_OPID_c0040400_mova_SME_ZA_HV_idx_destxN_SME_Znx4:
+      value = A64_OPID_c0040400_mov_SME_ZA_HV_idx_destxN_SME_Znx4;
+      break;
     default: return NULL;
     }
 
diff --git a/opcodes/aarch64-dis.c b/opcodes/aarch64-dis.c
index 1cdc4cfbb66ca4a31246cf17d2ae6ba4f37bdd67..4901e86fc063e8161cdf6bb38855fb46870225c4 100644
--- a/opcodes/aarch64-dis.c
+++ b/opcodes/aarch64-dis.c
@@ -3369,8 +3369,8 @@ aarch64_opcode_decode (const aarch64_opcode *, const aarch64_insn,
    conditions are met).
 
    In order to speed up the alias opcode lookup, aarch64-gen has preprocessed
-   aarch64_opcode_table and generated aarch64_find_alias_opcode and
-   aarch64_find_next_alias_opcode (in opcodes/aarch64-dis-2.c) to help.  */
+   aarch64_opcode_table and generated aarch64_find_next_alias_opcode (in
+   opcodes/aarch64-dis-2.c) to help.  */
 
 static void
 determine_disassembling_preference (struct aarch64_inst *inst,
@@ -3385,7 +3385,7 @@ determine_disassembling_preference (struct aarch64_inst *inst,
   if (!opcode_has_alias (opcode))
     return;
 
-  alias = aarch64_find_alias_opcode (opcode);
+  alias = aarch64_find_next_alias_opcode (opcode);
   assert (alias);
 
 #ifdef DEBUG_AARCH64
diff --git a/opcodes/aarch64-dis.h b/opcodes/aarch64-dis.h
index 42cc99c5015a8158a31a0090231b4bca768eef72..21999077acf50d869541ac95fc62a8a36505d3b0 100644
--- a/opcodes/aarch64-dis.h
+++ b/opcodes/aarch64-dis.h
@@ -41,11 +41,10 @@ const aarch64_opcode* aarch64_find_next_opcode (const aarch64_opcode *);
    In the case of multiple alias candidates, the one of the highest priority
    (or one of several aliases of the same highest priority) will be
    returned; for the other candidate(s), call aarch64_find_next_alias_opcode
-   to obtain.  Note that aarch64_find_next_alias_opcode finds the next
+   again to obtain.  Note that aarch64_find_next_alias_opcode finds the next
    alias candidate in a way as if all related aliases were in a single-link
    list with priority from the highest to the least.  */
 
-const aarch64_opcode* aarch64_find_alias_opcode (const aarch64_opcode *);
 const aarch64_opcode* aarch64_find_next_alias_opcode (const aarch64_opcode *);
 
 /* Switch-table-based high-level operand extractor.  */
diff --git a/opcodes/aarch64-gen.c b/opcodes/aarch64-gen.c
index 47015a10a52dae202f0a6834e074d22f91eda4f2..d0905123050227b7fa87d46bb7b9edb0ef30cd2f 100644
--- a/opcodes/aarch64-gen.c
+++ b/opcodes/aarch64-gen.c
@@ -708,44 +708,6 @@ print_find_real_opcode (const opcode_node *table, int num)
   printf ("}\n");
 }
 
-/* Generate aarch64_find_alias_opcode in C code to the standard output.
-   TABLE points to the alias info table, while NUM indicates the number of
-   entries in the table.  */
-
-static void
-print_find_alias_opcode (const opcode_node *table, int num)
-{
-  int i;
-
-  if (debug)
-    printf ("Enter print_find_alias_opcode\n");
-
-  printf ("\n");
-  printf ("const aarch64_opcode *\n");
-  printf ("aarch64_find_alias_opcode (const aarch64_opcode *opcode)\n");
-  printf ("{\n");
-  printf ("  /* Use the index as the key to locate the alias opcode.  */\n");
-  printf ("  enum aarch64_opcode_idx key = opcode - aarch64_opcode_table;\n");
-  printf ("  enum aarch64_opcode_idx value;\n");
-  printf ("  switch (key)\n");
-  printf ("    {\n");
-
-  for (i = 0; i < num; ++i)
-    {
-      const opcode_node *node = table + i;
-      assert (node->next);
-      printf ("    case %s:\n      value = %s;\n      break;\n",
-	      opcode_node_labels[real_index (node->index)],
-	      opcode_node_labels[real_index (node->next->index)]);
-    }
-
-  printf ("    default: return NULL;\n");
-  printf ("    }\n\n");
-
-  printf ("  return aarch64_opcode_table + value;\n");
-  printf ("}\n");
-}
-
 /* Generate aarch64_find_next_alias_opcode in C code to the standard output.
    TABLE points to the alias info table, while NUM indicates the number of
    entries in the table.  */
@@ -772,13 +734,11 @@ print_find_next_alias_opcode (const opcode_node *table, int num)
     {
       const opcode_node *node = table + i;
       assert (node->next);
-      if (node->next->next == NULL)
-	continue;
-      while (node->next->next)
+      while (node->next)
 	{
 	  printf ("    case %s:\n      value = %s;\n      break;\n",
-		  opcode_node_labels[real_index (node->next->index)],
-		  opcode_node_labels[real_index (node->next->next->index)]);
+		  opcode_node_labels[real_index (node->index)],
+		  opcode_node_labels[real_index (node->next->index)]);
 	  node = node->next;
 	}
     }
@@ -1518,7 +1478,6 @@ main (int argc, char **argv)
 
       if (gen_disassembler_p)
 	{
-	  print_find_alias_opcode (alias_info, num);
 	  print_find_next_alias_opcode (alias_info, num);
 	}
 


More information about the Binutils mailing list