[PATCH 27/28] aarch64: Fix GICR encoding

Alice Carlotti alice.carlotti@arm.com
Wed Nov 4 18:48:56 GMT 2026


Fix bit 21 in the encoding, since this is a SYSL alias (with L = 1), and
not a SYS alias (with L = 0).


diff --git a/gas/testsuite/gas/aarch64/gcie.d b/gas/testsuite/gas/aarch64/gcie.d
index 067683f5b01a9204fdf4a7aca629f4fc438504e8..07d2e7ab08771bfbe4d2fb67f01806ab716febfc 100644
--- a/gas/testsuite/gas/aarch64/gcie.d
+++ b/gas/testsuite/gas/aarch64/gcie.d
@@ -24,10 +24,10 @@ Disassembly of section \.text:
 [^:]+:	d508c15f 	gic	cdpri, xzr
 [^:]+:	d508c1a0 	gic	cdrcfg, x0
 [^:]+:	d508c1bf 	gic	cdrcfg, xzr
-[^:]+:	d508c300 	gicr	x0, cdia
-[^:]+:	d508c31f 	gicr	xzr, cdia
-[^:]+:	d508c320 	gicr	x0, cdnmia
-[^:]+:	d508c33f 	gicr	xzr, cdnmia
+[^:]+:	d528c300 	gicr	x0, cdia
+[^:]+:	d528c31f 	gicr	xzr, cdia
+[^:]+:	d528c320 	gicr	x0, cdnmia
+[^:]+:	d528c33f 	gicr	xzr, cdnmia
 [^:]+:	d50cc160 	gic	vdaff, x0
 [^:]+:	d50cc17f 	gic	vdaff, xzr
 [^:]+:	d50cc200 	gic	vddi, x0
diff --git a/opcodes/aarch64-dis-2.c b/opcodes/aarch64-dis-2.c
index fb3adda9518ef59b357ce618d4848485bb47ba14..adb563b4f980cc352b26911c804e35d5ec698e25 100644
--- a/opcodes/aarch64-dis-2.c
+++ b/opcodes/aarch64-dis-2.c
@@ -37096,10 +37096,10 @@ aarch64_find_next_opcode (const aarch64_opcode *opcode)
       value = A64_OPID_d5080000_at_SYSREG_AT_Rt;
       break;
     case A64_OPID_d52b7760_gcsss2_Rt:
-      value = A64_OPID_d5280000_sysl_Rt_UIMM3_OP1_CRn_CRm_UIMM3_OP2;
+      value = A64_OPID_d5280000_gicr_Rd_GICR;
       break;
     case A64_OPID_d52b7720_gcspopm_Rt:
-      value = A64_OPID_d5280000_sysl_Rt_UIMM3_OP1_CRn_CRm_UIMM3_OP2;
+      value = A64_OPID_d5280000_gicr_Rd_GICR;
       break;
     case A64_OPID_d503227f_gcsb_BARRIER_GCSB:
       value = A64_OPID_d503201f_hint_UIMM7;
@@ -37477,11 +37477,11 @@ aarch64_find_next_opcode (const aarch64_opcode *opcode)
       value = A64_OPID_d5080000_gic_GIC_Rd;
       break;
     case A64_OPID_d5080000_gic_GIC_Rd:
-      value = A64_OPID_d5080000_gicr_Rd_GICR;
-      break;
-    case A64_OPID_d5080000_gicr_Rd_GICR:
       value = A64_OPID_d508001f_gsb_GSB;
       break;
+    case A64_OPID_d5280000_gicr_Rd_GICR:
+      value = A64_OPID_d5280000_sysl_Rt_UIMM3_OP1_CRn_CRm_UIMM3_OP2;
+      break;
     case A64_OPID_d508001f_gsb_GSB:
       value = A64_OPID_d5080000_plbi_SYSREG_PLBI_Rt_SYS;
       break;
diff --git a/opcodes/aarch64-tbl-2.h b/opcodes/aarch64-tbl-2.h
index dea5ada38b944f9d4c534bc565360d9c3cd07dc4..405b5afbe95768848df5682186d0da310aeb66e0 100644
--- a/opcodes/aarch64-tbl-2.h
+++ b/opcodes/aarch64-tbl-2.h
@@ -3877,7 +3877,7 @@ enum aarch64_opcode_idx
   A64_OPID_c120e400_fmul_SME_Zdnx2_SME_Znx2_SME_Zmx2,
   A64_OPID_c121e400_fmul_SME_Zdnx4_SME_Znx4_SME_Zmx4,
   A64_OPID_d5080000_gic_GIC_Rd,
-  A64_OPID_d5080000_gicr_Rd_GICR,
+  A64_OPID_d5280000_gicr_Rd_GICR,
   A64_OPID_d508001f_gsb_GSB,
   A64_OPID_81600008_bftmopa_SME_ZAda_1b_SME_Znx2_SVE_Zm_16_SME_Zk_INDEX,
   A64_OPID_81400000_bftmopa_SME_ZAda_2b_SME_Znx2_SVE_Zm_16_SME_Zk_INDEX,
diff --git a/opcodes/aarch64-tbl.h b/opcodes/aarch64-tbl.h
index 129966fa9aec329ae7d618f7bb22d89fcedf258c..0cad4b801af2c91881659d5473232e1c69e008b0 100644
--- a/opcodes/aarch64-tbl.h
+++ b/opcodes/aarch64-tbl.h
@@ -7784,7 +7784,7 @@ const struct aarch64_opcode aarch64_opcode_table[] =
 
   /* Generalised Interrupt Controller v5 instructions.  */
   GCIE_INSN ("gic", 0xd5080000, 0xfff80000, OP2 (GIC, Rd), QL_SRC_X, F_ALIAS),
-  GCIE_INSN ("gicr", 0xd5080000, 0xfff80000, OP2 (Rd, GICR), QL_DST_X, F_ALIAS),
+  GCIE_INSN ("gicr", 0xd5280000, 0xfff80000, OP2 (Rd, GICR), QL_DST_X, F_ALIAS),
   GCIE_INSN ("gsb", 0xd508001f, 0xfff8001f, OP1 (GSB), QL_IMM_NIL, F_ALIAS),
 
   /* SME TMOP instructions.  */


More information about the Binutils mailing list