RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-26 05:00:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

llvm-mc/x86: Fix bug in disambiguation of displacement operand, introduced by me

Browse Source 
(I think).
 - We weren't properly parsing the leading parenthesized expression in something
   like 'push (4)(%eax)'.
 
 - Added ParseParenRelocatableExpression to support this. I suspect we should
   just use lookahead, though.

 - Test case to follow.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74685 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2009-07-02 02:09:07 +00:00
parent 46b6c5266e
commit 2c3f00cd94
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/llvm-mc/AsmParser.cpp
View File

@ -167,6 +167,19 @@ bool AsmParser::ParseRelocatableExpression(MCValue &Res) {
return false;
}
bool AsmParser::ParseParenRelocatableExpression(MCValue &Res) {
AsmExpr *Expr;
SMLoc StartLoc = Lexer.getLoc();
if (ParseParenExpr(Expr))
return true;
if (!Expr->EvaluateAsRelocatable(Ctx, Res))
return Error(StartLoc, "expected relocatable expression");
return false;
}
static unsigned getBinOpPrecedence(asmtok::TokKind K,
AsmBinaryExpr::Opcode &Kind) {
switch (K) {

10
tools/llvm-mc/AsmParser.h
View File

@ -73,6 +73,16 @@ private:
/// @result - False on success.
bool ParseRelocatableExpression(MCValue &Res);
/// ParseParenRelocatableExpression - Parse an expression which must be
/// relocatable, assuming that an initial '(' has already been consumed.
///
/// @param Res - The relocatable expression value. The result is undefined on
/// error.
/// @result - False on success.
///
/// @see ParseRelocatableExpression, ParseParenExpr.
bool ParseParenRelocatableExpression(MCValue &Res);
bool ParsePrimaryExpr(AsmExpr *&Res);
bool ParseBinOpRHS(unsigned Precedence, AsmExpr *&Res);
bool ParseParenExpr(AsmExpr *&Res);

2
tools/llvm-mc/MC-X86Specific.cpp
View File

@ -152,7 +152,7 @@ bool AsmParser::ParseX86MemOperand(X86Operand &Op) {
// memory operand consumed.
} else {
// It must be an parenthesized expression, parse it now.
if (ParseRelocatableExpression(Disp))
if (ParseParenRelocatableExpression(Disp))
return true;
// After parsing the base expression we could either have a parenthesized