[llvm] r184548 - [PowerPC] Support @h modifier
Ulrich Weigand
ulrich.weigand at de.ibm.com
Fri Jun 21 07:42:49 PDT 2013
Author: uweigand
Date: Fri Jun 21 09:42:49 2013
New Revision: 184548
URL: http://llvm.org/viewvc/llvm-project?rev=184548&view=rev
Log:
[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.
Modified:
llvm/trunk/include/llvm/MC/MCExpr.h
llvm/trunk/lib/MC/MCExpr.cpp
llvm/trunk/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp
llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h
llvm/trunk/test/MC/PowerPC/ppc64-fixup-apply.s
llvm/trunk/test/MC/PowerPC/ppc64-fixups.s
Modified: llvm/trunk/include/llvm/MC/MCExpr.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCExpr.h?rev=184548&r1=184547&r2=184548&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCExpr.h (original)
+++ llvm/trunk/include/llvm/MC/MCExpr.h Fri Jun 21 09:42:49 2013
@@ -172,6 +172,7 @@ public:
VK_ARM_PREL31,
VK_PPC_LO, // symbol at l
+ VK_PPC_HI, // symbol at h
VK_PPC_HA, // symbol at ha
VK_PPC_TOCBASE, // symbol at tocbase
VK_PPC_TOC, // symbol at toc
Modified: llvm/trunk/lib/MC/MCExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCExpr.cpp?rev=184548&r1=184547&r2=184548&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCExpr.cpp (original)
+++ llvm/trunk/lib/MC/MCExpr.cpp Fri Jun 21 09:42:49 2013
@@ -197,6 +197,7 @@ StringRef MCSymbolRefExpr::getVariantKin
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(S
.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)
Modified: llvm/trunk/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp?rev=184548&r1=184547&r2=184548&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp Fri Jun 21 09:42:49 2013
@@ -546,7 +546,7 @@ ParseRegister(unsigned &RegNo, SMLoc &St
}
/// 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;
Modified: llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp?rev=184548&r1=184547&r2=184548&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp Fri Jun 21 09:42:49 2013
@@ -90,6 +90,9 @@ unsigned PPCELFObjectWriter::getRelocTyp
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;
Modified: llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp?rev=184548&r1=184547&r2=184548&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp Fri Jun 21 09:42:49 2013
@@ -27,6 +27,7 @@ void PPCMCExpr::PrintImpl(raw_ostream &O
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 &O
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(MCV
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(MCV
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;
Modified: llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h?rev=184548&r1=184547&r2=184548&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h (original)
+++ llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h Fri Jun 21 09:42:49 2013
@@ -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);
}
Modified: llvm/trunk/test/MC/PowerPC/ppc64-fixup-apply.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/PowerPC/ppc64-fixup-apply.s?rev=184548&r1=184547&r2=184548&view=diff
==============================================================================
--- llvm/trunk/test/MC/PowerPC/ppc64-fixup-apply.s (original)
+++ llvm/trunk/test/MC/PowerPC/ppc64-fixup-apply.s Fri Jun 21 09:42:49 2013
@@ -33,6 +33,11 @@ addi 1, 1, 2f-1b at l
addis 1, 1, 1b-2f at ha
2:
+addi 1, 1, target6 at h
+addis 1, 1, target6 at h
+
+.set target6, 0x4321fedc
+
.data
.quad v1
@@ -54,7 +59,7 @@ addis 1, 1, 1b-2f at ha
# CHECK-NEXT: ]
# CHECK-NEXT: Address: 0x0
# CHECK-NEXT: Offset:
-# CHECK-NEXT: Size: 40
+# CHECK-NEXT: Size: 48
# CHECK-NEXT: Link: 0
# CHECK-NEXT: Info: 0
# CHECK-NEXT: AddressAlignment: 4
@@ -62,7 +67,7 @@ addis 1, 1, 1b-2f at ha
# CHECK-NEXT: SectionData (
# CHECK-NEXT: 0000: 38211234 3C211234 38215678 3C211234
# CHECK-NEXT: 0010: 38214444 3C211111 38218001 3C211001
-# CHECK-NEXT: 0020: 38210008 3C210000
+# CHECK-NEXT: 0020: 38210008 3C210000 38214321 3C214321
# CHECK-NEXT: )
# CHECK-NEXT: }
Modified: llvm/trunk/test/MC/PowerPC/ppc64-fixups.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/PowerPC/ppc64-fixups.s?rev=184548&r1=184547&r2=184548&view=diff
==============================================================================
--- llvm/trunk/test/MC/PowerPC/ppc64-fixups.s (original)
+++ llvm/trunk/test/MC/PowerPC/ppc64-fixups.s Fri Jun 21 09:42:49 2013
@@ -47,6 +47,16 @@
# CHECK-REL: 0x{{[0-9A-F]*[26AE]}} R_PPC64_ADDR16 target 0x0
lis 3, target
+# CHECK: li 3, target at h # encoding: [0x38,0x60,A,A]
+# CHECK-NEXT: # fixup A - offset: 2, value: target at h, kind: fixup_ppc_half16
+# CHECK-REL: 0x{{[0-9A-F]*[26AE]}} R_PPC64_ADDR16_HI target 0x0
+ li 3, target at h
+
+# CHECK: lis 3, target at h # encoding: [0x3c,0x60,A,A]
+# CHECK-NEXT: # fixup A - offset: 2, value: target at h, kind: fixup_ppc_half16
+# CHECK-REL: 0x{{[0-9A-F]*[26AE]}} R_PPC64_ADDR16_HI target 0x0
+ lis 3, target at h
+
# CHECK: lwz 1, target at l(3) # encoding: [0x80,0x23,A,A]
# CHECK-NEXT: # fixup A - offset: 2, value: target at l, kind: fixup_ppc_half16
# CHECK-REL: 0x{{[0-9A-F]*[26AE]}} R_PPC64_ADDR16_LO target 0x0
More information about the llvm-commits
mailing list