6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-19 06:31:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix AsmParser binary precedence for shift operators.

Browse Source 
rdar://9976729



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138208 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jim Grosbach 2011-08-20 16:24:13 +00:00
parent 2f4bdc5db9
commit fbe1681490
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/MC/MCParser/AsmParser.cpp
View File

@ -740,9 +740,12 @@ AsmParser::ApplyModifierToExpr(const MCExpr *E,
/// ParseExpression - Parse an expression and return it. /// ParseExpression - Parse an expression and return it.
/// ///
/// expr ::= expr +,- expr -> lowest. /// expr ::= expr &&,|| expr -> lowest.
/// expr ::= expr |,^,&,! expr -> middle. /// expr ::= expr |,^,&,! expr
/// expr ::= expr *,/,%,<<,>> expr -> highest. /// expr ::= expr ==,!=,<>,<,<=,>,>= expr
/// expr ::= expr <<,>> expr
/// expr ::= expr +,- expr
/// expr ::= expr *,/,% expr -> highest.
/// expr ::= primaryexpr /// expr ::= primaryexpr
/// ///
bool AsmParser::ParseExpression(const MCExpr *&Res, SMLoc &EndLoc) { bool AsmParser::ParseExpression(const MCExpr *&Res, SMLoc &EndLoc) {
@ -809,7 +812,7 @@ static unsigned getBinOpPrecedence(AsmToken::TokenKind K,
default: default:
return 0; // not a binop. return 0; // not a binop.
// Lowest Precedence: &&, ||, @ // Lowest Precedence: &&, ||
case AsmToken::AmpAmp: case AsmToken::AmpAmp:
Kind = MCBinaryExpr::LAnd; Kind = MCBinaryExpr::LAnd;
return 1; return 1;
@ -852,30 +855,32 @@ static unsigned getBinOpPrecedence(AsmToken::TokenKind K,
Kind = MCBinaryExpr::GTE; Kind = MCBinaryExpr::GTE;
return 3; return 3;
// Intermediate Precedence: <<, >>
case AsmToken::LessLess:
Kind = MCBinaryExpr::Shl;
return 4;
case AsmToken::GreaterGreater:
Kind = MCBinaryExpr::Shr;
return 4;
// High Intermediate Precedence: +, - // High Intermediate Precedence: +, -
case AsmToken::Plus: case AsmToken::Plus:
Kind = MCBinaryExpr::Add; Kind = MCBinaryExpr::Add;
return 4; return 5;
case AsmToken::Minus: case AsmToken::Minus:
Kind = MCBinaryExpr::Sub; Kind = MCBinaryExpr::Sub;
return 4; return 5;
// Highest Precedence: *, /, %, <<, >> // Highest Precedence: *, /, %
case AsmToken::Star: case AsmToken::Star:
Kind = MCBinaryExpr::Mul; Kind = MCBinaryExpr::Mul;
return 5; return 6;
case AsmToken::Slash: case AsmToken::Slash:
Kind = MCBinaryExpr::Div; Kind = MCBinaryExpr::Div;
return 5; return 6;
case AsmToken::Percent: case AsmToken::Percent:
Kind = MCBinaryExpr::Mod; Kind = MCBinaryExpr::Mod;
return 5; return 6;
case AsmToken::LessLess:
Kind = MCBinaryExpr::Shl;
return 5;
case AsmToken::GreaterGreater:
Kind = MCBinaryExpr::Shr;
return 5;
} }
} }

1
test/MC/AsmParser/exprs.s
View File

@ -44,6 +44,7 @@ k:
check_expr 0 || 1, 1 check_expr 0 || 1, 1
check_expr 0 || 0, 0 check_expr 0 || 0, 0
check_expr 1 + 2 < 3 + 4, 1 check_expr 1 + 2 < 3 + 4, 1
check_expr 1 << 8 - 1, 128
.set c, 10 .set c, 10
check_expr c + 1, 11 check_expr c + 1, 11