From d2849572463da994c685b3bd7a60d5a7566c01e3 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Fri, 21 Jun 2013 14:42:49 +0000 Subject: [PowerPC] Support @h modifier This adds necessary infrastructure to support the @h modifier. Note that all required relocation types were already present (and unused). This patch provides support for using @h in the assembler; it would also be possible to now use this feature in code generated by the compiler, but this is not done yet. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184548 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp | 3 +++ lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp | 8 ++++++++ lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h | 5 +++++ 3 files changed, 16 insertions(+) (limited to 'lib/Target/PowerPC/MCTargetDesc') diff --git a/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp b/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp index 0eb13b4..9a52816 100644 --- a/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp +++ b/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/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp b/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp index b29d6ff..8a346b4 100644 --- a/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp +++ b/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/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h b/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h index 8a7b78d..150acf6 100644 --- a/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h +++ b/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); } -- cgit v1.1