RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 11:13:28 +01:00
Code Issues Projects Releases Wiki Activity

[mips] Extend ParseJumpTarget to support the full symbol expression syntax.

Browse Source 
Summary:
This should fix the issues the D3222 caused in lld. Testcase is based on
the one that failed in the buildbot.

Depends on D3233

Reviewers: matheusalmeida, vmedic

Reviewed By: matheusalmeida

Differential Revision: http://llvm-reviews.chandlerc.com/D3234

llvm-svn: 205298
This commit is contained in:
Daniel Sanders 2014-04-01 10:41:48 +00:00
parent 516fca4b52
commit a13734ab15
2 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/Target/Mips/AsmParser/MipsAsmParser.cpp
View File

@ -1868,35 +1868,14 @@ MipsAsmParser::OperandMatchResultTy MipsAsmParser::ParseJumpTarget(
if (ResTy != MatchOperand_NoMatch)
return ResTy;
// Consume the $ if there is one. We'll add it to the symbol below.
bool hasConsumedDollar = false;
if (getLexer().is(AsmToken::Dollar)) {
Parser.Lex();
hasConsumedDollar = true;
const MCExpr *Expr = nullptr;
if (Parser.parseExpression(Expr)) {
// We have no way of knowing if a symbol was consumed so we must ParseFail
return MatchOperand_ParseFail;
}
StringRef Identifier;
if (Parser.parseIdentifier(Identifier))
return hasConsumedDollar ? MatchOperand_ParseFail : MatchOperand_NoMatch;
if (hasConsumedDollar)
Identifier = StringRef("$" + Identifier.str());
SMLoc E = SMLoc::getFromPointer(Parser.getTok().getLoc().getPointer() - 1);
MCSymbol *Sym = getContext().GetOrCreateSymbol(Identifier);
// Create a symbol reference.
const MCExpr *Res =
MCSymbolRefExpr::Create(Sym, MCSymbolRefExpr::VK_None, getContext());
Operands.push_back(MipsOperand::CreateImm(Res, S, E, *this));
Operands.push_back(
MipsOperand::CreateImm(Expr, S, getLexer().getLoc(), *this));
return MatchOperand_Success;
// // Look for the existing symbol, we should check if
// // we need to assign the proper RegisterKind.
// if (searchSymbolAlias(Operands))
// return false;
return MatchOperand_NoMatch;
}
MipsAsmParser::OperandMatchResultTy

14
test/MC/Mips/sym-expr.s Normal file
View File

@ -0,0 +1,14 @@
# Check parsing symbol expressions
# RUN: llvm-mc -triple=mipsel -show-inst-operands %s 2> %t0
# RUN: FileCheck %s < %t0
.global __start
.ent __start
__start:
nop
loc:
jal __start + 0x4 # CHECK: instruction: [jal, Imm<__start+4>]
jal __start + (-0x10) # CHECK: instruction: [jal, Imm<__start-16>]
jal (__start + (-0x10)) # CHECK: instruction: [jal, Imm<__start-16>]
.end __start