[llvm] 0ed4bdf - PPCAsmParser: Detect multiple specifiers
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Thu Mar 27 20:57:18 PDT 2025
Author: Fangrui Song
Date: 2025-03-27T20:57:13-07:00
New Revision: 0ed4bdfe70d88e8b7aa70739ffcb655ad01226ef
URL: https://github.com/llvm/llvm-project/commit/0ed4bdfe70d88e8b7aa70739ffcb655ad01226ef
DIFF: https://github.com/llvm/llvm-project/commit/0ed4bdfe70d88e8b7aa70739ffcb655ad01226ef.diff
LOG: PPCAsmParser: Detect multiple specifiers
In addition, simplify extractSpecifier and switch to the `Specifier`
naming convention.
Added:
Modified:
llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
llvm/test/MC/PowerPC/ppc64-fixups.s
Removed:
################################################################################
diff --git a/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp b/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
index f4b67a6134542..94628223b83bc 100644
--- a/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
+++ b/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
@@ -1363,107 +1363,79 @@ ParseStatus PPCAsmParser::tryParseRegister(MCRegister &Reg, SMLoc &StartLoc,
return ParseStatus::Success;
}
-/// Extract \code @l/@ha \endcode specifier from expression. Recursively scan
-/// the expression and check for VK_LO/HI/HA
-/// symbol variants. If all symbols with specifier use the same
-/// specifier, return the corresponding PPCMCExpr::Specifier,
-/// and a modified expression using the default symbol variant.
-/// Otherwise, return NULL.
+// Extract the @l or @ha specifier from the expression, returning a modified
+// expression with the specifier removed. Stores the extracted specifier in
+// `Spec`. Reports an error if multiple specifiers are detected.
const MCExpr *PPCAsmParser::extractSpecifier(const MCExpr *E,
- PPCMCExpr::Specifier &Variant) {
+ PPCMCExpr::Specifier &Spec) {
MCContext &Context = getParser().getContext();
- Variant = PPCMCExpr::VK_None;
-
switch (E->getKind()) {
- case MCExpr::Target:
case MCExpr::Constant:
- return nullptr;
+ break;
+ case MCExpr::Target: {
+ // Detect error but do not return a modified expression.
+ auto *TE = cast<PPCMCExpr>(E);
+ Spec = TE->getSpecifier();
+ (void)extractSpecifier(TE->getSubExpr(), Spec);
+ Spec = PPCMCExpr::VK_None;
+ } break;
case MCExpr::SymbolRef: {
- const MCSymbolRefExpr *SRE = cast<MCSymbolRefExpr>(E);
- Variant = (PPCMCExpr::Specifier)SRE->getKind();
- switch (Variant) {
- case PPCMCExpr::VK_LO:
- Variant = PPCMCExpr::VK_LO;
+ const auto *SRE = cast<MCSymbolRefExpr>(E);
+ switch (getSpecifier(SRE)) {
+ case PPCMCExpr::VK_None:
+ default:
break;
+ case PPCMCExpr::VK_LO:
case PPCMCExpr::VK_HI:
- Variant = PPCMCExpr::VK_HI;
- break;
case PPCMCExpr::VK_HA:
- Variant = PPCMCExpr::VK_HA;
- break;
case PPCMCExpr::VK_HIGH:
- Variant = PPCMCExpr::VK_HIGH;
- break;
case PPCMCExpr::VK_HIGHA:
- Variant = PPCMCExpr::VK_HIGHA;
- break;
case PPCMCExpr::VK_HIGHER:
- Variant = PPCMCExpr::VK_HIGHER;
- break;
case PPCMCExpr::VK_HIGHERA:
- Variant = PPCMCExpr::VK_HIGHERA;
- break;
case PPCMCExpr::VK_HIGHEST:
- Variant = PPCMCExpr::VK_HIGHEST;
- break;
case PPCMCExpr::VK_HIGHESTA:
- Variant = PPCMCExpr::VK_HIGHESTA;
- break;
- default:
- return nullptr;
+ if (Spec == PPCMCExpr::VK_None)
+ Spec = getSpecifier(SRE);
+ else
+ Error(E->getLoc(), "cannot contain more than one relocation specifier");
+ return MCSymbolRefExpr::create(&SRE->getSymbol(), Context);
}
-
- return MCSymbolRefExpr::create(&SRE->getSymbol(), Context);
+ break;
}
case MCExpr::Unary: {
const MCUnaryExpr *UE = cast<MCUnaryExpr>(E);
- const MCExpr *Sub = extractSpecifier(UE->getSubExpr(), Variant);
- if (!Sub)
- return nullptr;
- return MCUnaryExpr::create(UE->getOpcode(), Sub, Context);
+ const MCExpr *Sub = extractSpecifier(UE->getSubExpr(), Spec);
+ if (Spec != PPCMCExpr::VK_None)
+ return MCUnaryExpr::create(UE->getOpcode(), Sub, Context);
+ break;
}
case MCExpr::Binary: {
const MCBinaryExpr *BE = cast<MCBinaryExpr>(E);
- PPCMCExpr::Specifier LHSVariant, RHSVariant;
- const MCExpr *LHS = extractSpecifier(BE->getLHS(), LHSVariant);
- const MCExpr *RHS = extractSpecifier(BE->getRHS(), RHSVariant);
-
- if (!LHS && !RHS)
- return nullptr;
-
- if (!LHS) LHS = BE->getLHS();
- if (!RHS) RHS = BE->getRHS();
-
- if (LHSVariant == PPCMCExpr::VK_None)
- Variant = RHSVariant;
- else if (RHSVariant == PPCMCExpr::VK_None)
- Variant = LHSVariant;
- else if (LHSVariant == RHSVariant)
- Variant = LHSVariant;
- else
- return nullptr;
-
- return MCBinaryExpr::create(BE->getOpcode(), LHS, RHS, Context);
+ const MCExpr *LHS = extractSpecifier(BE->getLHS(), Spec);
+ const MCExpr *RHS = extractSpecifier(BE->getRHS(), Spec);
+ if (Spec != PPCMCExpr::VK_None)
+ return MCBinaryExpr::create(BE->getOpcode(), LHS, RHS, Context);
+ break;
}
}
- llvm_unreachable("Invalid expression kind!");
+ return E;
}
/// This
diff ers from the default "parseExpression" in that it handles
-/// modifiers.
+/// specifiers.
bool PPCAsmParser::parseExpression(const MCExpr *&EVal) {
// (ELF Platforms)
// Handle \code @l/@ha \endcode
if (getParser().parseExpression(EVal))
return true;
- PPCMCExpr::Specifier Spec;
+ auto Spec = PPCMCExpr::VK_None;
const MCExpr *E = extractSpecifier(EVal, Spec);
- if (E)
+ if (Spec != PPCMCExpr::VK_None)
EVal = PPCMCExpr::create(Spec, E, getParser().getContext());
return false;
diff --git a/llvm/test/MC/PowerPC/ppc64-fixups.s b/llvm/test/MC/PowerPC/ppc64-fixups.s
index 9904ad886e985..9bd9f6a4567d9 100644
--- a/llvm/test/MC/PowerPC/ppc64-fixups.s
+++ b/llvm/test/MC/PowerPC/ppc64-fixups.s
@@ -1,4 +1,3 @@
-
# RUN: llvm-mc -triple powerpc64-unknown-unknown --show-encoding %s | FileCheck -check-prefix=CHECK-BE %s
# RUN: llvm-mc -triple powerpc64le-unknown-unknown --show-encoding %s | FileCheck -check-prefix=CHECK-LE %s
@@ -7,6 +6,8 @@
# RUN: llvm-mc -triple powerpc64le-unknown-unknown -filetype=obj %s | \
# RUN: llvm-readobj -r - | FileCheck %s -check-prefix=CHECK-LE-REL
+# RUN: not llvm-mc -filetype=obj -triple powerpc64 --defsym ERR=1 %s -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR --implicit-check-not=error:
+
# CHECK-BE: b target # encoding: [0b010010AA,A,A,0bAAAAAA00]
# CHECK-LE: b target # encoding: [0bAAAAAA00,A,A,0b010010AA]
# CHECK-BE-NEXT: # fixup A - offset: 0, value: target, kind: fixup_ppc_br24
@@ -771,3 +772,16 @@ base:
# CHECK-LE-REL: 0x{{[0-9A-F]*[08]}} R_PPC64_DTPREL64 target 0x0
.quad target at dtprel
+.ifdef ERR
+# ERR: [[#@LINE+1]]:15: error: cannot contain more than one relocation specifier
+ori 1, 2, x at l+x@l
+
+# ERR: [[#@LINE+1]]:17: error: cannot contain more than one relocation specifier
+ori 1, 2, -(x at l+x@l)
+
+# ERR: [[#@LINE+1]]:11: error: cannot contain more than one relocation specifier
+ori 1, 2, x at l+3@l
+
+# ERR: [[#@LINE+1]]:12: error: cannot contain more than one relocation specifier
+ori 1, 2, (x at l+3)@l
+.endif
More information about the llvm-commits
mailing list