6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-01 00:33:09 +00:00
Code Issues Projects Releases Wiki Activity

Tighten up error checking in parser, disallowing instructions that f.e.,

Browse Source 
add pointers together.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3660 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-09-10 19:57:26 +00:00
parent 544b0dcd14
commit 4a6482ba9c
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/AsmParser/llvmAsmParser.y
View File

@ -686,6 +686,7 @@ Module *RunVMAsmParser(const string &Filename, FILE *F) {
// Binary Operators // Binary Operators
%type <BinaryOpVal> BinaryOps // all the binary operators %type <BinaryOpVal> BinaryOps // all the binary operators
%type <BinaryOpVal> ArithmeticOps LogicalOps SetCondOps // Binops Subcatagories
%token <BinaryOpVal> ADD SUB MUL DIV REM AND OR XOR %token <BinaryOpVal> ADD SUB MUL DIV REM AND OR XOR
%token <BinaryOpVal> SETLE SETGE SETLT SETGT SETEQ SETNE // Binary Comarators %token <BinaryOpVal> SETLE SETGE SETLT SETGT SETEQ SETNE // Binary Comarators
@ -720,8 +721,11 @@ EINT64VAL : EUINT64VAL {
// Operations that are notably excluded from this list include: // Operations that are notably excluded from this list include:
// RET, BR, & SWITCH because they end basic blocks and are treated specially. // RET, BR, & SWITCH because they end basic blocks and are treated specially.
// //
BinaryOps : ADD | SUB | MUL | DIV | REM | AND | OR | XOR; ArithmeticOps: ADD | SUB | MUL | DIV | REM;
BinaryOps : SETLE | SETGE | SETLT | SETGT | SETEQ | SETNE; LogicalOps : AND | OR | XOR;
SetCondOps : SETLE | SETGE | SETLT | SETGT | SETEQ | SETNE;
BinaryOps : ArithmeticOps | LogicalOps | SetCondOps;
ShiftOps : SHL | SHR; ShiftOps : SHL | SHR;
// These are some types that allow classification if we only want a particular // These are some types that allow classification if we only want a particular
@ -1507,7 +1511,23 @@ ValueRefList : ResolvedVal { // Used for call statements, and memory insts...
// ValueRefListE - Just like ValueRefList, except that it may also be empty! // ValueRefListE - Just like ValueRefList, except that it may also be empty!
ValueRefListE : ValueRefList | /*empty*/ { $$ = 0; }; ValueRefListE : ValueRefList | /*empty*/ { $$ = 0; };
InstVal : BinaryOps Types ValueRef ',' ValueRef { InstVal : ArithmeticOps Types ValueRef ',' ValueRef {
if (!(*$2)->isInteger() && !(*$2)->isFloatingPoint())
ThrowException("Arithmetic operator requires integer or FP operands!");
$$ = BinaryOperator::create($1, getVal(*$2, $3), getVal(*$2, $5));
if ($$ == 0)
ThrowException("binary operator returned null!");
delete $2;
}
| LogicalOps Types ValueRef ',' ValueRef {
if (!(*$2)->isIntegral())
ThrowException("Logical operator requires integral operands!");
$$ = BinaryOperator::create($1, getVal(*$2, $3), getVal(*$2, $5));
if ($$ == 0)
ThrowException("binary operator returned null!");
delete $2;
}
| SetCondOps Types ValueRef ',' ValueRef {
$$ = BinaryOperator::create($1, getVal(*$2, $3), getVal(*$2, $5)); $$ = BinaryOperator::create($1, getVal(*$2, $3), getVal(*$2, $5));
if ($$ == 0) if ($$ == 0)
ThrowException("binary operator returned null!"); ThrowException("binary operator returned null!");