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

MC/AsmParser: Fix relative precedence of {+,-} and comparison ops.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@117299 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2010-10-25 20:18:56 +00:00
parent bdf90d679b
commit b1e0f76352
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -717,13 +717,7 @@ static unsigned getBinOpPrecedence(AsmToken::TokenKind K,
Kind = MCBinaryExpr::And;
return 2;
// Intermediate Precedence: +, -, ==, !=, <>, <, <=, >, >=
case AsmToken::Plus:
Kind = MCBinaryExpr::Add;
return 3;
case AsmToken::Minus:
Kind = MCBinaryExpr::Sub;
return 3;
// Low Intermediate Precedence: ==, !=, <>, <, <=, >, >=
case AsmToken::EqualEqual:
Kind = MCBinaryExpr::EQ;
return 3;
@ -744,22 +738,30 @@ static unsigned getBinOpPrecedence(AsmToken::TokenKind K,
Kind = MCBinaryExpr::GTE;
return 3;
// High Intermediate Precedence: +, -
case AsmToken::Plus:
Kind = MCBinaryExpr::Add;
return 4;
case AsmToken::Minus:
Kind = MCBinaryExpr::Sub;
return 4;
// Highest Precedence: *, /, %, <<, >>
case AsmToken::Star:
Kind = MCBinaryExpr::Mul;
return 4;
return 5;
case AsmToken::Slash:
Kind = MCBinaryExpr::Div;
return 4;
return 5;
case AsmToken::Percent:
Kind = MCBinaryExpr::Mod;
return 4;
return 5;
case AsmToken::LessLess:
Kind = MCBinaryExpr::Shl;
return 4;
return 5;
case AsmToken::GreaterGreater:
Kind = MCBinaryExpr::Shr;
return 4;
return 5;
}
}

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

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