X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FAsmParser%2FllvmAsmParser.y.cvs;h=202c384129efb787973f36466dfed474d5640d01;hb=3da59db637a887474c1b1346c1f3ccf53b6c4663;hp=d95ea31bebe01ee3a981f82a2ba16b12d581ef45;hpb=d25db20f1a4e2ae10e22da6a1ca24d7ac6d87b16;p=oota-llvm.git diff --git a/lib/AsmParser/llvmAsmParser.y.cvs b/lib/AsmParser/llvmAsmParser.y.cvs index d95ea31bebe..202c384129e 100644 --- a/lib/AsmParser/llvmAsmParser.y.cvs +++ b/lib/AsmParser/llvmAsmParser.y.cvs @@ -27,6 +27,21 @@ #include #include +// The following is a gross hack. In order to rid the libAsmParser library of +// exceptions, we have to have a way of getting the yyparse function to go into +// an error situation. So, whenever we want an error to occur, the GenerateError +// function (see bottom of file) sets TriggerError. Then, at the end of each +// production in the grammer we use CHECK_FOR_ERROR which will invoke YYERROR +// (a goto) to put YACC in error state. Furthermore, several calls to +// GenerateError are made from inside productions and they must simulate the +// previous exception behavior by exiting the production immediately. We have +// replaced these with the GEN_ERROR macro which calls GeneratError and then +// immediately invokes YYERROR. This would be so much cleaner if it was a +// recursive descent parser. +static bool TriggerError = false; +#define CHECK_FOR_ERROR { if (TriggerError) { TriggerError = false; YYABORT; } } +#define GEN_ERROR(msg) { GenerateError(msg); YYERROR; } + int yyerror(const char *ErrorMsg); // Forward declarations to prevent "implicit int yylex(); // declaration" of xxx warnings. int yyparse(); @@ -68,11 +83,11 @@ static struct PerModuleInfo { Module *CurrentModule; std::map Values; // Module level numbered definitions std::map LateResolveValues; - std::vector Types; - std::map LateResolveTypes; + std::vector Types; + std::map LateResolveTypes; /// PlaceHolderInfo - When temporary placeholder objects are created, remember - /// how they were referenced and one which line of the input they came from so + /// how they were referenced and on which line of the input they came from so /// that we can resolve them later and print error messages as appropriate. std::map > PlaceHolderInfo; @@ -91,6 +106,8 @@ static struct PerModuleInfo { // are resolved when the constant pool has been completely parsed. // ResolveDefinitions(LateResolveValues); + if (TriggerError) + return; // Check to make sure that all global value forward references have been // resolved! @@ -103,7 +120,8 @@ static struct PerModuleInfo { UndefinedReferences += " " + I->first.first->getDescription() + " " + I->first.second.getName() + "\n"; } - ThrowException(UndefinedReferences); + GenerateError(UndefinedReferences); + return; } // Look for intrinsic functions and CallInst that need to be upgraded @@ -135,9 +153,10 @@ static struct PerModuleInfo { static struct PerFunctionInfo { Function *CurrentFunction; // Pointer to current function being created - std::map Values; // Keep track of #'d definitions + std::map Values; // Keep track of #'d definitions std::map LateResolveValues; - bool isDeclare; // Is this function a forward declararation? + bool isDeclare; // Is this function a forward declararation? + GlobalValue::LinkageTypes Linkage; // Linkage for forward declaration. /// BBForwardRefs - When we see forward references to basic blocks, keep /// track of them here. @@ -148,6 +167,7 @@ static struct PerFunctionInfo { inline PerFunctionInfo() { CurrentFunction = 0; isDeclare = false; + Linkage = GlobalValue::ExternalLinkage; } inline void FunctionStart(Function *M) { @@ -159,9 +179,11 @@ static struct PerFunctionInfo { NumberedBlocks.clear(); // Any forward referenced blocks left? - if (!BBForwardRefs.empty()) - ThrowException("Undefined reference to label " + + if (!BBForwardRefs.empty()) { + GenerateError("Undefined reference to label " + BBForwardRefs.begin()->first->getName()); + return; + } // Resolve all forward references now. ResolveDefinitions(LateResolveValues, &CurModule.LateResolveValues); @@ -169,6 +191,7 @@ static struct PerFunctionInfo { Values.clear(); // Clear out function local definitions CurrentFunction = 0; isDeclare = false; + Linkage = GlobalValue::ExternalLinkage; } } CurFun; // Info for the current function... @@ -194,7 +217,7 @@ static const Type *getTypeVal(const ValID &D, bool DoNotImprovise = false) { case ValID::NumberVal: // Is it a numbered definition? // Module constants occupy the lowest numbered slots... if ((unsigned)D.Num < CurModule.Types.size()) - return CurModule.Types[(unsigned)D.Num]; + return CurModule.Types[(unsigned)D.Num].type->get(); break; case ValID::NameVal: // Is it a named definition? if (const Type *N = CurModule.CurrentModule->getTypeByName(D.Name)) { @@ -203,7 +226,8 @@ static const Type *getTypeVal(const ValID &D, bool DoNotImprovise = false) { } break; default: - ThrowException("Internal parser error: Invalid symbol type reference!"); + GenerateError("Internal parser error: Invalid symbol type reference!"); + return 0; } // If we reached here, we referenced either a symbol that we don't know about @@ -214,19 +238,24 @@ static const Type *getTypeVal(const ValID &D, bool DoNotImprovise = false) { if (inFunctionScope()) { - if (D.Type == ValID::NameVal) - ThrowException("Reference to an undefined type: '" + D.getName() + "'"); - else - ThrowException("Reference to an undefined type: #" + itostr(D.Num)); + if (D.Type == ValID::NameVal) { + GenerateError("Reference to an undefined type: '" + D.getName() + "'"); + return 0; + } else { + GenerateError("Reference to an undefined type: #" + itostr(D.Num)); + return 0; + } } - std::map::iterator I =CurModule.LateResolveTypes.find(D); + std::map::iterator I =CurModule.LateResolveTypes.find(D); if (I != CurModule.LateResolveTypes.end()) - return I->second; + return I->second.type->get(); - Type *Typ = OpaqueType::get(); - CurModule.LateResolveTypes.insert(std::make_pair(D, Typ)); - return Typ; + TypeInfo TI; + TI.type = new PATypeHolder(OpaqueType::get()); + TI.signedness = isSignless; + CurModule.LateResolveTypes.insert(std::make_pair(D, TI)); + return TI.type->get(); } static Value *lookupInSymbolTable(const Type *Ty, const std::string &Name) { @@ -241,9 +270,11 @@ static Value *lookupInSymbolTable(const Type *Ty, const std::string &Name) { // it. Otherwise return null. // static Value *getValNonImprovising(const Type *Ty, const ValID &D) { - if (isa(Ty)) - ThrowException("Functions are not values and " + if (isa(Ty)) { + GenerateError("Functions are not values and " "must be referenced as pointers"); + return 0; + } switch (D.Type) { case ValID::NumberVal: { // Is it a numbered definition? @@ -278,32 +309,39 @@ static Value *getValNonImprovising(const Type *Ty, const ValID &D) { // Check to make sure that "Ty" is an integral type, and that our // value will fit into the specified type... case ValID::ConstSIntVal: // Is it a constant pool reference?? - if (!ConstantSInt::isValueValidForType(Ty, D.ConstPool64)) - ThrowException("Signed integral constant '" + + if (!ConstantInt::isValueValidForType(Ty, D.ConstPool64)) { + GenerateError("Signed integral constant '" + itostr(D.ConstPool64) + "' is invalid for type '" + Ty->getDescription() + "'!"); - return ConstantSInt::get(Ty, D.ConstPool64); + return 0; + } + return ConstantInt::get(Ty, D.ConstPool64); case ValID::ConstUIntVal: // Is it an unsigned const pool reference? - if (!ConstantUInt::isValueValidForType(Ty, D.UConstPool64)) { - if (!ConstantSInt::isValueValidForType(Ty, D.ConstPool64)) { - ThrowException("Integral constant '" + utostr(D.UConstPool64) + + if (!ConstantInt::isValueValidForType(Ty, D.UConstPool64)) { + if (!ConstantInt::isValueValidForType(Ty, D.ConstPool64)) { + GenerateError("Integral constant '" + utostr(D.UConstPool64) + "' is invalid or out of range!"); + return 0; } else { // This is really a signed reference. Transmogrify. - return ConstantSInt::get(Ty, D.ConstPool64); + return ConstantInt::get(Ty, D.ConstPool64); } } else { - return ConstantUInt::get(Ty, D.UConstPool64); + return ConstantInt::get(Ty, D.UConstPool64); } case ValID::ConstFPVal: // Is it a floating point const pool reference? - if (!ConstantFP::isValueValidForType(Ty, D.ConstPoolFP)) - ThrowException("FP constant invalid for type!!"); + if (!ConstantFP::isValueValidForType(Ty, D.ConstPoolFP)) { + GenerateError("FP constant invalid for type!!"); + return 0; + } return ConstantFP::get(Ty, D.ConstPoolFP); case ValID::ConstNullVal: // Is it a null value? - if (!isa(Ty)) - ThrowException("Cannot create a a non pointer null!"); + if (!isa(Ty)) { + GenerateError("Cannot create a a non pointer null!"); + return 0; + } return ConstantPointerNull::get(cast(Ty)); case ValID::ConstUndefVal: // Is it an undef value? @@ -313,16 +351,20 @@ static Value *getValNonImprovising(const Type *Ty, const ValID &D) { return Constant::getNullValue(Ty); case ValID::ConstantVal: // Fully resolved constant? - if (D.ConstantValue->getType() != Ty) - ThrowException("Constant expression type different from required type!"); + if (D.ConstantValue->getType() != Ty) { + GenerateError("Constant expression type different from required type!"); + return 0; + } return D.ConstantValue; case ValID::InlineAsmVal: { // Inline asm expression const PointerType *PTy = dyn_cast(Ty); const FunctionType *FTy = PTy ? dyn_cast(PTy->getElementType()) : 0; - if (!FTy || !InlineAsm::Verify(FTy, D.IAD->Constraints)) - ThrowException("Invalid type for asm constraint string!"); + if (!FTy || !InlineAsm::Verify(FTy, D.IAD->Constraints)) { + GenerateError("Invalid type for asm constraint string!"); + return 0; + } InlineAsm *IA = InlineAsm::get(FTy, D.IAD->AsmString, D.IAD->Constraints, D.IAD->HasSideEffects); D.destroy(); // Free InlineAsmDescriptor. @@ -344,15 +386,20 @@ static Value *getValNonImprovising(const Type *Ty, const ValID &D) { // real thing. // static Value *getVal(const Type *Ty, const ValID &ID) { - if (Ty == Type::LabelTy) - ThrowException("Cannot use a basic block here"); + if (Ty == Type::LabelTy) { + GenerateError("Cannot use a basic block here"); + return 0; + } // See if the value has already been defined. Value *V = getValNonImprovising(Ty, ID); if (V) return V; + if (TriggerError) return 0; - if (!Ty->isFirstClassType() && !isa(Ty)) - ThrowException("Invalid use of a composite type!"); + if (!Ty->isFirstClassType() && !isa(Ty)) { + GenerateError("Invalid use of a composite type!"); + return 0; + } // If we reached here, we referenced either a symbol that we don't know about // or an id number that hasn't been read yet. We may be referencing something @@ -384,7 +431,9 @@ static BasicBlock *getBBVal(const ValID &ID, bool isDefinition = false) { std::string Name; BasicBlock *BB = 0; switch (ID.Type) { - default: ThrowException("Illegal label reference " + ID.getName()); + default: + GenerateError("Illegal label reference " + ID.getName()); + return 0; case ValID::NumberVal: // Is it a numbered definition? if (unsigned(ID.Num) >= CurFun.NumberedBlocks.size()) CurFun.NumberedBlocks.resize(ID.Num+1); @@ -403,9 +452,11 @@ static BasicBlock *getBBVal(const ValID &ID, bool isDefinition = false) { // If this is the definition of the block, make sure the existing value was // just a forward reference. If it was a forward reference, there will be // an entry for it in the PlaceHolderInfo map. - if (isDefinition && !CurFun.BBForwardRefs.erase(BB)) + if (isDefinition && !CurFun.BBForwardRefs.erase(BB)) { // The existing value was a definition, not a forward reference. - ThrowException("Redefinition of label " + ID.getName()); + GenerateError("Redefinition of label " + ID.getName()); + return 0; + } ID.destroy(); // Free strdup'd memory. return BB; @@ -469,6 +520,8 @@ ResolveDefinitions(std::map &LateResolvers, ValID &DID = PHI->second.first; Value *TheRealValue = getValNonImprovising(LRI->first, DID); + if (TriggerError) + return; if (TheRealValue) { V->replaceAllUsesWith(TheRealValue); delete V; @@ -478,15 +531,18 @@ ResolveDefinitions(std::map &LateResolvers, // resolver table InsertValue(V, *FutureLateResolvers); } else { - if (DID.Type == ValID::NameVal) - ThrowException("Reference to an invalid definition: '" +DID.getName()+ + if (DID.Type == ValID::NameVal) { + GenerateError("Reference to an invalid definition: '" +DID.getName()+ "' of type '" + V->getType()->getDescription() + "'", PHI->second.second); - else - ThrowException("Reference to an invalid definition: #" + + return; + } else { + GenerateError("Reference to an invalid definition: #" + itostr(DID.Num) + " of type '" + V->getType()->getDescription() + "'", PHI->second.second); + return; + } } } } @@ -503,10 +559,10 @@ static void ResolveTypeTo(char *Name, const Type *ToTy) { if (Name) D = ValID::create(Name); else D = ValID::create((int)CurModule.Types.size()); - std::map::iterator I = + std::map::iterator I = CurModule.LateResolveTypes.find(D); if (I != CurModule.LateResolveTypes.end()) { - ((DerivedType*)I->second.get())->refineAbstractTypeTo(ToTy); + ((DerivedType*)I->second.type->get())->refineAbstractTypeTo(ToTy); CurModule.LateResolveTypes.erase(I); } } @@ -520,14 +576,18 @@ static void setValueName(Value *V, char *NameStr) { std::string Name(NameStr); // Copy string free(NameStr); // Free old string - if (V->getType() == Type::VoidTy) - ThrowException("Can't assign name '" + Name+"' to value with void type!"); + if (V->getType() == Type::VoidTy) { + GenerateError("Can't assign name '" + Name+"' to value with void type!"); + return; + } assert(inFunctionScope() && "Must be in function scope!"); SymbolTable &ST = CurFun.CurrentFunction->getSymbolTable(); - if (ST.lookup(V->getType(), Name)) - ThrowException("Redefinition of value named '" + Name + "' in the '" + + if (ST.lookup(V->getType(), Name)) { + GenerateError("Redefinition of value named '" + Name + "' in the '" + V->getType()->getDescription() + "' type plane!"); + return; + } // Set the name. V->setName(Name); @@ -540,8 +600,10 @@ static GlobalVariable * ParseGlobalVariable(char *NameStr,GlobalValue::LinkageTypes Linkage, bool isConstantGlobal, const Type *Ty, Constant *Initializer) { - if (isa(Ty)) - ThrowException("Cannot declare global vars of function type!"); + if (isa(Ty)) { + GenerateError("Cannot declare global vars of function type!"); + return 0; + } const PointerType *PTy = PointerType::get(Ty); @@ -598,8 +660,9 @@ ParseGlobalVariable(char *NameStr,GlobalValue::LinkageTypes Linkage, return EGV; } - ThrowException("Redefinition of global variable named '" + Name + + GenerateError("Redefinition of global variable named '" + Name + "' in the '" + Ty->getDescription() + "' type plane!"); + return 0; } } @@ -626,8 +689,10 @@ static bool setTypeName(const Type *T, char *NameStr) { free(NameStr); // Free old string // We don't allow assigning names to void type - if (T == Type::VoidTy) - ThrowException("Can't assign name '" + Name + "' to the void type!"); + if (T == Type::VoidTy) { + GenerateError("Can't assign name '" + Name + "' to the void type!"); + return false; + } // Set the type name, checking for conflicts as we do so. bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name, T); @@ -651,7 +716,7 @@ static bool setTypeName(const Type *T, char *NameStr) { if (Existing == T) return true; // Yes, it's equal. // Any other kind of (non-equivalent) redefinition is an error. - ThrowException("Redefinition of type named '" + Name + "' in the '" + + GenerateError("Redefinition of type named '" + Name + "' in the '" + T->getDescription() + "' type plane!"); } @@ -699,7 +764,10 @@ static std::vector UpRefs; /// thus we can complete the cycle. /// static PATypeHolder HandleUpRefs(const Type *ty) { - if (!ty->isAbstract()) return ty; + // If Ty isn't abstract, or if there are no up-references in it, then there is + // nothing to resolve here. + if (!ty->isAbstract() || UpRefs.empty()) return ty; + PATypeHolder Ty(ty); UR_OUT("Type '" << Ty->getDescription() << "' newly formed. Resolving upreferences.\n" << @@ -747,17 +815,91 @@ static PATypeHolder HandleUpRefs(const Type *ty) { return Ty; } +/// This function is used to obtain the correct opcode for an instruction when +/// an obsolete opcode is encountered. The OI parameter (OpcodeInfo) has both +/// an opcode and an "obsolete" flag. These are generated by the lexer and +/// the "obsolete" member will be true when the lexer encounters the token for +/// an obsolete opcode. For example, "div" was replaced by [usf]div but we need +/// to maintain backwards compatibility for asm files that still have the "div" +/// instruction. This function handles converting div -> [usf]div appropriately. +/// @brief Convert obsolete BinaryOps opcodes to new values +static void +sanitizeOpcode(OpcodeInfo &OI, const Type *Ty) +{ + // If its not obsolete, don't do anything + if (!OI.obsolete) + return; + + // If its a packed type we want to use the element type + if (const PackedType *PTy = dyn_cast(Ty)) + Ty = PTy->getElementType(); + + // Depending on the opcode .. + switch (OI.opcode) { + default: + GenerateError("Invalid obsolete opCode (check Lexer.l)"); + break; + case Instruction::UDiv: + // Handle cases where the opcode needs to change + if (Ty->isFloatingPoint()) + OI.opcode = Instruction::FDiv; + else if (Ty->isSigned()) + OI.opcode = Instruction::SDiv; + break; + case Instruction::URem: + if (Ty->isFloatingPoint()) + OI.opcode = Instruction::FRem; + else if (Ty->isSigned()) + OI.opcode = Instruction::SRem; + break; + } + // Its not obsolete any more, we fixed it. + OI.obsolete = false; +} + +/// This function is similar to the previous overload of sanitizeOpcode but +/// operates on Instruction::OtherOps instead of Instruction::BinaryOps. +/// @brief Convert obsolete OtherOps opcodes to new values +static void +sanitizeOpcode(OpcodeInfo &OI, const Type *Ty) +{ + // If its not obsolete, don't do anything + if (!OI.obsolete) + return; + + switch (OI.opcode) { + default: + GenerateError("Invalid obsolete opcode (check Lexer.l)"); + break; + case Instruction::LShr: + if (Ty->isSigned()) + OI.opcode = Instruction::AShr; + break; + } + // Its not obsolete any more, we fixed it. + OI.obsolete = false; +} // common code from the two 'RunVMAsmParser' functions - static Module * RunParser(Module * M) { +static Module* RunParser(Module * M) { llvmAsmlineno = 1; // Reset the current line number... ObsoleteVarArgs = false; NewVarArgs = false; - CurModule.CurrentModule = M; - yyparse(); // Parse the file, potentially throwing exception + // Check to make sure the parser succeeded + if (yyparse()) { + if (ParserResult) + delete ParserResult; + return 0; + } + + // Check to make sure that parsing produced a result + if (!ParserResult) + return 0; + + // Reset ParserResult variable while saving its value for the result. Module *Result = ParserResult; ParserResult = 0; @@ -772,13 +914,18 @@ static PATypeHolder HandleUpRefs(const Type *ty) { ObsoleteVarArgs = true; } - if (ObsoleteVarArgs && NewVarArgs) - ThrowException("This file is corrupt: it uses both new and old style varargs"); + if (ObsoleteVarArgs && NewVarArgs) { + GenerateError( + "This file is corrupt: it uses both new and old style varargs"); + return 0; + } if(ObsoleteVarArgs) { if(Function* F = Result->getNamedFunction("llvm.va_start")) { - if (F->arg_size() != 0) - ThrowException("Obsolete va_start takes 0 argument!"); + if (F->arg_size() != 0) { + GenerateError("Obsolete va_start takes 0 argument!"); + return 0; + } //foo = va_start() // -> @@ -804,8 +951,10 @@ static PATypeHolder HandleUpRefs(const Type *ty) { } if(Function* F = Result->getNamedFunction("llvm.va_end")) { - if(F->arg_size() != 1) - ThrowException("Obsolete va_end takes 1 argument!"); + if(F->arg_size() != 1) { + GenerateError("Obsolete va_end takes 1 argument!"); + return 0; + } //vaend foo // -> @@ -828,8 +977,10 @@ static PATypeHolder HandleUpRefs(const Type *ty) { } if(Function* F = Result->getNamedFunction("llvm.va_copy")) { - if(F->arg_size() != 1) - ThrowException("Obsolete va_copy takes 1 argument!"); + if(F->arg_size() != 1) { + GenerateError("Obsolete va_copy takes 1 argument!"); + return 0; + } //foo = vacopy(bar) // -> //a = alloca 1 of typeof(foo) @@ -860,8 +1011,7 @@ static PATypeHolder HandleUpRefs(const Type *ty) { } return Result; - - } +} //===----------------------------------------------------------------------===// // RunVMAsmParser - Define an interface to this parser @@ -890,19 +1040,18 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { %union { llvm::Module *ModuleVal; llvm::Function *FunctionVal; - std::pair *ArgVal; + std::pair *ArgVal; llvm::BasicBlock *BasicBlockVal; llvm::TerminatorInst *TermInstVal; llvm::Instruction *InstVal; llvm::Constant *ConstVal; - const llvm::Type *PrimType; - llvm::PATypeHolder *TypeVal; + TypeInfo TypeVal; llvm::Value *ValueVal; - std::vector > *ArgList; + std::vector >*ArgList; std::vector *ValueList; - std::list *TypeList; + std::list *TypeList; // Represent the RHS of PHI node std::list > *PHIList; @@ -918,13 +1067,14 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { bool BoolVal; char *StrVal; // This memory is strdup'd! - llvm::ValID ValIDVal; // strdup'd memory maybe! - - llvm::Instruction::BinaryOps BinaryOpVal; - llvm::Instruction::TermOps TermOpVal; - llvm::Instruction::MemoryOps MemOpVal; - llvm::Instruction::OtherOps OtherOpVal; - llvm::Module::Endianness Endianness; + llvm::ValID ValIDVal; // strdup'd memory maybe! + + BinaryOpInfo BinaryOpVal; + TermOpInfo TermOpVal; + MemOpInfo MemOpVal; + CastOpInfo CastOpVal; + OtherOpInfo OtherOpVal; + llvm::Module::Endianness Endianness; } %type Module FunctionList @@ -967,9 +1117,9 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { // Built in types... %type Types TypesV UpRTypes UpRTypesV -%type SIntType UIntType IntType FPType PrimType // Classifications -%token VOID BOOL SBYTE UBYTE SHORT USHORT INT UINT LONG ULONG -%token FLOAT DOUBLE TYPE LABEL +%type SIntType UIntType IntType FPType PrimType // Classifications +%token VOID BOOL SBYTE UBYTE SHORT USHORT INT UINT LONG ULONG +%token FLOAT DOUBLE TYPE LABEL %token VAR_ID LABELSTR STRINGCONSTANT %type Name OptName OptAssign @@ -978,10 +1128,13 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { %token IMPLEMENTATION ZEROINITIALIZER TRUETOK FALSETOK BEGINTOK ENDTOK %token DECLARE GLOBAL CONSTANT SECTION VOLATILE -%token TO DOTDOTDOT NULL_TOK UNDEF CONST INTERNAL LINKONCE WEAK APPENDING +%token TO DOTDOTDOT NULL_TOK UNDEF CONST INTERNAL LINKONCE WEAK APPENDING +%token DLLIMPORT DLLEXPORT EXTERN_WEAK %token OPAQUE NOT EXTERNAL TARGET TRIPLE ENDIAN POINTERSIZE LITTLE BIG ALIGN %token DEPLIBS CALL TAIL ASM_TOK MODULE SIDEEFFECT -%token CC_TOK CCC_TOK FASTCC_TOK COLDCC_TOK +%token CC_TOK CCC_TOK CSRETCC_TOK FASTCC_TOK COLDCC_TOK +%token X86_STDCALLCC_TOK X86_FASTCALLCC_TOK +%token DATALAYOUT %type OptCallingConv // Basic Block Terminating Operators @@ -989,15 +1142,20 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { // Binary Operators %type ArithmeticOps LogicalOps SetCondOps // Binops Subcatagories -%token ADD SUB MUL DIV REM AND OR XOR -%token SETLE SETGE SETLT SETGT SETEQ SETNE // Binary Comarators +%token ADD SUB MUL UDIV SDIV FDIV UREM SREM FREM AND OR XOR +%token SETLE SETGE SETLT SETGT SETEQ SETNE // Binary Comparators // Memory Instructions %token MALLOC ALLOCA FREE LOAD STORE GETELEMENTPTR +// Cast Operators +%type CastOps +%token TRUNC ZEXT SEXT FPTRUNC FPEXT BITCAST +%token UITOFP SITOFP FPTOUI FPTOSI INTTOPTR PTRTOINT + // Other Operators %type ShiftOps -%token PHI_TOK CAST SELECT SHL SHR VAARG +%token PHI_TOK SELECT SHL LSHR ASHR VAARG %token EXTRACTELEMENT INSERTELEMENT SHUFFLEVECTOR %token VAARG_old VANEXT_old //OBSOLETE @@ -1010,26 +1168,29 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { INTVAL : SINTVAL; INTVAL : UINTVAL { if ($1 > (uint32_t)INT32_MAX) // Outside of my range! - ThrowException("Value too large for type!"); + GEN_ERROR("Value too large for type!"); $$ = (int32_t)$1; + CHECK_FOR_ERROR }; EINT64VAL : ESINT64VAL; // These have same type and can't cause problems... EINT64VAL : EUINT64VAL { if ($1 > (uint64_t)INT64_MAX) // Outside of my range! - ThrowException("Value too large for type!"); + GEN_ERROR("Value too large for type!"); $$ = (int64_t)$1; + CHECK_FOR_ERROR }; // Operations that are notably excluded from this list include: // RET, BR, & SWITCH because they end basic blocks and are treated specially. // -ArithmeticOps: ADD | SUB | MUL | DIV | REM; +ArithmeticOps: ADD | SUB | MUL | UDIV | SDIV | FDIV | UREM | SREM | FREM; LogicalOps : AND | OR | XOR; SetCondOps : SETLE | SETGE | SETLT | SETGT | SETEQ | SETNE; - -ShiftOps : SHL | SHR; +CastOps : TRUNC | ZEXT | SEXT | FPTRUNC | FPEXT | BITCAST | + UITOFP | SITOFP | FPTOUI | FPTOSI | INTTOPTR | PTRTOINT; +ShiftOps : SHL | LSHR | ASHR; // These are some types that allow classification if we only want a particular // thing... for example, only a signed, unsigned, or integral type. @@ -1041,25 +1202,34 @@ FPType : FLOAT | DOUBLE; // OptAssign - Value producing statements have an optional assignment component OptAssign : Name '=' { $$ = $1; + CHECK_FOR_ERROR } | /*empty*/ { $$ = 0; + CHECK_FOR_ERROR }; -OptLinkage : INTERNAL { $$ = GlobalValue::InternalLinkage; } | - LINKONCE { $$ = GlobalValue::LinkOnceLinkage; } | - WEAK { $$ = GlobalValue::WeakLinkage; } | - APPENDING { $$ = GlobalValue::AppendingLinkage; } | - /*empty*/ { $$ = GlobalValue::ExternalLinkage; }; - -OptCallingConv : /*empty*/ { $$ = CallingConv::C; } | - CCC_TOK { $$ = CallingConv::C; } | - FASTCC_TOK { $$ = CallingConv::Fast; } | - COLDCC_TOK { $$ = CallingConv::Cold; } | - CC_TOK EUINT64VAL { +OptLinkage : INTERNAL { $$ = GlobalValue::InternalLinkage; } | + LINKONCE { $$ = GlobalValue::LinkOnceLinkage; } | + WEAK { $$ = GlobalValue::WeakLinkage; } | + APPENDING { $$ = GlobalValue::AppendingLinkage; } | + DLLIMPORT { $$ = GlobalValue::DLLImportLinkage; } | + DLLEXPORT { $$ = GlobalValue::DLLExportLinkage; } | + EXTERN_WEAK { $$ = GlobalValue::ExternalWeakLinkage; } | + /*empty*/ { $$ = GlobalValue::ExternalLinkage; }; + +OptCallingConv : /*empty*/ { $$ = CallingConv::C; } | + CCC_TOK { $$ = CallingConv::C; } | + CSRETCC_TOK { $$ = CallingConv::CSRet; } | + FASTCC_TOK { $$ = CallingConv::Fast; } | + COLDCC_TOK { $$ = CallingConv::Cold; } | + X86_STDCALLCC_TOK { $$ = CallingConv::X86_StdCall; } | + X86_FASTCALLCC_TOK { $$ = CallingConv::X86_FastCall; } | + CC_TOK EUINT64VAL { if ((unsigned)$2 != $2) - ThrowException("Calling conv too large!"); + GEN_ERROR("Calling conv too large!"); $$ = $2; + CHECK_FOR_ERROR }; // OptAlign/OptCAlign - An optional alignment, and an optional alignment with @@ -1068,21 +1238,24 @@ OptAlign : /*empty*/ { $$ = 0; } | ALIGN EUINT64VAL { $$ = $2; if ($$ != 0 && !isPowerOf2_32($$)) - ThrowException("Alignment must be a power of two!"); + GEN_ERROR("Alignment must be a power of two!"); + CHECK_FOR_ERROR }; OptCAlign : /*empty*/ { $$ = 0; } | ',' ALIGN EUINT64VAL { $$ = $3; if ($$ != 0 && !isPowerOf2_32($$)) - ThrowException("Alignment must be a power of two!"); + GEN_ERROR("Alignment must be a power of two!"); + CHECK_FOR_ERROR }; SectionString : SECTION STRINGCONSTANT { for (unsigned i = 0, e = strlen($2); i != e; ++i) if ($2[i] == '"' || $2[i] == '\\') - ThrowException("Invalid character in section name!"); + GEN_ERROR("Invalid character in section name!"); $$ = $2; + CHECK_FOR_ERROR }; OptSection : /*empty*/ { $$ = 0; } | @@ -1096,11 +1269,13 @@ GlobalVarAttributes : /* empty */ {} | GlobalVarAttribute : SectionString { CurGV->setSection($1); free($1); + CHECK_FOR_ERROR } | ALIGN EUINT64VAL { if ($2 != 0 && !isPowerOf2_32($2)) - ThrowException("Alignment must be a power of two!"); + GEN_ERROR("Alignment must be a power of two!"); CurGV->setAlignment($2); + CHECK_FOR_ERROR }; //===----------------------------------------------------------------------===// @@ -1110,14 +1285,22 @@ GlobalVarAttribute : SectionString { // // TypesV includes all of 'Types', but it also includes the void type. -TypesV : Types | VOID { $$ = new PATypeHolder($1); }; -UpRTypesV : UpRTypes | VOID { $$ = new PATypeHolder($1); }; +TypesV : Types | VOID { + $$.type = new PATypeHolder($1.type->get()); + $$.signedness = $1.signedness; +}; +UpRTypesV : UpRTypes | VOID { + $$.type = new PATypeHolder($1.type->get()); + $$.signedness = $1.signedness; +}; Types : UpRTypes { if (!UpRefs.empty()) - ThrowException("Invalid upreference in type: " + (*$1)->getDescription()); + GEN_ERROR("Invalid upreference in type: " + + ($1.type->get())->getDescription()); $$ = $1; - }; + CHECK_FOR_ERROR +}; // Derived types are added later... @@ -1125,89 +1308,123 @@ Types : UpRTypes { PrimType : BOOL | SBYTE | UBYTE | SHORT | USHORT | INT | UINT ; PrimType : LONG | ULONG | FLOAT | DOUBLE | TYPE | LABEL; UpRTypes : OPAQUE { - $$ = new PATypeHolder(OpaqueType::get()); + $$.type = new PATypeHolder(OpaqueType::get()); + $$.signedness = isSignless; + CHECK_FOR_ERROR } | PrimType { - $$ = new PATypeHolder($1); + $$ = $1; + CHECK_FOR_ERROR }; UpRTypes : SymbolicValueRef { // Named types are also simple types... - $$ = new PATypeHolder(getTypeVal($1)); + const Type* tmp = getTypeVal($1); + CHECK_FOR_ERROR + $$.type = new PATypeHolder(tmp); + $$.signedness = isSignless; }; // Include derived types in the Types production. // UpRTypes : '\\' EUINT64VAL { // Type UpReference - if ($2 > (uint64_t)~0U) ThrowException("Value out of range!"); + if ($2 > (uint64_t)~0U) GEN_ERROR("Value out of range!"); OpaqueType *OT = OpaqueType::get(); // Use temporary placeholder UpRefs.push_back(UpRefRecord((unsigned)$2, OT)); // Add to vector... - $$ = new PATypeHolder(OT); + $$.type = new PATypeHolder(OT); + $$.signedness = isSignless; UR_OUT("New Upreference!\n"); + CHECK_FOR_ERROR } | UpRTypesV '(' ArgTypeListI ')' { // Function derived type? std::vector Params; - for (std::list::iterator I = $3->begin(), + for (std::list::iterator I = $3->begin(), E = $3->end(); I != E; ++I) - Params.push_back(*I); + Params.push_back(I->type->get()); bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - $$ = new PATypeHolder(HandleUpRefs(FunctionType::get(*$1,Params,isVarArg))); + $$.type = new PATypeHolder(HandleUpRefs( + FunctionType::get($1.type->get(),Params,isVarArg))); + $$.signedness = isSignless; delete $3; // Delete the argument list - delete $1; // Delete the return type handle + delete $1.type; + CHECK_FOR_ERROR } | '[' EUINT64VAL 'x' UpRTypes ']' { // Sized array type? - $$ = new PATypeHolder(HandleUpRefs(ArrayType::get(*$4, (unsigned)$2))); - delete $4; + $$.type = new PATypeHolder(HandleUpRefs( + ArrayType::get($4.type->get(), (unsigned)$2))); + $$.signedness = isSignless; + delete $4.type; + CHECK_FOR_ERROR } | '<' EUINT64VAL 'x' UpRTypes '>' { // Packed array type? - const llvm::Type* ElemTy = $4->get(); - if ((unsigned)$2 != $2) - ThrowException("Unsigned result not equal to signed result"); - if (!ElemTy->isPrimitiveType()) - ThrowException("Elemental type of a PackedType must be primitive"); - if (!isPowerOf2_32($2)) - ThrowException("Vector length should be a power of 2!"); - $$ = new PATypeHolder(HandleUpRefs(PackedType::get(*$4, (unsigned)$2))); - delete $4; + const llvm::Type* ElemTy = $4.type->get(); + if ((unsigned)$2 != $2) + GEN_ERROR("Unsigned result not equal to signed result"); + if (!ElemTy->isPrimitiveType()) + GEN_ERROR("Elemental type of a PackedType must be primitive"); + if (!isPowerOf2_32($2)) + GEN_ERROR("Vector length should be a power of 2!"); + $$.type = new PATypeHolder(HandleUpRefs( + PackedType::get($4.type->get(), (unsigned)$2))); + $$.signedness = isSignless; + delete $4.type; + CHECK_FOR_ERROR } | '{' TypeListI '}' { // Structure type? std::vector Elements; - for (std::list::iterator I = $2->begin(), + for (std::list::iterator I = $2->begin(), E = $2->end(); I != E; ++I) - Elements.push_back(*I); + Elements.push_back(I->type->get()); - $$ = new PATypeHolder(HandleUpRefs(StructType::get(Elements))); + $$.type = new PATypeHolder(HandleUpRefs(StructType::get(Elements))); + $$.signedness = isSignless; delete $2; + CHECK_FOR_ERROR } | '{' '}' { // Empty structure type? - $$ = new PATypeHolder(StructType::get(std::vector())); + $$.type = new PATypeHolder(StructType::get(std::vector())); + $$.signedness = isSignless; + CHECK_FOR_ERROR } | UpRTypes '*' { // Pointer type? - $$ = new PATypeHolder(HandleUpRefs(PointerType::get(*$1))); - delete $1; + if ($1.type->get() == Type::LabelTy) + GEN_ERROR("Cannot form a pointer to a basic block"); + $$.type = new PATypeHolder(HandleUpRefs(PointerType::get($1.type->get()))); + $$.signedness = $1.signedness; + delete $1.type; + CHECK_FOR_ERROR }; // TypeList - Used for struct declarations and as a basis for function type // declaration type lists // TypeListI : UpRTypes { - $$ = new std::list(); - $$->push_back(*$1); delete $1; + $$ = new std::list(); + $$->push_back($1); + CHECK_FOR_ERROR } | TypeListI ',' UpRTypes { - ($$=$1)->push_back(*$3); delete $3; + ($$=$1)->push_back($3); + CHECK_FOR_ERROR }; // ArgTypeList - List of types for a function type declaration... ArgTypeListI : TypeListI | TypeListI ',' DOTDOTDOT { - ($$=$1)->push_back(Type::VoidTy); + TypeInfo TI; + TI.type = new PATypeHolder(Type::VoidTy); TI.signedness = isSignless; + ($$=$1)->push_back(TI); + CHECK_FOR_ERROR } | DOTDOTDOT { - ($$ = new std::list())->push_back(Type::VoidTy); + TypeInfo TI; + TI.type = new PATypeHolder(Type::VoidTy); TI.signedness = isSignless; + ($$ = new std::list())->push_back(TI); + CHECK_FOR_ERROR } | /*empty*/ { - $$ = new std::list(); + $$ = new std::list(); + CHECK_FOR_ERROR }; // ConstVal - The various declarations that go into the constant pool. This @@ -1217,146 +1434,154 @@ ArgTypeListI : TypeListI // ResolvedVal, ValueRef and ConstValueRef productions. // ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr - const ArrayType *ATy = dyn_cast($1->get()); + const ArrayType *ATy = dyn_cast($1.type->get()); if (ATy == 0) - ThrowException("Cannot make array constant with type: '" + - (*$1)->getDescription() + "'!"); + GEN_ERROR("Cannot make array constant with type: '" + + ($1.type->get())->getDescription() + "'!"); const Type *ETy = ATy->getElementType(); int NumElements = ATy->getNumElements(); // Verify that we have the correct size... if (NumElements != -1 && NumElements != (int)$3->size()) - ThrowException("Type mismatch: constant sized array initialized with " + + GEN_ERROR("Type mismatch: constant sized array initialized with " + utostr($3->size()) + " arguments, but has size of " + itostr(NumElements) + "!"); // Verify all elements are correct type! for (unsigned i = 0; i < $3->size(); i++) { if (ETy != (*$3)[i]->getType()) - ThrowException("Element #" + utostr(i) + " is not of type '" + + GEN_ERROR("Element #" + utostr(i) + " is not of type '" + ETy->getDescription() +"' as required!\nIt is of type '"+ (*$3)[i]->getType()->getDescription() + "'."); } $$ = ConstantArray::get(ATy, *$3); - delete $1; delete $3; + delete $1.type; delete $3; + CHECK_FOR_ERROR } | Types '[' ']' { - const ArrayType *ATy = dyn_cast($1->get()); + const ArrayType *ATy = dyn_cast($1.type->get()); if (ATy == 0) - ThrowException("Cannot make array constant with type: '" + - (*$1)->getDescription() + "'!"); + GEN_ERROR("Cannot make array constant with type: '" + + ($1.type->get())->getDescription() + "'!"); int NumElements = ATy->getNumElements(); if (NumElements != -1 && NumElements != 0) - ThrowException("Type mismatch: constant sized array initialized with 0" + GEN_ERROR("Type mismatch: constant sized array initialized with 0" " arguments, but has size of " + itostr(NumElements) +"!"); $$ = ConstantArray::get(ATy, std::vector()); - delete $1; + delete $1.type; + CHECK_FOR_ERROR } | Types 'c' STRINGCONSTANT { - const ArrayType *ATy = dyn_cast($1->get()); + const ArrayType *ATy = dyn_cast($1.type->get()); if (ATy == 0) - ThrowException("Cannot make array constant with type: '" + - (*$1)->getDescription() + "'!"); + GEN_ERROR("Cannot make array constant with type: '" + + ($1.type->get())->getDescription() + "'!"); int NumElements = ATy->getNumElements(); const Type *ETy = ATy->getElementType(); char *EndStr = UnEscapeLexed($3, true); if (NumElements != -1 && NumElements != (EndStr-$3)) - ThrowException("Can't build string constant of size " + + GEN_ERROR("Can't build string constant of size " + itostr((int)(EndStr-$3)) + " when array has size " + itostr(NumElements) + "!"); std::vector Vals; if (ETy == Type::SByteTy) { for (signed char *C = (signed char *)$3; C != (signed char *)EndStr; ++C) - Vals.push_back(ConstantSInt::get(ETy, *C)); + Vals.push_back(ConstantInt::get(ETy, *C)); } else if (ETy == Type::UByteTy) { for (unsigned char *C = (unsigned char *)$3; C != (unsigned char*)EndStr; ++C) - Vals.push_back(ConstantUInt::get(ETy, *C)); + Vals.push_back(ConstantInt::get(ETy, *C)); } else { free($3); - ThrowException("Cannot build string arrays of non byte sized elements!"); + GEN_ERROR("Cannot build string arrays of non byte sized elements!"); } free($3); $$ = ConstantArray::get(ATy, Vals); - delete $1; + delete $1.type; + CHECK_FOR_ERROR } | Types '<' ConstVector '>' { // Nonempty unsized arr - const PackedType *PTy = dyn_cast($1->get()); + const PackedType *PTy = dyn_cast($1.type->get()); if (PTy == 0) - ThrowException("Cannot make packed constant with type: '" + - (*$1)->getDescription() + "'!"); + GEN_ERROR("Cannot make packed constant with type: '" + + $1.type->get()->getDescription() + "'!"); const Type *ETy = PTy->getElementType(); int NumElements = PTy->getNumElements(); // Verify that we have the correct size... if (NumElements != -1 && NumElements != (int)$3->size()) - ThrowException("Type mismatch: constant sized packed initialized with " + + GEN_ERROR("Type mismatch: constant sized packed initialized with " + utostr($3->size()) + " arguments, but has size of " + itostr(NumElements) + "!"); // Verify all elements are correct type! for (unsigned i = 0; i < $3->size(); i++) { if (ETy != (*$3)[i]->getType()) - ThrowException("Element #" + utostr(i) + " is not of type '" + + GEN_ERROR("Element #" + utostr(i) + " is not of type '" + ETy->getDescription() +"' as required!\nIt is of type '"+ (*$3)[i]->getType()->getDescription() + "'."); } $$ = ConstantPacked::get(PTy, *$3); - delete $1; delete $3; + delete $1.type; delete $3; + CHECK_FOR_ERROR } | Types '{' ConstVector '}' { - const StructType *STy = dyn_cast($1->get()); + const StructType *STy = dyn_cast($1.type->get()); if (STy == 0) - ThrowException("Cannot make struct constant with type: '" + - (*$1)->getDescription() + "'!"); + GEN_ERROR("Cannot make struct constant with type: '" + + $1.type->get()->getDescription() + "'!"); if ($3->size() != STy->getNumContainedTypes()) - ThrowException("Illegal number of initializers for structure type!"); + GEN_ERROR("Illegal number of initializers for structure type!"); // Check to ensure that constants are compatible with the type initializer! for (unsigned i = 0, e = $3->size(); i != e; ++i) if ((*$3)[i]->getType() != STy->getElementType(i)) - ThrowException("Expected type '" + + GEN_ERROR("Expected type '" + STy->getElementType(i)->getDescription() + "' for element #" + utostr(i) + " of structure initializer!"); $$ = ConstantStruct::get(STy, *$3); - delete $1; delete $3; + delete $1.type; delete $3; + CHECK_FOR_ERROR } | Types '{' '}' { - const StructType *STy = dyn_cast($1->get()); + const StructType *STy = dyn_cast($1.type->get()); if (STy == 0) - ThrowException("Cannot make struct constant with type: '" + - (*$1)->getDescription() + "'!"); + GEN_ERROR("Cannot make struct constant with type: '" + + $1.type->get()->getDescription() + "'!"); if (STy->getNumContainedTypes() != 0) - ThrowException("Illegal number of initializers for structure type!"); + GEN_ERROR("Illegal number of initializers for structure type!"); $$ = ConstantStruct::get(STy, std::vector()); - delete $1; + delete $1.type; + CHECK_FOR_ERROR } | Types NULL_TOK { - const PointerType *PTy = dyn_cast($1->get()); + const PointerType *PTy = dyn_cast($1.type->get()); if (PTy == 0) - ThrowException("Cannot make null pointer constant with type: '" + - (*$1)->getDescription() + "'!"); + GEN_ERROR("Cannot make null pointer constant with type: '" + + $1.type->get()->getDescription() + "'!"); $$ = ConstantPointerNull::get(PTy); - delete $1; + delete $1.type; + CHECK_FOR_ERROR } | Types UNDEF { - $$ = UndefValue::get($1->get()); - delete $1; + $$ = UndefValue::get($1.type->get()); + delete $1.type; + CHECK_FOR_ERROR } | Types SymbolicValueRef { - const PointerType *Ty = dyn_cast($1->get()); + const PointerType *Ty = dyn_cast($1.type->get()); if (Ty == 0) - ThrowException("Global const reference must be a pointer type!"); + GEN_ERROR("Global const reference must be a pointer type!"); // ConstExprs can exist in the body of a function, thus creating // GlobalValues whenever they refer to a variable. Because we are in @@ -1369,6 +1594,7 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr CurFun.CurrentFunction = 0; Value *V = getValNonImprovising(Ty, $2); + CHECK_FOR_ERROR CurFun.CurrentFunction = SavedCurFn; @@ -1410,58 +1636,82 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr } $$ = cast(V); - delete $1; // Free the type handle + delete $1.type; // Free the type handle + CHECK_FOR_ERROR } | Types ConstExpr { - if ($1->get() != $2->getType()) - ThrowException("Mismatched types for constant expression!"); + if ($1.type->get() != $2->getType()) + GEN_ERROR("Mismatched types for constant expression!"); $$ = $2; - delete $1; + delete $1.type; + CHECK_FOR_ERROR } | Types ZEROINITIALIZER { - const Type *Ty = $1->get(); + const Type *Ty = $1.type->get(); if (isa(Ty) || Ty == Type::LabelTy || isa(Ty)) - ThrowException("Cannot create a null initialized value of this type!"); + GEN_ERROR("Cannot create a null initialized value of this type!"); $$ = Constant::getNullValue(Ty); - delete $1; + delete $1.type; + CHECK_FOR_ERROR }; ConstVal : SIntType EINT64VAL { // integral constants - if (!ConstantSInt::isValueValidForType($1, $2)) - ThrowException("Constant value doesn't fit in type!"); - $$ = ConstantSInt::get($1, $2); + if (!ConstantInt::isValueValidForType($1.type->get(), $2)) + GEN_ERROR("Constant value doesn't fit in type!"); + $$ = ConstantInt::get($1.type->get(), $2); + CHECK_FOR_ERROR } | UIntType EUINT64VAL { // integral constants - if (!ConstantUInt::isValueValidForType($1, $2)) - ThrowException("Constant value doesn't fit in type!"); - $$ = ConstantUInt::get($1, $2); + if (!ConstantInt::isValueValidForType($1.type->get(), $2)) + GEN_ERROR("Constant value doesn't fit in type!"); + $$ = ConstantInt::get($1.type->get(), $2); + CHECK_FOR_ERROR } | BOOL TRUETOK { // Boolean constants - $$ = ConstantBool::True; + $$ = ConstantBool::getTrue(); + CHECK_FOR_ERROR } | BOOL FALSETOK { // Boolean constants - $$ = ConstantBool::False; + $$ = ConstantBool::getFalse(); + CHECK_FOR_ERROR } | FPType FPVAL { // Float & Double constants - if (!ConstantFP::isValueValidForType($1, $2)) - ThrowException("Floating point constant invalid for type!!"); - $$ = ConstantFP::get($1, $2); + if (!ConstantFP::isValueValidForType($1.type->get(), $2)) + GEN_ERROR("Floating point constant invalid for type!!"); + $$ = ConstantFP::get($1.type->get(), $2); + CHECK_FOR_ERROR }; -ConstExpr: CAST '(' ConstVal TO Types ')' { - if (!$3->getType()->isFirstClassType()) - ThrowException("cast constant expression from a non-primitive type: '" + - $3->getType()->getDescription() + "'!"); - if (!$5->get()->isFirstClassType()) - ThrowException("cast constant expression to a non-primitive type: '" + - $5->get()->getDescription() + "'!"); - $$ = ConstantExpr::getCast($3, $5->get()); - delete $5; +ConstExpr: CastOps '(' ConstVal TO Types ')' { + Constant *Val = $3; + const Type *Ty = $5.type->get(); + if (!Val->getType()->isFirstClassType()) + GEN_ERROR("cast constant expression from a non-primitive type: '" + + Val->getType()->getDescription() + "'!"); + if (!Ty->isFirstClassType()) + GEN_ERROR("cast constant expression to a non-primitive type: '" + + Ty->getDescription() + "'!"); + if ($1.obsolete) { + if (Ty == Type::BoolTy) { + // The previous definition of cast to bool was a compare against zero. + // We have to retain that semantic so we do it here. + $$ = ConstantExpr::get(Instruction::SetNE, Val, + Constant::getNullValue(Val->getType())); + } else if (Val->getType()->isFloatingPoint() && isa(Ty)) { + Constant *CE = ConstantExpr::getFPToUI(Val, Type::ULongTy); + $$ = ConstantExpr::getIntToPtr(CE, Ty); + } else { + $$ = ConstantExpr::getCast(Val, Ty); + } + } else { + $$ = ConstantExpr::getCast($1.opcode, $3, $5.type->get()); + } + delete $5.type; } | GETELEMENTPTR '(' ConstVal IndexList ')' { if (!isa($3->getType())) - ThrowException("GetElementPtr requires a pointer operand!"); + GEN_ERROR("GetElementPtr requires a pointer operand!"); // LLVM 1.2 and earlier used ubyte struct indices. Convert any ubyte struct // indices to uint struct indices for compatibility. @@ -1470,101 +1720,119 @@ ConstExpr: CAST '(' ConstVal TO Types ')' { GTE = gep_type_end($3->getType(), $4->begin(), $4->end()); for (unsigned i = 0, e = $4->size(); i != e && GTI != GTE; ++i, ++GTI) if (isa(*GTI)) // Only change struct indices - if (ConstantUInt *CUI = dyn_cast((*$4)[i])) + if (ConstantInt *CUI = dyn_cast((*$4)[i])) if (CUI->getType() == Type::UByteTy) (*$4)[i] = ConstantExpr::getCast(CUI, Type::UIntTy); const Type *IdxTy = GetElementPtrInst::getIndexedType($3->getType(), *$4, true); if (!IdxTy) - ThrowException("Index list invalid for constant getelementptr!"); + GEN_ERROR("Index list invalid for constant getelementptr!"); std::vector IdxVec; for (unsigned i = 0, e = $4->size(); i != e; ++i) if (Constant *C = dyn_cast((*$4)[i])) IdxVec.push_back(C); else - ThrowException("Indices to constant getelementptr must be constants!"); + GEN_ERROR("Indices to constant getelementptr must be constants!"); delete $4; $$ = ConstantExpr::getGetElementPtr($3, IdxVec); + CHECK_FOR_ERROR } | SELECT '(' ConstVal ',' ConstVal ',' ConstVal ')' { if ($3->getType() != Type::BoolTy) - ThrowException("Select condition must be of boolean type!"); + GEN_ERROR("Select condition must be of boolean type!"); if ($5->getType() != $7->getType()) - ThrowException("Select operand types must match!"); + GEN_ERROR("Select operand types must match!"); $$ = ConstantExpr::getSelect($3, $5, $7); + CHECK_FOR_ERROR } | ArithmeticOps '(' ConstVal ',' ConstVal ')' { if ($3->getType() != $5->getType()) - ThrowException("Binary operator types must match!"); + GEN_ERROR("Binary operator types must match!"); + // First, make sure we're dealing with the right opcode by upgrading from + // obsolete versions. + sanitizeOpcode($1, $3->getType()); + CHECK_FOR_ERROR; + // HACK: llvm 1.3 and earlier used to emit invalid pointer constant exprs. // To retain backward compatibility with these early compilers, we emit a // cast to the appropriate integer type automatically if we are in the // broken case. See PR424 for more information. if (!isa($3->getType())) { - $$ = ConstantExpr::get($1, $3, $5); + $$ = ConstantExpr::get($1.opcode, $3, $5); } else { const Type *IntPtrTy = 0; switch (CurModule.CurrentModule->getPointerSize()) { case Module::Pointer32: IntPtrTy = Type::IntTy; break; case Module::Pointer64: IntPtrTy = Type::LongTy; break; - default: ThrowException("invalid pointer binary constant expr!"); + default: GEN_ERROR("invalid pointer binary constant expr!"); } - $$ = ConstantExpr::get($1, ConstantExpr::getCast($3, IntPtrTy), + $$ = ConstantExpr::get($1.opcode, ConstantExpr::getCast($3, IntPtrTy), ConstantExpr::getCast($5, IntPtrTy)); $$ = ConstantExpr::getCast($$, $3->getType()); } + CHECK_FOR_ERROR } | LogicalOps '(' ConstVal ',' ConstVal ')' { if ($3->getType() != $5->getType()) - ThrowException("Logical operator types must match!"); + GEN_ERROR("Logical operator types must match!"); if (!$3->getType()->isIntegral()) { if (!isa($3->getType()) || !cast($3->getType())->getElementType()->isIntegral()) - ThrowException("Logical operator requires integral operands!"); + GEN_ERROR("Logical operator requires integral operands!"); } - $$ = ConstantExpr::get($1, $3, $5); + $$ = ConstantExpr::get($1.opcode, $3, $5); + CHECK_FOR_ERROR } | SetCondOps '(' ConstVal ',' ConstVal ')' { if ($3->getType() != $5->getType()) - ThrowException("setcc operand types must match!"); - $$ = ConstantExpr::get($1, $3, $5); + GEN_ERROR("setcc operand types must match!"); + $$ = ConstantExpr::get($1.opcode, $3, $5); + CHECK_FOR_ERROR } | ShiftOps '(' ConstVal ',' ConstVal ')' { if ($5->getType() != Type::UByteTy) - ThrowException("Shift count for shift constant must be unsigned byte!"); + GEN_ERROR("Shift count for shift constant must be unsigned byte!"); if (!$3->getType()->isInteger()) - ThrowException("Shift constant expression requires integer operand!"); - $$ = ConstantExpr::get($1, $3, $5); + GEN_ERROR("Shift constant expression requires integer operand!"); + // Handle opcode upgrade situations + sanitizeOpcode($1, $3->getType()); + CHECK_FOR_ERROR; + $$ = ConstantExpr::get($1.opcode, $3, $5); + CHECK_FOR_ERROR } | EXTRACTELEMENT '(' ConstVal ',' ConstVal ')' { - if (!isa($3->getType())) - ThrowException("First operand of extractelement must be " - "packed type!"); - if ($5->getType() != Type::UIntTy) - ThrowException("Second operand of extractelement must be uint!"); + if (!ExtractElementInst::isValidOperands($3, $5)) + GEN_ERROR("Invalid extractelement operands!"); $$ = ConstantExpr::getExtractElement($3, $5); + CHECK_FOR_ERROR } | INSERTELEMENT '(' ConstVal ',' ConstVal ',' ConstVal ')' { + if (!InsertElementInst::isValidOperands($3, $5, $7)) + GEN_ERROR("Invalid insertelement operands!"); $$ = ConstantExpr::getInsertElement($3, $5, $7); + CHECK_FOR_ERROR } | SHUFFLEVECTOR '(' ConstVal ',' ConstVal ',' ConstVal ')' { if (!ShuffleVectorInst::isValidOperands($3, $5, $7)) - ThrowException("Invalid shufflevector operands!"); + GEN_ERROR("Invalid shufflevector operands!"); $$ = ConstantExpr::getShuffleVector($3, $5, $7); + CHECK_FOR_ERROR }; // ConstVector - A list of comma separated constants. ConstVector : ConstVector ',' ConstVal { ($$ = $1)->push_back($3); + CHECK_FOR_ERROR } | ConstVal { $$ = new std::vector(); $$->push_back($1); + CHECK_FOR_ERROR }; @@ -1582,6 +1850,7 @@ GlobalType : GLOBAL { $$ = false; } | CONSTANT { $$ = true; }; Module : FunctionList { $$ = ParserResult = $1; CurModule.ModuleDone(); + CHECK_FOR_ERROR; }; // FunctionList - A list of functions, preceeded by a constant pool. @@ -1589,26 +1858,32 @@ Module : FunctionList { FunctionList : FunctionList Function { $$ = $1; CurFun.FunctionDone(); + CHECK_FOR_ERROR } | FunctionList FunctionProto { $$ = $1; + CHECK_FOR_ERROR } | FunctionList MODULE ASM_TOK AsmBlock { $$ = $1; + CHECK_FOR_ERROR } | FunctionList IMPLEMENTATION { $$ = $1; + CHECK_FOR_ERROR } | ConstPool { $$ = CurModule.CurrentModule; // Emit an error if there are any unresolved types left. if (!CurModule.LateResolveTypes.empty()) { const ValID &DID = CurModule.LateResolveTypes.begin()->first; - if (DID.Type == ValID::NameVal) - ThrowException("Reference to an undefined type: '"+DID.getName() + "'"); - else - ThrowException("Reference to an undefined type: #" + itostr(DID.Num)); + if (DID.Type == ValID::NameVal) { + GEN_ERROR("Reference to an undefined type: '"+DID.getName() + "'"); + } else { + GEN_ERROR("Reference to an undefined type: #" + itostr(DID.Num)); + } } + CHECK_FOR_ERROR }; // ConstPool - Constants with optional names assigned to them. @@ -1622,36 +1897,65 @@ ConstPool : ConstPool OptAssign TYPE TypesV { // If types are not resolved eagerly, then the two types will not be // determined to be the same type! // - ResolveTypeTo($2, *$4); + ResolveTypeTo($2, $4.type->get()); - if (!setTypeName(*$4, $2) && !$2) { + if (!setTypeName($4.type->get(), $2) && !$2) { + CHECK_FOR_ERROR // If this is a named type that is not a redefinition, add it to the slot // table. - CurModule.Types.push_back(*$4); + CurModule.Types.push_back($4); + } else { + delete $4.type; } - - delete $4; + CHECK_FOR_ERROR } | ConstPool FunctionProto { // Function prototypes can be in const pool + CHECK_FOR_ERROR } | ConstPool MODULE ASM_TOK AsmBlock { // Asm blocks can be in the const pool + CHECK_FOR_ERROR } | ConstPool OptAssign OptLinkage GlobalType ConstVal { - if ($5 == 0) ThrowException("Global value initializer is not a constant!"); + if ($5 == 0) + GEN_ERROR("Global value initializer is not a constant!"); CurGV = ParseGlobalVariable($2, $3, $4, $5->getType(), $5); - } GlobalVarAttributes { + CHECK_FOR_ERROR + } GlobalVarAttributes { CurGV = 0; } | ConstPool OptAssign EXTERNAL GlobalType Types { - CurGV = ParseGlobalVariable($2, GlobalValue::ExternalLinkage, - $4, *$5, 0); - delete $5; - } GlobalVarAttributes { + CurGV = ParseGlobalVariable($2, GlobalValue::ExternalLinkage, $4, + $5.type->get(), 0); + CHECK_FOR_ERROR + delete $5.type; + } GlobalVarAttributes { + CurGV = 0; + CHECK_FOR_ERROR + } + | ConstPool OptAssign DLLIMPORT GlobalType Types { + CurGV = ParseGlobalVariable($2, GlobalValue::DLLImportLinkage, $4, + $5.type->get(), 0); + CHECK_FOR_ERROR + delete $5.type; + } GlobalVarAttributes { + CurGV = 0; + CHECK_FOR_ERROR + } + | ConstPool OptAssign EXTERN_WEAK GlobalType Types { + CurGV = + ParseGlobalVariable($2, GlobalValue::ExternalWeakLinkage, $4, + $5.type->get(), 0); + CHECK_FOR_ERROR + delete $5.type; + } GlobalVarAttributes { CurGV = 0; + CHECK_FOR_ERROR } | ConstPool TARGET TargetDefinition { + CHECK_FOR_ERROR } | ConstPool DEPLIBS '=' LibrariesDefinition { + CHECK_FOR_ERROR } | /* empty: end of list */ { }; @@ -1667,6 +1971,7 @@ AsmBlock : STRINGCONSTANT { CurModule.CurrentModule->setModuleInlineAsm(NewAsm); else CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+NewAsm); + CHECK_FOR_ERROR }; BigOrLittle : BIG { $$ = Module::BigEndian; }; @@ -1674,6 +1979,7 @@ BigOrLittle : LITTLE { $$ = Module::LittleEndian; }; TargetDefinition : ENDIAN '=' BigOrLittle { CurModule.CurrentModule->setEndianness($3); + CHECK_FOR_ERROR } | POINTERSIZE '=' EUINT64VAL { if ($3 == 32) @@ -1681,11 +1987,16 @@ TargetDefinition : ENDIAN '=' BigOrLittle { else if ($3 == 64) CurModule.CurrentModule->setPointerSize(Module::Pointer64); else - ThrowException("Invalid pointer size: '" + utostr($3) + "'!"); + GEN_ERROR("Invalid pointer size: '" + utostr($3) + "'!"); + CHECK_FOR_ERROR } | TRIPLE '=' STRINGCONSTANT { CurModule.CurrentModule->setTargetTriple($3); free($3); + } + | DATALAYOUT '=' STRINGCONSTANT { + CurModule.CurrentModule->setDataLayout($3); + free($3); }; LibrariesDefinition : '[' LibList ']'; @@ -1693,12 +2004,15 @@ LibrariesDefinition : '[' LibList ']'; LibList : LibList ',' STRINGCONSTANT { CurModule.CurrentModule->addLibrary($3); free($3); + CHECK_FOR_ERROR } | STRINGCONSTANT { CurModule.CurrentModule->addLibrary($1); free($1); + CHECK_FOR_ERROR } | /* empty: end of list */ { + CHECK_FOR_ERROR } ; @@ -1710,36 +2024,48 @@ Name : VAR_ID | STRINGCONSTANT; OptName : Name | /*empty*/ { $$ = 0; }; ArgVal : Types OptName { - if (*$1 == Type::VoidTy) - ThrowException("void typed arguments are invalid!"); - $$ = new std::pair($1, $2); + if ($1.type->get() == Type::VoidTy) + GEN_ERROR("void typed arguments are invalid!"); + $$ = new std::pair($1, $2); + CHECK_FOR_ERROR }; ArgListH : ArgListH ',' ArgVal { $$ = $1; $1->push_back(*$3); delete $3; + CHECK_FOR_ERROR } | ArgVal { - $$ = new std::vector >(); + $$ = new std::vector >(); $$->push_back(*$1); delete $1; + CHECK_FOR_ERROR }; ArgList : ArgListH { $$ = $1; + CHECK_FOR_ERROR } | ArgListH ',' DOTDOTDOT { $$ = $1; - $$->push_back(std::pair(new PATypeHolder(Type::VoidTy), 0)); + TypeInfo TI; + TI.type = new PATypeHolder(Type::VoidTy); + TI.signedness = isSignless; + $$->push_back(std::pair(TI,(char*)0)); + CHECK_FOR_ERROR } | DOTDOTDOT { - $$ = new std::vector >(); - $$->push_back(std::make_pair(new PATypeHolder(Type::VoidTy), (char*)0)); + $$ = new std::vector >(); + TypeInfo TI; + TI.type = new PATypeHolder(Type::VoidTy); + TI.signedness = isSignless; + $$->push_back(std::make_pair(TI, (char*)0)); + CHECK_FOR_ERROR } | /* empty */ { $$ = 0; + CHECK_FOR_ERROR }; FunctionHeaderH : OptCallingConv TypesV Name '(' ArgList ')' @@ -1748,22 +2074,23 @@ FunctionHeaderH : OptCallingConv TypesV Name '(' ArgList ')' std::string FunctionName($3); free($3); // Free strdup'd memory! - if (!(*$2)->isFirstClassType() && *$2 != Type::VoidTy) - ThrowException("LLVM functions cannot return aggregate types!"); + if (!($2.type->get())->isFirstClassType() && $2.type->get() != Type::VoidTy) + GEN_ERROR("LLVM functions cannot return aggregate types!"); std::vector ParamTypeList; if ($5) { // If there are arguments... - for (std::vector >::iterator I = $5->begin(); + for (std::vector >::iterator I = $5->begin(); I != $5->end(); ++I) - ParamTypeList.push_back(I->first->get()); + ParamTypeList.push_back(I->first.type->get()); } bool isVarArg = ParamTypeList.size() && ParamTypeList.back() == Type::VoidTy; if (isVarArg) ParamTypeList.pop_back(); - const FunctionType *FT = FunctionType::get(*$2, ParamTypeList, isVarArg); + const FunctionType *FT = FunctionType::get($2.type->get(), ParamTypeList, + isVarArg); const PointerType *PFT = PointerType::get(FT); - delete $2; + delete $2.type; ValID ID; if (!FunctionName.empty()) { @@ -1785,21 +2112,28 @@ FunctionHeaderH : OptCallingConv TypesV Name '(' ArgList ')' // If this is the case, either we need to be a forward decl, or it needs // to be. if (!CurFun.isDeclare && !Fn->isExternal()) - ThrowException("Redefinition of function '" + FunctionName + "'!"); + GEN_ERROR("Redefinition of function '" + FunctionName + "'!"); // Make sure to strip off any argument names so we can't get conflicts. if (Fn->isExternal()) for (Function::arg_iterator AI = Fn->arg_begin(), AE = Fn->arg_end(); AI != AE; ++AI) AI->setName(""); - } else { // Not already defined? Fn = new Function(FT, GlobalValue::ExternalLinkage, FunctionName, CurModule.CurrentModule); + InsertValue(Fn, CurModule.Values); } CurFun.FunctionStart(Fn); + + if (CurFun.isDeclare) { + // If we have declaration, always overwrite linkage. This will allow us to + // correctly handle cases, when pointer to function is passed as argument to + // another function. + Fn->setLinkage(CurFun.Linkage); + } Fn->setCallingConv($1); Fn->setAlignment($8); if ($7) { @@ -1810,22 +2144,22 @@ FunctionHeaderH : OptCallingConv TypesV Name '(' ArgList ')' // Add all of the arguments we parsed to the function... if ($5) { // Is null if empty... if (isVarArg) { // Nuke the last entry - assert($5->back().first->get() == Type::VoidTy && $5->back().second == 0&& - "Not a varargs marker!"); - delete $5->back().first; + assert($5->back().first.type->get() == Type::VoidTy && + $5->back().second == 0 && "Not a varargs marker!"); + delete $5->back().first.type; $5->pop_back(); // Delete the last entry } Function::arg_iterator ArgIt = Fn->arg_begin(); - for (std::vector >::iterator I = $5->begin(); + for (std::vector >::iterator I = $5->begin(); I != $5->end(); ++I, ++ArgIt) { - delete I->first; // Delete the typeholder... - + delete I->first.type; // Delete the typeholder... setValueName(ArgIt, I->second); // Insert arg into symtab... + CHECK_FOR_ERROR InsertValue(ArgIt); } - delete $5; // We're now done with the argument list } + CHECK_FOR_ERROR }; BEGIN : BEGINTOK | '{'; // Allow BEGIN or '{' to start a function @@ -1842,12 +2176,18 @@ END : ENDTOK | '}'; // Allow end of '}' to end a function Function : BasicBlockList END { $$ = $1; + CHECK_FOR_ERROR }; -FunctionProto : DECLARE { CurFun.isDeclare = true; } FunctionHeaderH { - $$ = CurFun.CurrentFunction; - CurFun.FunctionDone(); -}; +FnDeclareLinkage: /*default*/ | + DLLIMPORT { CurFun.Linkage = GlobalValue::DLLImportLinkage; } | + EXTERN_WEAK { CurFun.Linkage = GlobalValue::DLLImportLinkage; }; + +FunctionProto : DECLARE { CurFun.isDeclare = true; } FnDeclareLinkage FunctionHeaderH { + $$ = CurFun.CurrentFunction; + CurFun.FunctionDone(); + CHECK_FOR_ERROR + }; //===----------------------------------------------------------------------===// // Rules to match Basic Blocks @@ -1855,34 +2195,44 @@ FunctionProto : DECLARE { CurFun.isDeclare = true; } FunctionHeaderH { OptSideEffect : /* empty */ { $$ = false; + CHECK_FOR_ERROR } | SIDEEFFECT { $$ = true; + CHECK_FOR_ERROR }; ConstValueRef : ESINT64VAL { // A reference to a direct constant $$ = ValID::create($1); + CHECK_FOR_ERROR } | EUINT64VAL { $$ = ValID::create($1); + CHECK_FOR_ERROR } | FPVAL { // Perhaps it's an FP constant? $$ = ValID::create($1); + CHECK_FOR_ERROR } | TRUETOK { - $$ = ValID::create(ConstantBool::True); + $$ = ValID::create(ConstantBool::getTrue()); + CHECK_FOR_ERROR } | FALSETOK { - $$ = ValID::create(ConstantBool::False); + $$ = ValID::create(ConstantBool::getFalse()); + CHECK_FOR_ERROR } | NULL_TOK { $$ = ValID::createNull(); + CHECK_FOR_ERROR } | UNDEF { $$ = ValID::createUndef(); + CHECK_FOR_ERROR } | ZEROINITIALIZER { // A vector zero constant. $$ = ValID::createZeroInit(); + CHECK_FOR_ERROR } | '<' ConstVector '>' { // Nonempty unsized packed vector const Type *ETy = (*$2)[0]->getType(); @@ -1890,26 +2240,23 @@ ConstValueRef : ESINT64VAL { // A reference to a direct constant PackedType* pt = PackedType::get(ETy, NumElements); PATypeHolder* PTy = new PATypeHolder( - HandleUpRefs( - PackedType::get( - ETy, - NumElements) - ) - ); + HandleUpRefs(PackedType::get( ETy, NumElements))); // Verify all elements are correct type! for (unsigned i = 0; i < $2->size(); i++) { if (ETy != (*$2)[i]->getType()) - ThrowException("Element #" + utostr(i) + " is not of type '" + + GEN_ERROR("Element #" + utostr(i) + " is not of type '" + ETy->getDescription() +"' as required!\nIt is of type '" + (*$2)[i]->getType()->getDescription() + "'."); } $$ = ValID::create(ConstantPacked::get(pt, *$2)); delete PTy; delete $2; + CHECK_FOR_ERROR } | ConstExpr { $$ = ValID::create($1); + CHECK_FOR_ERROR } | ASM_TOK OptSideEffect STRINGCONSTANT ',' STRINGCONSTANT { char *End = UnEscapeLexed($3, true); @@ -1919,6 +2266,7 @@ ConstValueRef : ESINT64VAL { // A reference to a direct constant $$ = ValID::createInlineAsm(AsmStr, Constraints, $2); free($3); free($5); + CHECK_FOR_ERROR }; // SymbolicValueRef - Reference to one of two ways of symbolically refering to @@ -1926,9 +2274,11 @@ ConstValueRef : ESINT64VAL { // A reference to a direct constant // SymbolicValueRef : INTVAL { // Is it an integer reference...? $$ = ValID::create($1); + CHECK_FOR_ERROR } | Name { // Is it a named reference...? $$ = ValID::create($1); + CHECK_FOR_ERROR }; // ValueRef - A reference to a definition... either constant or symbolic @@ -1939,14 +2289,17 @@ ValueRef : SymbolicValueRef | ConstValueRef; // type immediately preceeds the value reference, and allows complex constant // pool references (for things like: 'ret [2 x int] [ int 12, int 42]') ResolvedVal : Types ValueRef { - $$ = getVal(*$1, $2); delete $1; + $$ = getVal($1.type->get(), $2); delete $1.type; + CHECK_FOR_ERROR }; BasicBlockList : BasicBlockList BasicBlock { $$ = $1; + CHECK_FOR_ERROR } | FunctionHeader BasicBlock { // Do not allow functions with 0 basic blocks $$ = $1; + CHECK_FOR_ERROR }; @@ -1955,19 +2308,27 @@ BasicBlockList : BasicBlockList BasicBlock { // BasicBlock : InstructionList OptAssign BBTerminatorInst { setValueName($3, $2); + CHECK_FOR_ERROR InsertValue($3); $1->getInstList().push_back($3); InsertValue($1); $$ = $1; + CHECK_FOR_ERROR }; InstructionList : InstructionList Inst { + if (CastInst *CI1 = dyn_cast($2)) + if (CastInst *CI2 = dyn_cast(CI1->getOperand(0))) + if (CI2->getParent() == 0) + $1->getInstList().push_back(CI2); $1->getInstList().push_back($2); $$ = $1; + CHECK_FOR_ERROR } | /* empty */ { $$ = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++), true); + CHECK_FOR_ERROR // Make sure to move the basic block to the correct location in the // function, instead of leaving it inserted wherever it was first @@ -1975,9 +2336,11 @@ InstructionList : InstructionList Inst { Function::BasicBlockListType &BBL = CurFun.CurrentFunction->getBasicBlockList(); BBL.splice(BBL.end(), BBL, $$); + CHECK_FOR_ERROR } | LABELSTR { $$ = CurBB = getBBVal(ValID::create($1), true); + CHECK_FOR_ERROR // Make sure to move the basic block to the correct location in the // function, instead of leaving it inserted wherever it was first @@ -1985,22 +2348,37 @@ InstructionList : InstructionList Inst { Function::BasicBlockListType &BBL = CurFun.CurrentFunction->getBasicBlockList(); BBL.splice(BBL.end(), BBL, $$); + CHECK_FOR_ERROR }; BBTerminatorInst : RET ResolvedVal { // Return with a result... $$ = new ReturnInst($2); + CHECK_FOR_ERROR } | RET VOID { // Return with no result... $$ = new ReturnInst(); + CHECK_FOR_ERROR } | BR LABEL ValueRef { // Unconditional Branch... - $$ = new BranchInst(getBBVal($3)); + BasicBlock* tmpBB = getBBVal($3); + CHECK_FOR_ERROR + $$ = new BranchInst(tmpBB); } // Conditional Branch... | BR BOOL ValueRef ',' LABEL ValueRef ',' LABEL ValueRef { - $$ = new BranchInst(getBBVal($6), getBBVal($9), getVal(Type::BoolTy, $3)); + BasicBlock* tmpBBA = getBBVal($6); + CHECK_FOR_ERROR + BasicBlock* tmpBBB = getBBVal($9); + CHECK_FOR_ERROR + Value* tmpVal = getVal(Type::BoolTy, $3); + CHECK_FOR_ERROR + $$ = new BranchInst(tmpBBA, tmpBBB, tmpVal); } | SWITCH IntType ValueRef ',' LABEL ValueRef '[' JumpTable ']' { - SwitchInst *S = new SwitchInst(getVal($2, $3), getBBVal($6), $8->size()); + Value* tmpVal = getVal($2.type->get(), $3); + CHECK_FOR_ERROR + BasicBlock* tmpBB = getBBVal($6); + CHECK_FOR_ERROR + SwitchInst *S = new SwitchInst(tmpVal, tmpBB, $8->size()); $$ = S; std::vector >::iterator I = $8->begin(), @@ -2009,20 +2387,26 @@ BBTerminatorInst : RET ResolvedVal { // Return with a result... if (ConstantInt *CI = dyn_cast(I->first)) S->addCase(CI, I->second); else - ThrowException("Switch case is constant, but not a simple integer!"); + GEN_ERROR("Switch case is constant, but not a simple integer!"); } delete $8; + CHECK_FOR_ERROR } | SWITCH IntType ValueRef ',' LABEL ValueRef '[' ']' { - SwitchInst *S = new SwitchInst(getVal($2, $3), getBBVal($6), 0); + Value* tmpVal = getVal($2.type->get(), $3); + CHECK_FOR_ERROR + BasicBlock* tmpBB = getBBVal($6); + CHECK_FOR_ERROR + SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0); $$ = S; + CHECK_FOR_ERROR } | INVOKE OptCallingConv TypesV ValueRef '(' ValueRefListE ')' TO LABEL ValueRef UNWIND LABEL ValueRef { const PointerType *PFTy; const FunctionType *Ty; - if (!(PFTy = dyn_cast($3->get())) || + if (!(PFTy = dyn_cast($3.type->get())) || !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; @@ -2035,14 +2419,16 @@ BBTerminatorInst : RET ResolvedVal { // Return with a result... bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy; if (isVarArg) ParamTypes.pop_back(); - Ty = FunctionType::get($3->get(), ParamTypes, isVarArg); + Ty = FunctionType::get($3.type->get(), ParamTypes, isVarArg); PFTy = PointerType::get(Ty); } Value *V = getVal(PFTy, $4); // Get the function we're calling... - + CHECK_FOR_ERROR BasicBlock *Normal = getBBVal($10); + CHECK_FOR_ERROR BasicBlock *Except = getBBVal($13); + CHECK_FOR_ERROR // Create the call node... if (!$6) { // Has no arguments? @@ -2057,62 +2443,80 @@ BBTerminatorInst : RET ResolvedVal { // Return with a result... for (; ArgI != ArgE && I != E; ++ArgI, ++I) if ((*ArgI)->getType() != *I) - ThrowException("Parameter " +(*ArgI)->getName()+ " is not of type '" + + GEN_ERROR("Parameter " +(*ArgI)->getName()+ " is not of type '" + (*I)->getDescription() + "'!"); if (I != E || (ArgI != ArgE && !Ty->isVarArg())) - ThrowException("Invalid number of parameters detected!"); + GEN_ERROR("Invalid number of parameters detected!"); $$ = new InvokeInst(V, Normal, Except, *$6); } cast($$)->setCallingConv($2); - delete $3; + delete $3.type; delete $6; + CHECK_FOR_ERROR } | UNWIND { $$ = new UnwindInst(); + CHECK_FOR_ERROR } | UNREACHABLE { $$ = new UnreachableInst(); + CHECK_FOR_ERROR }; JumpTable : JumpTable IntType ConstValueRef ',' LABEL ValueRef { $$ = $1; - Constant *V = cast(getValNonImprovising($2, $3)); + Constant *V = cast(getValNonImprovising($2.type->get(), $3)); + CHECK_FOR_ERROR if (V == 0) - ThrowException("May only switch on a constant pool value!"); + GEN_ERROR("May only switch on a constant pool value!"); - $$->push_back(std::make_pair(V, getBBVal($6))); + BasicBlock* tmpBB = getBBVal($6); + CHECK_FOR_ERROR + $$->push_back(std::make_pair(V, tmpBB)); } | IntType ConstValueRef ',' LABEL ValueRef { $$ = new std::vector >(); - Constant *V = cast(getValNonImprovising($1, $2)); + Constant *V = cast(getValNonImprovising($1.type->get(), $2)); + CHECK_FOR_ERROR if (V == 0) - ThrowException("May only switch on a constant pool value!"); + GEN_ERROR("May only switch on a constant pool value!"); - $$->push_back(std::make_pair(V, getBBVal($5))); + BasicBlock* tmpBB = getBBVal($5); + CHECK_FOR_ERROR + $$->push_back(std::make_pair(V, tmpBB)); }; Inst : OptAssign InstVal { // Is this definition named?? if so, assign the name... setValueName($2, $1); + CHECK_FOR_ERROR InsertValue($2); $$ = $2; + CHECK_FOR_ERROR }; PHIList : Types '[' ValueRef ',' ValueRef ']' { // Used for PHI nodes $$ = new std::list >(); - $$->push_back(std::make_pair(getVal(*$1, $3), getBBVal($5))); - delete $1; + Value* tmpVal = getVal($1.type->get(), $3); + CHECK_FOR_ERROR + BasicBlock* tmpBB = getBBVal($5); + CHECK_FOR_ERROR + $$->push_back(std::make_pair(tmpVal, tmpBB)); + delete $1.type; } | PHIList ',' '[' ValueRef ',' ValueRef ']' { $$ = $1; - $1->push_back(std::make_pair(getVal($1->front().first->getType(), $4), - getBBVal($6))); + Value* tmpVal = getVal($1->front().first->getType(), $4); + CHECK_FOR_ERROR + BasicBlock* tmpBB = getBBVal($6); + CHECK_FOR_ERROR + $1->push_back(std::make_pair(tmpVal, tmpBB)); }; @@ -2123,6 +2527,7 @@ ValueRefList : ResolvedVal { // Used for call statements, and memory insts... | ValueRefList ',' ResolvedVal { $$ = $1; $1->push_back($3); + CHECK_FOR_ERROR }; // ValueRefListE - Just like ValueRefList, except that it may also be empty! @@ -2130,45 +2535,63 @@ ValueRefListE : ValueRefList | /*empty*/ { $$ = 0; }; OptTailCall : TAIL CALL { $$ = true; + CHECK_FOR_ERROR } | CALL { $$ = false; + CHECK_FOR_ERROR }; - - InstVal : ArithmeticOps Types ValueRef ',' ValueRef { - if (!(*$2)->isInteger() && !(*$2)->isFloatingPoint() && - !isa((*$2).get())) - ThrowException( + if (!$2.type->get()->isInteger() && !$2.type->get()->isFloatingPoint() && + !isa($2.type->get())) + GEN_ERROR( "Arithmetic operator requires integer, FP, or packed operands!"); - if (isa((*$2).get()) && $1 == Instruction::Rem) - ThrowException("Rem not supported on packed types!"); - $$ = BinaryOperator::create($1, getVal(*$2, $3), getVal(*$2, $5)); + if (isa($2.type->get()) && + ($1.opcode == Instruction::URem || + $1.opcode == Instruction::SRem || + $1.opcode == Instruction::FRem)) + GEN_ERROR("U/S/FRem not supported on packed types!"); + // Upgrade the opcode from obsolete versions before we do anything with it. + sanitizeOpcode($1,$2.type->get()); + CHECK_FOR_ERROR; + Value* val1 = getVal($2.type->get(), $3); + CHECK_FOR_ERROR + Value* val2 = getVal($2.type->get(), $5); + CHECK_FOR_ERROR + $$ = BinaryOperator::create($1.opcode, val1, val2); if ($$ == 0) - ThrowException("binary operator returned null!"); - delete $2; + GEN_ERROR("binary operator returned null!"); + delete $2.type; } | LogicalOps Types ValueRef ',' ValueRef { - if (!(*$2)->isIntegral()) { - if (!isa($2->get()) || - !cast($2->get())->getElementType()->isIntegral()) - ThrowException("Logical operator requires integral operands!"); + if (!$2.type->get()->isIntegral()) { + if (!isa($2.type->get()) || + !cast($2.type->get())->getElementType()->isIntegral()) + GEN_ERROR("Logical operator requires integral operands!"); } - $$ = BinaryOperator::create($1, getVal(*$2, $3), getVal(*$2, $5)); + Value* tmpVal1 = getVal($2.type->get(), $3); + CHECK_FOR_ERROR + Value* tmpVal2 = getVal($2.type->get(), $5); + CHECK_FOR_ERROR + $$ = BinaryOperator::create($1.opcode, tmpVal1, tmpVal2); if ($$ == 0) - ThrowException("binary operator returned null!"); - delete $2; + GEN_ERROR("binary operator returned null!"); + delete $2.type; } | SetCondOps Types ValueRef ',' ValueRef { - if(isa((*$2).get())) { - ThrowException( + if(isa($2.type->get())) { + GEN_ERROR( "PackedTypes currently not supported in setcc instructions!"); } - $$ = new SetCondInst($1, getVal(*$2, $3), getVal(*$2, $5)); + Value* tmpVal1 = getVal($2.type->get(), $3); + CHECK_FOR_ERROR + Value* tmpVal2 = getVal($2.type->get(), $5); + CHECK_FOR_ERROR + $$ = new SetCondInst($1.opcode, tmpVal1, tmpVal2); if ($$ == 0) - ThrowException("binary operator returned null!"); - delete $2; + GEN_ERROR("binary operator returned null!"); + delete $2.type; } | NOT ResolvedVal { std::cerr << "WARNING: Use of eliminated 'not' instruction:" @@ -2176,37 +2599,63 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { Value *Ones = ConstantIntegral::getAllOnesValue($2->getType()); if (Ones == 0) - ThrowException("Expected integral type for not instruction!"); + GEN_ERROR("Expected integral type for not instruction!"); $$ = BinaryOperator::create(Instruction::Xor, $2, Ones); if ($$ == 0) - ThrowException("Could not create a xor instruction!"); + GEN_ERROR("Could not create a xor instruction!"); + CHECK_FOR_ERROR } | ShiftOps ResolvedVal ',' ResolvedVal { if ($4->getType() != Type::UByteTy) - ThrowException("Shift amount must be ubyte!"); + GEN_ERROR("Shift amount must be ubyte!"); if (!$2->getType()->isInteger()) - ThrowException("Shift constant expression requires integer operand!"); - $$ = new ShiftInst($1, $2, $4); - } - | CAST ResolvedVal TO Types { - if (!$4->get()->isFirstClassType()) - ThrowException("cast instruction to a non-primitive type: '" + - $4->get()->getDescription() + "'!"); - $$ = new CastInst($2, *$4); - delete $4; + GEN_ERROR("Shift constant expression requires integer operand!"); + // Handle opcode upgrade situations + sanitizeOpcode($1, $2->getType()); + CHECK_FOR_ERROR; + $$ = new ShiftInst($1.opcode, $2, $4); + CHECK_FOR_ERROR + } + | CastOps ResolvedVal TO Types { + Value* Val = $2; + const Type* Ty = $4.type->get(); + if (!Val->getType()->isFirstClassType()) + GEN_ERROR("cast from a non-primitive type: '" + + Val->getType()->getDescription() + "'!"); + if (!Ty->isFirstClassType()) + GEN_ERROR("cast to a non-primitive type: '" + Ty->getDescription() +"'!"); + + if ($1.obsolete) { + if (Ty == Type::BoolTy) { + // The previous definition of cast to bool was a compare against zero. + // We have to retain that semantic so we do it here. + $$ = new SetCondInst(Instruction::SetNE, $2, + Constant::getNullValue($2->getType())); + } else if (Val->getType()->isFloatingPoint() && isa(Ty)) { + CastInst *CI = new FPToUIInst(Val, Type::ULongTy); + $$ = new IntToPtrInst(CI, Ty); + } else { + $$ = CastInst::createInferredCast(Val, Ty); + } + } else { + $$ = CastInst::create($1.opcode, $2, $4.type->get()); + } + delete $4.type; } | SELECT ResolvedVal ',' ResolvedVal ',' ResolvedVal { if ($2->getType() != Type::BoolTy) - ThrowException("select condition must be boolean!"); + GEN_ERROR("select condition must be boolean!"); if ($4->getType() != $6->getType()) - ThrowException("select value types should match!"); + GEN_ERROR("select value types should match!"); $$ = new SelectInst($2, $4, $6); + CHECK_FOR_ERROR } | VAARG ResolvedVal ',' Types { NewVarArgs = true; - $$ = new VAArgInst($2, *$4); - delete $4; + $$ = new VAArgInst($2, $4.type->get()); + delete $4.type; + CHECK_FOR_ERROR } | VAARG_old ResolvedVal ',' Types { ObsoleteVarArgs = true; @@ -2224,8 +2673,9 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { CallInst* bar = new CallInst(NF, $2); CurBB->getInstList().push_back(bar); CurBB->getInstList().push_back(new StoreInst(bar, foo)); - $$ = new VAArgInst(foo, *$4); - delete $4; + $$ = new VAArgInst(foo, $4.type->get()); + delete $4.type; + CHECK_FOR_ERROR } | VANEXT_old ResolvedVal ',' Types { ObsoleteVarArgs = true; @@ -2244,55 +2694,50 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { CallInst* bar = new CallInst(NF, $2); CurBB->getInstList().push_back(bar); CurBB->getInstList().push_back(new StoreInst(bar, foo)); - Instruction* tmp = new VAArgInst(foo, *$4); + Instruction* tmp = new VAArgInst(foo, $4.type->get()); CurBB->getInstList().push_back(tmp); $$ = new LoadInst(foo); - delete $4; + delete $4.type; + CHECK_FOR_ERROR } | EXTRACTELEMENT ResolvedVal ',' ResolvedVal { - if (!isa($2->getType())) - ThrowException("First operand of extractelement must be " - "packed type!"); - if ($4->getType() != Type::UIntTy) - ThrowException("Second operand of extractelement must be uint!"); + if (!ExtractElementInst::isValidOperands($2, $4)) + GEN_ERROR("Invalid extractelement operands!"); $$ = new ExtractElementInst($2, $4); + CHECK_FOR_ERROR } | INSERTELEMENT ResolvedVal ',' ResolvedVal ',' ResolvedVal { - if (!isa($2->getType())) - ThrowException("First operand of insertelement must be " - "packed type!"); - if ($4->getType() != - cast($2->getType())->getElementType()) - ThrowException("Second operand of insertelement must be " - "packed element type!"); - if ($6->getType() != Type::UIntTy) - ThrowException("Third operand of insertelement must be uint!"); + if (!InsertElementInst::isValidOperands($2, $4, $6)) + GEN_ERROR("Invalid insertelement operands!"); $$ = new InsertElementInst($2, $4, $6); + CHECK_FOR_ERROR } | SHUFFLEVECTOR ResolvedVal ',' ResolvedVal ',' ResolvedVal { if (!ShuffleVectorInst::isValidOperands($2, $4, $6)) - ThrowException("Invalid shufflevector operands!"); + GEN_ERROR("Invalid shufflevector operands!"); $$ = new ShuffleVectorInst($2, $4, $6); + CHECK_FOR_ERROR } | PHI_TOK PHIList { const Type *Ty = $2->front().first->getType(); if (!Ty->isFirstClassType()) - ThrowException("PHI node operands must be of first class type!"); + GEN_ERROR("PHI node operands must be of first class type!"); $$ = new PHINode(Ty); ((PHINode*)$$)->reserveOperandSpace($2->size()); while ($2->begin() != $2->end()) { if ($2->front().first->getType() != Ty) - ThrowException("All elements of a PHI node must be of the same type!"); + GEN_ERROR("All elements of a PHI node must be of the same type!"); cast($$)->addIncoming($2->front().first, $2->front().second); $2->pop_front(); } delete $2; // Free the list... + CHECK_FOR_ERROR } | OptTailCall OptCallingConv TypesV ValueRef '(' ValueRefListE ')' { - const PointerType *PFTy; - const FunctionType *Ty; + const PointerType *PFTy = 0; + const FunctionType *Ty = 0; - if (!(PFTy = dyn_cast($3->get())) || + if (!(PFTy = dyn_cast($3.type->get())) || !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; @@ -2305,20 +2750,22 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy; if (isVarArg) ParamTypes.pop_back(); - if (!(*$3)->isFirstClassType() && *$3 != Type::VoidTy) - ThrowException("LLVM functions cannot return aggregate types!"); + if (!$3.type->get()->isFirstClassType() && + $3.type->get() != Type::VoidTy) + GEN_ERROR("LLVM functions cannot return aggregate types!"); - Ty = FunctionType::get($3->get(), ParamTypes, isVarArg); + Ty = FunctionType::get($3.type->get(), ParamTypes, isVarArg); PFTy = PointerType::get(Ty); } Value *V = getVal(PFTy, $4); // Get the function we're calling... + CHECK_FOR_ERROR // Create the call node... if (!$6) { // Has no arguments? // Make sure no arguments is a good thing! if (Ty->getNumParams() != 0) - ThrowException("No arguments passed to a function that " + GEN_ERROR("No arguments passed to a function that " "expects arguments!"); $$ = new CallInst(V, std::vector()); @@ -2332,110 +2779,139 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { for (; ArgI != ArgE && I != E; ++ArgI, ++I) if ((*ArgI)->getType() != *I) - ThrowException("Parameter " +(*ArgI)->getName()+ " is not of type '" + + GEN_ERROR("Parameter " +(*ArgI)->getName()+ " is not of type '" + (*I)->getDescription() + "'!"); if (I != E || (ArgI != ArgE && !Ty->isVarArg())) - ThrowException("Invalid number of parameters detected!"); + GEN_ERROR("Invalid number of parameters detected!"); $$ = new CallInst(V, *$6); } cast($$)->setTailCall($1); cast($$)->setCallingConv($2); - delete $3; + delete $3.type; delete $6; + CHECK_FOR_ERROR } | MemoryInst { $$ = $1; + CHECK_FOR_ERROR }; // IndexList - List of indices for GEP based instructions... IndexList : ',' ValueRefList { $$ = $2; + CHECK_FOR_ERROR } | /* empty */ { $$ = new std::vector(); + CHECK_FOR_ERROR }; OptVolatile : VOLATILE { $$ = true; + CHECK_FOR_ERROR } | /* empty */ { $$ = false; + CHECK_FOR_ERROR }; MemoryInst : MALLOC Types OptCAlign { - $$ = new MallocInst(*$2, 0, $3); - delete $2; + $$ = new MallocInst($2.type->get(), 0, $3); + delete $2.type; + CHECK_FOR_ERROR } | MALLOC Types ',' UINT ValueRef OptCAlign { - $$ = new MallocInst(*$2, getVal($4, $5), $6); - delete $2; + Value* tmpVal = getVal($4.type->get(), $5); + CHECK_FOR_ERROR + $$ = new MallocInst($2.type->get(), tmpVal, $6); + delete $2.type; } | ALLOCA Types OptCAlign { - $$ = new AllocaInst(*$2, 0, $3); - delete $2; + $$ = new AllocaInst($2.type->get(), 0, $3); + delete $2.type; + CHECK_FOR_ERROR } | ALLOCA Types ',' UINT ValueRef OptCAlign { - $$ = new AllocaInst(*$2, getVal($4, $5), $6); - delete $2; + Value* tmpVal = getVal($4.type->get(), $5); + CHECK_FOR_ERROR + $$ = new AllocaInst($2.type->get(), tmpVal, $6); + delete $2.type; } | FREE ResolvedVal { if (!isa($2->getType())) - ThrowException("Trying to free nonpointer type " + + GEN_ERROR("Trying to free nonpointer type " + $2->getType()->getDescription() + "!"); $$ = new FreeInst($2); + CHECK_FOR_ERROR } | OptVolatile LOAD Types ValueRef { - if (!isa($3->get())) - ThrowException("Can't load from nonpointer type: " + - (*$3)->getDescription()); - if (!cast($3->get())->getElementType()->isFirstClassType()) - ThrowException("Can't load from pointer of non-first-class type: " + - (*$3)->getDescription()); - $$ = new LoadInst(getVal(*$3, $4), "", $1); - delete $3; + if (!isa($3.type->get())) + GEN_ERROR("Can't load from nonpointer type: " + + $3.type->get()->getDescription()); + if (!cast($3.type->get())->getElementType()->isFirstClassType()) + GEN_ERROR("Can't load from pointer of non-first-class type: " + + $3.type->get()->getDescription()); + Value* tmpVal = getVal($3.type->get(), $4); + CHECK_FOR_ERROR + $$ = new LoadInst(tmpVal, "", $1); + delete $3.type; } | OptVolatile STORE ResolvedVal ',' Types ValueRef { - const PointerType *PT = dyn_cast($5->get()); + const PointerType *PT = dyn_cast($5.type->get()); if (!PT) - ThrowException("Can't store to a nonpointer type: " + - (*$5)->getDescription()); + GEN_ERROR("Can't store to a nonpointer type: " + + ($5.type->get())->getDescription()); const Type *ElTy = PT->getElementType(); if (ElTy != $3->getType()) - ThrowException("Can't store '" + $3->getType()->getDescription() + + GEN_ERROR("Can't store '" + $3->getType()->getDescription() + "' into space of type '" + ElTy->getDescription() + "'!"); - $$ = new StoreInst($3, getVal(*$5, $6), $1); - delete $5; + Value* tmpVal = getVal($5.type->get(), $6); + CHECK_FOR_ERROR + $$ = new StoreInst($3, tmpVal, $1); + delete $5.type; } | GETELEMENTPTR Types ValueRef IndexList { - if (!isa($2->get())) - ThrowException("getelementptr insn requires pointer operand!"); + if (!isa($2.type->get())) + GEN_ERROR("getelementptr insn requires pointer operand!"); // LLVM 1.2 and earlier used ubyte struct indices. Convert any ubyte struct // indices to uint struct indices for compatibility. generic_gep_type_iterator::iterator> - GTI = gep_type_begin($2->get(), $4->begin(), $4->end()), - GTE = gep_type_end($2->get(), $4->begin(), $4->end()); + GTI = gep_type_begin($2.type->get(), $4->begin(), $4->end()), + GTE = gep_type_end($2.type->get(), $4->begin(), $4->end()); for (unsigned i = 0, e = $4->size(); i != e && GTI != GTE; ++i, ++GTI) if (isa(*GTI)) // Only change struct indices - if (ConstantUInt *CUI = dyn_cast((*$4)[i])) + if (ConstantInt *CUI = dyn_cast((*$4)[i])) if (CUI->getType() == Type::UByteTy) (*$4)[i] = ConstantExpr::getCast(CUI, Type::UIntTy); - if (!GetElementPtrInst::getIndexedType(*$2, *$4, true)) - ThrowException("Invalid getelementptr indices for type '" + - (*$2)->getDescription()+ "'!"); - $$ = new GetElementPtrInst(getVal(*$2, $3), *$4); - delete $2; delete $4; + if (!GetElementPtrInst::getIndexedType($2.type->get(), *$4, true)) + GEN_ERROR("Invalid getelementptr indices for type '" + + $2.type->get()->getDescription()+ "'!"); + Value* tmpVal = getVal($2.type->get(), $3); + CHECK_FOR_ERROR + $$ = new GetElementPtrInst(tmpVal, *$4); + delete $2.type; + delete $4; }; %% + +void llvm::GenerateError(const std::string &message, int LineNo) { + if (LineNo == -1) LineNo = llvmAsmlineno; + // TODO: column number in exception + if (TheParseError) + TheParseError->setError(CurFilename, message, LineNo); + TriggerError = 1; +} + int yyerror(const char *ErrorMsg) { std::string where = std::string((CurFilename == "-") ? std::string("") : CurFilename) @@ -2445,6 +2921,6 @@ int yyerror(const char *ErrorMsg) { errMsg += "end-of-file."; else errMsg += "token: '" + std::string(llvmAsmtext, llvmAsmleng) + "'"; - ThrowException(errMsg); + GenerateError(errMsg); return 0; }