<div dir="ltr"><br><div class="gmail_extra"><div class="gmail_quote">On Wed, Aug 28, 2013 at 12:23 AM, Joerg Sonnenberger <span dir="ltr"><<a href="mailto:joerg@bec.de" target="_blank">joerg@bec.de</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: joerg<br>
Date: Tue Aug 27 15:23:19 2013<br>
New Revision: 189400<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=189400&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=189400&view=rev</a><br>
Log:<br>
Given target assembler parsers a chance to handle variant expressions<br>
first. Use this to turn the PPC modifiers into PPC specific expressions,<br>
allowing them to work on constants.<br>
<br>
Modified:<br>
llvm/trunk/include/llvm/MC/MCTargetAsmParser.h<br>
llvm/trunk/lib/MC/MCParser/AsmParser.cpp<br>
llvm/trunk/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp<br>
llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp<br>
llvm/trunk/test/MC/PowerPC/ppc64-errors.s<br>
llvm/trunk/test/MC/PowerPC/ppc64-fixups.s<br>
<br>
Modified: llvm/trunk/include/llvm/MC/MCTargetAsmParser.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCTargetAsmParser.h?rev=189400&r1=189399&r2=189400&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCTargetAsmParser.h?rev=189400&r1=189399&r2=189400&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/MC/MCTargetAsmParser.h (original)<br>
+++ llvm/trunk/include/llvm/MC/MCTargetAsmParser.h Tue Aug 27 15:23:19 2013<br>
@@ -11,6 +11,7 @@<br>
#define LLVM_MC_TARGETPARSER_H<br>
<br>
#include "llvm/MC/MCParser/MCAsmParserExtension.h"<br>
+#include "llvm/MC/MCExpr.h"<br>
<br>
namespace llvm {<br>
class MCStreamer;<br>
@@ -174,6 +175,12 @@ public:<br>
<br>
virtual void convertToMapAndConstraints(unsigned Kind,<br>
const SmallVectorImpl<MCParsedAsmOperand*> &Operands) = 0;<br>
+<br>
+ virtual const MCExpr *applyModifierToExpr(const MCExpr *E,<br>
+ MCSymbolRefExpr::VariantKind,<br>
+ MCContext &Ctx) {<br>
+ return 0;<br>
+ }<br>
};<br>
<br>
} // End llvm namespace<br>
<br>
Modified: llvm/trunk/lib/MC/MCParser/AsmParser.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/AsmParser.cpp?rev=189400&r1=189399&r2=189400&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/AsmParser.cpp?rev=189400&r1=189399&r2=189400&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/MC/MCParser/AsmParser.cpp (original)<br>
+++ llvm/trunk/lib/MC/MCParser/AsmParser.cpp Tue Aug 27 15:23:19 2013<br>
@@ -896,6 +896,10 @@ bool AsmParser::parsePrimaryExpr(const M<br>
const MCExpr *<br>
AsmParser::ApplyModifierToExpr(const MCExpr *E,<br>
MCSymbolRefExpr::VariantKind Variant) {<br>
+ // Ask the target implementation about this expression first.<br>
+ const MCExpr *NewE = getTargetParser().applyModifierToExpr(E, Variant, Ctx);<br>
+ if (NewE)<br>
+ return NewE;<br>
// Recurse over the given expression, rebuilding it to apply the given variant<br>
// if there is exactly one symbol.<br>
switch (E->getKind()) {<br>
<br>
Modified: llvm/trunk/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp?rev=189400&r1=189399&r2=189400&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp?rev=189400&r1=189399&r2=189400&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp (original)<br>
+++ llvm/trunk/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp Tue Aug 27 15:23:19 2013<br>
@@ -235,6 +235,10 @@ public:<br>
virtual bool ParseDirective(AsmToken DirectiveID);<br>
<br>
unsigned validateTargetOperandClass(MCParsedAsmOperand *Op, unsigned Kind);<br>
+<br>
+ virtual const MCExpr *applyModifierToExpr(const MCExpr *E,<br>
+ MCSymbolRefExpr::VariantKind,<br>
+ MCContext &Ctx);<br>
};<br>
<br>
/// PPCOperand - Instances of this class represent a parsed PowerPC machine<br>
@@ -1363,3 +1367,26 @@ unsigned PPCAsmParser::validateTargetOpe<br>
return Match_InvalidOperand;<br>
}<br>
<br>
+const MCExpr *<br>
+PPCAsmParser::applyModifierToExpr(const MCExpr *E,<br>
+ MCSymbolRefExpr::VariantKind Variant,<br>
+ MCContext &Ctx) {<br>
+ switch (Variant) {<br>
+ case MCSymbolRefExpr::VK_PPC_LO:<br>
+ return PPCMCExpr::Create(PPCMCExpr::VK_PPC_LO, E, false, Ctx);<br>
+ case MCSymbolRefExpr::VK_PPC_HI:<br>
+ return PPCMCExpr::Create(PPCMCExpr::VK_PPC_HI, E, false, Ctx);<br>
+ case MCSymbolRefExpr::VK_PPC_HA:<br>
+ return PPCMCExpr::Create(PPCMCExpr::VK_PPC_HA, E, false, Ctx);<br>
+ case MCSymbolRefExpr::VK_PPC_HIGHER:<br>
+ return PPCMCExpr::Create(PPCMCExpr::VK_PPC_HIGHER, E, false, Ctx);<br>
+ case MCSymbolRefExpr::VK_PPC_HIGHERA:<br>
+ return PPCMCExpr::Create(PPCMCExpr::VK_PPC_HIGHERA, E, false, Ctx);<br>
+ case MCSymbolRefExpr::VK_PPC_HIGHEST:<br>
+ return PPCMCExpr::Create(PPCMCExpr::VK_PPC_HIGHEST, E, false, Ctx);<br>
+ case MCSymbolRefExpr::VK_PPC_HIGHESTA:<br>
+ return PPCMCExpr::Create(PPCMCExpr::VK_PPC_HIGHESTA, E, false, Ctx);<br>
+ default:<br>
+ return 0;<br>
+ }<br>
+}<br>
<br>
Modified: llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp?rev=189400&r1=189399&r2=189400&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp?rev=189400&r1=189399&r2=189400&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp (original)<br>
+++ llvm/trunk/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp Tue Aug 27 15:23:19 2013<br>
@@ -54,7 +54,7 @@ PPCMCExpr::EvaluateAsRelocatableImpl(MCV<br>
const MCAsmLayout *Layout) const {<br>
MCValue Value;<br>
<br>
- if (!getSubExpr()->EvaluateAsRelocatable(Value, *Layout))<br>
+ if (Layout && !getSubExpr()->EvaluateAsRelocatable(Value, *Layout))<br>
return false;<br>
<br>
if (Value.isAbsolute()) {<br></blockquote><div><br></div><div>If Layout is NULL, Value will not be initialized at this point. This was detected by our MemorySanitizer bootstrap bot.</div><div>I've submitted a fix for this in r189456</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
@@ -85,7 +85,7 @@ PPCMCExpr::EvaluateAsRelocatableImpl(MCV<br>
break;<br>
}<br>
Res = MCValue::get(Result);<br>
- } else {<br>
+ } else if (Layout) {<br>
MCContext &Context = Layout->getAssembler().getContext();<br>
const MCSymbolRefExpr *Sym = Value.getSymA();<br>
MCSymbolRefExpr::VariantKind Modifier = Sym->getKind();<br>
@@ -118,7 +118,8 @@ PPCMCExpr::EvaluateAsRelocatableImpl(MCV<br>
}<br>
Sym = MCSymbolRefExpr::Create(&Sym->getSymbol(), Modifier, Context);<br>
Res = MCValue::get(Sym, Value.getSymB(), Value.getConstant());<br>
- }<br>
+ } else<br>
+ return false;<br>
<br>
return true;<br>
}<br>
<br>
Modified: llvm/trunk/test/MC/PowerPC/ppc64-errors.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/PowerPC/ppc64-errors.s?rev=189400&r1=189399&r2=189400&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/PowerPC/ppc64-errors.s?rev=189400&r1=189399&r2=189400&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/MC/PowerPC/ppc64-errors.s (original)<br>
+++ llvm/trunk/test/MC/PowerPC/ppc64-errors.s Tue Aug 27 15:23:19 2013<br>
@@ -96,3 +96,6 @@<br>
# CHECK-NEXT: ld 1, 32768(2)<br>
ld 1, 32768(2)<br>
<br>
+# CHECK: error: invalid modifier 'got' (no symbols present)<br>
+ addi 4, 3, 123@got<br>
+# CHECK-NEXT: addi 4, 3, 123@got<br>
<br>
Modified: llvm/trunk/test/MC/PowerPC/ppc64-fixups.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/PowerPC/ppc64-fixups.s?rev=189400&r1=189399&r2=189400&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/PowerPC/ppc64-fixups.s?rev=189400&r1=189399&r2=189400&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/MC/PowerPC/ppc64-fixups.s (original)<br>
+++ llvm/trunk/test/MC/PowerPC/ppc64-fixups.s Tue Aug 27 15:23:19 2013<br>
@@ -442,3 +442,7 @@ base:<br>
# CHECK-REL: 0x{{[0-9A-F]*[08]}} R_PPC64_DTPREL64 target 0x0<br>
.quad target@dtprel<br>
<br>
+# Constant fixup<br>
+ ori 1, 2, 131071@l<br>
+# CHECK: ori 1, 2, 131071@l # encoding: [0x60,0x41,A,A]<br>
+# CHECK-NEXT: # fixup A - offset: 2, value: 131071@l, kind: fixup_ppc_half16<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div>Alexey Samsonov, MSK</div>
</div></div>