6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-04-13 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix the .ll grammar rules to allow any type before an 'i32', not just an

Browse Source 
integer type.  Invalid things like 'float 42' are now rejected by the
semantic analysis in the productions not the parser.  This fixes PR2733.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@57560 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2008-10-15 06:16:45 +00:00
parent f9078f99d9
commit c7e3069bfa
2 changed files with 58 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
lib/AsmParser/llvmAsmParser.y
View File

@ -1071,7 +1071,7 @@ Module *llvm::RunVMAsmParser(llvm::MemoryBuffer *MB) {
// Built in types...
%type <TypeVal> Types ResultTypes
%type <PrimType> FPType PrimType // Classifications
%type <PrimType> PrimType // Classifications
%token <PrimType> VOID INTTYPE
%token <PrimType> FLOAT DOUBLE X86_FP80 FP128 PPC_FP128 LABEL
%token TYPE
@ -1165,10 +1165,6 @@ FPredicates
| FALSETOK { $$ = FCmpInst::FCMP_FALSE; }
;
// These are some types that allow classification if we only want a particular
// thing... for example, only a signed, unsigned, or integral type.
FPType : FLOAT | DOUBLE | PPC_FP128 | FP128 | X86_FP80;
LocalName : LOCALVAR | STRINGCONSTANT | PCTSTRINGCONSTANT ;
OptLocalName : LocalName | /*empty*/ { $$ = 0; };
@ -1882,61 +1878,82 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr
delete $1;
CHECK_FOR_ERROR
}
| INTTYPE ESINT64VAL { // integral constants
if (!ConstantInt::isValueValidForType($1, $2))
GEN_ERROR("Constant value doesn't fit in type");
$$ = ConstantInt::get($1, $2, true);
| Types ESINT64VAL { // integral constants
if (IntegerType *IT = dyn_cast<IntegerType>($1->get())) {
if (!ConstantInt::isValueValidForType(IT, $2))
GEN_ERROR("Constant value doesn't fit in type");
$$ = ConstantInt::get(IT, $2, true);
} else {
GEN_ERROR("integer constant must have integer type");
}
delete $1;
CHECK_FOR_ERROR
}
| INTTYPE ESAPINTVAL { // arbitrary precision integer constants
uint32_t BitWidth = cast<IntegerType>($1)->getBitWidth();
if ($2->getBitWidth() > BitWidth) {
GEN_ERROR("Constant value does not fit in type");
| Types ESAPINTVAL { // arbitrary precision integer constants
if (IntegerType *IT = dyn_cast<IntegerType>($1->get())) {
if ($2->getBitWidth() > IT->getBitWidth())
GEN_ERROR("Constant value does not fit in type");
$2->sextOrTrunc(IT->getBitWidth());
$$ = ConstantInt::get(*$2);
} else {
GEN_ERROR("integer constant must have integer type");
}
$2->sextOrTrunc(BitWidth);
$$ = ConstantInt::get(*$2);
delete $1;
delete $2;
CHECK_FOR_ERROR
}
| INTTYPE EUINT64VAL { // integral constants
if (!ConstantInt::isValueValidForType($1, $2))
GEN_ERROR("Constant value doesn't fit in type");
$$ = ConstantInt::get($1, $2, false);
CHECK_FOR_ERROR
}
| INTTYPE EUAPINTVAL { // arbitrary precision integer constants
uint32_t BitWidth = cast<IntegerType>($1)->getBitWidth();
if ($2->getBitWidth() > BitWidth) {
GEN_ERROR("Constant value does not fit in type");
| Types EUINT64VAL { // integral constants
if (IntegerType *IT = dyn_cast<IntegerType>($1->get())) {
if (!ConstantInt::isValueValidForType(IT, $2))
GEN_ERROR("Constant value doesn't fit in type");
$$ = ConstantInt::get(IT, $2, false);
} else {
GEN_ERROR("integer constant must have integer type");
}
$2->zextOrTrunc(BitWidth);
$$ = ConstantInt::get(*$2);
delete $2;
delete $1;
CHECK_FOR_ERROR
}
| INTTYPE TRUETOK { // Boolean constants
if (cast<IntegerType>($1)->getBitWidth() != 1)
| Types EUAPINTVAL { // arbitrary precision integer constants
if (IntegerType *IT = dyn_cast<IntegerType>($1->get())) {
if ($2->getBitWidth() > IT->getBitWidth())
GEN_ERROR("Constant value does not fit in type");
$2->zextOrTrunc(IT->getBitWidth());
$$ = ConstantInt::get(*$2);
} else {
GEN_ERROR("integer constant must have integer type");
}
delete $2;
delete $1;
CHECK_FOR_ERROR
}
| Types TRUETOK { // Boolean constants
if ($1->get() != Type::Int1Ty)
GEN_ERROR("Constant true must have type i1");
$$ = ConstantInt::getTrue();
delete $1;
CHECK_FOR_ERROR
}
| INTTYPE FALSETOK { // Boolean constants
if (cast<IntegerType>($1)->getBitWidth() != 1)
| Types FALSETOK { // Boolean constants
if ($1->get() != Type::Int1Ty)
GEN_ERROR("Constant false must have type i1");
$$ = ConstantInt::getFalse();
delete $1;
CHECK_FOR_ERROR
}
| FPType FPVAL { // Floating point constants
if (!ConstantFP::isValueValidForType($1, *$2))
| Types FPVAL { // Floating point constants
if (!ConstantFP::isValueValidForType($1->get(), *$2))
GEN_ERROR("Floating point constant invalid for type");
// Lexer has no type info, so builds all float and double FP constants
// as double. Fix this here. Long double is done right.
if (&$2->getSemantics()==&APFloat::IEEEdouble && $1==Type::FloatTy) {
if (&$2->getSemantics()==&APFloat::IEEEdouble && $1->get()==Type::FloatTy) {
bool ignored;
$2->convert(APFloat::IEEEsingle, APFloat::rmNearestTiesToEven,
&ignored);
}
$$ = ConstantFP::get(*$2);
delete $1;
delete $2;
CHECK_FOR_ERROR
};

6
test/Assembler/2008-10-14-NamedTypeOnInteger.ll Normal file
View File

@ -0,0 +1,6 @@
; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis
; PR2733
%t1 = type i32
%t2 = type { %t1 }
@i1 = constant %t2 { %t1 15 }