Skip to content

Commit 768e022

Browse files
jthackrayStylie777
jthackray
and
Stylie777
committed
[AArch64][llvm] Armv9.7-A: Add support for GICv5 (FEAT_GCIE)
Add new instruction and system registers that are specified in the Generic Interrupt Controller Architecture v5 (GICv5) standard, announced here: * https://community.arm.com/arm-community-blogs/b/architectures-and-processors-blog/posts/introducing-gicv5 and documented here: * https://developer.arm.com/documentation/109697/2025_09/2025-Architecture-Extensions * https://developer.arm.com/documentation/ddi0602/2025-09/ Co-authored-by: Jack Styles <[email protected]>
1 parent 9a67f9a commit 768e022

File tree

12 files changed

+1411
-6
lines changed

12 files changed

+1411
-6
lines changed

‎clang/test/Driver/aarch64-v97a.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,7 @@
3737
// RUN: %clang -target aarch64 -march=armv9.7a+mtetc -### -c %s 2>&1 | FileCheck -check-prefix=V97A-MTETC %s
3838
// RUN: %clang -target aarch64 -march=armv9.7-a+mtetc -### -c %s 2>&1 | FileCheck -check-prefix=V97A-MTETC %s
3939
// V97A-MTETC: "-cc1"{{.*}} "-triple" "aarch64{{.*}}" "-target-cpu" "generic" "-target-feature" "+v9.7a"{{.*}} "-target-feature" "+mtetc"
40+
41+
// RUN: %clang -target aarch64 -march=armv9.7a+gcie -### -c %s 2>&1 | FileCheck -check-prefix=VFAT-GCIE %s
42+
// RUN: %clang -target aarch64 -march=armv9.7-a+gcie -### -c %s 2>&1 | FileCheck -check-prefix=VFAT-GCIE %s
43+
// VFAT-GCIE: "-cc1"{{.*}} "-triple" "aarch64{{.*}}" "-target-cpu" "generic" "-target-feature" "+v9.7a"{{.*}} "-target-feature" "+gcie"

‎clang/test/Driver/print-supported-extensions-aarch64.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
// CHECK-NEXT: fp8fma FEAT_FP8FMA Enable Armv9.5-A FP8 multiply-add instructions
3333
// CHECK-NEXT: fprcvt FEAT_FPRCVT Enable Armv9.6-A base convert instructions for SIMD&FP scalar register operands of different input and output sizes
3434
// CHECK-NEXT: fp16 FEAT_FP16 Enable half-precision floating-point data processing
35+
// CHECK-NEXT: gcie FEAT_GCIE Enable Armv9.7-A GICv5 (Generic Interrupt Controller) CPU Interface Extension
3536
// CHECK-NEXT: gcs FEAT_GCS Enable Armv9.4-A Guarded Call Stack Extension
3637
// CHECK-NEXT: hbc FEAT_HBC Enable Armv8.8-A Hinted Conditional Branches Extension
3738
// CHECK-NEXT: i8mm FEAT_I8MM Enable Matrix Multiply Int8 Extension

‎llvm/lib/Target/AArch64/AArch64Features.td‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,9 @@ def FeatureMPAMv2: ExtensionWithMArch<"mpamv2", "MPAMv2", "FEAT_MPAMv2",
604604
def FeatureMTETC: ExtensionWithMArch<"mtetc", "MTETC", "FEAT_MTETC",
605605
"Enable Virtual Memory Tagging Extension">;
606606

607+
def FeatureGCIE: ExtensionWithMArch<"gcie", "GCIE", "FEAT_GCIE",
608+
"Enable Armv9.7-A GICv5 (Generic Interrupt Controller) CPU Interface Extension", [FeatureNMI]>;
609+
607610
//===----------------------------------------------------------------------===//
608611
// Other Features
609612
//===----------------------------------------------------------------------===//

‎llvm/lib/Target/AArch64/AArch64InstrInfo.td‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,8 @@ def HasMPAMv2 : Predicate<"Subtarget->hasMPAMv2()">,
406406
AssemblerPredicateWithAll<(all_of FeatureMPAMv2), "mpamv2">;
407407
def HasMTETC : Predicate<"Subtarget->hasMTETC()">,
408408
AssemblerPredicateWithAll<(all_of FeatureMTETC), "mtetc">;
409+
def HasGCIE : Predicate<"Subtarget->hasGCIE()">,
410+
AssemblerPredicateWithAll<(all_of FeatureGCIE), "gcie">;
409411
def IsLE : Predicate<"Subtarget->isLittleEndian()">;
410412
def IsBE : Predicate<"!Subtarget->isLittleEndian()">;
411413
def IsWindows : Predicate<"Subtarget->isTargetWindows()">;

‎llvm/lib/Target/AArch64/AArch64SystemOperands.td‎

Lines changed: 208 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2480,3 +2480,211 @@ def : MLBI<"ALLE1", 0b100, 0b0111, 0b0000, 0b100, 0>;
24802480
def : MLBI<"VMALLE1", 0b100, 0b0111, 0b0000, 0b101, 0>;
24812481
def : MLBI<"VPIDE1", 0b100, 0b0111, 0b0000, 0b110, 1>;
24822482
def : MLBI<"VPMGE1", 0b100, 0b0111, 0b0000, 0b111, 1>;
2483+
2484+
2485+
// v9.7-A GICv5 (FEAT_GCIE)
2486+
// CPU Interface Registers
2487+
// Op0 Op1 CRn CRm Op2
2488+
def : RWSysReg<"ICC_APR_EL1", 0b11, 0b001, 0b1100, 0b0000, 0b000>;
2489+
def : RWSysReg<"ICC_APR_EL3", 0b11, 0b110, 0b1100, 0b1000, 0b000>;
2490+
def : RWSysReg<"ICC_CR0_EL1", 0b11, 0b001, 0b1100, 0b0000, 0b001>;
2491+
def : RWSysReg<"ICC_CR0_EL3", 0b11, 0b110, 0b1100, 0b1001, 0b000>;
2492+
def : ROSysReg<"ICC_DOMHPPIR_EL3", 0b11, 0b110, 0b1100, 0b1000, 0b010>;
2493+
def : ROSysReg<"ICC_HAPR_EL1", 0b11, 0b001, 0b1100, 0b0000, 0b011>;
2494+
def : ROSysReg<"ICC_HPPIR_EL1", 0b11, 0b000, 0b1100, 0b1010, 0b011>;
2495+
def : ROSysReg<"ICC_HPPIR_EL3", 0b11, 0b110, 0b1100, 0b1001, 0b001>;
2496+
def : ROSysReg<"ICC_IAFFIDR_EL1", 0b11, 0b000, 0b1100, 0b1010, 0b101>;
2497+
def : RWSysReg<"ICC_ICSR_EL1", 0b11, 0b000, 0b1100, 0b1010, 0b100>;
2498+
def : ROSysReg<"ICC_IDR0_EL1", 0b11, 0b000, 0b1100, 0b1010, 0b010>;
2499+
def : RWSysReg<"ICC_PCR_EL1", 0b11, 0b001, 0b1100, 0b0000, 0b010>;
2500+
def : RWSysReg<"ICC_PCR_EL3", 0b11, 0b110, 0b1100, 0b1000, 0b001>;
2501+
2502+
// Virtual CPU Interface Registers
2503+
// Op0 Op1 CRn CRm Op2
2504+
def : RWSysReg<"ICV_APR_EL1", 0b11, 0b001, 0b1100, 0b0000, 0b000>;
2505+
def : RWSysReg<"ICV_CR0_EL1", 0b11, 0b001, 0b1100, 0b0000, 0b001>;
2506+
def : RWSysReg<"ICV_HAPR_EL1", 0b11, 0b001, 0b1100, 0b0000, 0b011>;
2507+
def : RWSysReg<"ICV_HPPIR_EL1", 0b11, 0b000, 0b1100, 0b1010, 0b011>;
2508+
def : RWSysReg<"ICV_PCR_EL1", 0b11, 0b001, 0b1100, 0b0000, 0b010>;
2509+
2510+
// PPI Registers
2511+
foreach n=0-1 in {
2512+
defvar nb = !cast<bit>(n);
2513+
// Op0 Op1 CRn CRm Op2
2514+
def : RWSysReg<"ICC_PPI_CACTIVER"#n#"_EL1", 0b11, 0b000, 0b1100, 0b1101, {0b00,nb}>;
2515+
def : RWSysReg<"ICC_PPI_CPENDR"#n#"_EL1", 0b11, 0b000, 0b1100, 0b1101, {0b10,nb}>;
2516+
def : RWSysReg<"ICC_PPI_ENABLER"#n#"_EL1", 0b11, 0b000, 0b1100, 0b1010, {0b11,nb}>;
2517+
def : RWSysReg<"ICC_PPI_SACTIVER"#n#"_EL1", 0b11, 0b000, 0b1100, 0b1101, {0b01,nb}>;
2518+
def : RWSysReg<"ICC_PPI_SPENDR"#n#"_EL1", 0b11, 0b000, 0b1100, 0b1101, {0b11,nb}>;
2519+
def : ROSysReg<"ICC_PPI_HMR"#n#"_EL1", 0b11, 0b000, 0b1100, 0b1010, {0b00,nb}>;
2520+
}
2521+
2522+
foreach n=0-3 in {
2523+
defvar nb = !cast<bits<2>>(n);
2524+
// Op0 Op1 CRn CRm Op2
2525+
def : RWSysReg<"ICC_PPI_DOMAINR"#n#"_EL3", 0b11, 0b110, 0b1100, 0b1000, {0b1,nb{1-0}}>;
2526+
2527+
}
2528+
2529+
foreach n=0-15 in{
2530+
defvar nb = !cast<bits<4>>(n);
2531+
// Op0 Op1 CRn CRm Op2
2532+
def : RWSysReg<"ICC_PPI_PRIORITYR"#n#"_EL1", 0b11, 0b000, 0b1100, {0b111,nb{3}}, nb{2-0}>;
2533+
}
2534+
2535+
// Virtual PPI Registers
2536+
foreach n=0-1 in {
2537+
defvar nb = !cast<bit>(n);
2538+
// Op0 Op1 CRn CRm Op2
2539+
def : RWSysReg<"ICV_PPI_CACTIVER"#n#"_EL1", 0b11, 0b000, 0b1100, 0b1101, {0b00,nb}>;
2540+
def : RWSysReg<"ICV_PPI_CPENDR"#n#"_EL1", 0b11, 0b000, 0b1100, 0b1101, {0b10,nb}>;
2541+
def : RWSysReg<"ICV_PPI_ENABLER"#n#"_EL1", 0b11, 0b000, 0b1100, 0b1010, {0b11,nb}>;
2542+
def : RWSysReg<"ICV_PPI_SACTIVER"#n#"_EL1", 0b11, 0b000, 0b1100, 0b1101, {0b01,nb}>;
2543+
def : RWSysReg<"ICV_PPI_SPENDR"#n#"_EL1", 0b11, 0b000, 0b1100, 0b1101, {0b11,nb}>;
2544+
def : RWSysReg<"ICV_PPI_HMR"#n#"_EL1", 0b11, 0b000, 0b1100, 0b1010, {0b00,nb}>;
2545+
}
2546+
2547+
foreach n=0-15 in {
2548+
defvar nb = !cast<bits<4>>(n);
2549+
// Op0 Op1 CRn CRm Op2
2550+
def : RWSysReg<"ICV_PPI_PRIORITYR"#n#"_EL1", 0b11, 0b000, 0b1100, {0b111,nb{3}}, nb{2-0}>;
2551+
}
2552+
2553+
// Hypervisor Control Registers
2554+
// Op0 Op1 CRn CRm Op2
2555+
def : RWSysReg<"ICH_APR_EL2", 0b11, 0b100, 0b1100, 0b1000, 0b100>;
2556+
def : RWSysReg<"ICH_CONTEXTR_EL2", 0b11, 0b100, 0b1100, 0b1011, 0b110>;
2557+
def : RWSysReg<"ICH_HFGITR_EL2", 0b11, 0b100, 0b1100, 0b1001, 0b111>;
2558+
def : RWSysReg<"ICH_HFGRTR_EL2", 0b11, 0b100, 0b1100, 0b1001, 0b100>;
2559+
def : RWSysReg<"ICH_HFGWTR_EL2", 0b11, 0b100, 0b1100, 0b1001, 0b110>;
2560+
def : ROSysReg<"ICH_HPPIR_EL2", 0b11, 0b100, 0b1100, 0b1000, 0b101>;
2561+
def : RWSysReg<"ICH_VCTLR_EL2", 0b11, 0b100, 0b1100, 0b1011, 0b100>;
2562+
2563+
foreach n=0-1 in {
2564+
defvar nb = !cast<bit>(n);
2565+
// Op0 Op1 CRn CRm Op2
2566+
def : RWSysReg<"ICH_PPI_ACTIVER"#n#"_EL2", 0b11, 0b100, 0b1100, 0b1010, {0b11,nb}>;
2567+
def : RWSysReg<"ICH_PPI_DVIR"#n#"_EL2", 0b11, 0b100, 0b1100, 0b1010, {0b00,nb}>;
2568+
def : RWSysReg<"ICH_PPI_ENABLER"#n#"_EL2", 0b11, 0b100, 0b1100, 0b1010, {0b01,nb}>;
2569+
def : RWSysReg<"ICH_PPI_PENDR"#n#"_EL2", 0b11, 0b100, 0b1100, 0b1010, {0b10,nb}>;
2570+
}
2571+
2572+
foreach n=0-15 in {
2573+
defvar nb = !cast<bits<4>>(n);
2574+
// Op0 Op1 CRn CRm Op2
2575+
def : RWSysReg<"ICH_PPI_PRIORITYR"#n#"_EL2", 0b11, 0b100, 0b1100, {0b111,nb{3}}, nb{2-0}>;
2576+
}
2577+
2578+
//===----------------------------------------------------------------------===//
2579+
// GICv5 instruction options.
2580+
//===----------------------------------------------------------------------===//
2581+
2582+
// GIC
2583+
class GIC<string name, bits<3> op1, bits<4> crn, bits<4> crm, bits<3> op2, bit needsreg> {
2584+
string Name = name;
2585+
bits<14> Encoding;
2586+
let Encoding{13-11} = op1;
2587+
let Encoding{10-7} = crn;
2588+
let Encoding{6-3} = crm;
2589+
let Encoding{2-0} = op2;
2590+
bit NeedsReg = needsreg;
2591+
string RequiresStr = [{ {AArch64::FeatureGCIE} }];
2592+
}
2593+
2594+
// GSB
2595+
class GSB<string name, bits<3> op1, bits<4> crn, bits<4> crm, bits<3> op2> {
2596+
string Name = name;
2597+
bits<14> Encoding;
2598+
let Encoding{13-11} = op1;
2599+
let Encoding{10-7} = crn;
2600+
let Encoding{6-3} = crm;
2601+
let Encoding{2-0} = op2;
2602+
string RequiresStr = [{ {AArch64::FeatureGCIE} }];
2603+
}
2604+
2605+
// GICR
2606+
class GICR<string name, bits<3> op1, bits<4> crn, bits<4> crm, bits<3> op2, bit needsreg> {
2607+
string Name = name;
2608+
bits<14> Encoding;
2609+
let Encoding{13-11} = op1;
2610+
let Encoding{10-7} = crn;
2611+
let Encoding{6-3} = crm;
2612+
let Encoding{2-0} = op2;
2613+
bit NeedsReg = needsreg;
2614+
string RequiresStr = [{ {AArch64::FeatureGCIE} }];
2615+
}
2616+
2617+
def GICTable : GenericTable {
2618+
let FilterClass = "GIC";
2619+
let CppTypeName = "GIC";
2620+
let Fields = ["Name", "Encoding", "NeedsReg", "RequiresStr"];
2621+
2622+
let PrimaryKey = ["Encoding"];
2623+
let PrimaryKeyName = "lookupGICByEncoding";
2624+
}
2625+
2626+
def GSBTable : GenericTable {
2627+
let FilterClass = "GSB";
2628+
let CppTypeName = "GSB";
2629+
let Fields = ["Name", "Encoding", "RequiresStr"];
2630+
2631+
let PrimaryKey = ["Encoding"];
2632+
let PrimaryKeyName = "lookupGSBByEncoding";
2633+
}
2634+
2635+
def GICRTable : GenericTable {
2636+
let FilterClass = "GICR";
2637+
let CppTypeName = "GICR";
2638+
let Fields = ["Name", "Encoding", "NeedsReg", "RequiresStr"];
2639+
2640+
let PrimaryKey = ["Encoding"];
2641+
let PrimaryKeyName = "lookupGICRByEncoding";
2642+
}
2643+
2644+
def lookupGICByName : SearchIndex {
2645+
let Table = GICTable;
2646+
let Key = ["Name"];
2647+
}
2648+
2649+
def lookupGSBByName : SearchIndex {
2650+
let Table = GSBTable;
2651+
let Key = ["Name"];
2652+
}
2653+
2654+
def lookupGICRByName : SearchIndex {
2655+
let Table = GICRTable;
2656+
let Key = ["Name"];
2657+
}
2658+
2659+
// Op1 CRn CRm Op2
2660+
def : GSB<"sys", 0b000, 0b1100, 0b0000, 0b000>;
2661+
def : GSB<"ack", 0b000, 0b1100, 0b0000, 0b001>;
2662+
2663+
// Op1 CRn CRm Op2 needsReg
2664+
def : GIC<"cdaff", 0b000, 0b1100, 0b0001, 0b011, 1>;
2665+
def : GIC<"cddi", 0b000, 0b1100, 0b0010, 0b000, 1>;
2666+
def : GIC<"cddis", 0b000, 0b1100, 0b0001, 0b000, 1>;
2667+
def : GIC<"cden", 0b000, 0b1100, 0b0001, 0b001, 1>;
2668+
def : GIC<"cdeoi", 0b000, 0b1100, 0b0001, 0b111, 1>;
2669+
def : GIC<"cdhm", 0b000, 0b1100, 0b0010, 0b001, 1>;
2670+
def : GIC<"cdpend", 0b000, 0b1100, 0b0001, 0b100, 1>;
2671+
def : GIC<"cdpri", 0b000, 0b1100, 0b0001, 0b010, 1>;
2672+
def : GIC<"cdrcfg", 0b000, 0b1100, 0b0001, 0b101, 1>;
2673+
def : GICR<"cdia", 0b000, 0b1100, 0b0011, 0b000, 1>;
2674+
def : GICR<"cdnmia", 0b000, 0b1100, 0b0011, 0b001, 1>;
2675+
def : GIC<"vdaff", 0b100, 0b1100, 0b0001, 0b011, 1>;
2676+
def : GIC<"vddi", 0b100, 0b1100, 0b0010, 0b000, 1>;
2677+
def : GIC<"vddis", 0b100, 0b1100, 0b0001, 0b000, 1>;
2678+
def : GIC<"vden", 0b100, 0b1100, 0b0001, 0b001, 1>;
2679+
def : GIC<"vdhm", 0b100, 0b1100, 0b0010, 0b001, 1>;
2680+
def : GIC<"vdpend", 0b100, 0b1100, 0b0001, 0b100, 1>;
2681+
def : GIC<"vdpri", 0b100, 0b1100, 0b0001, 0b010, 1>;
2682+
def : GIC<"vdrcfg", 0b100, 0b1100, 0b0001, 0b101, 1>;
2683+
def : GIC<"ldaff", 0b110, 0b1100, 0b0001, 0b011, 1>;
2684+
def : GIC<"lddi", 0b110, 0b1100, 0b0010, 0b000, 1>;
2685+
def : GIC<"lddis", 0b110, 0b1100, 0b0001, 0b000, 1>;
2686+
def : GIC<"lden", 0b110, 0b1100, 0b0001, 0b001, 1>;
2687+
def : GIC<"ldhm", 0b110, 0b1100, 0b0010, 0b001, 1>;
2688+
def : GIC<"ldpend", 0b110, 0b1100, 0b0001, 0b100, 1>;
2689+
def : GIC<"ldpri", 0b110, 0b1100, 0b0001, 0b010, 1>;
2690+
def : GIC<"ldrcfg", 0b110, 0b1100, 0b0001, 0b101, 1>;

‎llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp‎

Lines changed: 81 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ class AArch64AsmParser : public MCTargetAsmParser {
159159
SMLoc getLoc() const { return getParser().getTok().getLoc(); }
160160

161161
bool parseSysAlias(StringRef Name, SMLoc NameLoc, OperandVector &Operands);
162+
bool parseSyslAlias(StringRef Name, SMLoc NameLoc, OperandVector &Operands);
162163
bool parseSyspAlias(StringRef Name, SMLoc NameLoc, OperandVector &Operands);
163164
void createSysAlias(uint16_t Encoding, OperandVector &Operands, SMLoc S);
164165
AArch64CC::CondCode parseCondCodeString(StringRef Cond,
@@ -3888,6 +3889,7 @@ static const struct Extension {
38883889
{"tlbid", {AArch64::FeatureTLBID}},
38893890
{"mpamv2", {AArch64::FeatureMPAMv2}},
38903891
{"mtetc", {AArch64::FeatureMTETC}},
3892+
{"gcie", {AArch64::FeatureGCIE}},
38913893
};
38923894

38933895
static void setRequiredFeatureString(FeatureBitset FBS, std::string &Str) {
@@ -3960,7 +3962,7 @@ void AArch64AsmParser::createSysAlias(uint16_t Encoding, OperandVector &Operands
39603962
AArch64Operand::CreateImm(Expr, S, getLoc(), getContext()));
39613963
}
39623964

3963-
/// parseSysAlias - The IC, DC, AT, TLBI, and MLBI instructions
3965+
/// parseSysAlias - The IC, DC, AT, TLBI, MLBI and GIC{R} and GSB instructions
39643966
/// are simple aliases for the SYS instruction. Parse them specially so that
39653967
/// we create a SYS MCInst.
39663968
bool AArch64AsmParser::parseSysAlias(StringRef Name, SMLoc NameLoc,
@@ -4035,6 +4037,28 @@ bool AArch64AsmParser::parseSysAlias(StringRef Name, SMLoc NameLoc,
40354037
}
40364038
ExpectRegister = MLBI->NeedsReg;
40374039
createSysAlias(MLBI->Encoding, Operands, S);
4040+
} else if (Mnemonic == "gic") {
4041+
const AArch64GIC::GIC *GIC = AArch64GIC::lookupGICByName(Op);
4042+
if (!GIC)
4043+
return TokError("invalid operand for GIC instruction");
4044+
else if (!GIC->haveFeatures(getSTI().getFeatureBits())) {
4045+
std::string Str("GIC " + std::string(GIC->Name) + " requires: ");
4046+
setRequiredFeatureString(GIC->getRequiredFeatures(), Str);
4047+
return TokError(Str);
4048+
}
4049+
ExpectRegister = GIC->NeedsReg;
4050+
createSysAlias(GIC->Encoding, Operands, S);
4051+
} else if (Mnemonic == "gsb") {
4052+
const AArch64GSB::GSB *GSB = AArch64GSB::lookupGSBByName(Op);
4053+
if (!GSB)
4054+
return TokError("invalid operand for GSB instruction");
4055+
else if (!GSB->haveFeatures(getSTI().getFeatureBits())) {
4056+
std::string Str("GSB " + std::string(GSB->Name) + " requires: ");
4057+
setRequiredFeatureString(GSB->getRequiredFeatures(), Str);
4058+
return TokError(Str);
4059+
}
4060+
ExpectRegister = false;
4061+
createSysAlias(GSB->Encoding, Operands, S);
40384062
} else if (Mnemonic == "cfp" || Mnemonic == "dvp" || Mnemonic == "cpp" ||
40394063
Mnemonic == "cosp") {
40404064

@@ -4086,6 +4110,55 @@ bool AArch64AsmParser::parseSysAlias(StringRef Name, SMLoc NameLoc,
40864110
return false;
40874111
}
40884112

4113+
/// parseSyslAlias - The GICR instructions are simple aliases for
4114+
/// the SYSL instruction. Parse them specially so that we create a
4115+
/// SYS MCInst.
4116+
bool AArch64AsmParser::parseSyslAlias(StringRef Name, SMLoc NameLoc,
4117+
OperandVector &Operands) {
4118+
4119+
Mnemonic = Name;
4120+
Operands.push_back(
4121+
AArch64Operand::CreateToken("sysl", NameLoc, getContext()));
4122+
4123+
// Now expect two operands (identifier + register)
4124+
SMLoc startLoc = getLoc();
4125+
const AsmToken &regTok = getTok();
4126+
StringRef reg = regTok.getString();
4127+
unsigned RegNum = matchRegisterNameAlias(reg.lower(), RegKind::Scalar);
4128+
if (!RegNum)
4129+
return TokError("expected register operand");
4130+
4131+
Operands.push_back(AArch64Operand::CreateReg(
4132+
RegNum, RegKind::Scalar, startLoc, getLoc(), getContext(), EqualsReg));
4133+
4134+
Lex(); // Eat token
4135+
if (parseToken(AsmToken::Comma))
4136+
return true;
4137+
4138+
// Check for identifier
4139+
const AsmToken &operandTok = getTok();
4140+
StringRef Op = operandTok.getString();
4141+
SMLoc S2 = operandTok.getLoc();
4142+
Lex(); // Eat token
4143+
4144+
if (Mnemonic == "gicr") {
4145+
const AArch64GICR::GICR *GICR = AArch64GICR::lookupGICRByName(Op);
4146+
if (!GICR)
4147+
return Error(S2, "invalid operand for GICR instruction");
4148+
else if (!GICR->haveFeatures(getSTI().getFeatureBits())) {
4149+
std::string Str("GICR " + std::string(GICR->Name) + " requires: ");
4150+
setRequiredFeatureString(GICR->getRequiredFeatures(), Str);
4151+
return Error(S2, Str);
4152+
}
4153+
createSysAlias(GICR->Encoding, Operands, S2);
4154+
}
4155+
4156+
if (parseToken(AsmToken::EndOfStatement, "unexpected token in argument list"))
4157+
return true;
4158+
4159+
return false;
4160+
}
4161+
40894162
/// parseSyspAlias - The TLBIP instructions are simple aliases for
40904163
/// the SYSP instruction. Parse them specially so that we create a SYSP MCInst.
40914164
bool AArch64AsmParser::parseSyspAlias(StringRef Name, SMLoc NameLoc,
@@ -5353,13 +5426,17 @@ bool AArch64AsmParser::parseInstruction(ParseInstructionInfo &Info,
53535426
size_t Start = 0, Next = Name.find('.');
53545427
StringRef Head = Name.slice(Start, Next);
53555428

5356-
// IC, DC, AT, TLBI, MLBI and Prediction invalidation instructions are aliases
5357-
// for the SYS instruction.
5429+
// IC, DC, AT, TLBI, MLBI, GIC{R}, GSB and Prediction invalidation
5430+
// instructions are aliases for the SYS instruction.
53585431
if (Head == "ic" || Head == "dc" || Head == "at" || Head == "tlbi" ||
53595432
Head == "cfp" || Head == "dvp" || Head == "cpp" || Head == "cosp" ||
5360-
Head == "mlbi")
5433+
Head == "mlbi" || Head == "gic" || Head == "gsb")
53615434
return parseSysAlias(Head, NameLoc, Operands);
53625435

5436+
// GICR instructions are aliases for the SYSL instruction.
5437+
if (Head == "gicr")
5438+
return parseSyslAlias(Head, NameLoc, Operands);
5439+
53635440
// TLBIP instructions are aliases for the SYSP instruction.
53645441
if (Head == "tlbip")
53655442
return parseSyspAlias(Head, NameLoc, Operands);

0 commit comments

Comments
 (0)