diff options
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/MC/MCExpr.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp | 5 | ||||
| -rw-r--r-- | llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp | 8 | ||||
| -rw-r--r-- | llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h | 5 |
5 files changed, 23 insertions, 1 deletions
diff --git a/llvm/lib/MC/MCExpr.cpp b/llvm/lib/MC/MCExpr.cpp index 124bd01d6ad..f59222263da 100644 --- a/llvm/lib/MC/MCExpr.cpp +++ b/llvm/lib/MC/MCExpr.cpp @@ -197,6 +197,7 @@ StringRef MCSymbolRefExpr::getVariantKindName(VariantKind Kind) { case VK_ARM_TARGET2: return "(target2)"; case VK_ARM_PREL31: return "(prel31)"; case VK_PPC_LO: return "l"; + case VK_PPC_HI: return "h"; case VK_PPC_HA: return "ha"; case VK_PPC_TOCBASE: return "tocbase"; case VK_PPC_TOC: return "toc"; @@ -281,6 +282,8 @@ MCSymbolRefExpr::getVariantKindForName(StringRef Name) { .Case("secrel32", VK_SECREL) .Case("L", VK_PPC_LO) .Case("l", VK_PPC_LO) + .Case("H", VK_PPC_HI) + .Case("h", VK_PPC_HI) .Case("HA", VK_PPC_HA) .Case("ha", VK_PPC_HA) .Case("TOCBASE", VK_PPC_TOCBASE) diff --git a/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp b/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp index 752b6f7bd13..964f2722833 100644 --- a/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp +++ b/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp @@ -546,7 +546,7 @@ ParseRegister(unsigned &RegNo, SMLoc &StartLoc, SMLoc &EndLoc) { } /// Extract @l/@ha modifier from expression. Recursively scan -/// the expression and check for VK_PPC_LO / VK_PPC_HA +/// the expression and check for VK_PPC_LO/HI/HA /// symbol variants. If all symbols with modifier use the same /// variant, return the corresponding PPCMCExpr::VariantKind, /// and a modified expression using the default symbol variant. @@ -569,6 +569,9 @@ ExtractModifierFromExpr(const MCExpr *E, case MCSymbolRefExpr::VK_PPC_LO: Variant = PPCMCExpr::VK_PPC_LO; break; + case MCSymbolRefExpr::VK_PPC_HI: + Variant = PPCMCExpr::VK_PPC_HI; + break; case MCSymbolRefExpr::VK_PPC_HA: Variant = PPCMCExpr::VK_PPC_HA; break; diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp index 0eb13b443fb..9a528164040 100644 --- a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp +++ b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp @@ -90,6 +90,9 @@ unsigned PPCELFObjectWriter::getRelocTypeInner(const MCValue &Target, case MCSymbolRefExpr::VK_PPC_LO: Type = ELF::R_PPC_ADDR16_LO; break; + case MCSymbolRefExpr::VK_PPC_HI: + Type = ELF::R_PPC_ADDR16_HI; + break; case MCSymbolRefExpr::VK_PPC_HA: Type = ELF::R_PPC_ADDR16_HA; break; diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp index b29d6ffc024..8a346b422d2 100644 --- a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp +++ b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp @@ -27,6 +27,7 @@ void PPCMCExpr::PrintImpl(raw_ostream &OS) const { switch (Kind) { default: llvm_unreachable("Invalid kind!"); case VK_PPC_LO: OS << "lo16"; break; + case VK_PPC_HI: OS << "hi16"; break; case VK_PPC_HA: OS << "ha16"; break; } @@ -39,6 +40,7 @@ void PPCMCExpr::PrintImpl(raw_ostream &OS) const { switch (Kind) { default: llvm_unreachable("Invalid kind!"); case VK_PPC_LO: OS << "@l"; break; + case VK_PPC_HI: OS << "@h"; break; case VK_PPC_HA: OS << "@ha"; break; } } @@ -60,6 +62,9 @@ PPCMCExpr::EvaluateAsRelocatableImpl(MCValue &Res, case VK_PPC_LO: Result = Result & 0xffff; break; + case VK_PPC_HI: + Result = (Result >> 16) & 0xffff; + break; case VK_PPC_HA: Result = ((Result >> 16) + ((Result & 0x8000) ? 1 : 0)) & 0xffff; break; @@ -77,6 +82,9 @@ PPCMCExpr::EvaluateAsRelocatableImpl(MCValue &Res, case VK_PPC_LO: Modifier = MCSymbolRefExpr::VK_PPC_LO; break; + case VK_PPC_HI: + Modifier = MCSymbolRefExpr::VK_PPC_HI; + break; case VK_PPC_HA: Modifier = MCSymbolRefExpr::VK_PPC_HA; break; diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h index 8a7b78da9a8..150acf60529 100644 --- a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h +++ b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h @@ -21,6 +21,7 @@ public: enum VariantKind { VK_PPC_None, VK_PPC_LO, + VK_PPC_HI, VK_PPC_HA }; @@ -44,6 +45,10 @@ public: return Create(VK_PPC_LO, Expr, Ctx); } + static const PPCMCExpr *CreateHi(const MCExpr *Expr, MCContext &Ctx) { + return Create(VK_PPC_HI, Expr, Ctx); + } + static const PPCMCExpr *CreateHa(const MCExpr *Expr, MCContext &Ctx) { return Create(VK_PPC_HA, Expr, Ctx); } |
