X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FAsmParser%2FllvmAsmParser.cpp.cvs;h=9f58529133f0e37b090874ddecb496b73e8222fd;hb=317adcc9c6b29fb491d615996ba70b5c415a9eb2;hp=a47b9a59c6a8ef70adb44413ced77bc5c39ac74c;hpb=93c40036c813a0b569a56aaefef09f5e4c561574;p=oota-llvm.git diff --git a/lib/AsmParser/llvmAsmParser.cpp.cvs b/lib/AsmParser/llvmAsmParser.cpp.cvs index a47b9a59c6a..9f58529133f 100644 --- a/lib/AsmParser/llvmAsmParser.cpp.cvs +++ b/lib/AsmParser/llvmAsmParser.cpp.cvs @@ -1,7 +1,9 @@ -/* A Bison parser, made by GNU Bison 2.1. */ +/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +/* Skeleton implementation for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,13 +20,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ -/* Written by Richard Stallman by simplifying the original so called - ``semantic'' parser. */ +/* C LALR(1) parser skeleton written by Richard Stallman, by + simplifying the original so-called "semantic" parser. */ /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local @@ -37,7 +47,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.1" +#define YYBISON_VERSION "2.3" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -75,126 +85,148 @@ INTTYPE = 266, FLOAT = 267, DOUBLE = 268, - LABEL = 269, - TYPE = 270, - LOCALVAR = 271, - GLOBALVAR = 272, - LABELSTR = 273, - STRINGCONSTANT = 274, - ATSTRINGCONSTANT = 275, - IMPLEMENTATION = 276, - ZEROINITIALIZER = 277, - TRUETOK = 278, - FALSETOK = 279, - BEGINTOK = 280, - ENDTOK = 281, - DECLARE = 282, - DEFINE = 283, - GLOBAL = 284, - CONSTANT = 285, - SECTION = 286, - VOLATILE = 287, - TO = 288, - DOTDOTDOT = 289, - NULL_TOK = 290, - UNDEF = 291, - INTERNAL = 292, - LINKONCE = 293, - WEAK = 294, - APPENDING = 295, - DLLIMPORT = 296, - DLLEXPORT = 297, - EXTERN_WEAK = 298, - OPAQUE = 299, - EXTERNAL = 300, - TARGET = 301, - TRIPLE = 302, - ALIGN = 303, - DEPLIBS = 304, - CALL = 305, - TAIL = 306, - ASM_TOK = 307, - MODULE = 308, - SIDEEFFECT = 309, - CC_TOK = 310, - CCC_TOK = 311, - FASTCC_TOK = 312, - COLDCC_TOK = 313, - X86_STDCALLCC_TOK = 314, - X86_FASTCALLCC_TOK = 315, - DATALAYOUT = 316, - RET = 317, - BR = 318, - SWITCH = 319, - INVOKE = 320, - UNWIND = 321, - UNREACHABLE = 322, - ADD = 323, - SUB = 324, - MUL = 325, - UDIV = 326, - SDIV = 327, - FDIV = 328, - UREM = 329, - SREM = 330, - FREM = 331, - AND = 332, - OR = 333, - XOR = 334, - SHL = 335, - LSHR = 336, - ASHR = 337, - ICMP = 338, - FCMP = 339, - EQ = 340, - NE = 341, - SLT = 342, - SGT = 343, - SLE = 344, - SGE = 345, - ULT = 346, - UGT = 347, - ULE = 348, - UGE = 349, - OEQ = 350, - ONE = 351, - OLT = 352, - OGT = 353, - OLE = 354, - OGE = 355, - ORD = 356, - UNO = 357, - UEQ = 358, - UNE = 359, - MALLOC = 360, - ALLOCA = 361, - FREE = 362, - LOAD = 363, - STORE = 364, - GETELEMENTPTR = 365, - TRUNC = 366, - ZEXT = 367, - SEXT = 368, - FPTRUNC = 369, - FPEXT = 370, - BITCAST = 371, - UITOFP = 372, - SITOFP = 373, - FPTOUI = 374, - FPTOSI = 375, - INTTOPTR = 376, - PTRTOINT = 377, - PHI_TOK = 378, - SELECT = 379, - VAARG = 380, - EXTRACTELEMENT = 381, - INSERTELEMENT = 382, - SHUFFLEVECTOR = 383, - NORETURN = 384, - INREG = 385, - SRET = 386, - DEFAULT = 387, - HIDDEN = 388 + X86_FP80 = 269, + FP128 = 270, + PPC_FP128 = 271, + LABEL = 272, + TYPE = 273, + LOCALVAR = 274, + GLOBALVAR = 275, + LABELSTR = 276, + STRINGCONSTANT = 277, + ATSTRINGCONSTANT = 278, + PCTSTRINGCONSTANT = 279, + ZEROINITIALIZER = 280, + TRUETOK = 281, + FALSETOK = 282, + BEGINTOK = 283, + ENDTOK = 284, + DECLARE = 285, + DEFINE = 286, + GLOBAL = 287, + CONSTANT = 288, + SECTION = 289, + ALIAS = 290, + VOLATILE = 291, + THREAD_LOCAL = 292, + TO = 293, + DOTDOTDOT = 294, + NULL_TOK = 295, + UNDEF = 296, + INTERNAL = 297, + LINKONCE = 298, + WEAK = 299, + APPENDING = 300, + DLLIMPORT = 301, + DLLEXPORT = 302, + EXTERN_WEAK = 303, + COMMON = 304, + OPAQUE = 305, + EXTERNAL = 306, + TARGET = 307, + TRIPLE = 308, + ALIGN = 309, + ADDRSPACE = 310, + DEPLIBS = 311, + CALL = 312, + TAIL = 313, + ASM_TOK = 314, + MODULE = 315, + SIDEEFFECT = 316, + CC_TOK = 317, + CCC_TOK = 318, + FASTCC_TOK = 319, + COLDCC_TOK = 320, + X86_STDCALLCC_TOK = 321, + X86_FASTCALLCC_TOK = 322, + DATALAYOUT = 323, + RET = 324, + BR = 325, + SWITCH = 326, + INVOKE = 327, + UNWIND = 328, + UNREACHABLE = 329, + ADD = 330, + SUB = 331, + MUL = 332, + UDIV = 333, + SDIV = 334, + FDIV = 335, + UREM = 336, + SREM = 337, + FREM = 338, + AND = 339, + OR = 340, + XOR = 341, + SHL = 342, + LSHR = 343, + ASHR = 344, + ICMP = 345, + FCMP = 346, + VICMP = 347, + VFCMP = 348, + EQ = 349, + NE = 350, + SLT = 351, + SGT = 352, + SLE = 353, + SGE = 354, + ULT = 355, + UGT = 356, + ULE = 357, + UGE = 358, + OEQ = 359, + ONE = 360, + OLT = 361, + OGT = 362, + OLE = 363, + OGE = 364, + ORD = 365, + UNO = 366, + UEQ = 367, + UNE = 368, + MALLOC = 369, + ALLOCA = 370, + FREE = 371, + LOAD = 372, + STORE = 373, + GETELEMENTPTR = 374, + TRUNC = 375, + ZEXT = 376, + SEXT = 377, + FPTRUNC = 378, + FPEXT = 379, + BITCAST = 380, + UITOFP = 381, + SITOFP = 382, + FPTOUI = 383, + FPTOSI = 384, + INTTOPTR = 385, + PTRTOINT = 386, + PHI_TOK = 387, + SELECT = 388, + VAARG = 389, + EXTRACTELEMENT = 390, + INSERTELEMENT = 391, + SHUFFLEVECTOR = 392, + GETRESULT = 393, + EXTRACTVALUE = 394, + INSERTVALUE = 395, + SIGNEXT = 396, + ZEROEXT = 397, + NORETURN = 398, + INREG = 399, + SRET = 400, + NOUNWIND = 401, + NOALIAS = 402, + BYVAL = 403, + NEST = 404, + READNONE = 405, + READONLY = 406, + GC = 407, + DEFAULT = 408, + HIDDEN = 409, + PROTECTED = 410 }; #endif /* Tokens. */ @@ -209,132 +241,154 @@ #define INTTYPE 266 #define FLOAT 267 #define DOUBLE 268 -#define LABEL 269 -#define TYPE 270 -#define LOCALVAR 271 -#define GLOBALVAR 272 -#define LABELSTR 273 -#define STRINGCONSTANT 274 -#define ATSTRINGCONSTANT 275 -#define IMPLEMENTATION 276 -#define ZEROINITIALIZER 277 -#define TRUETOK 278 -#define FALSETOK 279 -#define BEGINTOK 280 -#define ENDTOK 281 -#define DECLARE 282 -#define DEFINE 283 -#define GLOBAL 284 -#define CONSTANT 285 -#define SECTION 286 -#define VOLATILE 287 -#define TO 288 -#define DOTDOTDOT 289 -#define NULL_TOK 290 -#define UNDEF 291 -#define INTERNAL 292 -#define LINKONCE 293 -#define WEAK 294 -#define APPENDING 295 -#define DLLIMPORT 296 -#define DLLEXPORT 297 -#define EXTERN_WEAK 298 -#define OPAQUE 299 -#define EXTERNAL 300 -#define TARGET 301 -#define TRIPLE 302 -#define ALIGN 303 -#define DEPLIBS 304 -#define CALL 305 -#define TAIL 306 -#define ASM_TOK 307 -#define MODULE 308 -#define SIDEEFFECT 309 -#define CC_TOK 310 -#define CCC_TOK 311 -#define FASTCC_TOK 312 -#define COLDCC_TOK 313 -#define X86_STDCALLCC_TOK 314 -#define X86_FASTCALLCC_TOK 315 -#define DATALAYOUT 316 -#define RET 317 -#define BR 318 -#define SWITCH 319 -#define INVOKE 320 -#define UNWIND 321 -#define UNREACHABLE 322 -#define ADD 323 -#define SUB 324 -#define MUL 325 -#define UDIV 326 -#define SDIV 327 -#define FDIV 328 -#define UREM 329 -#define SREM 330 -#define FREM 331 -#define AND 332 -#define OR 333 -#define XOR 334 -#define SHL 335 -#define LSHR 336 -#define ASHR 337 -#define ICMP 338 -#define FCMP 339 -#define EQ 340 -#define NE 341 -#define SLT 342 -#define SGT 343 -#define SLE 344 -#define SGE 345 -#define ULT 346 -#define UGT 347 -#define ULE 348 -#define UGE 349 -#define OEQ 350 -#define ONE 351 -#define OLT 352 -#define OGT 353 -#define OLE 354 -#define OGE 355 -#define ORD 356 -#define UNO 357 -#define UEQ 358 -#define UNE 359 -#define MALLOC 360 -#define ALLOCA 361 -#define FREE 362 -#define LOAD 363 -#define STORE 364 -#define GETELEMENTPTR 365 -#define TRUNC 366 -#define ZEXT 367 -#define SEXT 368 -#define FPTRUNC 369 -#define FPEXT 370 -#define BITCAST 371 -#define UITOFP 372 -#define SITOFP 373 -#define FPTOUI 374 -#define FPTOSI 375 -#define INTTOPTR 376 -#define PTRTOINT 377 -#define PHI_TOK 378 -#define SELECT 379 -#define VAARG 380 -#define EXTRACTELEMENT 381 -#define INSERTELEMENT 382 -#define SHUFFLEVECTOR 383 -#define NORETURN 384 -#define INREG 385 -#define SRET 386 -#define DEFAULT 387 -#define HIDDEN 388 +#define X86_FP80 269 +#define FP128 270 +#define PPC_FP128 271 +#define LABEL 272 +#define TYPE 273 +#define LOCALVAR 274 +#define GLOBALVAR 275 +#define LABELSTR 276 +#define STRINGCONSTANT 277 +#define ATSTRINGCONSTANT 278 +#define PCTSTRINGCONSTANT 279 +#define ZEROINITIALIZER 280 +#define TRUETOK 281 +#define FALSETOK 282 +#define BEGINTOK 283 +#define ENDTOK 284 +#define DECLARE 285 +#define DEFINE 286 +#define GLOBAL 287 +#define CONSTANT 288 +#define SECTION 289 +#define ALIAS 290 +#define VOLATILE 291 +#define THREAD_LOCAL 292 +#define TO 293 +#define DOTDOTDOT 294 +#define NULL_TOK 295 +#define UNDEF 296 +#define INTERNAL 297 +#define LINKONCE 298 +#define WEAK 299 +#define APPENDING 300 +#define DLLIMPORT 301 +#define DLLEXPORT 302 +#define EXTERN_WEAK 303 +#define COMMON 304 +#define OPAQUE 305 +#define EXTERNAL 306 +#define TARGET 307 +#define TRIPLE 308 +#define ALIGN 309 +#define ADDRSPACE 310 +#define DEPLIBS 311 +#define CALL 312 +#define TAIL 313 +#define ASM_TOK 314 +#define MODULE 315 +#define SIDEEFFECT 316 +#define CC_TOK 317 +#define CCC_TOK 318 +#define FASTCC_TOK 319 +#define COLDCC_TOK 320 +#define X86_STDCALLCC_TOK 321 +#define X86_FASTCALLCC_TOK 322 +#define DATALAYOUT 323 +#define RET 324 +#define BR 325 +#define SWITCH 326 +#define INVOKE 327 +#define UNWIND 328 +#define UNREACHABLE 329 +#define ADD 330 +#define SUB 331 +#define MUL 332 +#define UDIV 333 +#define SDIV 334 +#define FDIV 335 +#define UREM 336 +#define SREM 337 +#define FREM 338 +#define AND 339 +#define OR 340 +#define XOR 341 +#define SHL 342 +#define LSHR 343 +#define ASHR 344 +#define ICMP 345 +#define FCMP 346 +#define VICMP 347 +#define VFCMP 348 +#define EQ 349 +#define NE 350 +#define SLT 351 +#define SGT 352 +#define SLE 353 +#define SGE 354 +#define ULT 355 +#define UGT 356 +#define ULE 357 +#define UGE 358 +#define OEQ 359 +#define ONE 360 +#define OLT 361 +#define OGT 362 +#define OLE 363 +#define OGE 364 +#define ORD 365 +#define UNO 366 +#define UEQ 367 +#define UNE 368 +#define MALLOC 369 +#define ALLOCA 370 +#define FREE 371 +#define LOAD 372 +#define STORE 373 +#define GETELEMENTPTR 374 +#define TRUNC 375 +#define ZEXT 376 +#define SEXT 377 +#define FPTRUNC 378 +#define FPEXT 379 +#define BITCAST 380 +#define UITOFP 381 +#define SITOFP 382 +#define FPTOUI 383 +#define FPTOSI 384 +#define INTTOPTR 385 +#define PTRTOINT 386 +#define PHI_TOK 387 +#define SELECT 388 +#define VAARG 389 +#define EXTRACTELEMENT 390 +#define INSERTELEMENT 391 +#define SHUFFLEVECTOR 392 +#define GETRESULT 393 +#define EXTRACTVALUE 394 +#define INSERTVALUE 395 +#define SIGNEXT 396 +#define ZEROEXT 397 +#define NORETURN 398 +#define INREG 399 +#define SRET 400 +#define NOUNWIND 401 +#define NOALIAS 402 +#define BYVAL 403 +#define NEST 404 +#define READNONE 405 +#define READONLY 406 +#define GC 407 +#define DEFAULT 408 +#define HIDDEN 409 +#define PROTECTED 410 /* Copy the first part of user declarations. */ -#line 14 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 14 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" #include "ParserInternals.h" #include "llvm/CallingConv.h" @@ -342,6 +396,7 @@ #include "llvm/Instructions.h" #include "llvm/Module.h" #include "llvm/ValueSymbolTable.h" +#include "llvm/AutoUpgrade.h" #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/Support/CommandLine.h" #include "llvm/ADT/SmallVector.h" @@ -352,9 +407,6 @@ #include #include #include -#ifndef NDEBUG -#define YYDEBUG 1 -#endif // 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 @@ -374,15 +426,6 @@ static bool TriggerError = false; int yyerror(const char *ErrorMsg); // Forward declarations to prevent "implicit int yylex(); // declaration" of xxx warnings. int yyparse(); - -namespace llvm { - std::string CurFilename; -#if YYDEBUG -static cl::opt -Debug("debug-yacc", cl::desc("Print yacc debug state changes"), - cl::Hidden, cl::init(false)); -#endif -} using namespace llvm; static Module *ParserResult; @@ -455,6 +498,11 @@ static struct PerModuleInfo { return; } + // Look for intrinsic functions and CallInst that need to be upgraded + for (Module::iterator FI = CurrentModule->begin(), + FE = CurrentModule->end(); FI != FE; ) + UpgradeCallsToIntrinsic(FI++); // must be post-increment, as we remove + Values.clear(); // Clear out function local definitions Types.clear(); CurrentModule = 0; @@ -524,8 +572,6 @@ static struct PerModuleInfo { } return false; } - - } CurModule; static struct PerFunctionInfo { @@ -608,7 +654,7 @@ static const Type *getTypeVal(const ValID &D, bool DoNotImprovise = false) { return CurModule.Types[D.Num]; break; case ValID::LocalName: // Is it a named definition? - if (const Type *N = CurModule.CurrentModule->getTypeByName(D.Name)) { + if (const Type *N = CurModule.CurrentModule->getTypeByName(D.getName())) { D.destroy(); // Free old strdup'd memory... return N; } @@ -686,7 +732,7 @@ static Value *getExistingVal(const Type *Ty, const ValID &D) { if (!inFunctionScope()) return 0; ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable(); - Value *N = SymTab.lookup(D.Name); + Value *N = SymTab.lookup(D.getName()); if (N == 0) return 0; if (N->getType() != Ty) @@ -697,7 +743,7 @@ static Value *getExistingVal(const Type *Ty, const ValID &D) { } case ValID::GlobalName: { // Is it a named definition? ValueSymbolTable &SymTab = CurModule.CurrentModule->getValueSymbolTable(); - Value *N = SymTab.lookup(D.Name); + Value *N = SymTab.lookup(D.getName()); if (N == 0) return 0; if (N->getType() != Ty) @@ -710,33 +756,42 @@ static Value *getExistingVal(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 (!ConstantInt::isValueValidForType(Ty, D.ConstPool64)) { + if (!isa(Ty) || + !ConstantInt::isValueValidForType(Ty, D.ConstPool64)) { GenerateError("Signed integral constant '" + itostr(D.ConstPool64) + "' is invalid for type '" + Ty->getDescription() + "'"); return 0; } - return ConstantInt::get(Ty, D.ConstPool64); + return ConstantInt::get(Ty, D.ConstPool64, true); case ValID::ConstUIntVal: // Is it an unsigned const pool reference? - 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 ConstantInt::get(Ty, D.ConstPool64); - } - } else { + if (isa(Ty) && + ConstantInt::isValueValidForType(Ty, D.UConstPool64)) return ConstantInt::get(Ty, D.UConstPool64); + + if (!isa(Ty) || + !ConstantInt::isValueValidForType(Ty, D.ConstPool64)) { + GenerateError("Integral constant '" + utostr(D.UConstPool64) + + "' is invalid or out of range for type '" + + Ty->getDescription() + "'"); + return 0; } + // This is really a signed reference. Transmogrify. + return ConstantInt::get(Ty, D.ConstPool64, true); case ValID::ConstFPVal: // Is it a floating point const pool reference? - if (!ConstantFP::isValueValidForType(Ty, D.ConstPoolFP)) { + if (!Ty->isFloatingPoint() || + !ConstantFP::isValueValidForType(Ty, *D.ConstPoolFP)) { GenerateError("FP constant invalid for type"); return 0; } - return ConstantFP::get(Ty, D.ConstPoolFP); + // Lexer has no type info, so builds all float and double FP constants + // as double. Fix this here. Long double does not need this. + if (&D.ConstPoolFP->getSemantics() == &APFloat::IEEEdouble && + Ty==Type::FloatTy) + D.ConstPoolFP->convert(APFloat::IEEEsingle, APFloat::rmNearestTiesToEven); + return ConstantFP::get(*D.ConstPoolFP); case ValID::ConstNullVal: // Is it a null value? if (!isa(Ty)) { @@ -798,7 +853,7 @@ static Value *getVal(const Type *Ty, const ValID &ID) { if (TriggerError) return 0; if (!Ty->isFirstClassType() && !isa(Ty)) { - GenerateError("Invalid use of a composite type"); + GenerateError("Invalid use of a non-first-class type"); return 0; } @@ -806,12 +861,30 @@ static Value *getVal(const Type *Ty, const ValID &ID) { // or an id number that hasn't been read yet. We may be referencing something // forward, so just create an entry to be resolved later and get to it... // - V = new Argument(Ty); - + switch (ID.Type) { + case ValID::GlobalName: + case ValID::GlobalID: { + const PointerType *PTy = dyn_cast(Ty); + if (!PTy) { + GenerateError("Invalid type for reference to global" ); + return 0; + } + const Type* ElTy = PTy->getElementType(); + if (const FunctionType *FTy = dyn_cast(ElTy)) + V = Function::Create(FTy, GlobalValue::ExternalLinkage); + else + V = new GlobalVariable(ElTy, false, GlobalValue::ExternalLinkage, 0, "", + (Module*)0, false, PTy->getAddressSpace()); + break; + } + default: + V = new Argument(Ty); + } + // Remember where this forward reference came from. FIXME, shouldn't we try // to recycle these things?? CurModule.PlaceHolderInfo.insert(std::make_pair(V, std::make_pair(ID, - llvmAsmlineno))); + LLLgetLineNo()))); if (inFunctionScope()) InsertValue(V, CurFun.LateResolveValues); @@ -837,29 +910,33 @@ static BasicBlock *defineBBVal(const ValID &ID) { CurFun.CurrentFunction->getBasicBlockList().remove(BB); CurFun.CurrentFunction->getBasicBlockList().push_back(BB); + // We're about to erase the entry, save the key so we can clean it up. + ValID Tmp = BBI->first; + // Erase the forward ref from the map as its no longer "forward" CurFun.BBForwardRefs.erase(ID); + // The key has been removed from the map but so we don't want to leave + // strdup'd memory around so destroy it too. + Tmp.destroy(); + // If its a numbered definition, bump the number and set the BB value. if (ID.Type == ValID::LocalID) { assert(ID.Num == CurFun.NextValNum && "Invalid new block number"); InsertValue(BB); } - - ID.destroy(); - return BB; - } - - // We haven't seen this BB before and its first mention is a definition. - // Just create it and return it. - std::string Name (ID.Type == ValID::LocalName ? ID.Name : ""); - BB = new BasicBlock(Name, CurFun.CurrentFunction); - if (ID.Type == ValID::LocalID) { - assert(ID.Num == CurFun.NextValNum && "Invalid new block number"); - InsertValue(BB); + } else { + // We haven't seen this BB before and its first mention is a definition. + // Just create it and return it. + std::string Name (ID.Type == ValID::LocalName ? ID.getName() : ""); + BB = BasicBlock::Create(Name, CurFun.CurrentFunction); + if (ID.Type == ValID::LocalID) { + assert(ID.Num == CurFun.NextValNum && "Invalid new block number"); + InsertValue(BB); + } } - ID.destroy(); // Free strdup'd memory + ID.destroy(); return BB; } @@ -874,14 +951,15 @@ static BasicBlock *getBBVal(const ValID &ID) { if (BBI != CurFun.BBForwardRefs.end()) { BB = BBI->second; } if (ID.Type == ValID::LocalName) { - std::string Name = ID.Name; + std::string Name = ID.getName(); Value *N = CurFun.CurrentFunction->getValueSymbolTable().lookup(Name); - if (N) + if (N) { if (N->getType()->getTypeID() == Type::LabelTyID) BB = cast(N); else GenerateError("Reference to label '" + Name + "' is actually of type '"+ N->getType()->getDescription() + "'"); + } } else if (ID.Type == ValID::LocalID) { if (ID.Num < CurFun.NextValNum && ID.Num < CurFun.Values.size()) { if (CurFun.Values[ID.Num]->getType()->getTypeID() == Type::LabelTyID) @@ -905,8 +983,8 @@ static BasicBlock *getBBVal(const ValID &ID) { // Otherwise, this block has not been seen before, create it. std::string Name; if (ID.Type == ValID::LocalName) - Name = ID.Name; - BB = new BasicBlock(Name, CurFun.CurrentFunction); + Name = ID.getName(); + BB = BasicBlock::Create(Name, CurFun.CurrentFunction); // Insert it in the forward refs map. CurFun.BBForwardRefs[ID] = BB; @@ -977,10 +1055,12 @@ ResolveDefinitions(ValueList &LateResolvers, ValueList *FutureLateResolvers) { // name is not null) things referencing Name can be resolved. Otherwise, things // refering to the number can be resolved. Do this now. // -static void ResolveTypeTo(char *Name, const Type *ToTy) { +static void ResolveTypeTo(std::string *Name, const Type *ToTy) { ValID D; - if (Name) D = ValID::createLocalName(Name); - else D = ValID::createLocalID(CurModule.Types.size()); + if (Name) + D = ValID::createLocalName(*Name); + else + D = ValID::createLocalID(CurModule.Types.size()); std::map::iterator I = CurModule.LateResolveTypes.find(D); @@ -994,10 +1074,10 @@ static void ResolveTypeTo(char *Name, const Type *ToTy) { // null potentially, in which case this is a noop. The string passed in is // assumed to be a malloc'd string buffer, and is free'd by this function. // -static void setValueName(Value *V, char *NameStr) { +static void setValueName(Value *V, std::string *NameStr) { if (!NameStr) return; - std::string Name(NameStr); // Copy string - free(NameStr); // Free old string + std::string Name(*NameStr); // Copy string + delete NameStr; // Free old string if (V->getType() == Type::VoidTy) { GenerateError("Can't assign name '" + Name+"' to value with void type"); @@ -1019,29 +1099,34 @@ static void setValueName(Value *V, char *NameStr) { /// ParseGlobalVariable - Handle parsing of a global. If Initializer is null, /// this is a declaration, otherwise it is a definition. static GlobalVariable * -ParseGlobalVariable(char *NameStr, +ParseGlobalVariable(std::string *NameStr, GlobalValue::LinkageTypes Linkage, GlobalValue::VisibilityTypes Visibility, bool isConstantGlobal, const Type *Ty, - Constant *Initializer) { + Constant *Initializer, bool IsThreadLocal, + unsigned AddressSpace = 0) { if (isa(Ty)) { GenerateError("Cannot declare global vars of function type"); return 0; } + if (Ty == Type::LabelTy) { + GenerateError("Cannot declare global vars of label type"); + return 0; + } - const PointerType *PTy = PointerType::get(Ty); + const PointerType *PTy = PointerType::get(Ty, AddressSpace); std::string Name; if (NameStr) { - Name = NameStr; // Copy string - free(NameStr); // Free old string + Name = *NameStr; // Copy string + delete NameStr; // Free old string } // See if this global value was forward referenced. If so, recycle the // object. ValID ID; if (!Name.empty()) { - ID = ValID::createGlobalName((char*)Name.c_str()); + ID = ValID::createGlobalName(Name); } else { ID = ValID::createGlobalID(CurModule.Values.size()); } @@ -1056,6 +1141,7 @@ ParseGlobalVariable(char *NameStr, GV->setLinkage(Linkage); GV->setVisibility(Visibility); GV->setConstant(isConstantGlobal); + GV->setThreadLocal(IsThreadLocal); InsertValue(GV, CurModule.Values); return GV; } @@ -1080,7 +1166,7 @@ ParseGlobalVariable(char *NameStr, // Otherwise there is no existing GV to use, create one now. GlobalVariable *GV = new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer, Name, - CurModule.CurrentModule); + CurModule.CurrentModule, IsThreadLocal, AddressSpace); GV->setVisibility(Visibility); InsertValue(GV, CurModule.Values); return GV; @@ -1093,12 +1179,12 @@ ParseGlobalVariable(char *NameStr, // This function returns true if the type has already been defined, but is // allowed to be redefined in the specified context. If the name is a new name // for the type plane, it is inserted and false is returned. -static bool setTypeName(const Type *T, char *NameStr) { +static bool setTypeName(const Type *T, std::string *NameStr) { assert(!inFunctionScope() && "Can't give types function-local names!"); if (NameStr == 0) return false; - std::string Name(NameStr); // Copy string - free(NameStr); // Free old string + std::string Name(*NameStr); // Copy string + delete NameStr; // Free old string // We don't allow assigning names to void type if (T == Type::VoidTy) { @@ -1233,22 +1319,11 @@ static PATypeHolder HandleUpRefs(const Type *ty) { // static Module* RunParser(Module * M); -Module *llvm::RunVMAsmParser(const std::string &Filename, FILE *F) { - set_scan_file(F); - - CurFilename = Filename; - return RunParser(new Module(CurFilename)); -} - -Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { - set_scan_string(AsmString); - - CurFilename = "from_memory"; - if (M == NULL) { - return RunParser(new Module (CurFilename)); - } else { - return RunParser(M); - } +Module *llvm::RunVMAsmParser(llvm::MemoryBuffer *MB) { + InitLLLexer(MB); + Module *M = RunParser(new Module(LLLgetFilename())); + FreeLexer(); + return M; } @@ -1271,9 +1346,10 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { # define YYTOKEN_TABLE 0 #endif -#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 932 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" -typedef union YYSTYPE { +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +#line 953 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" +{ llvm::Module *ModuleVal; llvm::Function *FunctionVal; llvm::BasicBlock *BasicBlockVal; @@ -1286,10 +1362,11 @@ typedef union YYSTYPE { llvm::PATypeHolder *TypeVal; llvm::Value *ValueVal; std::vector *ValueList; + std::vector *ConstantList; llvm::ArgListType *ArgList; llvm::TypeWithAttrs TypeWithAttrs; llvm::TypeWithAttrsList *TypeWithAttrsList; - llvm::ValueRefList *ValueRefList; + llvm::ParamList *ParamList; // Represent the RHS of PHI node std::list /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t + +#ifdef YYTYPE_INT16 +typedef YYTYPE_INT16 yytype_int16; +#else +typedef short int yytype_int16; #endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int + +#ifndef YYSIZE_T +# ifdef __SIZE_TYPE__ +# define YYSIZE_T __SIZE_TYPE__ +# elif defined size_t +# define YYSIZE_T size_t +# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# else +# define YYSIZE_T unsigned int +# endif #endif +#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) + #ifndef YY_ # if YYENABLE_NLS # if ENABLE_NLS @@ -1360,7 +1471,32 @@ typedef union YYSTYPE { # endif #endif -#if ! defined (yyoverflow) || YYERROR_VERBOSE +/* Suppress unused-variable warnings by "using" E. */ +#if ! defined lint || defined __GNUC__ +# define YYUSE(e) ((void) (e)) +#else +# define YYUSE(e) /* empty */ +#endif + +/* Identity function, used to suppress warnings about constant conditions. */ +#ifndef lint +# define YYID(n) (n) +#else +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static int +YYID (int i) +#else +static int +YYID (i) + int i; +#endif +{ + return i; +} +#endif + +#if ! defined yyoverflow || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -1368,64 +1504,76 @@ typedef union YYSTYPE { # if YYSTACK_USE_ALLOCA # ifdef __GNUC__ # define YYSTACK_ALLOC __builtin_alloca +# elif defined __BUILTIN_VA_ARG_INCR +# include /* INFRINGES ON USER NAME SPACE */ +# elif defined _AIX +# define YYSTACK_ALLOC __alloca +# elif defined _MSC_VER +# include /* INFRINGES ON USER NAME SPACE */ +# define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if defined (__STDC__) || defined (__cplusplus) +# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) # include /* INFRINGES ON USER NAME SPACE */ -# define YYINCLUDED_STDLIB_H +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif # endif # endif # endif # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely invoke alloca (N) if N exceeds 4096. Use a slightly smaller number to allow for a few compiler-allocated temporary stack slots. */ -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ # endif # else # define YYSTACK_ALLOC YYMALLOC # define YYSTACK_FREE YYFREE # ifndef YYSTACK_ALLOC_MAXIMUM -# define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1) +# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# ifdef __cplusplus -extern "C" { +# if (defined __cplusplus && ! defined _STDLIB_H \ + && ! ((defined YYMALLOC || defined malloc) \ + && (defined YYFREE || defined free))) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \ - && (defined (__STDC__) || defined (__cplusplus))) +# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \ - && (defined (__STDC__) || defined (__cplusplus))) +# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif -# ifdef __cplusplus -} -# endif # endif -#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ -#if (! defined (yyoverflow) \ - && (! defined (__cplusplus) \ - || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL))) +#if (! defined yyoverflow \ + && (! defined __cplusplus \ + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc { - short int yyss; + yytype_int16 yyss; YYSTYPE yyvs; }; @@ -1435,13 +1583,13 @@ union yyalloc /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \ + ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do not overlap. */ # ifndef YYCOPY -# if defined (__GNUC__) && 1 < __GNUC__ +# if defined __GNUC__ && 1 < __GNUC__ # define YYCOPY(To, From, Count) \ __builtin_memcpy (To, From, (Count) * sizeof (*(From))) # else @@ -1452,7 +1600,7 @@ union yyalloc for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ - while (0) + while (YYID (0)) # endif # endif @@ -1470,53 +1618,47 @@ union yyalloc yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ - while (0) - -#endif + while (YYID (0)) -#if defined (__STDC__) || defined (__cplusplus) - typedef signed char yysigned_char; -#else - typedef short int yysigned_char; #endif -/* YYFINAL -- State number of the termination state. */ -#define YYFINAL 40 +/* YYFINAL -- State number of the termination state. */ +#define YYFINAL 44 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1429 +#define YYLAST 2339 -/* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 148 -/* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 78 -/* YYNRULES -- Number of rules. */ -#define YYNRULES 286 -/* YYNRULES -- Number of states. */ -#define YYNSTATES 559 +/* YYNTOKENS -- Number of terminals. */ +#define YYNTOKENS 170 +/* YYNNTS -- Number of nonterminals. */ +#define YYNNTS 86 +/* YYNRULES -- Number of rules. */ +#define YYNRULES 340 +/* YYNRULES -- Number of states. */ +#define YYNSTATES 699 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 388 +#define YYMAXUTOK 410 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const unsigned char yytranslate[] = +static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 138, 139, 136, 2, 135, 2, 2, 2, 2, 2, + 156, 157, 160, 2, 159, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 143, 134, 144, 2, 2, 2, 2, 2, 2, 2, + 165, 158, 166, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 140, 137, 142, 2, 2, 2, 2, 2, 147, + 2, 162, 161, 164, 2, 2, 2, 2, 2, 169, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 141, 2, 2, 145, 2, 146, 2, 2, 2, 2, + 163, 2, 2, 167, 2, 168, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1542,13 +1684,16 @@ static const unsigned char yytranslate[] = 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, 130, 131, 132, 133 + 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, + 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, + 155 }; #if YYDEBUG /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ -static const unsigned short int yyprhs[] = +static const yytype_uint16 yyprhs[] = { 0, 0, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, @@ -1556,213 +1701,251 @@ static const unsigned short int yyprhs[] = 59, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 89, 91, 93, 95, 97, 99, 101, 103, 105, 107, 109, 111, 113, 115, 117, - 119, 121, 122, 125, 126, 128, 130, 133, 134, 136, - 138, 140, 142, 144, 146, 148, 150, 151, 153, 154, - 156, 158, 159, 161, 163, 165, 167, 168, 170, 172, - 174, 176, 178, 181, 183, 185, 187, 189, 190, 193, - 195, 197, 198, 201, 202, 205, 206, 210, 213, 214, - 216, 217, 221, 223, 226, 228, 230, 232, 234, 236, - 238, 241, 243, 246, 252, 258, 264, 270, 274, 277, - 283, 288, 291, 293, 295, 297, 301, 303, 307, 309, - 310, 312, 316, 321, 325, 329, 334, 339, 343, 350, - 356, 359, 362, 365, 368, 371, 374, 377, 380, 383, - 386, 389, 392, 399, 405, 414, 421, 428, 436, 444, - 451, 460, 469, 473, 475, 477, 479, 481, 482, 484, - 487, 488, 492, 493, 497, 501, 503, 507, 511, 512, - 519, 520, 528, 529, 537, 540, 544, 546, 550, 554, - 558, 562, 564, 565, 571, 575, 577, 581, 583, 584, - 594, 596, 598, 603, 605, 607, 610, 614, 615, 617, - 619, 621, 623, 625, 627, 629, 631, 633, 637, 639, - 645, 647, 649, 651, 653, 655, 657, 660, 663, 666, - 670, 673, 674, 676, 679, 682, 686, 696, 706, 715, - 730, 732, 734, 741, 747, 750, 757, 765, 769, 775, - 776, 777, 781, 784, 786, 792, 798, 805, 812, 817, - 824, 829, 834, 841, 848, 851, 860, 862, 864, 865, - 869, 876, 880, 887, 890, 895, 902 + 119, 121, 123, 125, 127, 129, 130, 135, 136, 139, + 140, 142, 144, 146, 147, 150, 152, 154, 156, 158, + 160, 162, 164, 166, 168, 169, 171, 173, 175, 176, + 178, 180, 181, 183, 185, 187, 189, 190, 192, 194, + 195, 197, 199, 201, 203, 205, 208, 210, 212, 214, + 216, 218, 220, 222, 224, 226, 229, 230, 233, 235, + 237, 239, 241, 243, 245, 246, 249, 250, 253, 254, + 257, 258, 262, 265, 266, 268, 269, 273, 275, 278, + 280, 282, 284, 286, 288, 290, 292, 294, 296, 300, + 302, 305, 311, 317, 323, 329, 333, 336, 342, 347, + 350, 352, 354, 356, 360, 362, 366, 368, 369, 371, + 375, 380, 384, 388, 393, 398, 402, 409, 415, 418, + 421, 424, 427, 430, 433, 436, 439, 442, 445, 448, + 451, 458, 464, 473, 480, 487, 495, 503, 511, 519, + 526, 535, 544, 550, 558, 562, 564, 566, 568, 570, + 571, 574, 581, 583, 584, 586, 589, 590, 594, 595, + 599, 603, 607, 611, 612, 621, 622, 632, 633, 643, + 649, 652, 656, 658, 662, 666, 670, 674, 676, 677, + 683, 687, 689, 693, 695, 696, 707, 709, 711, 716, + 718, 720, 723, 727, 728, 730, 732, 734, 736, 738, + 740, 742, 744, 746, 750, 754, 757, 760, 764, 767, + 773, 778, 780, 786, 788, 790, 792, 794, 796, 798, + 801, 803, 807, 810, 813, 817, 820, 821, 823, 826, + 829, 833, 843, 853, 862, 877, 879, 881, 888, 894, + 897, 904, 912, 917, 922, 929, 936, 937, 938, 942, + 945, 949, 952, 954, 960, 966, 973, 980, 987, 994, + 999, 1006, 1011, 1016, 1023, 1030, 1033, 1042, 1044, 1046, + 1047, 1051, 1058, 1062, 1069, 1072, 1078, 1086, 1092, 1097, + 1102 }; -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const short int yyrhs[] = +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yytype_int16 yyrhs[] = { - 188, 0, -1, 68, -1, 69, -1, 70, -1, 71, - -1, 72, -1, 73, -1, 74, -1, 75, -1, 76, - -1, 80, -1, 81, -1, 82, -1, 77, -1, 78, - -1, 79, -1, 111, -1, 112, -1, 113, -1, 114, - -1, 115, -1, 116, -1, 117, -1, 118, -1, 119, - -1, 120, -1, 121, -1, 122, -1, 85, -1, 86, - -1, 87, -1, 88, -1, 89, -1, 90, -1, 91, - -1, 92, -1, 93, -1, 94, -1, 95, -1, 96, - -1, 97, -1, 98, -1, 99, -1, 100, -1, 101, - -1, 102, -1, 103, -1, 104, -1, 91, -1, 92, - -1, 93, -1, 94, -1, 23, -1, 24, -1, 11, - -1, 12, -1, 13, -1, 16, -1, 19, -1, 156, - -1, -1, 156, 134, -1, -1, 17, -1, 20, -1, - 159, 134, -1, -1, 37, -1, 39, -1, 38, -1, - 40, -1, 42, -1, 41, -1, 43, -1, 45, -1, - -1, 133, -1, -1, 41, -1, 43, -1, -1, 37, - -1, 38, -1, 39, -1, 42, -1, -1, 56, -1, - 57, -1, 58, -1, 59, -1, 60, -1, 55, 4, - -1, 112, -1, 113, -1, 130, -1, 131, -1, -1, - 168, 167, -1, 129, -1, 167, -1, -1, 170, 169, - -1, -1, 48, 4, -1, -1, 135, 48, 4, -1, - 31, 19, -1, -1, 173, -1, -1, 135, 176, 175, - -1, 173, -1, 48, 4, -1, 11, -1, 12, -1, - 13, -1, 14, -1, 44, -1, 177, -1, 178, 136, - -1, 210, -1, 137, 4, -1, 178, 138, 182, 139, - 170, -1, 10, 138, 182, 139, 170, -1, 140, 4, - 141, 178, 142, -1, 143, 4, 141, 178, 144, -1, - 145, 183, 146, -1, 145, 146, -1, 143, 145, 183, - 146, 144, -1, 143, 145, 146, 144, -1, 178, 168, - -1, 178, -1, 10, -1, 179, -1, 181, 135, 179, - -1, 181, -1, 181, 135, 34, -1, 34, -1, -1, - 178, -1, 183, 135, 178, -1, 178, 140, 186, 142, - -1, 178, 140, 142, -1, 178, 147, 19, -1, 178, - 143, 186, 144, -1, 178, 145, 186, 146, -1, 178, - 145, 146, -1, 178, 143, 145, 186, 146, 144, -1, - 178, 143, 145, 146, 144, -1, 178, 35, -1, 178, - 36, -1, 178, 210, -1, 178, 185, -1, 178, 22, - -1, 154, 3, -1, 154, 5, -1, 154, 4, -1, - 154, 6, -1, 11, 23, -1, 11, 24, -1, 155, - 9, -1, 151, 138, 184, 33, 178, 139, -1, 110, - 138, 184, 221, 139, -1, 124, 138, 184, 135, 184, - 135, 184, 139, -1, 149, 138, 184, 135, 184, 139, - -1, 150, 138, 184, 135, 184, 139, -1, 83, 152, - 138, 184, 135, 184, 139, -1, 84, 153, 138, 184, - 135, 184, 139, -1, 126, 138, 184, 135, 184, 139, - -1, 127, 138, 184, 135, 184, 135, 184, 139, -1, - 128, 138, 184, 135, 184, 135, 184, 139, -1, 186, - 135, 184, -1, 184, -1, 29, -1, 30, -1, 189, - -1, -1, 190, -1, 189, 190, -1, -1, 28, 191, - 206, -1, -1, 27, 192, 207, -1, 53, 52, 196, - -1, 21, -1, 158, 15, 178, -1, 158, 15, 10, - -1, -1, 160, 163, 187, 184, 193, 175, -1, -1, - 160, 161, 163, 187, 184, 194, 175, -1, -1, 160, - 162, 163, 187, 178, 195, 175, -1, 46, 197, -1, - 49, 134, 198, -1, 19, -1, 47, 134, 19, -1, - 61, 134, 19, -1, 140, 199, 142, -1, 199, 135, - 19, -1, 19, -1, -1, 200, 135, 178, 168, 157, - -1, 178, 168, 157, -1, 200, -1, 200, 135, 34, - -1, 34, -1, -1, 166, 180, 159, 138, 201, 139, - 170, 174, 171, -1, 25, -1, 145, -1, 165, 163, - 202, 203, -1, 26, -1, 146, -1, 213, 205, -1, - 164, 163, 202, -1, -1, 54, -1, 3, -1, 4, - -1, 9, -1, 23, -1, 24, -1, 35, -1, 36, - -1, 22, -1, 143, 186, 144, -1, 185, -1, 52, - 208, 19, 135, 19, -1, 7, -1, 8, -1, 156, - -1, 159, -1, 210, -1, 209, -1, 178, 211, -1, - 213, 214, -1, 204, 214, -1, 215, 158, 216, -1, - 215, 218, -1, -1, 18, -1, 62, 212, -1, 62, - 10, -1, 63, 14, 211, -1, 63, 11, 211, 135, - 14, 211, 135, 14, 211, -1, 64, 154, 211, 135, - 14, 211, 140, 217, 142, -1, 64, 154, 211, 135, - 14, 211, 140, 142, -1, 65, 166, 180, 211, 138, - 220, 139, 170, 33, 14, 211, 66, 14, 211, -1, - 66, -1, 67, -1, 217, 154, 209, 135, 14, 211, - -1, 154, 209, 135, 14, 211, -1, 158, 223, -1, - 178, 140, 211, 135, 211, 142, -1, 219, 135, 140, - 211, 135, 211, 142, -1, 178, 211, 168, -1, 220, - 135, 178, 211, 168, -1, -1, -1, 221, 135, 212, - -1, 51, 50, -1, 50, -1, 149, 178, 211, 135, - 211, -1, 150, 178, 211, 135, 211, -1, 83, 152, - 178, 211, 135, 211, -1, 84, 153, 178, 211, 135, - 211, -1, 151, 212, 33, 178, -1, 124, 212, 135, - 212, 135, 212, -1, 125, 212, 135, 178, -1, 126, - 212, 135, 212, -1, 127, 212, 135, 212, 135, 212, - -1, 128, 212, 135, 212, 135, 212, -1, 123, 219, - -1, 222, 166, 180, 211, 138, 220, 139, 170, -1, - 225, -1, 32, -1, -1, 105, 178, 172, -1, 105, - 178, 135, 11, 211, 172, -1, 106, 178, 172, -1, - 106, 178, 135, 11, 211, 172, -1, 107, 212, -1, - 224, 108, 178, 211, -1, 224, 109, 212, 135, 178, - 211, -1, 110, 178, 211, 221, -1 + 216, 0, -1, 75, -1, 76, -1, 77, -1, 78, + -1, 79, -1, 80, -1, 81, -1, 82, -1, 83, + -1, 87, -1, 88, -1, 89, -1, 84, -1, 85, + -1, 86, -1, 120, -1, 121, -1, 122, -1, 123, + -1, 124, -1, 125, -1, 126, -1, 127, -1, 128, + -1, 129, -1, 130, -1, 131, -1, 94, -1, 95, + -1, 96, -1, 97, -1, 98, -1, 99, -1, 100, + -1, 101, -1, 102, -1, 103, -1, 104, -1, 105, + -1, 106, -1, 107, -1, 108, -1, 109, -1, 110, + -1, 111, -1, 112, -1, 113, -1, 100, -1, 101, + -1, 102, -1, 103, -1, 26, -1, 27, -1, 11, + -1, 12, -1, 13, -1, 16, -1, 15, -1, 14, + -1, 19, -1, 22, -1, 24, -1, 178, -1, -1, + 55, 156, 4, 157, -1, -1, 178, 158, -1, -1, + 20, -1, 23, -1, 184, -1, -1, 182, 158, -1, + 42, -1, 44, -1, 43, -1, 45, -1, 47, -1, + 49, -1, 46, -1, 48, -1, 51, -1, -1, 153, + -1, 154, -1, 155, -1, -1, 46, -1, 48, -1, + -1, 42, -1, 43, -1, 44, -1, 47, -1, -1, + 44, -1, 42, -1, -1, 63, -1, 64, -1, 65, + -1, 66, -1, 67, -1, 62, 4, -1, 142, -1, + 121, -1, 141, -1, 122, -1, 144, -1, 145, -1, + 147, -1, 148, -1, 149, -1, 54, 4, -1, -1, + 193, 192, -1, 143, -1, 146, -1, 142, -1, 141, + -1, 150, -1, 151, -1, -1, 195, 194, -1, -1, + 152, 22, -1, -1, 54, 4, -1, -1, 159, 54, + 4, -1, 34, 22, -1, -1, 199, -1, -1, 159, + 202, 201, -1, 199, -1, 54, 4, -1, 11, -1, + 12, -1, 13, -1, 16, -1, 15, -1, 14, -1, + 17, -1, 50, -1, 203, -1, 204, 180, 160, -1, + 238, -1, 161, 4, -1, 204, 156, 208, 157, 195, + -1, 10, 156, 208, 157, 195, -1, 162, 4, 163, + 204, 164, -1, 165, 4, 163, 204, 166, -1, 167, + 209, 168, -1, 167, 168, -1, 165, 167, 209, 168, + 166, -1, 165, 167, 168, 166, -1, 204, 193, -1, + 204, -1, 10, -1, 205, -1, 207, 159, 205, -1, + 207, -1, 207, 159, 39, -1, 39, -1, -1, 204, + -1, 209, 159, 204, -1, 204, 162, 212, 164, -1, + 204, 162, 164, -1, 204, 169, 22, -1, 204, 165, + 212, 166, -1, 204, 167, 212, 168, -1, 204, 167, + 168, -1, 204, 165, 167, 212, 168, 166, -1, 204, + 165, 167, 168, 166, -1, 204, 40, -1, 204, 41, + -1, 204, 238, -1, 204, 211, -1, 204, 25, -1, + 176, 3, -1, 176, 5, -1, 176, 4, -1, 176, + 6, -1, 11, 26, -1, 11, 27, -1, 177, 9, + -1, 173, 156, 210, 38, 204, 157, -1, 119, 156, + 210, 250, 157, -1, 133, 156, 210, 159, 210, 159, + 210, 157, -1, 171, 156, 210, 159, 210, 157, -1, + 172, 156, 210, 159, 210, 157, -1, 90, 174, 156, + 210, 159, 210, 157, -1, 91, 175, 156, 210, 159, + 210, 157, -1, 92, 174, 156, 210, 159, 210, 157, + -1, 93, 175, 156, 210, 159, 210, 157, -1, 135, + 156, 210, 159, 210, 157, -1, 136, 156, 210, 159, + 210, 159, 210, 157, -1, 137, 156, 210, 159, 210, + 159, 210, 157, -1, 139, 156, 210, 251, 157, -1, + 140, 156, 210, 159, 210, 251, 157, -1, 212, 159, + 210, -1, 210, -1, 32, -1, 33, -1, 37, -1, + -1, 206, 238, -1, 125, 156, 215, 38, 204, 157, + -1, 217, -1, -1, 218, -1, 217, 218, -1, -1, + 31, 219, 234, -1, -1, 30, 220, 235, -1, 60, + 59, 224, -1, 181, 18, 204, -1, 181, 18, 10, + -1, -1, 183, 187, 214, 213, 210, 180, 221, 201, + -1, -1, 183, 185, 187, 214, 213, 210, 180, 222, + 201, -1, -1, 183, 186, 187, 214, 213, 204, 180, + 223, 201, -1, 183, 187, 35, 190, 215, -1, 52, + 225, -1, 56, 158, 226, -1, 22, -1, 53, 158, + 22, -1, 68, 158, 22, -1, 162, 227, 164, -1, + 227, 159, 22, -1, 22, -1, -1, 228, 159, 204, + 193, 179, -1, 204, 193, 179, -1, 228, -1, 228, + 159, 39, -1, 39, -1, -1, 191, 206, 182, 156, + 229, 157, 195, 200, 197, 196, -1, 28, -1, 167, + -1, 189, 187, 230, 231, -1, 29, -1, 168, -1, + 242, 233, -1, 188, 187, 230, -1, -1, 61, -1, + 3, -1, 4, -1, 9, -1, 26, -1, 27, -1, + 40, -1, 41, -1, 25, -1, 165, 212, 166, -1, + 162, 212, 164, -1, 162, 164, -1, 169, 22, -1, + 167, 212, 168, -1, 167, 168, -1, 165, 167, 212, + 168, 166, -1, 165, 167, 168, 166, -1, 211, -1, + 59, 236, 22, 159, 22, -1, 7, -1, 8, -1, + 178, -1, 182, -1, 238, -1, 237, -1, 204, 239, + -1, 240, -1, 241, 159, 240, -1, 242, 243, -1, + 232, 243, -1, 244, 181, 245, -1, 244, 247, -1, + -1, 21, -1, 69, 241, -1, 69, 10, -1, 70, + 17, 239, -1, 70, 11, 239, 159, 17, 239, 159, + 17, 239, -1, 71, 176, 239, 159, 17, 239, 162, + 246, 164, -1, 71, 176, 239, 159, 17, 239, 162, + 164, -1, 72, 191, 206, 239, 156, 249, 157, 195, + 38, 17, 239, 73, 17, 239, -1, 73, -1, 74, + -1, 246, 176, 237, 159, 17, 239, -1, 176, 237, + 159, 17, 239, -1, 181, 253, -1, 204, 162, 239, + 159, 239, 164, -1, 248, 159, 162, 239, 159, 239, + 164, -1, 204, 193, 239, 193, -1, 17, 193, 239, + 193, -1, 249, 159, 204, 193, 239, 193, -1, 249, + 159, 17, 193, 239, 193, -1, -1, -1, 250, 159, + 240, -1, 159, 4, -1, 251, 159, 4, -1, 58, + 57, -1, 57, -1, 171, 204, 239, 159, 239, -1, + 172, 204, 239, 159, 239, -1, 90, 174, 204, 239, + 159, 239, -1, 91, 175, 204, 239, 159, 239, -1, + 92, 174, 204, 239, 159, 239, -1, 93, 175, 204, + 239, 159, 239, -1, 173, 240, 38, 204, -1, 133, + 240, 159, 240, 159, 240, -1, 134, 240, 159, 204, + -1, 135, 240, 159, 240, -1, 136, 240, 159, 240, + 159, 240, -1, 137, 240, 159, 240, 159, 240, -1, + 132, 248, -1, 252, 191, 206, 239, 156, 249, 157, + 195, -1, 255, -1, 36, -1, -1, 114, 204, 198, + -1, 114, 204, 159, 11, 239, 198, -1, 115, 204, + 198, -1, 115, 204, 159, 11, 239, 198, -1, 116, + 240, -1, 254, 117, 204, 239, 198, -1, 254, 118, + 240, 159, 204, 239, 198, -1, 138, 204, 239, 159, + 4, -1, 119, 204, 239, 250, -1, 139, 204, 239, + 251, -1, 140, 204, 239, 159, 204, 239, 251, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const unsigned short int yyrline[] = +static const yytype_uint16 yyrline[] = { - 0, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, - 1086, 1087, 1087, 1087, 1087, 1087, 1087, 1088, 1088, 1088, - 1088, 1088, 1088, 1089, 1089, 1089, 1089, 1089, 1089, 1092, - 1092, 1093, 1093, 1094, 1094, 1095, 1095, 1096, 1096, 1100, - 1100, 1101, 1101, 1102, 1102, 1103, 1103, 1104, 1104, 1105, - 1105, 1106, 1106, 1107, 1108, 1113, 1114, 1114, 1116, 1116, - 1117, 1117, 1121, 1125, 1130, 1130, 1132, 1136, 1142, 1143, - 1144, 1145, 1146, 1150, 1151, 1152, 1156, 1157, 1161, 1162, - 1163, 1167, 1168, 1169, 1170, 1171, 1174, 1175, 1176, 1177, - 1178, 1179, 1180, 1187, 1188, 1189, 1190, 1193, 1194, 1199, - 1200, 1203, 1204, 1211, 1212, 1218, 1219, 1227, 1235, 1236, - 1241, 1242, 1243, 1248, 1261, 1261, 1261, 1261, 1264, 1268, - 1272, 1279, 1284, 1292, 1310, 1328, 1333, 1345, 1355, 1359, - 1369, 1376, 1383, 1390, 1395, 1400, 1407, 1408, 1415, 1422, - 1430, 1435, 1446, 1474, 1490, 1519, 1547, 1572, 1591, 1617, - 1637, 1649, 1656, 1722, 1732, 1742, 1751, 1761, 1769, 1779, - 1784, 1789, 1797, 1809, 1831, 1839, 1845, 1856, 1861, 1866, - 1872, 1878, 1887, 1891, 1899, 1899, 1910, 1915, 1923, 1924, - 1928, 1928, 1932, 1932, 1935, 1938, 1950, 1974, 1985, 1985, - 1995, 1995, 2003, 2003, 2013, 2016, 2022, 2035, 2039, 2044, - 2046, 2051, 2056, 2065, 2075, 2086, 2090, 2099, 2108, 2113, - 2225, 2225, 2227, 2236, 2236, 2238, 2243, 2255, 2259, 2264, - 2268, 2272, 2276, 2280, 2284, 2288, 2292, 2296, 2321, 2325, - 2339, 2343, 2347, 2351, 2357, 2357, 2363, 2372, 2376, 2385, - 2394, 2403, 2407, 2412, 2416, 2420, 2425, 2435, 2454, 2463, - 2530, 2534, 2541, 2552, 2565, 2575, 2586, 2596, 2604, 2612, - 2615, 2616, 2623, 2627, 2632, 2653, 2670, 2683, 2696, 2708, - 2716, 2723, 2729, 2735, 2741, 2756, 2820, 2825, 2829, 2836, - 2843, 2851, 2858, 2866, 2874, 2888, 2905 + 0, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, + 1118, 1119, 1119, 1119, 1119, 1119, 1119, 1120, 1120, 1120, + 1120, 1120, 1120, 1121, 1121, 1121, 1121, 1121, 1121, 1124, + 1124, 1125, 1125, 1126, 1126, 1127, 1127, 1128, 1128, 1132, + 1132, 1133, 1133, 1134, 1134, 1135, 1135, 1136, 1136, 1137, + 1137, 1138, 1138, 1139, 1140, 1145, 1146, 1146, 1146, 1146, + 1146, 1148, 1148, 1148, 1149, 1149, 1151, 1152, 1156, 1160, + 1165, 1165, 1167, 1168, 1173, 1179, 1180, 1181, 1182, 1183, + 1184, 1188, 1189, 1190, 1194, 1195, 1196, 1197, 1201, 1202, + 1203, 1207, 1208, 1209, 1210, 1211, 1215, 1216, 1217, 1220, + 1221, 1222, 1223, 1224, 1225, 1226, 1233, 1234, 1235, 1236, + 1237, 1238, 1239, 1240, 1241, 1242, 1246, 1247, 1252, 1253, + 1254, 1255, 1256, 1257, 1260, 1261, 1266, 1267, 1274, 1275, + 1281, 1282, 1291, 1299, 1300, 1305, 1306, 1307, 1312, 1325, + 1325, 1325, 1325, 1325, 1325, 1325, 1328, 1332, 1336, 1343, + 1348, 1356, 1385, 1410, 1415, 1425, 1435, 1439, 1449, 1456, + 1465, 1472, 1477, 1482, 1489, 1490, 1497, 1504, 1512, 1518, + 1530, 1558, 1574, 1601, 1629, 1655, 1675, 1701, 1721, 1733, + 1740, 1806, 1816, 1826, 1832, 1842, 1848, 1858, 1864, 1870, + 1883, 1895, 1916, 1924, 1930, 1941, 1946, 1951, 1956, 1961, + 1967, 1973, 1979, 1987, 1998, 2002, 2010, 2010, 2013, 2013, + 2016, 2028, 2049, 2054, 2062, 2063, 2067, 2067, 2071, 2071, + 2074, 2077, 2101, 2113, 2112, 2124, 2123, 2133, 2132, 2143, + 2183, 2186, 2192, 2202, 2206, 2211, 2213, 2218, 2223, 2232, + 2242, 2253, 2257, 2266, 2275, 2280, 2409, 2409, 2411, 2420, + 2420, 2422, 2427, 2439, 2443, 2448, 2452, 2456, 2460, 2464, + 2468, 2472, 2476, 2480, 2502, 2524, 2528, 2541, 2553, 2558, + 2570, 2576, 2580, 2590, 2594, 2598, 2603, 2610, 2610, 2616, + 2625, 2630, 2635, 2639, 2648, 2657, 2666, 2670, 2678, 2685, + 2689, 2694, 2705, 2724, 2733, 2819, 2823, 2830, 2841, 2854, + 2864, 2875, 2885, 2896, 2904, 2914, 2921, 2924, 2925, 2933, + 2939, 2948, 2952, 2957, 2973, 2990, 3004, 3018, 3032, 3046, + 3058, 3066, 3073, 3079, 3085, 3091, 3106, 3196, 3201, 3205, + 3212, 3219, 3229, 3236, 3246, 3254, 3268, 3285, 3293, 3308, + 3323 }; #endif #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { "$end", "error", "$undefined", "ESINT64VAL", "EUINT64VAL", "ESAPINTVAL", "EUAPINTVAL", "LOCALVAL_ID", "GLOBALVAL_ID", "FPVAL", "VOID", "INTTYPE", - "FLOAT", "DOUBLE", "LABEL", "TYPE", "LOCALVAR", "GLOBALVAR", "LABELSTR", - "STRINGCONSTANT", "ATSTRINGCONSTANT", "IMPLEMENTATION", - "ZEROINITIALIZER", "TRUETOK", "FALSETOK", "BEGINTOK", "ENDTOK", - "DECLARE", "DEFINE", "GLOBAL", "CONSTANT", "SECTION", "VOLATILE", "TO", + "FLOAT", "DOUBLE", "X86_FP80", "FP128", "PPC_FP128", "LABEL", "TYPE", + "LOCALVAR", "GLOBALVAR", "LABELSTR", "STRINGCONSTANT", + "ATSTRINGCONSTANT", "PCTSTRINGCONSTANT", "ZEROINITIALIZER", "TRUETOK", + "FALSETOK", "BEGINTOK", "ENDTOK", "DECLARE", "DEFINE", "GLOBAL", + "CONSTANT", "SECTION", "ALIAS", "VOLATILE", "THREAD_LOCAL", "TO", "DOTDOTDOT", "NULL_TOK", "UNDEF", "INTERNAL", "LINKONCE", "WEAK", - "APPENDING", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "OPAQUE", - "EXTERNAL", "TARGET", "TRIPLE", "ALIGN", "DEPLIBS", "CALL", "TAIL", - "ASM_TOK", "MODULE", "SIDEEFFECT", "CC_TOK", "CCC_TOK", "FASTCC_TOK", - "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATALAYOUT", - "RET", "BR", "SWITCH", "INVOKE", "UNWIND", "UNREACHABLE", "ADD", "SUB", - "MUL", "UDIV", "SDIV", "FDIV", "UREM", "SREM", "FREM", "AND", "OR", - "XOR", "SHL", "LSHR", "ASHR", "ICMP", "FCMP", "EQ", "NE", "SLT", "SGT", - "SLE", "SGE", "ULT", "UGT", "ULE", "UGE", "OEQ", "ONE", "OLT", "OGT", - "OLE", "OGE", "ORD", "UNO", "UEQ", "UNE", "MALLOC", "ALLOCA", "FREE", - "LOAD", "STORE", "GETELEMENTPTR", "TRUNC", "ZEXT", "SEXT", "FPTRUNC", - "FPEXT", "BITCAST", "UITOFP", "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR", - "PTRTOINT", "PHI_TOK", "SELECT", "VAARG", "EXTRACTELEMENT", - "INSERTELEMENT", "SHUFFLEVECTOR", "NORETURN", "INREG", "SRET", "DEFAULT", - "HIDDEN", "'='", "','", "'*'", "'\\\\'", "'('", "')'", "'['", "'x'", - "']'", "'<'", "'>'", "'{'", "'}'", "'c'", "$accept", "ArithmeticOps", - "LogicalOps", "CastOps", "IPredicates", "FPredicates", "IntType", - "FPType", "LocalName", "OptLocalName", "OptLocalAssign", "GlobalName", - "OptGlobalAssign", "GVInternalLinkage", "GVExternalLinkage", - "GVVisibilityStyle", "FunctionDeclareLinkage", "FunctionDefineLinkage", - "OptCallingConv", "ParamAttr", "OptParamAttrs", "FuncAttr", - "OptFuncAttrs", "OptAlign", "OptCAlign", "SectionString", "OptSection", - "GlobalVarAttributes", "GlobalVarAttribute", "PrimType", "Types", - "ArgType", "ResultTypes", "ArgTypeList", "ArgTypeListI", "TypeListI", - "ConstVal", "ConstExpr", "ConstVector", "GlobalType", "Module", + "APPENDING", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "COMMON", "OPAQUE", + "EXTERNAL", "TARGET", "TRIPLE", "ALIGN", "ADDRSPACE", "DEPLIBS", "CALL", + "TAIL", "ASM_TOK", "MODULE", "SIDEEFFECT", "CC_TOK", "CCC_TOK", + "FASTCC_TOK", "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", + "DATALAYOUT", "RET", "BR", "SWITCH", "INVOKE", "UNWIND", "UNREACHABLE", + "ADD", "SUB", "MUL", "UDIV", "SDIV", "FDIV", "UREM", "SREM", "FREM", + "AND", "OR", "XOR", "SHL", "LSHR", "ASHR", "ICMP", "FCMP", "VICMP", + "VFCMP", "EQ", "NE", "SLT", "SGT", "SLE", "SGE", "ULT", "UGT", "ULE", + "UGE", "OEQ", "ONE", "OLT", "OGT", "OLE", "OGE", "ORD", "UNO", "UEQ", + "UNE", "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE", "GETELEMENTPTR", + "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT", "BITCAST", "UITOFP", + "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR", "PTRTOINT", "PHI_TOK", + "SELECT", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR", + "GETRESULT", "EXTRACTVALUE", "INSERTVALUE", "SIGNEXT", "ZEROEXT", + "NORETURN", "INREG", "SRET", "NOUNWIND", "NOALIAS", "BYVAL", "NEST", + "READNONE", "READONLY", "GC", "DEFAULT", "HIDDEN", "PROTECTED", "'('", + "')'", "'='", "','", "'*'", "'\\\\'", "'['", "'x'", "']'", "'<'", "'>'", + "'{'", "'}'", "'c'", "$accept", "ArithmeticOps", "LogicalOps", "CastOps", + "IPredicates", "FPredicates", "IntType", "FPType", "LocalName", + "OptLocalName", "OptAddrSpace", "OptLocalAssign", "GlobalName", + "OptGlobalAssign", "GlobalAssign", "GVInternalLinkage", + "GVExternalLinkage", "GVVisibilityStyle", "FunctionDeclareLinkage", + "FunctionDefineLinkage", "AliasLinkage", "OptCallingConv", "ParamAttr", + "OptParamAttrs", "FuncAttr", "OptFuncAttrs", "OptGC", "OptAlign", + "OptCAlign", "SectionString", "OptSection", "GlobalVarAttributes", + "GlobalVarAttribute", "PrimType", "Types", "ArgType", "ResultTypes", + "ArgTypeList", "ArgTypeListI", "TypeListI", "ConstVal", "ConstExpr", + "ConstVector", "GlobalType", "ThreadLocal", "AliaseeRef", "Module", "DefinitionList", "Definition", "@1", "@2", "@3", "@4", "@5", "AsmBlock", "TargetDefinition", "LibrariesDefinition", "LibList", "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader", "END", "Function", "FunctionProto", "OptSideEffect", "ConstValueRef", - "SymbolicValueRef", "ValueRef", "ResolvedVal", "BasicBlockList", - "BasicBlock", "InstructionList", "BBTerminatorInst", "JumpTable", "Inst", - "PHIList", "ValueRefList", "IndexList", "OptTailCall", "InstVal", - "OptVolatile", "MemoryInst", 0 + "SymbolicValueRef", "ValueRef", "ResolvedVal", "ReturnedVal", + "BasicBlockList", "BasicBlock", "InstructionList", "BBTerminatorInst", + "JumpTable", "Inst", "PHIList", "ParamList", "IndexList", + "ConstantIndexList", "OptTailCall", "InstVal", "OptVolatile", + "MemoryInst", 0 }; #endif # ifdef YYPRINT /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ -static const unsigned short int yytoknum[] = +static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, @@ -1777,47 +1960,55 @@ static const unsigned short int yytoknum[] = 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, - 385, 386, 387, 388, 61, 44, 42, 92, 40, 41, - 91, 120, 93, 60, 62, 123, 125, 99 + 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, + 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, + 405, 406, 407, 408, 409, 410, 40, 41, 61, 44, + 42, 92, 91, 120, 93, 60, 62, 123, 125, 99 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const unsigned char yyr1[] = +static const yytype_uint8 yyr1[] = { - 0, 148, 149, 149, 149, 149, 149, 149, 149, 149, - 149, 150, 150, 150, 150, 150, 150, 151, 151, 151, - 151, 151, 151, 151, 151, 151, 151, 151, 151, 152, - 152, 152, 152, 152, 152, 152, 152, 152, 152, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 154, 155, 155, 156, 156, - 157, 157, 158, 158, 159, 159, 160, 160, 161, 161, - 161, 161, 161, 162, 162, 162, 163, 163, 164, 164, - 164, 165, 165, 165, 165, 165, 166, 166, 166, 166, - 166, 166, 166, 167, 167, 167, 167, 168, 168, 169, - 169, 170, 170, 171, 171, 172, 172, 173, 174, 174, - 175, 175, 176, 176, 177, 177, 177, 177, 178, 178, - 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, - 178, 179, 180, 180, 181, 181, 182, 182, 182, 182, - 183, 183, 184, 184, 184, 184, 184, 184, 184, 184, - 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, - 184, 184, 185, 185, 185, 185, 185, 185, 185, 185, - 185, 185, 186, 186, 187, 187, 188, 188, 189, 189, - 191, 190, 192, 190, 190, 190, 190, 190, 193, 190, - 194, 190, 195, 190, 190, 190, 196, 197, 197, 198, - 199, 199, 199, 200, 200, 201, 201, 201, 201, 202, - 203, 203, 204, 205, 205, 206, 207, 208, 208, 209, - 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, - 210, 210, 210, 210, 211, 211, 212, 213, 213, 214, - 215, 215, 215, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 217, 217, 218, 219, 219, 220, 220, 220, - 221, 221, 222, 222, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 224, 224, 225, - 225, 225, 225, 225, 225, 225, 225 + 0, 170, 171, 171, 171, 171, 171, 171, 171, 171, + 171, 172, 172, 172, 172, 172, 172, 173, 173, 173, + 173, 173, 173, 173, 173, 173, 173, 173, 173, 174, + 174, 174, 174, 174, 174, 174, 174, 174, 174, 175, + 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, + 175, 175, 175, 175, 175, 176, 177, 177, 177, 177, + 177, 178, 178, 178, 179, 179, 180, 180, 181, 181, + 182, 182, 183, 183, 184, 185, 185, 185, 185, 185, + 185, 186, 186, 186, 187, 187, 187, 187, 188, 188, + 188, 189, 189, 189, 189, 189, 190, 190, 190, 191, + 191, 191, 191, 191, 191, 191, 192, 192, 192, 192, + 192, 192, 192, 192, 192, 192, 193, 193, 194, 194, + 194, 194, 194, 194, 195, 195, 196, 196, 197, 197, + 198, 198, 199, 200, 200, 201, 201, 202, 202, 203, + 203, 203, 203, 203, 203, 203, 204, 204, 204, 204, + 204, 204, 204, 204, 204, 204, 204, 204, 204, 205, + 206, 206, 207, 207, 208, 208, 208, 208, 209, 209, + 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, + 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 212, 212, 213, 213, 214, 214, + 215, 215, 216, 216, 217, 217, 219, 218, 220, 218, + 218, 218, 218, 221, 218, 222, 218, 223, 218, 218, + 218, 218, 224, 225, 225, 226, 227, 227, 227, 228, + 228, 229, 229, 229, 229, 230, 231, 231, 232, 233, + 233, 234, 235, 236, 236, 237, 237, 237, 237, 237, + 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, + 237, 237, 237, 238, 238, 238, 238, 239, 239, 240, + 241, 241, 242, 242, 243, 244, 244, 244, 245, 245, + 245, 245, 245, 245, 245, 245, 245, 246, 246, 247, + 248, 248, 249, 249, 249, 249, 249, 250, 250, 251, + 251, 252, 252, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 254, 254, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const unsigned char yyr2[] = +static const yytype_uint8 yyr2[] = { 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1825,542 +2016,774 @@ static const unsigned char yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 0, 2, 0, 1, 1, 2, 0, 1, 1, - 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, - 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, - 1, 1, 2, 1, 1, 1, 1, 0, 2, 1, - 1, 0, 2, 0, 2, 0, 3, 2, 0, 1, - 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, - 2, 1, 2, 5, 5, 5, 5, 3, 2, 5, - 4, 2, 1, 1, 1, 3, 1, 3, 1, 0, - 1, 3, 4, 3, 3, 4, 4, 3, 6, 5, + 1, 1, 1, 1, 1, 0, 4, 0, 2, 0, + 1, 1, 1, 0, 2, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, + 1, 0, 1, 1, 1, 1, 0, 1, 1, 0, + 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 0, 2, 1, 1, + 1, 1, 1, 1, 0, 2, 0, 2, 0, 2, + 0, 3, 2, 0, 1, 0, 3, 1, 2, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, + 2, 5, 5, 5, 5, 3, 2, 5, 4, 2, + 1, 1, 1, 3, 1, 3, 1, 0, 1, 3, + 4, 3, 3, 4, 4, 3, 6, 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 6, 5, 8, 6, 6, 7, 7, 6, - 8, 8, 3, 1, 1, 1, 1, 0, 1, 2, - 0, 3, 0, 3, 3, 1, 3, 3, 0, 6, - 0, 7, 0, 7, 2, 3, 1, 3, 3, 3, - 3, 1, 0, 5, 3, 1, 3, 1, 0, 9, - 1, 1, 4, 1, 1, 2, 3, 0, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 3, 1, 5, - 1, 1, 1, 1, 1, 1, 2, 2, 2, 3, - 2, 0, 1, 2, 2, 3, 9, 9, 8, 14, - 1, 1, 6, 5, 2, 6, 7, 3, 5, 0, - 0, 3, 2, 1, 5, 5, 6, 6, 4, 6, - 4, 4, 6, 6, 2, 8, 1, 1, 0, 3, - 6, 3, 6, 2, 4, 6, 4 + 6, 5, 8, 6, 6, 7, 7, 7, 7, 6, + 8, 8, 5, 7, 3, 1, 1, 1, 1, 0, + 2, 6, 1, 0, 1, 2, 0, 3, 0, 3, + 3, 3, 3, 0, 8, 0, 9, 0, 9, 5, + 2, 3, 1, 3, 3, 3, 3, 1, 0, 5, + 3, 1, 3, 1, 0, 10, 1, 1, 4, 1, + 1, 2, 3, 0, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 3, 3, 2, 2, 3, 2, 5, + 4, 1, 5, 1, 1, 1, 1, 1, 1, 2, + 1, 3, 2, 2, 3, 2, 0, 1, 2, 2, + 3, 9, 9, 8, 14, 1, 1, 6, 5, 2, + 6, 7, 4, 4, 6, 6, 0, 0, 3, 2, + 3, 2, 1, 5, 5, 6, 6, 6, 6, 4, + 6, 4, 4, 6, 6, 2, 8, 1, 1, 0, + 3, 6, 3, 6, 2, 5, 7, 5, 4, 4, + 7 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state STATE-NUM when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ -static const unsigned short int yydefact[] = +static const yytype_uint16 yydefact[] = { - 67, 58, 64, 59, 65, 185, 182, 180, 0, 0, - 0, 0, 0, 0, 76, 0, 67, 178, 78, 81, - 0, 0, 194, 0, 0, 62, 0, 66, 68, 70, - 69, 71, 73, 72, 74, 75, 77, 76, 76, 0, - 1, 179, 79, 80, 76, 183, 82, 83, 84, 85, - 76, 241, 181, 241, 0, 0, 202, 195, 196, 184, - 230, 231, 187, 114, 115, 116, 117, 118, 0, 0, - 0, 0, 232, 233, 119, 186, 121, 0, 0, 174, - 175, 0, 86, 86, 242, 238, 63, 213, 214, 215, - 237, 197, 198, 201, 0, 139, 122, 0, 0, 0, - 0, 128, 140, 0, 120, 139, 0, 0, 114, 115, - 116, 0, 0, 0, 188, 0, 87, 88, 89, 90, - 91, 0, 216, 0, 278, 240, 0, 199, 138, 97, - 134, 136, 0, 0, 0, 0, 0, 0, 127, 0, - 190, 192, 159, 160, 155, 157, 156, 158, 161, 154, - 150, 151, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 14, 15, 16, 11, 12, 13, 0, 0, 0, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 153, 152, 110, 92, 133, 132, 0, - 210, 211, 212, 277, 263, 0, 0, 0, 0, 86, - 250, 251, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 239, 86, 254, - 0, 276, 200, 131, 0, 101, 0, 0, 130, 0, - 141, 101, 110, 110, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 0, 53, 54, 49, 50, 51, - 52, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 0, 0, 0, 0, 0, 0, 143, 173, 0, - 0, 0, 147, 0, 144, 0, 0, 0, 0, 189, - 0, 262, 244, 0, 243, 0, 0, 55, 0, 0, - 0, 0, 105, 105, 283, 0, 0, 274, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 93, - 94, 95, 96, 98, 137, 135, 124, 125, 126, 129, - 123, 191, 193, 0, 0, 260, 0, 0, 0, 0, - 0, 142, 128, 140, 0, 145, 146, 0, 0, 0, - 0, 0, 112, 110, 208, 219, 220, 221, 226, 222, - 223, 224, 225, 217, 0, 228, 235, 234, 236, 0, - 245, 0, 0, 0, 0, 0, 279, 0, 281, 260, + 73, 61, 70, 62, 71, 63, 218, 216, 0, 0, + 0, 0, 0, 0, 84, 72, 0, 73, 214, 88, + 91, 0, 0, 230, 0, 0, 68, 0, 74, 75, + 77, 76, 78, 81, 79, 82, 80, 83, 85, 86, + 87, 84, 84, 209, 1, 215, 89, 90, 84, 219, + 92, 93, 94, 95, 84, 286, 217, 286, 0, 0, + 238, 231, 232, 220, 273, 274, 222, 139, 140, 141, + 144, 143, 142, 145, 146, 0, 0, 0, 0, 275, + 276, 147, 221, 149, 209, 209, 96, 208, 0, 99, + 99, 287, 283, 69, 249, 250, 251, 282, 233, 234, + 237, 0, 167, 150, 0, 0, 0, 0, 156, 168, + 0, 0, 167, 0, 0, 0, 98, 97, 0, 206, + 207, 0, 0, 100, 101, 102, 103, 104, 0, 252, + 0, 329, 285, 0, 235, 166, 116, 162, 164, 0, + 0, 0, 0, 0, 0, 155, 0, 0, 148, 0, + 0, 161, 0, 160, 0, 229, 139, 140, 141, 144, + 143, 142, 0, 0, 67, 67, 105, 0, 246, 247, + 248, 328, 312, 0, 0, 0, 0, 99, 295, 296, + 2, 3, 4, 5, 6, 7, 8, 9, 10, 14, + 15, 16, 11, 12, 13, 0, 0, 0, 0, 0, + 0, 0, 0, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 284, 99, 299, + 0, 327, 236, 159, 0, 124, 67, 67, 158, 0, + 169, 0, 124, 67, 67, 0, 210, 187, 188, 183, + 185, 184, 186, 189, 182, 178, 179, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 181, 180, 223, 0, 311, + 289, 67, 280, 288, 0, 0, 55, 0, 0, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 0, + 53, 54, 49, 50, 51, 52, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 48, 0, 0, 0, 130, + 130, 334, 67, 67, 325, 0, 0, 0, 0, 0, + 67, 67, 67, 67, 67, 0, 0, 0, 0, 0, + 107, 109, 108, 106, 110, 111, 112, 113, 114, 117, + 165, 163, 152, 153, 154, 157, 66, 151, 225, 227, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 171, 205, 0, 0, 0, 175, 0, 172, + 0, 0, 0, 135, 244, 255, 256, 257, 262, 258, + 259, 260, 261, 253, 0, 0, 0, 0, 271, 278, + 277, 279, 0, 0, 290, 0, 0, 67, 67, 67, + 67, 0, 330, 0, 332, 307, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 67, 0, 115, 121, 120, 118, 119, 122, 123, 125, + 135, 135, 0, 0, 0, 0, 0, 307, 0, 0, + 0, 0, 0, 0, 0, 170, 156, 168, 0, 173, + 174, 0, 0, 0, 0, 224, 243, 116, 241, 0, + 254, 0, 265, 0, 0, 0, 268, 0, 266, 281, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 99, 100, 102, 0, 0, 0, 0, - 0, 0, 0, 172, 149, 0, 0, 0, 0, 107, - 113, 111, 207, 97, 205, 0, 218, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 286, 0, 0, - 0, 270, 271, 0, 0, 0, 0, 268, 0, 284, - 0, 0, 0, 0, 163, 0, 0, 0, 0, 148, - 0, 0, 0, 61, 0, 101, 0, 227, 0, 0, - 259, 0, 0, 105, 106, 105, 0, 0, 0, 0, - 0, 264, 265, 259, 0, 0, 0, 261, 0, 169, - 0, 0, 165, 166, 162, 60, 204, 206, 97, 108, - 0, 0, 0, 0, 0, 266, 267, 0, 280, 282, - 0, 0, 269, 272, 273, 0, 285, 167, 168, 0, - 0, 0, 61, 109, 103, 229, 0, 0, 97, 0, - 101, 255, 0, 101, 164, 170, 171, 203, 0, 209, - 0, 248, 0, 0, 257, 0, 0, 256, 275, 104, - 246, 0, 247, 0, 97, 0, 0, 0, 258, 0, - 0, 0, 0, 253, 0, 0, 252, 0, 249 + 338, 0, 0, 0, 321, 322, 0, 0, 0, 0, + 339, 0, 0, 0, 319, 0, 130, 0, 226, 228, + 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 204, 177, 0, 0, 0, 0, 0, 0, + 137, 135, 65, 0, 124, 0, 264, 156, 0, 263, + 267, 0, 0, 306, 0, 0, 0, 0, 130, 131, + 130, 0, 0, 0, 0, 0, 0, 337, 309, 0, + 67, 313, 314, 306, 0, 335, 67, 211, 0, 0, + 0, 0, 191, 0, 0, 0, 0, 202, 0, 176, + 0, 0, 67, 132, 138, 136, 64, 240, 242, 116, + 133, 0, 270, 0, 0, 0, 116, 116, 0, 315, + 316, 317, 318, 331, 333, 308, 0, 0, 320, 323, + 324, 310, 0, 0, 130, 0, 0, 0, 0, 0, + 199, 0, 0, 0, 193, 194, 190, 65, 134, 128, + 272, 269, 0, 0, 0, 0, 124, 0, 300, 0, + 340, 124, 336, 195, 196, 197, 198, 0, 0, 0, + 203, 239, 0, 126, 0, 293, 0, 0, 107, 109, + 116, 116, 0, 116, 116, 301, 326, 192, 200, 201, + 129, 0, 245, 291, 0, 292, 0, 303, 302, 0, + 0, 0, 127, 0, 0, 0, 116, 116, 0, 0, + 0, 305, 304, 298, 0, 0, 297, 0, 294 }; -/* YYDEFGOTO[NTERM-NUM]. */ -static const short int yydefgoto[] = +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int16 yydefgoto[] = { - -1, 190, 191, 192, 254, 271, 111, 112, 72, 486, - 12, 73, 14, 37, 38, 39, 44, 50, 121, 323, - 233, 395, 326, 529, 376, 352, 514, 289, 353, 74, - 113, 130, 199, 131, 132, 103, 278, 365, 279, 81, - 15, 16, 17, 19, 18, 195, 242, 243, 59, 22, - 57, 94, 414, 415, 122, 202, 51, 89, 52, 45, - 417, 366, 76, 368, 294, 53, 85, 86, 227, 533, - 125, 307, 494, 398, 228, 229, 230, 231 + -1, 272, 273, 274, 299, 316, 162, 163, 79, 587, + 113, 12, 80, 14, 15, 41, 42, 43, 48, 54, + 118, 128, 349, 233, 439, 352, 672, 653, 412, 530, + 629, 465, 531, 81, 164, 137, 154, 138, 139, 110, + 373, 398, 374, 121, 88, 155, 16, 17, 18, 20, + 19, 383, 440, 441, 63, 23, 61, 101, 468, 469, + 129, 170, 55, 96, 56, 49, 471, 399, 83, 401, + 282, 283, 57, 92, 93, 227, 657, 132, 324, 598, + 490, 500, 228, 229, 230, 231 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -440 -static const short int yypact[] = +#define YYPACT_NINF -622 +static const yytype_int16 yypact[] = { - 406, -440, -440, -440, -440, -440, -440, -440, -2, -101, - 21, -55, 80, -20, 15, 132, 556, -440, 253, 197, - -7, 87, -440, 20, 207, -440, 893, -440, -440, -440, - -440, -440, -440, -440, -440, -440, -440, 97, 97, 125, - -440, -440, -440, -440, 97, -440, -440, -440, -440, -440, - 97, 235, -440, 6, 240, 248, 258, -440, -440, -440, - -440, -440, 134, -440, -440, -440, -440, -440, 269, 277, - 11, 123, -440, -440, -440, 33, -440, 125, 125, -440, - -440, 1055, 128, 128, -440, -440, 47, -440, -440, -440, - -440, -440, -440, -440, -57, 939, -440, 154, 156, 488, - 134, -440, 33, -112, -440, 939, 1055, 1149, 38, 281, - 289, 239, 293, 850, -440, 299, -440, -440, -440, -440, - -440, 1168, -440, 2, 1301, -440, 285, -440, -440, 33, - -440, 170, 167, 1149, 1149, 164, -97, 1149, -440, 171, - -440, 33, -440, -440, -440, -440, -440, -440, -440, -440, - -440, -440, -440, -440, -440, -440, -440, -440, -440, -440, - -440, -440, -440, -440, -440, -440, -440, 254, 446, 174, - -440, -440, -440, -440, -440, -440, -440, -440, -440, -440, - -440, -440, 175, 176, 177, 178, 109, 1203, 676, 290, - 181, 182, 183, -440, -440, 187, -440, 134, 33, 93, - -440, -440, -440, -440, -440, 273, 1217, 127, 313, 128, - -440, -440, 254, 446, 1149, 1149, 1149, 1149, 1149, 1149, - 1149, 1149, 1149, 1149, 1149, 1149, 1149, -440, 128, -440, - 70, -440, -440, -29, 1098, -440, 72, -39, -440, 184, - 33, -440, 187, 187, -440, -440, -440, -440, -440, -440, - -440, -440, -440, -440, 188, -440, -440, -440, -440, -440, - -440, -440, -440, -440, -440, -440, -440, -440, -440, -440, - -440, 196, 1055, 1055, 1055, 1055, 1055, -440, -440, 22, - 771, -44, -440, -59, -440, 1055, 1055, 1055, -9, -440, - 198, -440, 134, 591, -440, 728, 728, -440, 728, 1168, - 1149, 1149, 112, 147, -440, 591, 75, 190, 200, 214, - 215, 217, 219, 591, 591, 322, 1168, 1149, 1149, -440, - -440, -440, -440, -440, -440, -440, -41, -440, -440, -440, - -41, -440, -440, 1055, 1055, -440, 230, 231, 232, 233, - 1055, -440, 225, 850, -43, -440, -440, 236, 241, 337, - 355, 371, -440, 187, 1114, -440, -440, -440, -440, -440, - -440, -440, -440, 323, 1055, -440, -440, -440, -440, 243, - -440, 244, 728, 591, 591, 17, -440, 19, -440, -440, - 728, 242, 1149, 1149, 1149, 1149, 1149, 245, 246, 1149, - 728, 591, 249, -440, -440, -440, 252, 255, -24, 1055, - 1055, 1055, 1055, -440, -440, 247, 1055, 1055, 1149, -440, - -440, -440, -440, 33, 257, 260, -440, 375, -37, 383, - 386, 264, 268, 272, 728, 400, 728, 275, 282, 728, - 284, 33, -440, 295, 296, 728, 728, 33, 270, -440, - 1149, 1055, 1055, 1149, -440, 297, 298, 301, 303, -440, - 300, 302, 150, 32, 1133, -440, 305, -440, 728, 728, - 1149, 728, 728, 307, -440, 307, 728, 311, 1149, 1149, - 1149, -440, -440, 1149, 591, 308, 310, -440, 1055, -440, - 1055, 1055, -440, -440, -440, -440, -440, -440, 33, 46, - 397, 315, 314, 591, 26, -440, -440, 376, -440, -440, - 309, 728, -440, -440, -440, 89, -440, -440, -440, 317, - 319, 321, 32, -440, 413, -440, 449, 7, -440, 1149, - -440, -440, 324, -440, -440, -440, -440, -440, 460, -440, - 728, -440, 976, 9, -29, 591, 149, -440, -41, -440, - -440, 330, -440, 976, -440, 453, 454, 336, -29, 728, - 728, 461, 412, -440, 728, 465, -440, 728, -440 + 805, -622, -622, -622, -622, -622, -622, -622, -6, -112, + 23, -97, 91, -94, 24, -622, 126, 1385, -622, 135, + 257, 48, 77, -622, 3, 216, -622, 1807, -622, -622, + -622, -622, -622, -622, -622, -622, -622, -622, -622, -622, + -622, 49, 49, 187, -622, -622, -622, -622, 49, -622, + -622, -622, -622, -622, 49, 218, -622, 16, 220, 239, + 243, -622, -622, -622, -622, -622, 110, -622, -622, -622, + -622, -622, -622, -622, -622, 267, 271, 1, 691, -622, + -622, -622, -28, -622, 246, 246, 206, -622, 46, 215, + 215, -622, -622, 343, -622, -622, -622, -622, -622, -622, + -622, -59, 1537, -622, 121, 130, 880, 110, -622, -28, + -110, 138, 1537, 142, 46, 46, -622, -622, 1555, -622, + -622, 1830, 302, -622, -622, -622, -622, -622, 1848, -622, + -14, 2199, -622, 293, -622, -622, -28, -622, 160, 165, + 1877, 1877, 168, -103, 1877, -622, 334, 189, -622, 1830, + 1877, 110, 191, -28, 221, -622, 85, 341, 342, 345, + 354, 355, 323, 360, 1373, 315, -622, 28, -622, -622, + -622, -622, -622, 316, 1921, 42, 361, 215, -622, -622, + -622, -622, -622, -622, -622, -622, -622, -622, -622, -622, + -622, -622, -622, -622, -622, 393, 529, 393, 529, 1877, + 1877, 1877, 1877, -622, -622, -622, -622, -622, -622, -622, + -622, -622, -622, -622, -622, 1877, 1877, 1877, 1877, 1877, + 1877, 1877, 1877, 1877, 1877, 1877, 1877, -622, 215, -622, + 70, -622, -622, 176, 1578, -622, -39, -46, -622, 208, + -28, 223, -622, 315, 5, 1555, -622, -622, -622, -622, + -622, -622, -622, -622, -622, -622, -622, 393, 529, 393, + 529, 219, 227, 228, 234, 235, 241, 242, 1596, 2009, + 993, 356, 244, 245, 251, -622, -622, -622, 254, -622, + 110, 792, -622, 240, 943, 943, -622, 943, 1848, -622, + -622, -622, -622, -622, -622, -622, -622, -622, -622, 1877, + -622, -622, -622, -622, -622, -622, -622, -622, -622, -622, + -622, -622, -622, -622, -622, -622, 1877, 1877, 1877, 26, + 58, -622, 792, -35, 252, 256, 258, 259, 260, 263, + 792, 792, 792, 792, 792, 389, 1848, 1877, 1877, 375, + -622, -622, -622, -622, -622, -622, -622, -622, -622, -622, + -622, -622, 202, -622, -622, -622, -622, 202, -622, 142, + 390, 273, 274, 276, 277, 1830, 1830, 1830, 1830, 1830, + 1830, 1830, -622, -622, 57, 1268, -82, -622, -64, -622, + 1830, 1830, 1830, 275, 1628, -622, -622, -622, -622, -622, + -622, -622, -622, 374, 1757, 2041, 1313, 414, -622, -622, + -622, -622, 1877, 278, -622, 279, 943, 792, 792, 792, + 792, 31, -622, 33, -622, -622, 943, 280, 1877, 1877, + 1877, 1877, 1877, 281, 282, 284, 285, 287, 1877, 943, + 792, 288, -622, -622, -622, -622, -622, -622, -622, -622, + 275, 275, 1877, 1830, 1830, 1830, 1830, -622, 290, 291, + 292, 294, 282, 295, 1830, -622, 286, 1222, -62, -622, + -622, 301, 307, 429, 20, -622, -622, -28, 309, 312, + -622, 448, -622, 87, 1508, -10, -622, -61, -622, -622, + 455, 456, 318, 317, 319, 320, 321, 943, 473, 943, + 338, 339, 943, 340, -28, -622, 344, 346, 478, 496, + 351, 1877, 943, 943, -28, 348, 352, 1877, -622, -622, + -5, 353, 357, 359, 362, 115, 1830, 1830, 1830, 1830, + 146, 1830, -622, -622, 336, 1830, 1830, 1877, 493, 515, + -622, 275, 530, 1789, -622, 363, -622, 358, -60, -622, + -622, 943, 943, 2082, 943, 943, 943, 943, 352, -622, + 352, 1877, 943, 364, 1877, 1877, 1877, -622, -622, 516, + 792, -622, -622, 2082, 472, -622, 792, -622, 1830, 1830, + 1830, 1830, -622, 368, 377, 372, 376, -622, 282, -622, + 379, 381, 2, -622, -622, -622, -622, -622, -622, -28, + 4, 517, -622, 380, 382, 378, -16, -28, 157, -622, + -622, -622, -622, -622, -622, -622, 384, 943, -622, -622, + -622, -622, 282, 178, 352, 386, 388, 394, 396, 1830, + -622, 1830, 1830, 198, -622, -622, -622, 530, -622, 507, + -622, -622, 533, -7, 641, 641, -622, 2100, -622, 398, + 351, -622, -622, -622, -622, -622, -622, 406, 408, 409, + -622, -622, 564, 417, 943, -622, 1088, 7, 415, 416, + -622, -622, -12, -16, -28, -622, 202, -622, -622, -622, + -622, 548, -622, -622, 418, -622, 1088, 176, 176, 557, + 641, 641, -622, 558, 419, 943, -622, -622, 943, 562, + 508, 176, 176, -622, 943, 563, -622, 943, -622 }; /* YYPGOTO[NTERM-NUM]. */ -static const short int yypgoto[] = +static const yytype_int16 yypgoto[] = { - -440, 358, 359, 361, 274, 276, -206, -440, 0, -19, - 401, 13, -440, -440, -440, 31, -440, -440, -178, -309, - -394, -440, -236, -440, -297, -1, -440, -207, -440, -440, - -25, 263, -252, -440, 387, 404, -69, -110, -162, 160, - -440, -440, 490, -440, -440, -440, -440, -440, -440, -440, - -440, -440, -440, -440, 426, -440, -440, -440, -440, -440, - -440, -439, -73, 100, -212, -440, 457, -440, -440, -440, - -440, -440, 40, 135, -440, -440, -440, -440 + -622, 451, 452, 454, -163, -157, -174, -622, 0, -41, + -102, 494, 13, -622, -622, -622, -622, 222, -622, -622, + -622, -145, -622, -427, -622, -227, -622, -622, -301, -2, + -622, -412, -622, -622, -26, 369, -116, -622, 477, 484, + -113, -161, -259, 8, 147, 347, -622, -622, 574, -622, + -622, -622, -622, -622, -622, -622, -622, -622, -622, -622, + 503, -622, -622, -622, -622, -622, -622, -621, -121, 55, + -195, -622, -622, 537, -622, -622, -622, -622, -622, 32, + 151, -445, -622, -622, -622, -622 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -178 -static const short int yytable[] = +#define YYTABLE_NINF -214 +static const yytype_int16 yytable[] = { - 11, 75, 298, 193, 304, 330, 378, 308, 309, 310, - 311, 312, 114, 13, 315, 98, 11, 394, 297, 453, - 297, 394, 350, 137, 84, 281, 283, 200, 424, 13, - 426, 299, 87, 23, 138, 331, 332, 140, 137, 351, - 194, -55, -55, -55, -55, 20, 102, 372, 1, 239, - 316, 3, 28, 29, 30, 31, 32, 33, 34, 21, - 35, 142, 143, 1, 390, 425, 3, 425, 77, 78, - 129, 319, 320, 24, 102, 82, 340, 350, 126, 25, - 129, 83, 141, 319, 320, 127, 11, 346, 393, 321, - 322, 340, 340, 541, 512, 26, 198, 104, 340, 105, - 345, 321, 322, 405, 547, 328, 392, 457, 236, 237, - 2, 443, 240, 4, 27, 444, 60, 61, 344, 100, - 108, 109, 110, 66, 534, 1, 2, 54, 3, 4, - 60, 61, 40, 100, 63, 64, 65, 66, 295, 1, - 2, 296, 3, 4, 319, 320, 411, 201, 36, 531, - 548, 542, 88, 67, 79, 80, 99, 340, 319, 320, - 56, 519, 321, 322, 341, 520, 498, 67, 499, 104, - 430, 105, 432, 433, 434, 393, 321, 322, 317, 318, - 394, 293, 545, 115, 116, 117, 118, 119, 120, 302, - 303, 293, 305, 306, 293, 293, 293, 293, 293, 313, - 314, 293, 418, 335, 336, 337, 338, 339, 104, 129, - 105, 104, 290, 105, 327, 380, 347, 348, 349, 489, - 367, 55, 367, 367, 519, 367, 58, 394, 523, 394, - 36, 477, 367, 193, 46, 47, 48, 106, 107, 49, - 367, 367, 144, 145, 146, 147, 68, 375, 104, 69, - 105, 277, 70, 84, 71, 343, 502, 503, 504, 91, - 68, 319, 320, 69, 396, 397, 70, 92, 71, 101, - 194, 403, 95, 96, 198, 373, 374, 93, 393, 321, - 322, 97, 377, 104, 536, 105, 104, 538, 105, 484, - -56, 198, 391, 293, 42, 133, 43, 134, -57, 367, - 367, 367, 148, 196, 232, 234, 235, 367, 238, 284, - 241, 532, 272, 273, 274, 275, 276, 367, 367, 285, - 286, 287, 288, 291, 297, 381, 333, 543, 329, 413, - 445, 446, 447, 448, 334, 382, 354, 450, 451, 244, - 245, 246, 247, 248, 249, 250, 251, 252, 253, 383, - 384, 367, 385, 367, 386, 389, 367, 293, 431, 293, - 293, 293, 367, 367, 437, 399, 400, 401, 402, 404, - 408, 406, 475, 476, 409, 410, 407, 416, 419, 420, - 435, 436, 429, 452, 440, 367, 367, 441, 367, 367, - 442, 449, 454, 367, 456, 369, 370, 458, 371, 455, - 459, 367, 460, 461, 464, 379, -177, 462, 473, 509, - 443, 510, 511, 387, 388, 474, 515, 466, 293, 468, - 367, -63, 1, 2, 425, 3, 4, 5, 367, 488, - 469, 470, 478, 6, 7, 493, 480, 479, 481, 482, - 490, 483, 497, 293, 293, 293, 501, 507, 493, 508, - 516, 521, 8, 485, 517, 9, 524, 367, 525, 10, - 526, 528, 367, 530, 539, 546, 537, 549, 550, 255, - 256, 551, 421, 422, 423, 554, 367, 367, 555, 557, - 428, 367, 224, 225, 367, 226, 300, 124, 513, 301, - 438, 439, 139, 527, 535, 60, 61, 325, 100, 63, - 64, 65, 66, 136, 1, 2, 41, 3, 4, 123, - 90, 0, 485, 505, 427, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 463, 0, 465, 0, 0, 467, - 0, 0, 67, 0, 0, 471, 472, 257, 258, 259, - 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, - 270, 0, 0, 0, 0, 0, -176, 0, 491, 492, - 0, 495, 496, 0, 0, 0, 500, 0, 0, 0, - 0, -63, 1, 2, 506, 3, 4, 5, 0, 0, - 0, 0, 0, 6, 7, 0, 0, 0, 0, 0, - 0, 0, 0, 518, 355, 356, 0, 0, 60, 61, - 357, 522, 8, 0, 0, 9, 0, 1, 2, 10, - 3, 4, 0, 358, 359, 360, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 68, 361, 362, 69, 0, - 540, 70, 0, 71, 135, 544, 0, 0, 0, 0, - 0, 0, 0, 363, 0, 0, 0, 0, 0, 552, - 553, 0, 0, 0, 556, 0, 0, 558, 0, 152, - 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, - 163, 164, 165, 166, 167, 168, 0, 0, 0, 0, - 0, 0, 0, 60, 61, 0, 100, 108, 109, 110, - 66, 0, 1, 2, 0, 3, 4, 0, 0, 0, - 0, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 0, 182, 0, 183, 184, 185, - 67, 0, 0, 0, 0, 0, 0, 104, 0, 105, - 0, 355, 356, 0, 364, 60, 61, 357, 0, 0, - 0, 0, 0, 0, 1, 2, 0, 3, 4, 0, - 358, 359, 360, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 361, 362, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 60, 61, - 363, 100, 108, 109, 110, 66, 0, 1, 2, 0, - 3, 4, 0, 0, 0, 0, 152, 153, 154, 155, - 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, - 166, 167, 168, 68, 0, 67, 69, 0, 0, 70, - 0, 71, 282, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 169, 170, - 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, - 181, 0, 182, 0, 183, 184, 185, 60, 61, 0, - 0, 0, 0, 0, 0, 0, 1, 2, 0, 3, - 4, 364, 149, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 150, 151, 0, 0, 0, + 11, 82, 287, 275, 286, 105, 321, 520, 165, 111, + 376, 378, 167, 13, 168, 357, 111, 11, 286, 414, + 111, 325, 326, 327, 328, 329, 679, 111, 508, 509, + 13, 335, 288, 246, 317, 674, 243, 91, 528, -145, + 532, 318, 487, 276, 489, 94, 24, 21, 2, 144, + 111, 4, 109, 284, 528, 684, 144, 111, 145, 285, + 111, 26, 22, 277, 28, 239, 29, 30, 31, 32, + 33, 34, 35, 36, 529, 37, 136, 454, 119, 120, + 109, 111, 25, 336, 459, 488, 136, 488, -55, -55, + -55, -55, 153, 11, 361, 454, 363, 454, 454, 454, + 133, 362, 153, 364, 460, 134, 524, 540, 593, 27, + 112, 247, 248, 111, 236, 237, 458, 112, 240, 585, + 354, 112, 149, 150, 244, 353, 44, 416, 112, 433, + 434, 435, -67, 623, 436, 473, 475, 477, 437, 438, + -145, 358, 359, 431, -145, 433, 434, 435, 281, 454, + 436, 112, 567, 169, 437, 438, 539, 655, 112, 626, + 400, 112, 627, 400, 400, 60, 400, 640, 106, 634, + 635, 675, 406, 319, 320, 281, 322, 38, 39, 40, + 278, 46, 112, 47, 95, 411, -67, 337, 338, 323, + 281, 281, 281, 281, 281, 330, 331, 332, 333, 334, + 281, 400, 38, 39, 40, 565, 58, 479, 136, 400, + 400, 400, 400, 400, 112, 538, 454, 413, -67, 153, + 429, 455, 86, 493, 87, 495, 496, 497, 64, 65, + 339, 114, 115, 677, 678, 59, 680, 681, 62, 91, + 1, 2, 98, 3, 4, 5, 454, 603, 116, 604, + 117, 536, 447, 448, 449, 450, 451, 452, 453, 691, + 692, 99, 153, 84, 85, 100, 102, 461, 462, 463, + 89, 103, 572, 407, 551, 104, 90, 122, 123, 124, + 125, 126, 127, 87, 140, 400, 400, 400, 400, 400, + 408, 409, 410, 141, 146, 400, 275, 340, 341, 50, + 51, 52, 148, 577, 53, 559, 166, 590, 400, 400, + 153, 430, 281, 642, 636, 232, 637, 342, 343, 234, + 344, 345, 235, 346, 347, 348, 249, 250, 251, 252, + 511, 512, 513, 514, 238, 641, 276, 637, 241, 403, + 404, 522, 405, 433, 434, 435, 242, 245, 436, 457, + -56, -57, 437, 438, -60, 650, 605, 559, 467, 608, + 609, 610, 1, -59, -58, 3, 400, 5, 400, 253, + 111, 400, 286, 279, 355, 365, 281, 415, 379, 432, + 356, 400, 400, 366, 367, 423, 424, 425, 426, 427, + 368, 369, 281, 494, 281, 281, 281, 370, 371, 402, + 380, 381, 504, 573, 574, 575, 576, 382, 578, 662, + 384, 417, 580, 581, 666, 418, 510, 419, 420, 421, + 400, 400, 422, 400, 400, 400, 400, 428, 442, 443, + 444, 400, 445, 446, 464, 470, 478, 480, 481, 400, + 498, 499, 492, 501, 502, 400, 503, 507, 457, 516, + 517, 518, 523, 519, 521, 615, 616, 617, 618, 656, + 525, 482, 483, 484, 485, 486, 526, 527, 533, 534, + 535, 491, 541, 542, 543, 560, 544, 549, 545, 546, + 547, 566, 557, 676, 505, 506, 400, 289, 290, 291, + 292, 293, 294, 295, 296, 297, 298, 551, 552, 554, + 558, 582, 579, 555, 563, 556, 647, 589, 648, 649, + 559, 564, 568, 400, 400, 583, 569, 597, 570, 584, + 611, 571, 591, 607, 592, 281, 488, 619, 281, 281, + 281, 621, 586, 400, 620, 622, 624, 597, 625, 630, + 633, 632, 548, 643, 550, 644, 631, 553, 638, 1, + 654, 645, 3, 646, 5, 300, 301, 561, 562, 400, + 400, 652, 665, 667, 400, 668, 669, 400, 670, 671, + 682, -18, -19, 400, 685, 688, 400, 683, 689, 694, + 697, 695, 224, 225, 339, 226, 651, 131, 628, 147, + 143, 45, 360, 130, 97, 613, 594, 595, 515, 599, + 600, 601, 602, 351, 0, 0, 0, 606, 0, 0, + 0, 664, 0, 0, 0, 612, 0, 0, 0, 0, + 0, 614, 0, 0, 0, 0, 0, 586, 0, 302, + 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, + 313, 314, 315, 0, 385, 386, 0, 0, 64, 65, + 387, 340, 341, 0, 0, 0, 0, 0, 0, 0, + 1, 2, 639, 3, 4, 5, 388, 389, 390, 0, + 0, 342, 343, 0, 344, 345, 0, 346, 347, 348, + 0, 391, 392, 0, 0, 0, 0, 0, 0, 660, + 661, 0, 0, 0, 0, 339, 0, 0, 64, 65, + 393, 107, 67, 68, 69, 70, 71, 72, 73, 673, + 1, 2, 0, 3, 4, 5, 180, 181, 182, 183, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, + 194, 257, 258, 259, 260, 686, 687, 0, 0, 0, + 690, 74, 0, 693, 0, 0, 0, 0, 0, 696, + 0, 0, 698, 0, 0, 0, 0, 0, 0, 0, + 261, 203, 658, 659, 206, 207, 208, 209, 210, 211, + 212, 213, 214, 0, 262, 0, 263, 264, 265, 0, + 266, 267, 342, 343, 0, 344, 345, 0, 346, 347, + 348, 0, 0, 0, 0, 385, 386, 0, 0, 64, + 65, 387, 0, 394, 0, -213, 395, 0, 396, 0, + 397, 1, 2, 0, 3, 4, 5, 388, 389, 390, + 0, 0, 0, -69, 1, 2, 0, 3, 4, 5, + 0, 0, 391, 392, 0, 6, 7, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 111, 0, 0, + 0, 393, 75, 76, 0, 0, 77, 8, 78, 108, + 0, 9, 0, 0, 0, 10, 0, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 193, 194, 257, 258, 259, 260, 0, 64, 65, 0, + 107, 67, 68, 69, 70, 71, 72, 73, 0, 1, + 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, + 0, 261, 203, 204, 205, 206, 207, 208, 209, 210, + 211, 212, 213, 214, 0, 262, 0, 263, 264, 265, + 74, 266, 267, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 385, 386, 112, 0, + 64, 65, 387, 0, 394, 0, 0, 395, 0, 396, + 0, 397, 1, 2, 0, 3, 4, 5, 388, 389, + 390, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 391, 392, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 64, 65, 393, 107, 156, 157, 158, 159, 160, 161, + 73, 0, 1, 2, 0, 3, 4, 5, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, + 192, 193, 194, 257, 258, 259, 260, 0, 0, 0, + 0, 75, 76, 74, 0, 77, 0, 78, 142, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 261, 203, 204, 205, 206, 207, 208, 209, + 210, 211, 212, 213, 214, 0, 262, 0, 263, 264, + 265, 0, 266, 267, 0, 0, 0, 0, 0, 0, + 0, 385, 386, 0, 0, 0, 0, 387, 0, 0, + 0, 0, 0, 0, 0, 394, 0, 0, 395, 0, + 396, 0, 397, 388, 389, 390, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 391, 392, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 393, 0, 0, + 0, 0, 0, 0, 75, 76, 0, 0, 77, 0, + 78, 377, 0, 180, 181, 182, 183, 184, 185, 186, + 187, 188, 189, 190, 191, 192, 193, 194, 257, 258, + 259, 260, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 261, 203, 204, + 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, + 0, 262, 0, 263, 264, 265, 0, 266, 267, 64, + 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 2, 0, 3, 4, 5, 254, 0, 0, + 394, 0, 0, 395, 0, 396, 0, 397, 0, 0, + 0, 0, 255, 256, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 64, 65, 111, 107, 156, + 157, 158, 159, 160, 161, 73, 0, 1, 2, 0, + 3, 4, 5, 0, 0, 0, 0, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 193, 194, 257, 258, 259, 260, 0, 0, 74, 0, + 64, 65, 0, 107, 156, 157, 158, 159, 160, 161, + 73, 0, 1, 2, 0, 3, 4, 5, 0, 0, + 0, 261, 203, 204, 205, 206, 207, 208, 209, 210, + 211, 212, 213, 214, 0, 262, 0, 263, 264, 265, + 0, 266, 267, 74, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 112, 0, + 64, 65, -67, 0, 268, -212, 0, 269, 0, 270, + 0, 271, 1, 2, 0, 3, 4, 5, 254, 0, + 0, 0, 0, -69, 1, 2, 0, 3, 4, 5, + 0, 0, 0, 255, 256, 6, 7, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 111, 75, + 76, 0, 0, 77, 0, 78, 456, 8, 0, 0, + 0, 9, 0, 0, 0, 10, 0, 0, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, + 192, 193, 194, 257, 258, 259, 260, 0, 0, 0, + 0, 0, 0, 0, 75, 76, 0, 0, 77, 0, + 78, 476, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 261, 203, 204, 205, 206, 207, 208, 209, + 210, 211, 212, 213, 214, 0, 262, 0, 263, 264, + 265, 0, 266, 267, 0, 64, 65, 0, 107, 156, + 157, 158, 159, 160, 161, 73, 0, 1, 2, 112, + 3, 4, 5, 0, 0, 268, 0, 0, 269, 0, + 270, 0, 271, 0, 64, 65, 0, 107, 67, 68, + 69, 70, 71, 72, 73, 0, 1, 2, 74, 3, + 4, 5, 64, 65, 0, 151, 67, 68, 69, 70, + 71, 72, 73, 0, 1, 2, 135, 3, 4, 5, + 0, 0, 0, 0, 0, 64, 65, 74, 107, 67, + 68, 69, 70, 71, 72, 73, 0, 1, 2, 0, + 3, 4, 5, 64, 65, 74, 107, 156, 157, 158, + 159, 160, 161, 73, 0, 1, 2, 350, 3, 4, + 5, 0, 0, 0, 0, 0, 0, 0, 74, 0, + 0, 0, 0, 0, 0, 64, 65, 0, 107, 67, + 68, 69, 70, 71, 72, 73, 74, 1, 2, 0, + 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 466, 0, 75, + 76, 0, 0, 77, 0, 78, 537, 0, 74, 0, + 152, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 75, 76, + 0, 0, 77, 0, 78, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 75, 76, 0, 0, + 77, 0, 78, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 75, + 76, 0, 0, 77, 0, 78, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 75, 76, 0, + 372, 77, 0, 78, 64, 65, 0, 107, 156, 157, + 158, 159, 160, 161, 73, 0, 1, 2, 0, 3, + 4, 5, 0, 0, 0, 0, 0, 0, 0, 75, + 76, 0, 0, 77, 0, 78, 64, 65, 0, 107, + 67, 68, 69, 70, 71, 72, 73, 74, 1, 2, + 0, 3, 4, 5, 64, 65, 0, 66, 67, 68, + 69, 70, 71, 72, 73, 0, 1, 2, 588, 3, + 4, 5, 0, 0, 0, 0, 0, 64, 65, 74, + 107, 156, 157, 158, 159, 160, 161, 73, 0, 1, + 2, 0, 3, 4, 5, 64, 65, 74, 151, 67, + 68, 69, 70, 71, 72, 73, 0, 1, 2, 0, + 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, + 74, 0, 0, 0, 64, 65, 0, 107, 67, 68, + 69, 70, 71, 72, 73, 0, 1, 2, 74, 3, + 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 75, 76, + 0, 472, 77, 0, 78, 0, 0, 74, 64, 65, + 0, 280, 67, 68, 69, 70, 71, 72, 73, 0, + 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, + 75, 76, 0, 0, 77, 0, 78, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 75, 76, + 0, 74, 77, 0, 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 60, 61, 0, 62, 63, 64, 65, 66, 68, 1, - 2, 69, 3, 4, 70, 0, 71, 342, 152, 153, - 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, - 164, 165, 166, 167, 168, 0, 0, 67, 0, 0, - 0, 0, 0, 0, 0, 0, 60, 61, 0, 100, - 63, 64, 65, 66, 0, 1, 2, 0, 3, 4, - 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 179, 180, 181, 128, 182, 0, 183, 184, 185, 355, - 356, 0, 0, 67, 0, 357, 104, 0, 105, 0, - 186, 0, 0, 187, 0, 188, 0, 189, 358, 359, - 360, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 361, 362, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 363, 0, - 68, 0, 0, 69, 0, 0, 70, 0, 71, 0, - 0, 0, 0, 0, 152, 153, 154, 155, 156, 157, - 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, - 168, 0, 60, 61, 0, 100, 108, 109, 110, 66, - 0, 1, 2, 0, 3, 4, 68, 0, 0, 69, - 0, 0, 70, 0, 71, 0, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 180, 181, 67, - 182, 0, 183, 184, 185, 60, 61, 0, 100, 63, - 64, 65, 66, 0, 1, 2, 0, 3, 4, 364, - 0, 60, 61, 0, 100, 63, 64, 65, 66, 0, - 1, 2, 324, 3, 4, 0, 0, 0, 0, 0, - 60, 61, 67, 100, 63, 64, 65, 66, 412, 1, - 2, 0, 3, 4, 0, 0, 60, 61, 67, 100, - 63, 64, 65, 66, 0, 1, 2, 487, 3, 4, - 0, 0, 0, 0, 0, 60, 61, 67, 197, 63, - 64, 65, 66, 0, 1, 2, 0, 3, 4, 0, - 0, 0, 68, 67, 0, 69, 0, 0, 70, 0, - 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 60, 61, 67, 100, 108, 109, 110, 66, 0, 1, - 2, 0, 3, 4, 60, 61, 0, 292, 63, 64, - 65, 66, 0, 1, 2, 68, 3, 4, 69, 0, - 0, 70, 0, 71, 0, 0, 0, 67, 0, 0, - 0, 68, 0, 0, 69, 0, 0, 70, 0, 71, - 0, 67, 0, 0, 0, 0, 0, 0, 0, 0, - 68, 0, 0, 69, 0, 0, 70, 0, 71, 0, - 0, 0, 0, 0, 0, 0, 68, 0, 0, 69, - 0, 0, 70, 0, 71, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 68, 0, 0, 69, 0, - 0, 70, 0, 71, 0, 0, 0, 0, 0, 0, + 0, 75, 76, 0, 0, 77, 0, 78, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 75, + 76, 0, 0, 77, 0, 78, 64, 65, 0, 107, + 156, 157, 158, 159, 160, 161, 73, 0, 1, 2, + 0, 3, 4, 5, 0, 0, 0, 0, 75, 76, + 0, 0, 77, 0, 78, 0, 0, 0, 64, 65, + 0, 107, 156, 157, 158, 159, 160, 161, 73, 74, + 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 203, 0, 0, 0, 0, 0, 0, - 68, 0, 0, 69, 0, 0, 70, 0, 280, 0, - 0, 204, 205, 0, 68, 0, 0, 69, 0, 0, - 70, 0, 71, 206, 207, 208, 209, 210, 211, 152, - 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, - 163, 164, 165, 166, 212, 213, 0, 0, 0, 0, + 0, 0, 75, 76, 0, 0, 77, 0, 78, 64, + 65, 74, 107, 67, 68, 69, 70, 71, 72, 596, + 0, 1, 2, 0, 3, 4, 5, 64, 65, 0, + 107, 67, 68, 69, 70, 71, 72, 663, 0, 1, + 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, + 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 214, 215, 216, 0, - 0, 217, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 218, 219, 220, 221, 222, 223 + 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 75, 76, 0, 0, 77, 0, 375, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 75, 76, 0, 0, 77, 0, 474, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 171, 0, 0, 0, 0, + 0, 0, 0, 75, 76, 0, 0, 77, 0, 78, + 0, 0, 0, 0, 0, 0, 172, 173, 0, 0, + 0, 75, 76, 0, 0, 77, 0, 78, 174, 175, + 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, + 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, + 196, 197, 198, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 199, 200, 201, 0, 0, 202, 203, + 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, + 214, 215, 216, 217, 218, 219, 220, 221, 222, 223 }; -static const short int yycheck[] = +static const yytype_int16 yycheck[] = { - 0, 26, 208, 113, 216, 241, 303, 219, 220, 221, - 222, 223, 81, 0, 226, 4, 16, 326, 11, 413, - 11, 330, 31, 135, 18, 187, 188, 25, 11, 16, - 11, 209, 26, 134, 146, 242, 243, 106, 135, 48, - 113, 3, 4, 5, 6, 47, 71, 299, 16, 146, - 228, 19, 37, 38, 39, 40, 41, 42, 43, 61, - 45, 23, 24, 16, 316, 48, 19, 48, 37, 38, - 95, 112, 113, 52, 99, 44, 135, 31, 135, 134, - 105, 50, 107, 112, 113, 142, 86, 146, 129, 130, - 131, 135, 135, 532, 488, 15, 121, 136, 135, 138, - 144, 130, 131, 146, 543, 144, 318, 144, 133, 134, - 17, 135, 137, 20, 134, 139, 7, 8, 280, 10, - 11, 12, 13, 14, 518, 16, 17, 134, 19, 20, - 7, 8, 0, 10, 11, 12, 13, 14, 11, 16, - 17, 14, 19, 20, 112, 113, 353, 145, 133, 142, - 544, 142, 146, 44, 29, 30, 145, 135, 112, 113, - 140, 135, 130, 131, 142, 139, 463, 44, 465, 136, - 382, 138, 384, 385, 386, 129, 130, 131, 108, 109, - 489, 206, 33, 55, 56, 57, 58, 59, 60, 214, - 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, - 225, 226, 364, 272, 273, 274, 275, 276, 136, 234, - 138, 136, 199, 138, 142, 140, 285, 286, 287, 455, - 293, 134, 295, 296, 135, 298, 19, 536, 139, 538, - 133, 443, 305, 343, 37, 38, 39, 77, 78, 42, - 313, 314, 3, 4, 5, 6, 137, 135, 136, 140, - 138, 142, 143, 18, 145, 280, 468, 469, 470, 19, - 137, 112, 113, 140, 333, 334, 143, 19, 145, 146, - 343, 340, 138, 4, 299, 300, 301, 19, 129, 130, - 131, 4, 135, 136, 520, 138, 136, 523, 138, 139, - 9, 316, 317, 318, 41, 141, 43, 141, 9, 372, - 373, 374, 9, 4, 19, 135, 139, 380, 144, 19, - 139, 517, 138, 138, 138, 138, 138, 390, 391, 138, - 138, 138, 135, 50, 11, 135, 138, 533, 144, 354, - 399, 400, 401, 402, 138, 135, 138, 406, 407, 85, - 86, 87, 88, 89, 90, 91, 92, 93, 94, 135, - 135, 424, 135, 426, 135, 33, 429, 382, 383, 384, - 385, 386, 435, 436, 389, 135, 135, 135, 135, 144, - 33, 135, 441, 442, 19, 4, 135, 54, 135, 135, - 135, 135, 140, 408, 135, 458, 459, 135, 461, 462, - 135, 144, 135, 466, 19, 295, 296, 14, 298, 139, - 14, 474, 138, 135, 4, 305, 0, 135, 138, 478, - 135, 480, 481, 313, 314, 440, 19, 135, 443, 135, - 493, 15, 16, 17, 48, 19, 20, 21, 501, 454, - 135, 135, 135, 27, 28, 460, 135, 139, 135, 139, - 135, 139, 135, 468, 469, 470, 135, 139, 473, 139, - 135, 142, 46, 453, 140, 49, 139, 530, 139, 53, - 139, 48, 535, 14, 4, 135, 142, 14, 14, 23, - 24, 135, 372, 373, 374, 14, 549, 550, 66, 14, - 380, 554, 124, 124, 557, 124, 212, 86, 489, 213, - 390, 391, 105, 512, 519, 7, 8, 234, 10, 11, - 12, 13, 14, 99, 16, 17, 16, 19, 20, 83, - 53, -1, 512, 473, 379, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 424, -1, 426, -1, -1, 429, - -1, -1, 44, -1, -1, 435, 436, 91, 92, 93, - 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, - 104, -1, -1, -1, -1, -1, 0, -1, 458, 459, - -1, 461, 462, -1, -1, -1, 466, -1, -1, -1, - -1, 15, 16, 17, 474, 19, 20, 21, -1, -1, - -1, -1, -1, 27, 28, -1, -1, -1, -1, -1, - -1, -1, -1, 493, 3, 4, -1, -1, 7, 8, - 9, 501, 46, -1, -1, 49, -1, 16, 17, 53, - 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 137, 35, 36, 140, -1, - 530, 143, -1, 145, 146, 535, -1, -1, -1, -1, - -1, -1, -1, 52, -1, -1, -1, -1, -1, 549, - 550, -1, -1, -1, 554, -1, -1, 557, -1, 68, - 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, -1, -1, -1, -1, - -1, -1, -1, 7, 8, -1, 10, 11, 12, 13, - 14, -1, 16, 17, -1, 19, 20, -1, -1, -1, - -1, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, -1, 124, -1, 126, 127, 128, - 44, -1, -1, -1, -1, -1, -1, 136, -1, 138, - -1, 3, 4, -1, 143, 7, 8, 9, -1, -1, - -1, -1, -1, -1, 16, 17, -1, 19, 20, -1, + 0, 27, 176, 164, 11, 4, 201, 452, 121, 55, + 269, 270, 128, 0, 28, 242, 55, 17, 11, 320, + 55, 216, 217, 218, 219, 220, 38, 55, 440, 441, + 17, 226, 177, 154, 197, 656, 149, 21, 34, 55, + 467, 198, 11, 164, 11, 29, 158, 53, 20, 159, + 55, 23, 78, 11, 34, 676, 159, 55, 168, 17, + 55, 158, 68, 165, 158, 168, 42, 43, 44, 45, + 46, 47, 48, 49, 54, 51, 102, 159, 32, 33, + 106, 55, 59, 228, 166, 54, 112, 54, 3, 4, + 5, 6, 118, 93, 257, 159, 259, 159, 159, 159, + 159, 258, 128, 260, 168, 164, 168, 168, 168, 18, + 156, 26, 27, 55, 140, 141, 375, 156, 144, 531, + 166, 156, 114, 115, 150, 164, 0, 162, 156, 141, + 142, 143, 160, 578, 146, 394, 395, 396, 150, 151, + 156, 243, 244, 338, 160, 141, 142, 143, 174, 159, + 146, 156, 157, 167, 150, 151, 166, 164, 156, 157, + 281, 156, 589, 284, 285, 162, 287, 612, 167, 596, + 597, 164, 288, 199, 200, 201, 202, 153, 154, 155, + 167, 46, 156, 48, 168, 159, 160, 117, 118, 215, + 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, + 226, 322, 153, 154, 155, 506, 158, 402, 234, 330, + 331, 332, 333, 334, 156, 474, 159, 159, 160, 245, + 336, 164, 35, 418, 37, 420, 421, 422, 7, 8, + 54, 84, 85, 660, 661, 158, 663, 664, 22, 21, + 19, 20, 22, 22, 23, 24, 159, 548, 42, 550, + 44, 164, 365, 366, 367, 368, 369, 370, 371, 686, + 687, 22, 288, 41, 42, 22, 156, 380, 381, 382, + 48, 4, 157, 299, 159, 4, 54, 62, 63, 64, + 65, 66, 67, 37, 163, 406, 407, 408, 409, 410, + 316, 317, 318, 163, 156, 416, 457, 121, 122, 42, + 43, 44, 160, 157, 47, 159, 4, 534, 429, 430, + 336, 337, 338, 614, 157, 22, 159, 141, 142, 159, + 144, 145, 157, 147, 148, 149, 3, 4, 5, 6, + 443, 444, 445, 446, 166, 157, 457, 159, 4, 284, + 285, 454, 287, 141, 142, 143, 157, 156, 146, 375, + 9, 9, 150, 151, 9, 157, 551, 159, 384, 554, + 555, 556, 19, 9, 9, 22, 487, 24, 489, 9, + 55, 492, 11, 57, 166, 156, 402, 322, 22, 4, + 157, 502, 503, 156, 156, 330, 331, 332, 333, 334, + 156, 156, 418, 419, 420, 421, 422, 156, 156, 159, + 156, 156, 428, 516, 517, 518, 519, 156, 521, 636, + 156, 159, 525, 526, 641, 159, 442, 159, 159, 159, + 541, 542, 159, 544, 545, 546, 547, 38, 38, 156, + 156, 552, 156, 156, 159, 61, 22, 159, 159, 560, + 159, 159, 162, 159, 159, 566, 159, 159, 474, 159, + 159, 159, 166, 159, 159, 568, 569, 570, 571, 633, + 159, 406, 407, 408, 409, 410, 159, 38, 159, 157, + 22, 416, 17, 17, 156, 501, 159, 4, 159, 159, + 159, 507, 4, 657, 429, 430, 607, 94, 95, 96, + 97, 98, 99, 100, 101, 102, 103, 159, 159, 159, + 4, 527, 166, 159, 156, 159, 619, 533, 621, 622, + 159, 159, 159, 634, 635, 22, 159, 543, 159, 4, + 4, 159, 159, 159, 166, 551, 54, 159, 554, 555, + 556, 159, 532, 654, 157, 159, 157, 563, 157, 22, + 162, 159, 487, 157, 489, 157, 166, 492, 164, 19, + 17, 157, 22, 157, 24, 26, 27, 502, 503, 680, + 681, 54, 164, 157, 685, 157, 157, 688, 4, 152, + 22, 156, 156, 694, 17, 17, 697, 159, 159, 17, + 17, 73, 131, 131, 54, 131, 627, 93, 590, 112, + 106, 17, 245, 90, 57, 563, 541, 542, 447, 544, + 545, 546, 547, 234, -1, -1, -1, 552, -1, -1, + -1, 637, -1, -1, -1, 560, -1, -1, -1, -1, + -1, 566, -1, -1, -1, -1, -1, 627, -1, 100, + 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, + 111, 112, 113, -1, 3, 4, -1, -1, 7, 8, + 9, 121, 122, -1, -1, -1, -1, -1, -1, -1, + 19, 20, 607, 22, 23, 24, 25, 26, 27, -1, + -1, 141, 142, -1, 144, 145, -1, 147, 148, 149, + -1, 40, 41, -1, -1, -1, -1, -1, -1, 634, + 635, -1, -1, -1, -1, 54, -1, -1, 7, 8, + 59, 10, 11, 12, 13, 14, 15, 16, 17, 654, + 19, 20, -1, 22, 23, 24, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + 89, 90, 91, 92, 93, 680, 681, -1, -1, -1, + 685, 50, -1, 688, -1, -1, -1, -1, -1, 694, + -1, -1, 697, -1, -1, -1, -1, -1, -1, -1, + 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, + 129, 130, 131, -1, 133, -1, 135, 136, 137, -1, + 139, 140, 141, 142, -1, 144, 145, -1, 147, 148, + 149, -1, -1, -1, -1, 3, 4, -1, -1, 7, + 8, 9, -1, 162, -1, 0, 165, -1, 167, -1, + 169, 19, 20, -1, 22, 23, 24, 25, 26, 27, + -1, -1, -1, 18, 19, 20, -1, 22, 23, 24, + -1, -1, 40, 41, -1, 30, 31, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 55, -1, -1, + -1, 59, 161, 162, -1, -1, 165, 52, 167, 168, + -1, 56, -1, -1, -1, 60, -1, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, -1, 7, 8, -1, + 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, + 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, + -1, 119, 120, 121, 122, 123, 124, 125, 126, 127, + 128, 129, 130, 131, -1, 133, -1, 135, 136, 137, + 50, 139, 140, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 3, 4, 156, -1, + 7, 8, 9, -1, 162, -1, -1, 165, -1, 167, + -1, 169, 19, 20, -1, 22, 23, 24, 25, 26, + 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 40, 41, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 7, 8, 59, 10, 11, 12, 13, 14, 15, 16, + 17, -1, 19, 20, -1, 22, 23, 24, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, 92, 93, -1, -1, -1, + -1, 161, 162, 50, -1, 165, -1, 167, 168, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 119, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, 130, 131, -1, 133, -1, 135, 136, + 137, -1, 139, 140, -1, -1, -1, -1, -1, -1, + -1, 3, 4, -1, -1, -1, -1, 9, -1, -1, + -1, -1, -1, -1, -1, 162, -1, -1, 165, -1, + 167, -1, 169, 25, 26, 27, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 40, 41, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 59, -1, -1, + -1, -1, -1, -1, 161, 162, -1, -1, 165, -1, + 167, 168, -1, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 93, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 119, 120, 121, + 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, + -1, 133, -1, 135, 136, 137, -1, 139, 140, 7, + 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 19, 20, -1, 22, 23, 24, 25, -1, -1, + 162, -1, -1, 165, -1, 167, -1, 169, -1, -1, + -1, -1, 40, 41, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 7, 8, 55, 10, 11, + 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, + 22, 23, 24, -1, -1, -1, -1, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, -1, -1, 50, -1, + 7, 8, -1, 10, 11, 12, 13, 14, 15, 16, + 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, + -1, 119, 120, 121, 122, 123, 124, 125, 126, 127, + 128, 129, 130, 131, -1, 133, -1, 135, 136, 137, + -1, 139, 140, 50, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 156, -1, + 7, 8, 160, -1, 162, 0, -1, 165, -1, 167, + -1, 169, 19, 20, -1, 22, 23, 24, 25, -1, + -1, -1, -1, 18, 19, 20, -1, 22, 23, 24, + -1, -1, -1, 40, 41, 30, 31, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 55, 161, + 162, -1, -1, 165, -1, 167, 168, 52, -1, -1, + -1, 56, -1, -1, -1, 60, -1, -1, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, 92, 93, -1, -1, -1, + -1, -1, -1, -1, 161, 162, -1, -1, 165, -1, + 167, 168, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 119, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, 130, 131, -1, 133, -1, 135, 136, + 137, -1, 139, 140, -1, 7, 8, -1, 10, 11, + 12, 13, 14, 15, 16, 17, -1, 19, 20, 156, + 22, 23, 24, -1, -1, 162, -1, -1, 165, -1, + 167, -1, 169, -1, 7, 8, -1, 10, 11, 12, + 13, 14, 15, 16, 17, -1, 19, 20, 50, 22, + 23, 24, 7, 8, -1, 10, 11, 12, 13, 14, + 15, 16, 17, -1, 19, 20, 39, 22, 23, 24, + -1, -1, -1, -1, -1, 7, 8, 50, 10, 11, + 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, + 22, 23, 24, 7, 8, 50, 10, 11, 12, 13, + 14, 15, 16, 17, -1, 19, 20, 39, 22, 23, + 24, -1, -1, -1, -1, -1, -1, -1, 50, -1, + -1, -1, -1, -1, -1, 7, 8, -1, 10, 11, + 12, 13, 14, 15, 16, 17, 50, 19, 20, -1, + 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 39, -1, 161, + 162, -1, -1, 165, -1, 167, 168, -1, 50, -1, + 125, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 161, 162, + -1, -1, 165, -1, 167, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 161, 162, -1, -1, + 165, -1, 167, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 161, + 162, -1, -1, 165, -1, 167, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 161, 162, -1, + 164, 165, -1, 167, 7, 8, -1, 10, 11, 12, + 13, 14, 15, 16, 17, -1, 19, 20, -1, 22, + 23, 24, -1, -1, -1, -1, -1, -1, -1, 161, + 162, -1, -1, 165, -1, 167, 7, 8, -1, 10, + 11, 12, 13, 14, 15, 16, 17, 50, 19, 20, + -1, 22, 23, 24, 7, 8, -1, 10, 11, 12, + 13, 14, 15, 16, 17, -1, 19, 20, 39, 22, + 23, 24, -1, -1, -1, -1, -1, 7, 8, 50, + 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, + 20, -1, 22, 23, 24, 7, 8, 50, 10, 11, + 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 35, 36, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 7, 8, - 52, 10, 11, 12, 13, 14, -1, 16, 17, -1, - 19, 20, -1, -1, -1, -1, 68, 69, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 137, -1, 44, 140, -1, -1, 143, - -1, 145, 146, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 110, 111, - 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, - 122, -1, 124, -1, 126, 127, 128, 7, 8, -1, - -1, -1, -1, -1, -1, -1, 16, 17, -1, 19, - 20, 143, 22, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 35, 36, -1, -1, -1, + 50, -1, -1, -1, 7, 8, -1, 10, 11, 12, + 13, 14, 15, 16, 17, -1, 19, 20, 50, 22, + 23, 24, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 161, 162, + -1, 164, 165, -1, 167, -1, -1, 50, 7, 8, + -1, 10, 11, 12, 13, 14, 15, 16, 17, -1, + 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, + 161, 162, -1, -1, 165, -1, 167, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 161, 162, + -1, 50, 165, -1, 167, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 161, 162, -1, -1, 165, -1, 167, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 161, + 162, -1, -1, 165, -1, 167, 7, 8, -1, 10, + 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, + -1, 22, 23, 24, -1, -1, -1, -1, 161, 162, + -1, -1, 165, -1, 167, -1, -1, -1, 7, 8, + -1, 10, 11, 12, 13, 14, 15, 16, 17, 50, + 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 161, 162, -1, -1, 165, -1, 167, 7, + 8, 50, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, 7, 8, -1, + 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, + 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, + -1, -1, 50, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 7, 8, -1, 10, 11, 12, 13, 14, 137, 16, - 17, 140, 19, 20, 143, -1, 145, 146, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, -1, -1, 44, -1, -1, - -1, -1, -1, -1, -1, -1, 7, 8, -1, 10, - 11, 12, 13, 14, -1, 16, 17, -1, 19, 20, - 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - 120, 121, 122, 34, 124, -1, 126, 127, 128, 3, - 4, -1, -1, 44, -1, 9, 136, -1, 138, -1, - 140, -1, -1, 143, -1, 145, -1, 147, 22, 23, - 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 35, 36, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 52, -1, - 137, -1, -1, 140, -1, -1, 143, -1, 145, -1, - -1, -1, -1, -1, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, -1, 7, 8, -1, 10, 11, 12, 13, 14, - -1, 16, 17, -1, 19, 20, 137, -1, -1, 140, - -1, -1, 143, -1, 145, -1, 110, 111, 112, 113, - 114, 115, 116, 117, 118, 119, 120, 121, 122, 44, - 124, -1, 126, 127, 128, 7, 8, -1, 10, 11, - 12, 13, 14, -1, 16, 17, -1, 19, 20, 143, - -1, 7, 8, -1, 10, 11, 12, 13, 14, -1, - 16, 17, 34, 19, 20, -1, -1, -1, -1, -1, - 7, 8, 44, 10, 11, 12, 13, 14, 34, 16, - 17, -1, 19, 20, -1, -1, 7, 8, 44, 10, - 11, 12, 13, 14, -1, 16, 17, 34, 19, 20, - -1, -1, -1, -1, -1, 7, 8, 44, 10, 11, - 12, 13, 14, -1, 16, 17, -1, 19, 20, -1, - -1, -1, 137, 44, -1, 140, -1, -1, 143, -1, - 145, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 7, 8, 44, 10, 11, 12, 13, 14, -1, 16, - 17, -1, 19, 20, 7, 8, -1, 10, 11, 12, - 13, 14, -1, 16, 17, 137, 19, 20, 140, -1, - -1, 143, -1, 145, -1, -1, -1, 44, -1, -1, - -1, 137, -1, -1, 140, -1, -1, 143, -1, 145, - -1, 44, -1, -1, -1, -1, -1, -1, -1, -1, - 137, -1, -1, 140, -1, -1, 143, -1, 145, -1, - -1, -1, -1, -1, -1, -1, 137, -1, -1, 140, - -1, -1, 143, -1, 145, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 137, -1, -1, 140, -1, - -1, 143, -1, 145, -1, -1, -1, -1, -1, -1, + 50, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 32, -1, -1, -1, -1, -1, -1, - 137, -1, -1, 140, -1, -1, 143, -1, 145, -1, - -1, 50, 51, -1, 137, -1, -1, 140, -1, -1, - 143, -1, 145, 62, 63, 64, 65, 66, 67, 68, - 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, -1, -1, -1, -1, + 161, 162, -1, -1, 165, -1, 167, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 105, 106, 107, -1, - -1, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124, 125, 126, 127, 128 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 161, 162, -1, -1, 165, -1, 167, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 36, -1, -1, -1, -1, + -1, -1, -1, 161, 162, -1, -1, 165, -1, 167, + -1, -1, -1, -1, -1, -1, 57, 58, -1, -1, + -1, 161, 162, -1, -1, 165, -1, 167, 69, 70, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, + 91, 92, 93, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 114, 115, 116, -1, -1, 119, 120, + 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 138, 139, 140 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ -static const unsigned char yystos[] = +static const yytype_uint8 yystos[] = { - 0, 16, 17, 19, 20, 21, 27, 28, 46, 49, - 53, 156, 158, 159, 160, 188, 189, 190, 192, 191, - 47, 61, 197, 134, 52, 134, 15, 134, 37, 38, - 39, 40, 41, 42, 43, 45, 133, 161, 162, 163, - 0, 190, 41, 43, 164, 207, 37, 38, 39, 42, - 165, 204, 206, 213, 134, 134, 140, 198, 19, 196, - 7, 8, 10, 11, 12, 13, 14, 44, 137, 140, - 143, 145, 156, 159, 177, 178, 210, 163, 163, 29, - 30, 187, 163, 163, 18, 214, 215, 26, 146, 205, - 214, 19, 19, 19, 199, 138, 4, 4, 4, 145, - 10, 146, 178, 183, 136, 138, 187, 187, 11, 12, - 13, 154, 155, 178, 184, 55, 56, 57, 58, 59, - 60, 166, 202, 202, 158, 218, 135, 142, 34, 178, - 179, 181, 182, 141, 141, 146, 183, 135, 146, 182, - 184, 178, 23, 24, 3, 4, 5, 6, 9, 22, - 35, 36, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 80, 81, 82, 83, 84, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 124, 126, 127, 128, 140, 143, 145, 147, - 149, 150, 151, 185, 210, 193, 4, 10, 178, 180, - 25, 145, 203, 32, 50, 51, 62, 63, 64, 65, - 66, 67, 83, 84, 105, 106, 107, 110, 123, 124, - 125, 126, 127, 128, 149, 150, 151, 216, 222, 223, - 224, 225, 19, 168, 135, 139, 178, 178, 144, 146, - 178, 139, 194, 195, 85, 86, 87, 88, 89, 90, - 91, 92, 93, 94, 152, 23, 24, 91, 92, 93, - 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, - 104, 153, 138, 138, 138, 138, 138, 142, 184, 186, - 145, 186, 146, 186, 19, 138, 138, 138, 135, 175, - 159, 50, 10, 178, 212, 11, 14, 11, 154, 166, - 152, 153, 178, 178, 212, 178, 178, 219, 212, 212, - 212, 212, 212, 178, 178, 212, 166, 108, 109, 112, - 113, 130, 131, 167, 34, 179, 170, 142, 144, 144, - 170, 175, 175, 138, 138, 184, 184, 184, 184, 184, - 135, 142, 146, 178, 186, 144, 146, 184, 184, 184, - 31, 48, 173, 176, 138, 3, 4, 9, 22, 23, - 24, 35, 36, 52, 143, 185, 209, 210, 211, 211, - 211, 211, 180, 178, 178, 135, 172, 135, 172, 211, - 140, 135, 135, 135, 135, 135, 135, 211, 211, 33, - 180, 178, 212, 129, 167, 169, 184, 184, 221, 135, - 135, 135, 135, 184, 144, 146, 135, 135, 33, 19, - 4, 175, 34, 178, 200, 201, 54, 208, 186, 135, - 135, 211, 211, 211, 11, 48, 11, 221, 211, 140, - 212, 178, 212, 212, 212, 135, 135, 178, 211, 211, - 135, 135, 135, 135, 139, 184, 184, 184, 184, 144, - 184, 184, 178, 168, 135, 139, 19, 144, 14, 14, - 138, 135, 135, 211, 4, 211, 135, 211, 135, 135, - 135, 211, 211, 138, 178, 184, 184, 212, 135, 139, - 135, 135, 139, 139, 139, 156, 157, 34, 178, 170, - 135, 211, 211, 178, 220, 211, 211, 135, 172, 172, - 211, 135, 212, 212, 212, 220, 211, 139, 139, 184, - 184, 184, 168, 173, 174, 19, 135, 140, 211, 135, - 139, 142, 211, 139, 139, 139, 139, 157, 48, 171, - 14, 142, 154, 217, 168, 178, 170, 142, 170, 4, - 211, 209, 142, 154, 211, 33, 135, 209, 168, 14, - 14, 135, 211, 211, 14, 66, 211, 14, 211 + 0, 19, 20, 22, 23, 24, 30, 31, 52, 56, + 60, 178, 181, 182, 183, 184, 216, 217, 218, 220, + 219, 53, 68, 225, 158, 59, 158, 18, 158, 42, + 43, 44, 45, 46, 47, 48, 49, 51, 153, 154, + 155, 185, 186, 187, 0, 218, 46, 48, 188, 235, + 42, 43, 44, 47, 189, 232, 234, 242, 158, 158, + 162, 226, 22, 224, 7, 8, 10, 11, 12, 13, + 14, 15, 16, 17, 50, 161, 162, 165, 167, 178, + 182, 203, 204, 238, 187, 187, 35, 37, 214, 187, + 187, 21, 243, 244, 29, 168, 233, 243, 22, 22, + 22, 227, 156, 4, 4, 4, 167, 10, 168, 204, + 209, 55, 156, 180, 214, 214, 42, 44, 190, 32, + 33, 213, 62, 63, 64, 65, 66, 67, 191, 230, + 230, 181, 247, 159, 164, 39, 204, 205, 207, 208, + 163, 163, 168, 209, 159, 168, 156, 208, 160, 213, + 213, 10, 125, 204, 206, 215, 11, 12, 13, 14, + 15, 16, 176, 177, 204, 210, 4, 206, 28, 167, + 231, 36, 57, 58, 69, 70, 71, 72, 73, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 91, 92, 93, 114, + 115, 116, 119, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 137, 138, 139, 140, 171, 172, 173, 245, 252, 253, + 254, 255, 22, 193, 159, 157, 204, 204, 166, 168, + 204, 4, 157, 210, 204, 156, 238, 26, 27, 3, + 4, 5, 6, 9, 25, 40, 41, 90, 91, 92, + 93, 119, 133, 135, 136, 137, 139, 140, 162, 165, + 167, 169, 171, 172, 173, 211, 238, 180, 182, 57, + 10, 204, 240, 241, 11, 17, 11, 176, 191, 94, + 95, 96, 97, 98, 99, 100, 101, 102, 103, 174, + 26, 27, 100, 101, 102, 103, 104, 105, 106, 107, + 108, 109, 110, 111, 112, 113, 175, 174, 175, 204, + 204, 240, 204, 204, 248, 240, 240, 240, 240, 240, + 204, 204, 204, 204, 204, 240, 191, 117, 118, 54, + 121, 122, 141, 142, 144, 145, 147, 148, 149, 192, + 39, 205, 195, 164, 166, 166, 157, 195, 180, 180, + 215, 174, 175, 174, 175, 156, 156, 156, 156, 156, + 156, 156, 164, 210, 212, 167, 212, 168, 212, 22, + 156, 156, 156, 221, 156, 3, 4, 9, 25, 26, + 27, 40, 41, 59, 162, 165, 167, 169, 211, 237, + 238, 239, 159, 239, 239, 239, 206, 204, 204, 204, + 204, 159, 198, 159, 198, 239, 162, 159, 159, 159, + 159, 159, 159, 239, 239, 239, 239, 239, 38, 206, + 204, 240, 4, 141, 142, 143, 146, 150, 151, 194, + 222, 223, 38, 156, 156, 156, 156, 210, 210, 210, + 210, 210, 210, 210, 159, 164, 168, 204, 212, 166, + 168, 210, 210, 210, 159, 201, 39, 204, 228, 229, + 61, 236, 164, 212, 167, 212, 168, 212, 22, 240, + 159, 159, 239, 239, 239, 239, 239, 11, 54, 11, + 250, 239, 162, 240, 204, 240, 240, 240, 159, 159, + 251, 159, 159, 159, 204, 239, 239, 159, 201, 201, + 204, 210, 210, 210, 210, 250, 159, 159, 159, 159, + 251, 159, 210, 166, 168, 159, 159, 38, 34, 54, + 199, 202, 193, 159, 157, 22, 164, 168, 212, 166, + 168, 17, 17, 156, 159, 159, 159, 159, 239, 4, + 239, 159, 159, 239, 159, 159, 159, 4, 4, 159, + 204, 239, 239, 156, 159, 198, 204, 157, 159, 159, + 159, 159, 157, 210, 210, 210, 210, 157, 210, 166, + 210, 210, 204, 22, 4, 201, 178, 179, 39, 204, + 195, 159, 166, 168, 239, 239, 17, 204, 249, 239, + 239, 239, 239, 198, 198, 240, 239, 159, 240, 240, + 240, 4, 239, 249, 239, 210, 210, 210, 210, 159, + 157, 159, 159, 251, 157, 157, 157, 193, 199, 200, + 22, 166, 159, 162, 193, 193, 157, 159, 164, 239, + 251, 157, 198, 157, 157, 157, 157, 210, 210, 210, + 157, 179, 54, 197, 17, 164, 176, 246, 121, 122, + 239, 239, 195, 17, 204, 164, 195, 157, 157, 157, + 4, 152, 196, 239, 237, 164, 176, 193, 193, 38, + 193, 193, 22, 159, 237, 17, 239, 239, 17, 159, + 239, 193, 193, 239, 17, 73, 239, 17, 239 }; #define yyerrok (yyerrstatus = 0) @@ -2388,7 +2811,7 @@ do \ yychar = (Token); \ yylval = (Value); \ yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK; \ + YYPOPSTACK (1); \ goto yybackup; \ } \ else \ @@ -2396,7 +2819,7 @@ do \ yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ -while (0) +while (YYID (0)) #define YYTERROR 1 @@ -2411,7 +2834,7 @@ while (0) #ifndef YYLLOC_DEFAULT # define YYLLOC_DEFAULT(Current, Rhs, N) \ do \ - if (N) \ + if (YYID (N)) \ { \ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ @@ -2425,7 +2848,7 @@ while (0) (Current).first_column = (Current).last_column = \ YYRHSLOC (Rhs, 0).last_column; \ } \ - while (0) + while (YYID (0)) #endif @@ -2437,8 +2860,8 @@ while (0) # if YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) # else # define YY_LOCATION_PRINT(File, Loc) ((void) 0) # endif @@ -2465,36 +2888,96 @@ while (0) do { \ if (yydebug) \ YYFPRINTF Args; \ -} while (0) +} while (YYID (0)) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yysymprint (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (0) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (YYID (0)) + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_value_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + if (!yyvaluep) + return; +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# else + YYUSE (yyoutput); +# endif + switch (yytype) + { + default: + break; + } +} + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + if (yytype < YYNTOKENS) + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + yy_symbol_value_print (yyoutput, yytype, yyvaluep); + YYFPRINTF (yyoutput, ")"); +} /*------------------------------------------------------------------. | yy_stack_print -- Print the state stack from its BOTTOM up to its | | TOP (included). | `------------------------------------------------------------------*/ -#if defined (__STDC__) || defined (__cplusplus) +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (short int *bottom, short int *top) +yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) #else static void yy_stack_print (bottom, top) - short int *bottom; - short int *top; + yytype_int16 *bottom; + yytype_int16 *top; #endif { YYFPRINTF (stderr, "Stack now"); - for (/* Nothing. */; bottom <= top; ++bottom) + for (; bottom <= top; ++bottom) YYFPRINTF (stderr, " %d", *bottom); YYFPRINTF (stderr, "\n"); } @@ -2503,37 +2986,45 @@ yy_stack_print (bottom, top) do { \ if (yydebug) \ yy_stack_print ((Bottom), (Top)); \ -} while (0) +} while (YYID (0)) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if defined (__STDC__) || defined (__cplusplus) +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void -yy_reduce_print (int yyrule) +yy_reduce_print (YYSTYPE *yyvsp, int yyrule) #else static void -yy_reduce_print (yyrule) +yy_reduce_print (yyvsp, yyrule) + YYSTYPE *yyvsp; int yyrule; #endif { + int yynrhs = yyr2[yyrule]; int yyi; unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ", - yyrule - 1, yylno); - /* Print the symbols being reduced, and their result. */ - for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) - YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]); - YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]); + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + yyrule - 1, yylno); + /* The symbols being reduced. */ + for (yyi = 0; yyi < yynrhs; yyi++) + { + fprintf (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); + fprintf (stderr, "\n"); + } } # define YY_REDUCE_PRINT(Rule) \ do { \ if (yydebug) \ - yy_reduce_print (Rule); \ -} while (0) + yy_reduce_print (yyvsp, Rule); \ +} while (YYID (0)) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ @@ -2567,42 +3058,44 @@ int yydebug; #if YYERROR_VERBOSE # ifndef yystrlen -# if defined (__GLIBC__) && defined (_STRING_H) +# if defined __GLIBC__ && defined _STRING_H # define yystrlen strlen # else /* Return the length of YYSTR. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static YYSIZE_T -# if defined (__STDC__) || defined (__cplusplus) yystrlen (const char *yystr) -# else +#else +static YYSIZE_T yystrlen (yystr) - const char *yystr; -# endif + const char *yystr; +#endif { - const char *yys = yystr; - - while (*yys++ != '\0') + YYSIZE_T yylen; + for (yylen = 0; yystr[yylen]; yylen++) continue; - - return yys - yystr - 1; + return yylen; } # endif # endif # ifndef yystpcpy -# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE # define yystpcpy stpcpy # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static char * -# if defined (__STDC__) || defined (__cplusplus) yystpcpy (char *yydest, const char *yysrc) -# else +#else +static char * yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -# endif + char *yydest; + const char *yysrc; +#endif { char *yyd = yydest; const char *yys = yysrc; @@ -2628,7 +3121,7 @@ yytnamerr (char *yyres, const char *yystr) { if (*yystr == '"') { - size_t yyn = 0; + YYSIZE_T yyn = 0; char const *yyp = yystr; for (;;) @@ -2663,53 +3156,123 @@ yytnamerr (char *yyres, const char *yystr) } # endif -#endif /* YYERROR_VERBOSE */ - - - -#if YYDEBUG -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -#if defined (__STDC__) || defined (__cplusplus) -static void -yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep) -#else -static void -yysymprint (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE *yyvaluep; -#endif +/* Copy into YYRESULT an error message about the unexpected token + YYCHAR while in state YYSTATE. Return the number of bytes copied, + including the terminating null byte. If YYRESULT is null, do not + copy anything; just return the number of bytes that would be + copied. As a special case, return 0 if an ordinary "syntax error" + message will do. Return YYSIZE_MAXIMUM if overflow occurs during + size calculation. */ +static YYSIZE_T +yysyntax_error (char *yyresult, int yystate, int yychar) { - /* Pacify ``unused variable'' warnings. */ - (void) yyvaluep; + int yyn = yypact[yystate]; - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) + return 0; else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + { + int yytype = YYTRANSLATE (yychar); + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + int yysize_overflow = 0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + int yyx; + +# if 0 + /* This is so xgettext sees the translatable formats that are + constructed on the fly. */ + YY_("syntax error, unexpected %s"); + YY_("syntax error, unexpected %s, expecting %s"); + YY_("syntax error, unexpected %s, expecting %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); +# endif + char *yyfmt; + char const *yyf; + static char const yyunexpected[] = "syntax error, unexpected %s"; + static char const yyexpecting[] = ", expecting %s"; + static char const yyor[] = " or %s"; + char yyformat[sizeof yyunexpected + + sizeof yyexpecting - 1 + + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) + * (sizeof yyor - 1))]; + char const *yyprefix = yyexpecting; + + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 1; + + yyarg[0] = yytname[yytype]; + yyfmt = yystpcpy (yyformat, yyunexpected); + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + yyformat[sizeof yyunexpected - 1] = '\0'; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + yyfmt = yystpcpy (yyfmt, yyprefix); + yyprefix = yyor; + } + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# endif - switch (yytype) - { - default: - break; + if (yysize_overflow) + return YYSIZE_MAXIMUM; + + if (yyresult) + { + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + char *yyp = yyresult; + int yyi = 0; + while ((*yyp = *yyf) != '\0') + { + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyf += 2; + } + else + { + yyp++; + yyf++; + } + } + } + return yysize; } - YYFPRINTF (yyoutput, ")"); } +#endif /* YYERROR_VERBOSE */ + -#endif /* ! YYDEBUG */ /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ -#if defined (__STDC__) || defined (__cplusplus) +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) #else @@ -2720,8 +3283,7 @@ yydestruct (yymsg, yytype, yyvaluep) YYSTYPE *yyvaluep; #endif { - /* Pacify ``unused variable'' warnings. */ - (void) yyvaluep; + YYUSE (yyvaluep); if (!yymsg) yymsg = "Deleting"; @@ -2731,7 +3293,7 @@ yydestruct (yymsg, yytype, yyvaluep) { default: - break; + break; } } @@ -2739,13 +3301,13 @@ yydestruct (yymsg, yytype, yyvaluep) /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM -# if defined (__STDC__) || defined (__cplusplus) +#if defined __STDC__ || defined __cplusplus int yyparse (void *YYPARSE_PARAM); -# else +#else int yyparse (); -# endif +#endif #else /* ! YYPARSE_PARAM */ -#if defined (__STDC__) || defined (__cplusplus) +#if defined __STDC__ || defined __cplusplus int yyparse (void); #else int yyparse (); @@ -2770,14 +3332,18 @@ int yynerrs; `----------*/ #ifdef YYPARSE_PARAM -# if defined (__STDC__) || defined (__cplusplus) -int yyparse (void *YYPARSE_PARAM) -# else -int yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -# endif +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void *YYPARSE_PARAM) +#else +int +yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; +#endif #else /* ! YYPARSE_PARAM */ -#if defined (__STDC__) || defined (__cplusplus) +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) int yyparse (void) #else @@ -2795,6 +3361,12 @@ yyparse () int yyerrstatus; /* Look-ahead token as an internal (translated) token number. */ int yytoken = 0; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif /* Three stacks and their tools: `yyss': related to states, @@ -2805,9 +3377,9 @@ yyparse () to reallocate them elsewhere. */ /* The state stack. */ - short int yyssa[YYINITDEPTH]; - short int *yyss = yyssa; - short int *yyssp; + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss = yyssa; + yytype_int16 *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; @@ -2816,7 +3388,7 @@ yyparse () -#define YYPOPSTACK (yyvsp--, yyssp--) +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) YYSIZE_T yystacksize = YYINITDEPTH; @@ -2825,9 +3397,9 @@ yyparse () YYSTYPE yyval; - /* When reducing, the number of symbols on the RHS of the reduced - rule. */ - int yylen; + /* The number of symbols on the RHS of the reduced rule. + Keep to zero when no symbol should be popped. */ + int yylen = 0; YYDPRINTF ((stderr, "Starting parse\n")); @@ -2851,8 +3423,7 @@ yyparse () `------------------------------------------------------------*/ yynewstate: /* In all cases, when you get here, the value and location stacks - have just been pushed. so pushing a state here evens the stacks. - */ + have just been pushed. So pushing a state here evens the stacks. */ yyssp++; yysetstate: @@ -2865,11 +3436,11 @@ yyparse () #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of + /* Give user a chance to reallocate the stack. Use copies of these so that the &'s don't force the real ones into memory. */ YYSTYPE *yyvs1 = yyvs; - short int *yyss1 = yyss; + yytype_int16 *yyss1 = yyss; /* Each stack pointer address is followed by the size of the @@ -2897,7 +3468,7 @@ yyparse () yystacksize = YYMAXDEPTH; { - short int *yyss1 = yyss; + yytype_int16 *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) @@ -2932,12 +3503,10 @@ yyparse () `-----------*/ yybackup: -/* Do appropriate processing given the current state. */ -/* Read a look-ahead token if we need one and don't already have one. */ -/* yyresume: */ + /* Do appropriate processing given the current state. Read a + look-ahead token if we need one and don't already have one. */ /* First try to decide what to do without reference to look-ahead token. */ - yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; @@ -2979,22 +3548,21 @@ yybackup: if (yyn == YYFINAL) YYACCEPT; + /* Count tokens shifted since error; after three, turn off error + status. */ + if (yyerrstatus) + yyerrstatus--; + /* Shift the look-ahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the token being shifted unless it is eof. */ + /* Discard the shifted token unless it is eof. */ if (yychar != YYEOF) yychar = YYEMPTY; + yystate = yyn; *++yyvsp = yylval; - - /* Count tokens shifted since error; after three, turn off error - status. */ - if (yyerrstatus) - yyerrstatus--; - - yystate = yyn; goto yynewstate; @@ -3030,812 +3598,938 @@ yyreduce: switch (yyn) { case 29: -#line 1092 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1124 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;} break; case 30: -#line 1092 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1124 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;} break; case 31: -#line 1093 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1125 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;} break; case 32: -#line 1093 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1125 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;} break; case 33: -#line 1094 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1126 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;} break; case 34: -#line 1094 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1126 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;} break; case 35: -#line 1095 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1127 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;} break; case 36: -#line 1095 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1127 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;} break; case 37: -#line 1096 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1128 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;} break; case 38: -#line 1096 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1128 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;} break; case 39: -#line 1100 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1132 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;} break; case 40: -#line 1100 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1132 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;} break; case 41: -#line 1101 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1133 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;} break; case 42: -#line 1101 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1133 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;} break; case 43: -#line 1102 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1134 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;} break; case 44: -#line 1102 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1134 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;} break; case 45: -#line 1103 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1135 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;} break; case 46: -#line 1103 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1135 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;} break; case 47: -#line 1104 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1136 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;} break; case 48: -#line 1104 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1136 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;} break; case 49: -#line 1105 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1137 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;} break; case 50: -#line 1105 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1137 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;} break; case 51: -#line 1106 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1138 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;} break; case 52: -#line 1106 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1138 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;} break; case 53: -#line 1107 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1139 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;} break; case 54: -#line 1108 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 1140 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;} break; - case 61: -#line 1117 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 65: +#line 1149 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; ;} break; - case 62: -#line 1121 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 66: +#line 1151 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.UIntVal)=(yyvsp[(3) - (4)].UInt64Val); ;} + break; + + case 67: +#line 1152 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.UIntVal)=0; ;} + break; + + case 68: +#line 1156 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.StrVal) = (yyvsp[-1].StrVal); + (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal); CHECK_FOR_ERROR ;} break; - case 63: -#line 1125 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 69: +#line 1160 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; CHECK_FOR_ERROR ;} break; - case 66: -#line 1132 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 73: +#line 1168 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.StrVal) = (yyvsp[-1].StrVal); + (yyval.StrVal) = 0; CHECK_FOR_ERROR ;} break; - case 67: -#line 1136 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 74: +#line 1173 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.StrVal) = 0; + (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal); CHECK_FOR_ERROR ;} break; - case 68: -#line 1142 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 75: +#line 1179 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::InternalLinkage; ;} break; - case 69: -#line 1143 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 76: +#line 1180 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::WeakLinkage; ;} break; - case 70: -#line 1144 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 77: +#line 1181 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;} break; - case 71: -#line 1145 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 78: +#line 1182 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;} break; - case 72: -#line 1146 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 79: +#line 1183 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;} break; - case 73: -#line 1150 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 80: +#line 1184 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.Linkage) = GlobalValue::CommonLinkage; ;} + break; + + case 81: +#line 1188 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;} break; - case 74: -#line 1151 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 82: +#line 1189 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;} break; - case 75: -#line 1152 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 83: +#line 1190 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; - case 76: -#line 1156 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { (yyval.Visibility) = GlobalValue::DefaultVisibility; ;} + case 84: +#line 1194 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.Visibility) = GlobalValue::DefaultVisibility; ;} break; - case 77: -#line 1157 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { (yyval.Visibility) = GlobalValue::HiddenVisibility; ;} + case 85: +#line 1195 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.Visibility) = GlobalValue::DefaultVisibility; ;} break; - case 78: -#line 1161 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 86: +#line 1196 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.Visibility) = GlobalValue::HiddenVisibility; ;} + break; + + case 87: +#line 1197 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.Visibility) = GlobalValue::ProtectedVisibility; ;} + break; + + case 88: +#line 1201 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; - case 79: -#line 1162 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 89: +#line 1202 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;} break; - case 80: -#line 1163 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 90: +#line 1203 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;} break; - case 81: -#line 1167 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 91: +#line 1207 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; - case 82: -#line 1168 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 92: +#line 1208 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::InternalLinkage; ;} break; - case 83: -#line 1169 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 93: +#line 1209 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;} break; - case 84: -#line 1170 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 94: +#line 1210 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::WeakLinkage; ;} break; - case 85: -#line 1171 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 95: +#line 1211 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;} break; - case 86: -#line 1174 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 96: +#line 1215 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} + break; + + case 97: +#line 1216 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.Linkage) = GlobalValue::WeakLinkage; ;} + break; + + case 98: +#line 1217 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.Linkage) = GlobalValue::InternalLinkage; ;} + break; + + case 99: +#line 1220 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::C; ;} break; - case 87: -#line 1175 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 100: +#line 1221 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::C; ;} break; - case 88: -#line 1176 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 101: +#line 1222 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::Fast; ;} break; - case 89: -#line 1177 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 102: +#line 1223 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::Cold; ;} break; - case 90: -#line 1178 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 103: +#line 1224 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::X86_StdCall; ;} break; - case 91: -#line 1179 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 104: +#line 1225 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::X86_FastCall; ;} break; - case 92: -#line 1180 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 105: +#line 1226 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val)) + if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val)) GEN_ERROR("Calling conv too large"); - (yyval.UIntVal) = (yyvsp[0].UInt64Val); + (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val); CHECK_FOR_ERROR ;} break; - case 93: -#line 1187 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { (yyval.ParamAttrs) = FunctionType::ZExtAttribute; ;} + case 106: +#line 1233 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::ZExt; ;} break; - case 94: -#line 1188 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { (yyval.ParamAttrs) = FunctionType::SExtAttribute; ;} + case 107: +#line 1234 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::ZExt; ;} break; - case 95: -#line 1189 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { (yyval.ParamAttrs) = FunctionType::InRegAttribute; ;} + case 108: +#line 1235 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::SExt; ;} break; - case 96: -#line 1190 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { (yyval.ParamAttrs) = FunctionType::StructRetAttribute; ;} + case 109: +#line 1236 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::SExt; ;} break; - case 97: -#line 1193 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { (yyval.ParamAttrs) = FunctionType::NoAttributeSet; ;} + case 110: +#line 1237 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::InReg; ;} break; - case 98: -#line 1194 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 111: +#line 1238 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::StructRet; ;} + break; + + case 112: +#line 1239 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::NoAlias; ;} + break; + + case 113: +#line 1240 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::ByVal; ;} + break; + + case 114: +#line 1241 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::Nest; ;} + break; + + case 115: +#line 1242 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = + ParamAttr::constructAlignmentFromInt((yyvsp[(2) - (2)].UInt64Val)); ;} + break; + + case 116: +#line 1246 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::None; ;} + break; + + case 117: +#line 1247 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.ParamAttrs) = FunctionType::ParameterAttributes((yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs)); + (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs); ;} break; - case 99: -#line 1199 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { (yyval.ParamAttrs) = FunctionType::NoReturnAttribute; ;} + case 118: +#line 1252 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::NoReturn; ;} break; - case 101: -#line 1203 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { (yyval.ParamAttrs) = FunctionType::NoAttributeSet; ;} + case 119: +#line 1253 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::NoUnwind; ;} break; - case 102: -#line 1204 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 120: +#line 1254 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::ZExt; ;} + break; + + case 121: +#line 1255 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::SExt; ;} + break; + + case 122: +#line 1256 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::ReadNone; ;} + break; + + case 123: +#line 1257 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::ReadOnly; ;} + break; + + case 124: +#line 1260 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamAttrs) = ParamAttr::None; ;} + break; + + case 125: +#line 1261 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.ParamAttrs) = FunctionType::ParameterAttributes((yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs)); + (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs); ;} break; - case 103: -#line 1211 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 126: +#line 1266 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.StrVal) = 0; ;} + break; + + case 127: +#line 1267 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal); + ;} + break; + + case 128: +#line 1274 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = 0; ;} break; - case 104: -#line 1212 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 129: +#line 1275 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.UIntVal) = (yyvsp[0].UInt64Val); + (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val); if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal))) GEN_ERROR("Alignment must be a power of two"); CHECK_FOR_ERROR ;} break; - case 105: -#line 1218 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 130: +#line 1281 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = 0; ;} break; - case 106: -#line 1219 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 131: +#line 1282 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.UIntVal) = (yyvsp[0].UInt64Val); + (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val); if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal))) GEN_ERROR("Alignment must be a power of two"); CHECK_FOR_ERROR ;} break; - case 107: -#line 1227 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 132: +#line 1291 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - for (unsigned i = 0, e = strlen((yyvsp[0].StrVal)); i != e; ++i) - if ((yyvsp[0].StrVal)[i] == '"' || (yyvsp[0].StrVal)[i] == '\\') + for (unsigned i = 0, e = (yyvsp[(2) - (2)].StrVal)->length(); i != e; ++i) + if ((*(yyvsp[(2) - (2)].StrVal))[i] == '"' || (*(yyvsp[(2) - (2)].StrVal))[i] == '\\') GEN_ERROR("Invalid character in section name"); - (yyval.StrVal) = (yyvsp[0].StrVal); + (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal); CHECK_FOR_ERROR ;} break; - case 108: -#line 1235 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 133: +#line 1299 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; ;} break; - case 109: -#line 1236 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { (yyval.StrVal) = (yyvsp[0].StrVal); ;} + case 134: +#line 1300 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;} break; - case 110: -#line 1241 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 135: +#line 1305 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" {;} break; - case 111: -#line 1242 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 136: +#line 1306 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" {;} break; - case 112: -#line 1243 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 137: +#line 1307 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - CurGV->setSection((yyvsp[0].StrVal)); - free((yyvsp[0].StrVal)); + CurGV->setSection(*(yyvsp[(1) - (1)].StrVal)); + delete (yyvsp[(1) - (1)].StrVal); CHECK_FOR_ERROR ;} break; - case 113: -#line 1248 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 138: +#line 1312 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[0].UInt64Val))) + if ((yyvsp[(2) - (2)].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[(2) - (2)].UInt64Val))) GEN_ERROR("Alignment must be a power of two"); - CurGV->setAlignment((yyvsp[0].UInt64Val)); + CurGV->setAlignment((yyvsp[(2) - (2)].UInt64Val)); CHECK_FOR_ERROR ;} break; - case 118: -#line 1264 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 146: +#line 1328 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeVal) = new PATypeHolder(OpaqueType::get()); CHECK_FOR_ERROR ;} break; - case 119: -#line 1268 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 147: +#line 1332 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType)); + (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType)); CHECK_FOR_ERROR ;} break; - case 120: -#line 1272 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 148: +#line 1336 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Pointer type? - if (*(yyvsp[-1].TypeVal) == Type::LabelTy) + if (*(yyvsp[(1) - (3)].TypeVal) == Type::LabelTy) GEN_ERROR("Cannot form a pointer to a basic block"); - (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(PointerType::get(*(yyvsp[-1].TypeVal)))); - delete (yyvsp[-1].TypeVal); + (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(PointerType::get(*(yyvsp[(1) - (3)].TypeVal), (yyvsp[(2) - (3)].UIntVal)))); + delete (yyvsp[(1) - (3)].TypeVal); CHECK_FOR_ERROR ;} break; - case 121: -#line 1279 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 149: +#line 1343 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Named types are also simple types... - const Type* tmp = getTypeVal((yyvsp[0].ValIDVal)); + const Type* tmp = getTypeVal((yyvsp[(1) - (1)].ValIDVal)); CHECK_FOR_ERROR (yyval.TypeVal) = new PATypeHolder(tmp); ;} break; - case 122: -#line 1284 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 150: +#line 1348 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Type UpReference - if ((yyvsp[0].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range"); + if ((yyvsp[(2) - (2)].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range"); OpaqueType *OT = OpaqueType::get(); // Use temporary placeholder - UpRefs.push_back(UpRefRecord((unsigned)(yyvsp[0].UInt64Val), OT)); // Add to vector... + UpRefs.push_back(UpRefRecord((unsigned)(yyvsp[(2) - (2)].UInt64Val), OT)); // Add to vector... (yyval.TypeVal) = new PATypeHolder(OT); UR_OUT("New Upreference!\n"); CHECK_FOR_ERROR ;} break; - case 123: -#line 1292 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { + case 151: +#line 1356 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. + const Type *RetTy = *(yyvsp[(1) - (5)].TypeVal); + if (!FunctionType::isValidReturnType(RetTy)) + GEN_ERROR("Invalid result type for LLVM function"); + std::vector Params; - std::vector Attrs; - Attrs.push_back((yyvsp[0].ParamAttrs)); - for (TypeWithAttrsList::iterator I=(yyvsp[-2].TypeWithAttrsList)->begin(), E=(yyvsp[-2].TypeWithAttrsList)->end(); I != E; ++I) { - Params.push_back(I->Ty->get()); - if (I->Ty->get() != Type::VoidTy) - Attrs.push_back(I->Attrs); + TypeWithAttrsList::iterator I = (yyvsp[(3) - (5)].TypeWithAttrsList)->begin(), E = (yyvsp[(3) - (5)].TypeWithAttrsList)->end(); + for (; I != E; ++I ) { + const Type *Ty = I->Ty->get(); + Params.push_back(Ty); } + bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - FunctionType *FT = FunctionType::get(*(yyvsp[-4].TypeVal), Params, isVarArg, Attrs); - delete (yyvsp[-2].TypeWithAttrsList); // Delete the argument list - delete (yyvsp[-4].TypeVal); // Delete the return type handle + for (unsigned i = 0; i != Params.size(); ++i) + if (!(Params[i]->isFirstClassType() || isa(Params[i]))) + GEN_ERROR("Function arguments must be value types!"); + + CHECK_FOR_ERROR + + FunctionType *FT = FunctionType::get(RetTy, Params, isVarArg); + delete (yyvsp[(3) - (5)].TypeWithAttrsList); // Delete the argument list + delete (yyvsp[(1) - (5)].TypeVal); // Delete the return type handle (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); CHECK_FOR_ERROR ;} break; - case 124: -#line 1310 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 152: +#line 1385 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. std::vector Params; - std::vector Attrs; - Attrs.push_back((yyvsp[0].ParamAttrs)); - for (TypeWithAttrsList::iterator I=(yyvsp[-2].TypeWithAttrsList)->begin(), E=(yyvsp[-2].TypeWithAttrsList)->end(); I != E; ++I) { - Params.push_back(I->Ty->get()); - if (I->Ty->get() != Type::VoidTy) - Attrs.push_back(I->Attrs); + TypeWithAttrsList::iterator I = (yyvsp[(3) - (5)].TypeWithAttrsList)->begin(), E = (yyvsp[(3) - (5)].TypeWithAttrsList)->end(); + for ( ; I != E; ++I ) { + const Type* Ty = I->Ty->get(); + Params.push_back(Ty); } + bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - FunctionType *FT = FunctionType::get((yyvsp[-4].PrimType), Params, isVarArg, Attrs); - delete (yyvsp[-2].TypeWithAttrsList); // Delete the argument list + for (unsigned i = 0; i != Params.size(); ++i) + if (!(Params[i]->isFirstClassType() || isa(Params[i]))) + GEN_ERROR("Function arguments must be value types!"); + + CHECK_FOR_ERROR + + FunctionType *FT = FunctionType::get((yyvsp[(1) - (5)].PrimType), Params, isVarArg); + delete (yyvsp[(3) - (5)].TypeWithAttrsList); // Delete the argument list (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); CHECK_FOR_ERROR ;} break; - case 125: -#line 1328 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 153: +#line 1410 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Sized array type? - (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val)))); - delete (yyvsp[-1].TypeVal); + (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[(4) - (5)].TypeVal), (yyvsp[(2) - (5)].UInt64Val)))); + delete (yyvsp[(4) - (5)].TypeVal); CHECK_FOR_ERROR ;} break; - case 126: -#line 1333 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 154: +#line 1415 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Vector type? - const llvm::Type* ElemTy = (yyvsp[-1].TypeVal)->get(); - if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val)) + const llvm::Type* ElemTy = (yyvsp[(4) - (5)].TypeVal)->get(); + if ((unsigned)(yyvsp[(2) - (5)].UInt64Val) != (yyvsp[(2) - (5)].UInt64Val)) GEN_ERROR("Unsigned result not equal to signed result"); if (!ElemTy->isFloatingPoint() && !ElemTy->isInteger()) GEN_ERROR("Element type of a VectorType must be primitive"); - if (!isPowerOf2_32((yyvsp[-3].UInt64Val))) - GEN_ERROR("Vector length should be a power of 2"); - (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(VectorType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val)))); - delete (yyvsp[-1].TypeVal); + (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(VectorType::get(*(yyvsp[(4) - (5)].TypeVal), (unsigned)(yyvsp[(2) - (5)].UInt64Val)))); + delete (yyvsp[(4) - (5)].TypeVal); CHECK_FOR_ERROR ;} break; - case 127: -#line 1345 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 155: +#line 1425 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Structure type? std::vector Elements; - for (std::list::iterator I = (yyvsp[-1].TypeList)->begin(), - E = (yyvsp[-1].TypeList)->end(); I != E; ++I) + for (std::list::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(), + E = (yyvsp[(2) - (3)].TypeList)->end(); I != E; ++I) Elements.push_back(*I); (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(StructType::get(Elements))); - delete (yyvsp[-1].TypeList); + delete (yyvsp[(2) - (3)].TypeList); CHECK_FOR_ERROR ;} break; - case 128: -#line 1355 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 156: +#line 1435 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Empty structure type? (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector())); CHECK_FOR_ERROR ;} break; - case 129: -#line 1359 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 157: +#line 1439 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { std::vector Elements; - for (std::list::iterator I = (yyvsp[-2].TypeList)->begin(), - E = (yyvsp[-2].TypeList)->end(); I != E; ++I) + for (std::list::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(), + E = (yyvsp[(3) - (5)].TypeList)->end(); I != E; ++I) Elements.push_back(*I); (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true))); - delete (yyvsp[-2].TypeList); + delete (yyvsp[(3) - (5)].TypeList); CHECK_FOR_ERROR ;} break; - case 130: -#line 1369 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 158: +#line 1449 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Empty structure type? (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector(), true)); CHECK_FOR_ERROR ;} break; - case 131: -#line 1376 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { - (yyval.TypeWithAttrs).Ty = (yyvsp[-1].TypeVal); - (yyval.TypeWithAttrs).Attrs = (yyvsp[0].ParamAttrs); + case 159: +#line 1456 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + // Allow but ignore attributes on function types; this permits auto-upgrade. + // FIXME: remove in LLVM 3.0. + (yyval.TypeWithAttrs).Ty = (yyvsp[(1) - (2)].TypeVal); + (yyval.TypeWithAttrs).Attrs = ParamAttr::None; ;} break; - case 132: -#line 1383 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 160: +#line 1465 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription()); - if (!(*(yyvsp[0].TypeVal))->isFirstClassType()) + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription()); + if (!(*(yyvsp[(1) - (1)].TypeVal))->isFirstClassType() && !isa((yyvsp[(1) - (1)].TypeVal)->get())) GEN_ERROR("LLVM functions cannot return aggregate types"); - (yyval.TypeVal) = (yyvsp[0].TypeVal); + (yyval.TypeVal) = (yyvsp[(1) - (1)].TypeVal); ;} break; - case 133: -#line 1390 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 161: +#line 1472 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeVal) = new PATypeHolder(Type::VoidTy); ;} break; - case 134: -#line 1395 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 162: +#line 1477 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeWithAttrsList) = new TypeWithAttrsList(); - (yyval.TypeWithAttrsList)->push_back((yyvsp[0].TypeWithAttrs)); + (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs)); CHECK_FOR_ERROR ;} break; - case 135: -#line 1400 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 163: +#line 1482 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - ((yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList))->push_back((yyvsp[0].TypeWithAttrs)); + ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs)); CHECK_FOR_ERROR ;} break; - case 137: -#line 1408 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 165: +#line 1490 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList); - TypeWithAttrs TWA; TWA.Attrs = FunctionType::NoAttributeSet; + (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList); + TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None; TWA.Ty = new PATypeHolder(Type::VoidTy); (yyval.TypeWithAttrsList)->push_back(TWA); CHECK_FOR_ERROR ;} break; - case 138: -#line 1415 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 166: +#line 1497 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeWithAttrsList) = new TypeWithAttrsList; - TypeWithAttrs TWA; TWA.Attrs = FunctionType::NoAttributeSet; + TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None; TWA.Ty = new PATypeHolder(Type::VoidTy); (yyval.TypeWithAttrsList)->push_back(TWA); CHECK_FOR_ERROR ;} break; - case 139: -#line 1422 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 167: +#line 1504 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeWithAttrsList) = new TypeWithAttrsList(); CHECK_FOR_ERROR ;} break; - case 140: -#line 1430 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 168: +#line 1512 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeList) = new std::list(); - (yyval.TypeList)->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal); + (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal)); + delete (yyvsp[(1) - (1)].TypeVal); CHECK_FOR_ERROR ;} break; - case 141: -#line 1435 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 169: +#line 1518 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal); + ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal)); + delete (yyvsp[(3) - (3)].TypeVal); CHECK_FOR_ERROR ;} break; - case 142: -#line 1446 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 170: +#line 1530 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Nonempty unsized arr if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription()); - const ArrayType *ATy = dyn_cast((yyvsp[-3].TypeVal)->get()); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription()); + const ArrayType *ATy = dyn_cast((yyvsp[(1) - (4)].TypeVal)->get()); if (ATy == 0) GEN_ERROR("Cannot make array constant with type: '" + - (*(yyvsp[-3].TypeVal))->getDescription() + "'"); + (*(yyvsp[(1) - (4)].TypeVal))->getDescription() + "'"); const Type *ETy = ATy->getElementType(); int NumElements = ATy->getNumElements(); // Verify that we have the correct size... - if (NumElements != -1 && NumElements != (int)(yyvsp[-1].ConstVector)->size()) + if (NumElements != -1 && NumElements != (int)(yyvsp[(3) - (4)].ConstVector)->size()) GEN_ERROR("Type mismatch: constant sized array initialized with " + - utostr((yyvsp[-1].ConstVector)->size()) + " arguments, but has size of " + + utostr((yyvsp[(3) - (4)].ConstVector)->size()) + " arguments, but has size of " + itostr(NumElements) + ""); // Verify all elements are correct type! - for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) { - if (ETy != (*(yyvsp[-1].ConstVector))[i]->getType()) + for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) { + if (ETy != (*(yyvsp[(3) - (4)].ConstVector))[i]->getType()) GEN_ERROR("Element #" + utostr(i) + " is not of type '" + ETy->getDescription() +"' as required!\nIt is of type '"+ - (*(yyvsp[-1].ConstVector))[i]->getType()->getDescription() + "'."); + (*(yyvsp[(3) - (4)].ConstVector))[i]->getType()->getDescription() + "'."); } - (yyval.ConstVal) = ConstantArray::get(ATy, *(yyvsp[-1].ConstVector)); - delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector); + (yyval.ConstVal) = ConstantArray::get(ATy, *(yyvsp[(3) - (4)].ConstVector)); + delete (yyvsp[(1) - (4)].TypeVal); delete (yyvsp[(3) - (4)].ConstVector); CHECK_FOR_ERROR ;} break; - case 143: -#line 1474 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 171: +#line 1558 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription()); - const ArrayType *ATy = dyn_cast((yyvsp[-2].TypeVal)->get()); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); + const ArrayType *ATy = dyn_cast((yyvsp[(1) - (3)].TypeVal)->get()); if (ATy == 0) GEN_ERROR("Cannot make array constant with type: '" + - (*(yyvsp[-2].TypeVal))->getDescription() + "'"); + (*(yyvsp[(1) - (3)].TypeVal))->getDescription() + "'"); int NumElements = ATy->getNumElements(); if (NumElements != -1 && NumElements != 0) GEN_ERROR("Type mismatch: constant sized array initialized with 0" " arguments, but has size of " + itostr(NumElements) +""); (yyval.ConstVal) = ConstantArray::get(ATy, std::vector()); - delete (yyvsp[-2].TypeVal); + delete (yyvsp[(1) - (3)].TypeVal); CHECK_FOR_ERROR ;} break; - case 144: -#line 1490 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 172: +#line 1574 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription()); - const ArrayType *ATy = dyn_cast((yyvsp[-2].TypeVal)->get()); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); + const ArrayType *ATy = dyn_cast((yyvsp[(1) - (3)].TypeVal)->get()); if (ATy == 0) GEN_ERROR("Cannot make array constant with type: '" + - (*(yyvsp[-2].TypeVal))->getDescription() + "'"); + (*(yyvsp[(1) - (3)].TypeVal))->getDescription() + "'"); int NumElements = ATy->getNumElements(); const Type *ETy = ATy->getElementType(); - char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true); - if (NumElements != -1 && NumElements != (EndStr-(yyvsp[0].StrVal))) + if (NumElements != -1 && NumElements != int((yyvsp[(3) - (3)].StrVal)->length())) GEN_ERROR("Can't build string constant of size " + - itostr((int)(EndStr-(yyvsp[0].StrVal))) + + itostr((int)((yyvsp[(3) - (3)].StrVal)->length())) + " when array has size " + itostr(NumElements) + ""); std::vector Vals; if (ETy == Type::Int8Ty) { - for (unsigned char *C = (unsigned char *)(yyvsp[0].StrVal); - C != (unsigned char*)EndStr; ++C) - Vals.push_back(ConstantInt::get(ETy, *C)); + for (unsigned i = 0; i < (yyvsp[(3) - (3)].StrVal)->length(); ++i) + Vals.push_back(ConstantInt::get(ETy, (*(yyvsp[(3) - (3)].StrVal))[i])); } else { - free((yyvsp[0].StrVal)); + delete (yyvsp[(3) - (3)].StrVal); GEN_ERROR("Cannot build string arrays of non byte sized elements"); } - free((yyvsp[0].StrVal)); + delete (yyvsp[(3) - (3)].StrVal); (yyval.ConstVal) = ConstantArray::get(ATy, Vals); - delete (yyvsp[-2].TypeVal); + delete (yyvsp[(1) - (3)].TypeVal); CHECK_FOR_ERROR ;} break; - case 145: -#line 1519 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 173: +#line 1601 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Nonempty unsized arr if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription()); - const VectorType *PTy = dyn_cast((yyvsp[-3].TypeVal)->get()); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription()); + const VectorType *PTy = dyn_cast((yyvsp[(1) - (4)].TypeVal)->get()); if (PTy == 0) GEN_ERROR("Cannot make packed constant with type: '" + - (*(yyvsp[-3].TypeVal))->getDescription() + "'"); + (*(yyvsp[(1) - (4)].TypeVal))->getDescription() + "'"); const Type *ETy = PTy->getElementType(); int NumElements = PTy->getNumElements(); // Verify that we have the correct size... - if (NumElements != -1 && NumElements != (int)(yyvsp[-1].ConstVector)->size()) + if (NumElements != -1 && NumElements != (int)(yyvsp[(3) - (4)].ConstVector)->size()) GEN_ERROR("Type mismatch: constant sized packed initialized with " + - utostr((yyvsp[-1].ConstVector)->size()) + " arguments, but has size of " + + utostr((yyvsp[(3) - (4)].ConstVector)->size()) + " arguments, but has size of " + itostr(NumElements) + ""); // Verify all elements are correct type! - for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) { - if (ETy != (*(yyvsp[-1].ConstVector))[i]->getType()) + for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) { + if (ETy != (*(yyvsp[(3) - (4)].ConstVector))[i]->getType()) GEN_ERROR("Element #" + utostr(i) + " is not of type '" + ETy->getDescription() +"' as required!\nIt is of type '"+ - (*(yyvsp[-1].ConstVector))[i]->getType()->getDescription() + "'."); + (*(yyvsp[(3) - (4)].ConstVector))[i]->getType()->getDescription() + "'."); } - (yyval.ConstVal) = ConstantVector::get(PTy, *(yyvsp[-1].ConstVector)); - delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector); + (yyval.ConstVal) = ConstantVector::get(PTy, *(yyvsp[(3) - (4)].ConstVector)); + delete (yyvsp[(1) - (4)].TypeVal); delete (yyvsp[(3) - (4)].ConstVector); CHECK_FOR_ERROR ;} break; - case 146: -#line 1547 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 174: +#line 1629 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - const StructType *STy = dyn_cast((yyvsp[-3].TypeVal)->get()); + const StructType *STy = dyn_cast((yyvsp[(1) - (4)].TypeVal)->get()); if (STy == 0) GEN_ERROR("Cannot make struct constant with type: '" + - (*(yyvsp[-3].TypeVal))->getDescription() + "'"); + (*(yyvsp[(1) - (4)].TypeVal))->getDescription() + "'"); - if ((yyvsp[-1].ConstVector)->size() != STy->getNumContainedTypes()) + if ((yyvsp[(3) - (4)].ConstVector)->size() != STy->getNumContainedTypes()) 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 = (yyvsp[-1].ConstVector)->size(); i != e; ++i) - if ((*(yyvsp[-1].ConstVector))[i]->getType() != STy->getElementType(i)) + for (unsigned i = 0, e = (yyvsp[(3) - (4)].ConstVector)->size(); i != e; ++i) + if ((*(yyvsp[(3) - (4)].ConstVector))[i]->getType() != STy->getElementType(i)) GEN_ERROR("Expected type '" + STy->getElementType(i)->getDescription() + "' for element #" + utostr(i) + @@ -3843,51 +4537,53 @@ yyreduce: // Check to ensure that Type is not packed if (STy->isPacked()) - GEN_ERROR("Unpacked Initializer to vector type '" + STy->getDescription() + "'"); + GEN_ERROR("Unpacked Initializer to vector type '" + + STy->getDescription() + "'"); - (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[-1].ConstVector)); - delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector); + (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[(3) - (4)].ConstVector)); + delete (yyvsp[(1) - (4)].TypeVal); delete (yyvsp[(3) - (4)].ConstVector); CHECK_FOR_ERROR ;} break; - case 147: -#line 1572 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 175: +#line 1655 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription()); - const StructType *STy = dyn_cast((yyvsp[-2].TypeVal)->get()); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); + const StructType *STy = dyn_cast((yyvsp[(1) - (3)].TypeVal)->get()); if (STy == 0) GEN_ERROR("Cannot make struct constant with type: '" + - (*(yyvsp[-2].TypeVal))->getDescription() + "'"); + (*(yyvsp[(1) - (3)].TypeVal))->getDescription() + "'"); if (STy->getNumContainedTypes() != 0) GEN_ERROR("Illegal number of initializers for structure type"); // Check to ensure that Type is not packed if (STy->isPacked()) - GEN_ERROR("Unpacked Initializer to vector type '" + STy->getDescription() + "'"); + GEN_ERROR("Unpacked Initializer to vector type '" + + STy->getDescription() + "'"); (yyval.ConstVal) = ConstantStruct::get(STy, std::vector()); - delete (yyvsp[-2].TypeVal); + delete (yyvsp[(1) - (3)].TypeVal); CHECK_FOR_ERROR ;} break; - case 148: -#line 1591 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 176: +#line 1675 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - const StructType *STy = dyn_cast((yyvsp[-5].TypeVal)->get()); + const StructType *STy = dyn_cast((yyvsp[(1) - (6)].TypeVal)->get()); if (STy == 0) GEN_ERROR("Cannot make struct constant with type: '" + - (*(yyvsp[-5].TypeVal))->getDescription() + "'"); + (*(yyvsp[(1) - (6)].TypeVal))->getDescription() + "'"); - if ((yyvsp[-2].ConstVector)->size() != STy->getNumContainedTypes()) + if ((yyvsp[(4) - (6)].ConstVector)->size() != STy->getNumContainedTypes()) 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 = (yyvsp[-2].ConstVector)->size(); i != e; ++i) - if ((*(yyvsp[-2].ConstVector))[i]->getType() != STy->getElementType(i)) + for (unsigned i = 0, e = (yyvsp[(4) - (6)].ConstVector)->size(); i != e; ++i) + if ((*(yyvsp[(4) - (6)].ConstVector))[i]->getType() != STy->getElementType(i)) GEN_ERROR("Expected type '" + STy->getElementType(i)->getDescription() + "' for element #" + utostr(i) + @@ -3898,21 +4594,21 @@ yyreduce: GEN_ERROR("Vector initializer to non-vector type '" + STy->getDescription() + "'"); - (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[-2].ConstVector)); - delete (yyvsp[-5].TypeVal); delete (yyvsp[-2].ConstVector); + (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[(4) - (6)].ConstVector)); + delete (yyvsp[(1) - (6)].TypeVal); delete (yyvsp[(4) - (6)].ConstVector); CHECK_FOR_ERROR ;} break; - case 149: -#line 1617 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 177: +#line 1701 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription()); - const StructType *STy = dyn_cast((yyvsp[-4].TypeVal)->get()); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription()); + const StructType *STy = dyn_cast((yyvsp[(1) - (5)].TypeVal)->get()); if (STy == 0) GEN_ERROR("Cannot make struct constant with type: '" + - (*(yyvsp[-4].TypeVal))->getDescription() + "'"); + (*(yyvsp[(1) - (5)].TypeVal))->getDescription() + "'"); if (STy->getNumContainedTypes() != 0) GEN_ERROR("Illegal number of initializers for structure type"); @@ -3923,46 +4619,46 @@ yyreduce: STy->getDescription() + "'"); (yyval.ConstVal) = ConstantStruct::get(STy, std::vector()); - delete (yyvsp[-4].TypeVal); + delete (yyvsp[(1) - (5)].TypeVal); CHECK_FOR_ERROR ;} break; - case 150: -#line 1637 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 178: +#line 1721 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription()); - const PointerType *PTy = dyn_cast((yyvsp[-1].TypeVal)->get()); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); + const PointerType *PTy = dyn_cast((yyvsp[(1) - (2)].TypeVal)->get()); if (PTy == 0) GEN_ERROR("Cannot make null pointer constant with type: '" + - (*(yyvsp[-1].TypeVal))->getDescription() + "'"); + (*(yyvsp[(1) - (2)].TypeVal))->getDescription() + "'"); (yyval.ConstVal) = ConstantPointerNull::get(PTy); - delete (yyvsp[-1].TypeVal); + delete (yyvsp[(1) - (2)].TypeVal); CHECK_FOR_ERROR ;} break; - case 151: -#line 1649 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 179: +#line 1733 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription()); - (yyval.ConstVal) = UndefValue::get((yyvsp[-1].TypeVal)->get()); - delete (yyvsp[-1].TypeVal); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); + (yyval.ConstVal) = UndefValue::get((yyvsp[(1) - (2)].TypeVal)->get()); + delete (yyvsp[(1) - (2)].TypeVal); CHECK_FOR_ERROR ;} break; - case 152: -#line 1656 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 180: +#line 1740 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription()); - const PointerType *Ty = dyn_cast((yyvsp[-1].TypeVal)->get()); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); + const PointerType *Ty = dyn_cast((yyvsp[(1) - (2)].TypeVal)->get()); if (Ty == 0) - GEN_ERROR("Global const reference must be a pointer type"); + GEN_ERROR("Global const reference must be a pointer type " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); // ConstExprs can exist in the body of a function, thus creating // GlobalValues whenever they refer to a variable. Because we are in @@ -3974,7 +4670,7 @@ yyreduce: Function *SavedCurFn = CurFun.CurrentFunction; CurFun.CurrentFunction = 0; - Value *V = getExistingVal(Ty, (yyvsp[0].ValIDVal)); + Value *V = getExistingVal(Ty, (yyvsp[(2) - (2)].ValIDVal)); CHECK_FOR_ERROR CurFun.CurrentFunction = SavedCurFn; @@ -3989,307 +4685,392 @@ yyreduce: // First check to see if the forward references value is already created! PerModuleInfo::GlobalRefsType::iterator I = - CurModule.GlobalRefs.find(std::make_pair(PT, (yyvsp[0].ValIDVal))); + CurModule.GlobalRefs.find(std::make_pair(PT, (yyvsp[(2) - (2)].ValIDVal))); if (I != CurModule.GlobalRefs.end()) { V = I->second; // Placeholder already exists, use it... - (yyvsp[0].ValIDVal).destroy(); + (yyvsp[(2) - (2)].ValIDVal).destroy(); } else { std::string Name; - if ((yyvsp[0].ValIDVal).Type == ValID::GlobalName) - Name = (yyvsp[0].ValIDVal).Name; - else if ((yyvsp[0].ValIDVal).Type != ValID::GlobalID) + if ((yyvsp[(2) - (2)].ValIDVal).Type == ValID::GlobalName) + Name = (yyvsp[(2) - (2)].ValIDVal).getName(); + else if ((yyvsp[(2) - (2)].ValIDVal).Type != ValID::GlobalID) GEN_ERROR("Invalid reference to global"); // Create the forward referenced global. GlobalValue *GV; if (const FunctionType *FTy = dyn_cast(PT->getElementType())) { - GV = new Function(FTy, GlobalValue::ExternalLinkage, Name, - CurModule.CurrentModule); + GV = Function::Create(FTy, GlobalValue::ExternalWeakLinkage, Name, + CurModule.CurrentModule); } else { GV = new GlobalVariable(PT->getElementType(), false, - GlobalValue::ExternalLinkage, 0, + GlobalValue::ExternalWeakLinkage, 0, Name, CurModule.CurrentModule); } // Keep track of the fact that we have a forward ref to recycle it - CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, (yyvsp[0].ValIDVal)), GV)); + CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, (yyvsp[(2) - (2)].ValIDVal)), GV)); V = GV; } } (yyval.ConstVal) = cast(V); - delete (yyvsp[-1].TypeVal); // Free the type handle + delete (yyvsp[(1) - (2)].TypeVal); // Free the type handle CHECK_FOR_ERROR ;} break; - case 153: -#line 1722 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 181: +#line 1806 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription()); - if ((yyvsp[-1].TypeVal)->get() != (yyvsp[0].ConstVal)->getType()) + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); + if ((yyvsp[(1) - (2)].TypeVal)->get() != (yyvsp[(2) - (2)].ConstVal)->getType()) GEN_ERROR("Mismatched types for constant expression: " + - (*(yyvsp[-1].TypeVal))->getDescription() + " and " + (yyvsp[0].ConstVal)->getType()->getDescription()); - (yyval.ConstVal) = (yyvsp[0].ConstVal); - delete (yyvsp[-1].TypeVal); + (*(yyvsp[(1) - (2)].TypeVal))->getDescription() + " and " + (yyvsp[(2) - (2)].ConstVal)->getType()->getDescription()); + (yyval.ConstVal) = (yyvsp[(2) - (2)].ConstVal); + delete (yyvsp[(1) - (2)].TypeVal); CHECK_FOR_ERROR ;} break; - case 154: -#line 1732 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 182: +#line 1816 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription()); - const Type *Ty = (yyvsp[-1].TypeVal)->get(); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); + const Type *Ty = (yyvsp[(1) - (2)].TypeVal)->get(); if (isa(Ty) || Ty == Type::LabelTy || isa(Ty)) GEN_ERROR("Cannot create a null initialized value of this type"); (yyval.ConstVal) = Constant::getNullValue(Ty); - delete (yyvsp[-1].TypeVal); + delete (yyvsp[(1) - (2)].TypeVal); CHECK_FOR_ERROR ;} break; - case 155: -#line 1742 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 183: +#line 1826 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // integral constants - if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val))) + if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].SInt64Val))) GEN_ERROR("Constant value doesn't fit in type"); - APInt Val(64, (yyvsp[0].SInt64Val)); - uint32_t BitWidth = cast((yyvsp[-1].PrimType))->getBitWidth(); - Val.sextOrTrunc(BitWidth); - (yyval.ConstVal) = ConstantInt::get(Val); + (yyval.ConstVal) = ConstantInt::get((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].SInt64Val), true); CHECK_FOR_ERROR ;} break; - case 156: -#line 1751 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 184: +#line 1832 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // arbitrary precision integer constants - uint32_t BitWidth = cast((yyvsp[-1].PrimType))->getBitWidth(); - if ((yyvsp[0].APIntVal)->getBitWidth() > BitWidth) { + uint32_t BitWidth = cast((yyvsp[(1) - (2)].PrimType))->getBitWidth(); + if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) { GEN_ERROR("Constant value does not fit in type"); } - (yyvsp[0].APIntVal)->sextOrTrunc(BitWidth); - (yyval.ConstVal) = ConstantInt::get(*(yyvsp[0].APIntVal)); - delete (yyvsp[0].APIntVal); + (yyvsp[(2) - (2)].APIntVal)->sextOrTrunc(BitWidth); + (yyval.ConstVal) = ConstantInt::get(*(yyvsp[(2) - (2)].APIntVal)); + delete (yyvsp[(2) - (2)].APIntVal); CHECK_FOR_ERROR ;} break; - case 157: -#line 1761 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 185: +#line 1842 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // integral constants - if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val))) + if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].UInt64Val))) GEN_ERROR("Constant value doesn't fit in type"); - uint32_t BitWidth = cast((yyvsp[-1].PrimType))->getBitWidth(); - APInt Val(BitWidth, (yyvsp[0].UInt64Val)); - (yyval.ConstVal) = ConstantInt::get(Val); + (yyval.ConstVal) = ConstantInt::get((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].UInt64Val), false); CHECK_FOR_ERROR ;} break; - case 158: -#line 1769 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 186: +#line 1848 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // arbitrary precision integer constants - uint32_t BitWidth = cast((yyvsp[-1].PrimType))->getBitWidth(); - if ((yyvsp[0].APIntVal)->getBitWidth() > BitWidth) { + uint32_t BitWidth = cast((yyvsp[(1) - (2)].PrimType))->getBitWidth(); + if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) { GEN_ERROR("Constant value does not fit in type"); } - (yyvsp[0].APIntVal)->zextOrTrunc(BitWidth); - (yyval.ConstVal) = ConstantInt::get(*(yyvsp[0].APIntVal)); - delete (yyvsp[0].APIntVal); + (yyvsp[(2) - (2)].APIntVal)->zextOrTrunc(BitWidth); + (yyval.ConstVal) = ConstantInt::get(*(yyvsp[(2) - (2)].APIntVal)); + delete (yyvsp[(2) - (2)].APIntVal); CHECK_FOR_ERROR ;} break; - case 159: -#line 1779 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 187: +#line 1858 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Boolean constants - assert(cast((yyvsp[-1].PrimType))->getBitWidth() == 1 && "Not Bool?"); + if (cast((yyvsp[(1) - (2)].PrimType))->getBitWidth() != 1) + GEN_ERROR("Constant true must have type i1"); (yyval.ConstVal) = ConstantInt::getTrue(); CHECK_FOR_ERROR ;} break; - case 160: -#line 1784 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 188: +#line 1864 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Boolean constants - assert(cast((yyvsp[-1].PrimType))->getBitWidth() == 1 && "Not Bool?"); + if (cast((yyvsp[(1) - (2)].PrimType))->getBitWidth() != 1) + GEN_ERROR("Constant false must have type i1"); (yyval.ConstVal) = ConstantInt::getFalse(); CHECK_FOR_ERROR ;} break; - case 161: -#line 1789 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { // Float & Double constants - if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].FPVal))) + case 189: +#line 1870 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { // Floating point constants + if (!ConstantFP::isValueValidForType((yyvsp[(1) - (2)].PrimType), *(yyvsp[(2) - (2)].FPVal))) GEN_ERROR("Floating point constant invalid for type"); - (yyval.ConstVal) = ConstantFP::get((yyvsp[-1].PrimType), (yyvsp[0].FPVal)); + // Lexer has no type info, so builds all float and double FP constants + // as double. Fix this here. Long double is done right. + if (&(yyvsp[(2) - (2)].FPVal)->getSemantics()==&APFloat::IEEEdouble && (yyvsp[(1) - (2)].PrimType)==Type::FloatTy) + (yyvsp[(2) - (2)].FPVal)->convert(APFloat::IEEEsingle, APFloat::rmNearestTiesToEven); + (yyval.ConstVal) = ConstantFP::get(*(yyvsp[(2) - (2)].FPVal)); + delete (yyvsp[(2) - (2)].FPVal); CHECK_FOR_ERROR ;} break; - case 162: -#line 1797 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 190: +#line 1883 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription()); - Constant *Val = (yyvsp[-3].ConstVal); - const Type *DestTy = (yyvsp[-1].TypeVal)->get(); - if (!CastInst::castIsValid((yyvsp[-5].CastOpVal), (yyvsp[-3].ConstVal), DestTy)) + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription()); + Constant *Val = (yyvsp[(3) - (6)].ConstVal); + const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get(); + if (!CastInst::castIsValid((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy)) GEN_ERROR("invalid cast opcode for cast from '" + Val->getType()->getDescription() + "' to '" + DestTy->getDescription() + "'"); - (yyval.ConstVal) = ConstantExpr::getCast((yyvsp[-5].CastOpVal), (yyvsp[-3].ConstVal), DestTy); - delete (yyvsp[-1].TypeVal); + (yyval.ConstVal) = ConstantExpr::getCast((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy); + delete (yyvsp[(5) - (6)].TypeVal); ;} break; - case 163: -#line 1809 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 191: +#line 1895 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if (!isa((yyvsp[-2].ConstVal)->getType())) + if (!isa((yyvsp[(3) - (5)].ConstVal)->getType())) GEN_ERROR("GetElementPtr requires a pointer operand"); const Type *IdxTy = - GetElementPtrInst::getIndexedType((yyvsp[-2].ConstVal)->getType(), &(*(yyvsp[-1].ValueList))[0], (yyvsp[-1].ValueList)->size(), - true); + GetElementPtrInst::getIndexedType((yyvsp[(3) - (5)].ConstVal)->getType(), (yyvsp[(4) - (5)].ValueList)->begin(), (yyvsp[(4) - (5)].ValueList)->end()); if (!IdxTy) GEN_ERROR("Index list invalid for constant getelementptr"); SmallVector IdxVec; - for (unsigned i = 0, e = (yyvsp[-1].ValueList)->size(); i != e; ++i) - if (Constant *C = dyn_cast((*(yyvsp[-1].ValueList))[i])) + for (unsigned i = 0, e = (yyvsp[(4) - (5)].ValueList)->size(); i != e; ++i) + if (Constant *C = dyn_cast((*(yyvsp[(4) - (5)].ValueList))[i])) IdxVec.push_back(C); else GEN_ERROR("Indices to constant getelementptr must be constants"); - delete (yyvsp[-1].ValueList); + delete (yyvsp[(4) - (5)].ValueList); - (yyval.ConstVal) = ConstantExpr::getGetElementPtr((yyvsp[-2].ConstVal), &IdxVec[0], IdxVec.size()); + (yyval.ConstVal) = ConstantExpr::getGetElementPtr((yyvsp[(3) - (5)].ConstVal), &IdxVec[0], IdxVec.size()); CHECK_FOR_ERROR ;} break; - case 164: -#line 1831 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 192: +#line 1916 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[-5].ConstVal)->getType() != Type::Int1Ty) + if ((yyvsp[(3) - (8)].ConstVal)->getType() != Type::Int1Ty) GEN_ERROR("Select condition must be of boolean type"); - if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType()) + if ((yyvsp[(5) - (8)].ConstVal)->getType() != (yyvsp[(7) - (8)].ConstVal)->getType()) GEN_ERROR("Select operand types must match"); - (yyval.ConstVal) = ConstantExpr::getSelect((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); + (yyval.ConstVal) = ConstantExpr::getSelect((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)); CHECK_FOR_ERROR ;} break; - case 165: -#line 1839 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 193: +#line 1924 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType()) + if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType()) GEN_ERROR("Binary operator types must match"); CHECK_FOR_ERROR; - (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); + (yyval.ConstVal) = ConstantExpr::get((yyvsp[(1) - (6)].BinaryOpVal), (yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal)); ;} break; - case 166: -#line 1845 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 194: +#line 1930 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType()) + if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType()) GEN_ERROR("Logical operator types must match"); - if (!(yyvsp[-3].ConstVal)->getType()->isInteger()) { - if (Instruction::isShift((yyvsp[-5].BinaryOpVal)) || !isa((yyvsp[-3].ConstVal)->getType()) || - !cast((yyvsp[-3].ConstVal)->getType())->getElementType()->isInteger()) + if (!(yyvsp[(3) - (6)].ConstVal)->getType()->isInteger()) { + if (Instruction::isShift((yyvsp[(1) - (6)].BinaryOpVal)) || !isa((yyvsp[(3) - (6)].ConstVal)->getType()) || + !cast((yyvsp[(3) - (6)].ConstVal)->getType())->getElementType()->isInteger()) GEN_ERROR("Logical operator requires integral operands"); } - (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); + (yyval.ConstVal) = ConstantExpr::get((yyvsp[(1) - (6)].BinaryOpVal), (yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal)); CHECK_FOR_ERROR ;} break; - case 167: -#line 1856 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 195: +#line 1941 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType()) + if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType()) GEN_ERROR("icmp operand types must match"); - (yyval.ConstVal) = ConstantExpr::getICmp((yyvsp[-5].IPredicate), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); + (yyval.ConstVal) = ConstantExpr::getICmp((yyvsp[(2) - (7)].IPredicate), (yyvsp[(4) - (7)].ConstVal), (yyvsp[(6) - (7)].ConstVal)); ;} break; - case 168: -#line 1861 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 196: +#line 1946 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType()) + if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType()) GEN_ERROR("fcmp operand types must match"); - (yyval.ConstVal) = ConstantExpr::getFCmp((yyvsp[-5].FPredicate), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); + (yyval.ConstVal) = ConstantExpr::getFCmp((yyvsp[(2) - (7)].FPredicate), (yyvsp[(4) - (7)].ConstVal), (yyvsp[(6) - (7)].ConstVal)); ;} break; - case 169: -#line 1866 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 197: +#line 1951 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType()) + GEN_ERROR("vicmp operand types must match"); + (yyval.ConstVal) = ConstantExpr::getVICmp((yyvsp[(2) - (7)].IPredicate), (yyvsp[(4) - (7)].ConstVal), (yyvsp[(6) - (7)].ConstVal)); + ;} + break; + + case 198: +#line 1956 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType()) + GEN_ERROR("vfcmp operand types must match"); + (yyval.ConstVal) = ConstantExpr::getVFCmp((yyvsp[(2) - (7)].FPredicate), (yyvsp[(4) - (7)].ConstVal), (yyvsp[(6) - (7)].ConstVal)); + ;} + break; + + case 199: +#line 1961 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal))) + if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal))) GEN_ERROR("Invalid extractelement operands"); - (yyval.ConstVal) = ConstantExpr::getExtractElement((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); + (yyval.ConstVal) = ConstantExpr::getExtractElement((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal)); CHECK_FOR_ERROR ;} break; - case 170: -#line 1872 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 200: +#line 1967 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal))) + if (!InsertElementInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal))) GEN_ERROR("Invalid insertelement operands"); - (yyval.ConstVal) = ConstantExpr::getInsertElement((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); + (yyval.ConstVal) = ConstantExpr::getInsertElement((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)); CHECK_FOR_ERROR ;} break; - case 171: -#line 1878 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 201: +#line 1973 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal))) + if (!ShuffleVectorInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal))) GEN_ERROR("Invalid shufflevector operands"); - (yyval.ConstVal) = ConstantExpr::getShuffleVector((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); + (yyval.ConstVal) = ConstantExpr::getShuffleVector((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)); CHECK_FOR_ERROR ;} break; - case 172: -#line 1887 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 202: +#line 1979 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal)); + if (!isa((yyvsp[(3) - (5)].ConstVal)->getType()) && !isa((yyvsp[(3) - (5)].ConstVal)->getType())) + GEN_ERROR("ExtractValue requires an aggregate operand"); + + (yyval.ConstVal) = ConstantExpr::getExtractValue((yyvsp[(3) - (5)].ConstVal), &(*(yyvsp[(4) - (5)].ConstantList))[0], (yyvsp[(4) - (5)].ConstantList)->size()); + delete (yyvsp[(4) - (5)].ConstantList); CHECK_FOR_ERROR ;} break; - case 173: -#line 1891 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 203: +#line 1987 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + if (!isa((yyvsp[(3) - (7)].ConstVal)->getType()) && !isa((yyvsp[(3) - (7)].ConstVal)->getType())) + GEN_ERROR("InsertValue requires an aggregate operand"); + + (yyval.ConstVal) = ConstantExpr::getInsertValue((yyvsp[(3) - (7)].ConstVal), (yyvsp[(5) - (7)].ConstVal), &(*(yyvsp[(6) - (7)].ConstantList))[0], (yyvsp[(6) - (7)].ConstantList)->size()); + delete (yyvsp[(6) - (7)].ConstantList); + CHECK_FOR_ERROR + ;} + break; + + case 204: +#line 1998 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal)); + CHECK_FOR_ERROR + ;} + break; + + case 205: +#line 2002 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ConstVector) = new std::vector(); - (yyval.ConstVector)->push_back((yyvsp[0].ConstVal)); + (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal)); CHECK_FOR_ERROR ;} break; - case 174: -#line 1899 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 206: +#line 2010 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; ;} break; - case 175: -#line 1899 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 207: +#line 2010 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; ;} break; - case 176: -#line 1910 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 208: +#line 2013 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.BoolVal) = true; ;} + break; + + case 209: +#line 2013 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.BoolVal) = false; ;} + break; + + case 210: +#line 2016 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + const Type* VTy = (yyvsp[(1) - (2)].TypeVal)->get(); + Value *V = getVal(VTy, (yyvsp[(2) - (2)].ValIDVal)); + CHECK_FOR_ERROR + GlobalValue* Aliasee = dyn_cast(V); + if (!Aliasee) + GEN_ERROR("Aliases can be created only to global values"); + + (yyval.ConstVal) = Aliasee; + CHECK_FOR_ERROR + delete (yyvsp[(1) - (2)].TypeVal); + ;} + break; + + case 211: +#line 2028 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + Constant *Val = (yyvsp[(3) - (6)].ConstVal); + const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get(); + if (!CastInst::castIsValid((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy)) + GEN_ERROR("invalid cast opcode for cast from '" + + Val->getType()->getDescription() + "' to '" + + DestTy->getDescription() + "'"); + + (yyval.ConstVal) = ConstantExpr::getCast((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy); + CHECK_FOR_ERROR + delete (yyvsp[(5) - (6)].TypeVal); + ;} + break; + + case 212: +#line 2049 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule; CurModule.ModuleDone(); @@ -4297,8 +5078,8 @@ yyreduce: ;} break; - case 177: -#line 1915 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 213: +#line 2054 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule; CurModule.ModuleDone(); @@ -4306,59 +5087,43 @@ yyreduce: ;} break; - case 180: -#line 1928 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 216: +#line 2067 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { CurFun.isDeclare = false; ;} break; - case 181: -#line 1928 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 217: +#line 2067 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { CurFun.FunctionDone(); CHECK_FOR_ERROR ;} break; - case 182: -#line 1932 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 218: +#line 2071 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { CurFun.isDeclare = true; ;} break; - case 183: -#line 1932 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { - CHECK_FOR_ERROR - ;} - break; - - case 184: -#line 1935 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 219: +#line 2071 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; - case 185: -#line 1938 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 220: +#line 2074 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - // 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::LocalName) { - GEN_ERROR("Reference to an undefined type: '"+DID.getName() + "'"); - } else { - GEN_ERROR("Reference to an undefined type: #" + itostr(DID.Num)); - } - } CHECK_FOR_ERROR ;} break; - case 186: -#line 1950 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 221: +#line 2077 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription()); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription()); // Eagerly resolve types. This is not an optimization, this is a // requirement that is due to the fact that we could have this: // @@ -4368,264 +5133,312 @@ yyreduce: // If types are not resolved eagerly, then the two types will not be // determined to be the same type! // - ResolveTypeTo((yyvsp[-2].StrVal), *(yyvsp[0].TypeVal)); + ResolveTypeTo((yyvsp[(1) - (3)].StrVal), *(yyvsp[(3) - (3)].TypeVal)); - if (!setTypeName(*(yyvsp[0].TypeVal), (yyvsp[-2].StrVal)) && !(yyvsp[-2].StrVal)) { + if (!setTypeName(*(yyvsp[(3) - (3)].TypeVal), (yyvsp[(1) - (3)].StrVal)) && !(yyvsp[(1) - (3)].StrVal)) { CHECK_FOR_ERROR // If this is a named type that is not a redefinition, add it to the slot // table. - CurModule.Types.push_back(*(yyvsp[0].TypeVal)); + CurModule.Types.push_back(*(yyvsp[(3) - (3)].TypeVal)); } - delete (yyvsp[0].TypeVal); + delete (yyvsp[(3) - (3)].TypeVal); CHECK_FOR_ERROR ;} break; - case 187: -#line 1974 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 222: +#line 2101 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - ResolveTypeTo((yyvsp[-2].StrVal), (yyvsp[0].PrimType)); + ResolveTypeTo((yyvsp[(1) - (3)].StrVal), (yyvsp[(3) - (3)].PrimType)); - if (!setTypeName((yyvsp[0].PrimType), (yyvsp[-2].StrVal)) && !(yyvsp[-2].StrVal)) { + if (!setTypeName((yyvsp[(3) - (3)].PrimType), (yyvsp[(1) - (3)].StrVal)) && !(yyvsp[(1) - (3)].StrVal)) { CHECK_FOR_ERROR // If this is a named type that is not a redefinition, add it to the slot // table. - CurModule.Types.push_back((yyvsp[0].PrimType)); + CurModule.Types.push_back((yyvsp[(3) - (3)].PrimType)); } CHECK_FOR_ERROR ;} break; - case 188: -#line 1985 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 223: +#line 2113 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { /* "Externally Visible" Linkage */ - if ((yyvsp[0].ConstVal) == 0) + if ((yyvsp[(5) - (6)].ConstVal) == 0) GEN_ERROR("Global value initializer is not a constant"); - CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalLinkage, - (yyvsp[-2].Visibility), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal)->getType(), (yyvsp[0].ConstVal)); + CurGV = ParseGlobalVariable((yyvsp[(1) - (6)].StrVal), GlobalValue::ExternalLinkage, + (yyvsp[(2) - (6)].Visibility), (yyvsp[(4) - (6)].BoolVal), (yyvsp[(5) - (6)].ConstVal)->getType(), (yyvsp[(5) - (6)].ConstVal), (yyvsp[(3) - (6)].BoolVal), (yyvsp[(6) - (6)].UIntVal)); CHECK_FOR_ERROR ;} break; - case 189: -#line 1992 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 224: +#line 2120 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { CurGV = 0; ;} break; - case 190: -#line 1995 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 225: +#line 2124 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[0].ConstVal) == 0) + if ((yyvsp[(6) - (7)].ConstVal) == 0) GEN_ERROR("Global value initializer is not a constant"); - CurGV = ParseGlobalVariable((yyvsp[-4].StrVal), (yyvsp[-3].Linkage), (yyvsp[-2].Visibility), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal)->getType(), (yyvsp[0].ConstVal)); + CurGV = ParseGlobalVariable((yyvsp[(1) - (7)].StrVal), (yyvsp[(2) - (7)].Linkage), (yyvsp[(3) - (7)].Visibility), (yyvsp[(5) - (7)].BoolVal), (yyvsp[(6) - (7)].ConstVal)->getType(), (yyvsp[(6) - (7)].ConstVal), (yyvsp[(4) - (7)].BoolVal), (yyvsp[(7) - (7)].UIntVal)); CHECK_FOR_ERROR ;} break; - case 191: -#line 2000 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 226: +#line 2129 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { CurGV = 0; ;} break; - case 192: -#line 2003 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 227: +#line 2133 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription()); - CurGV = ParseGlobalVariable((yyvsp[-4].StrVal), (yyvsp[-3].Linkage), (yyvsp[-2].Visibility), (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(6) - (7)].TypeVal))->getDescription()); + CurGV = ParseGlobalVariable((yyvsp[(1) - (7)].StrVal), (yyvsp[(2) - (7)].Linkage), (yyvsp[(3) - (7)].Visibility), (yyvsp[(5) - (7)].BoolVal), *(yyvsp[(6) - (7)].TypeVal), 0, (yyvsp[(4) - (7)].BoolVal), (yyvsp[(7) - (7)].UIntVal)); CHECK_FOR_ERROR - delete (yyvsp[0].TypeVal); + delete (yyvsp[(6) - (7)].TypeVal); ;} break; - case 193: -#line 2009 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 228: +#line 2139 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { CurGV = 0; CHECK_FOR_ERROR ;} break; - case 194: -#line 2013 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 229: +#line 2143 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + std::string Name; + if ((yyvsp[(1) - (5)].StrVal)) { + Name = *(yyvsp[(1) - (5)].StrVal); + delete (yyvsp[(1) - (5)].StrVal); + } + if (Name.empty()) + GEN_ERROR("Alias name cannot be empty"); + + Constant* Aliasee = (yyvsp[(5) - (5)].ConstVal); + if (Aliasee == 0) + GEN_ERROR(std::string("Invalid aliasee for alias: ") + Name); + + GlobalAlias* GA = new GlobalAlias(Aliasee->getType(), (yyvsp[(4) - (5)].Linkage), Name, Aliasee, + CurModule.CurrentModule); + GA->setVisibility((yyvsp[(2) - (5)].Visibility)); + InsertValue(GA, CurModule.Values); + + + // If there was a forward reference of this alias, resolve it now. + + ValID ID; + if (!Name.empty()) + ID = ValID::createGlobalName(Name); + else + ID = ValID::createGlobalID(CurModule.Values.size()-1); + + if (GlobalValue *FWGV = + CurModule.GetForwardRefForGlobal(GA->getType(), ID)) { + // Replace uses of the fwdref with the actual alias. + FWGV->replaceAllUsesWith(GA); + if (GlobalVariable *GV = dyn_cast(FWGV)) + GV->eraseFromParent(); + else + cast(FWGV)->eraseFromParent(); + } + ID.destroy(); + + CHECK_FOR_ERROR + ;} + break; + + case 230: +#line 2183 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; - case 195: -#line 2016 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 231: +#line 2186 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; - case 196: -#line 2022 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 232: +#line 2192 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm(); - char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true); - std::string NewAsm((yyvsp[0].StrVal), EndStr); - free((yyvsp[0].StrVal)); - if (AsmSoFar.empty()) - CurModule.CurrentModule->setModuleInlineAsm(NewAsm); + CurModule.CurrentModule->setModuleInlineAsm(*(yyvsp[(1) - (1)].StrVal)); else - CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+NewAsm); + CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+*(yyvsp[(1) - (1)].StrVal)); + delete (yyvsp[(1) - (1)].StrVal); CHECK_FOR_ERROR ;} break; - case 197: -#line 2035 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 233: +#line 2202 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal)); - free((yyvsp[0].StrVal)); + CurModule.CurrentModule->setTargetTriple(*(yyvsp[(3) - (3)].StrVal)); + delete (yyvsp[(3) - (3)].StrVal); ;} break; - case 198: -#line 2039 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 234: +#line 2206 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal)); - free((yyvsp[0].StrVal)); + CurModule.CurrentModule->setDataLayout(*(yyvsp[(3) - (3)].StrVal)); + delete (yyvsp[(3) - (3)].StrVal); ;} break; - case 200: -#line 2046 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 236: +#line 2213 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal)); - free((yyvsp[0].StrVal)); + CurModule.CurrentModule->addLibrary(*(yyvsp[(3) - (3)].StrVal)); + delete (yyvsp[(3) - (3)].StrVal); CHECK_FOR_ERROR ;} break; - case 201: -#line 2051 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 237: +#line 2218 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal)); - free((yyvsp[0].StrVal)); + CurModule.CurrentModule->addLibrary(*(yyvsp[(1) - (1)].StrVal)); + delete (yyvsp[(1) - (1)].StrVal); CHECK_FOR_ERROR ;} break; - case 202: -#line 2056 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 238: +#line 2223 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; - case 203: -#line 2065 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 239: +#line 2232 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription()); - if (*(yyvsp[-2].TypeVal) == Type::VoidTy) - GEN_ERROR("void typed arguments are invalid"); - ArgListEntry E; E.Attrs = (yyvsp[-1].ParamAttrs); E.Ty = (yyvsp[-2].TypeVal); E.Name = (yyvsp[0].StrVal); - (yyval.ArgList) = (yyvsp[-4].ArgList); - (yyvsp[-4].ArgList)->push_back(E); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription()); + if (!(*(yyvsp[(3) - (5)].TypeVal))->isFirstClassType()) + GEN_ERROR("Argument types must be first-class"); + ArgListEntry E; E.Attrs = (yyvsp[(4) - (5)].ParamAttrs); E.Ty = (yyvsp[(3) - (5)].TypeVal); E.Name = (yyvsp[(5) - (5)].StrVal); + (yyval.ArgList) = (yyvsp[(1) - (5)].ArgList); + (yyvsp[(1) - (5)].ArgList)->push_back(E); CHECK_FOR_ERROR ;} break; - case 204: -#line 2075 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 240: +#line 2242 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription()); - if (*(yyvsp[-2].TypeVal) == Type::VoidTy) - GEN_ERROR("void typed arguments are invalid"); - ArgListEntry E; E.Attrs = (yyvsp[-1].ParamAttrs); E.Ty = (yyvsp[-2].TypeVal); E.Name = (yyvsp[0].StrVal); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); + if (!(*(yyvsp[(1) - (3)].TypeVal))->isFirstClassType()) + GEN_ERROR("Argument types must be first-class"); + ArgListEntry E; E.Attrs = (yyvsp[(2) - (3)].ParamAttrs); E.Ty = (yyvsp[(1) - (3)].TypeVal); E.Name = (yyvsp[(3) - (3)].StrVal); (yyval.ArgList) = new ArgListType; (yyval.ArgList)->push_back(E); CHECK_FOR_ERROR ;} break; - case 205: -#line 2086 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 241: +#line 2253 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.ArgList) = (yyvsp[0].ArgList); + (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList); CHECK_FOR_ERROR ;} break; - case 206: -#line 2090 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 242: +#line 2257 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.ArgList) = (yyvsp[-2].ArgList); + (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList); struct ArgListEntry E; E.Ty = new PATypeHolder(Type::VoidTy); E.Name = 0; - E.Attrs = FunctionType::NoAttributeSet; + E.Attrs = ParamAttr::None; (yyval.ArgList)->push_back(E); CHECK_FOR_ERROR ;} break; - case 207: -#line 2099 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 243: +#line 2266 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = new ArgListType; struct ArgListEntry E; E.Ty = new PATypeHolder(Type::VoidTy); E.Name = 0; - E.Attrs = FunctionType::NoAttributeSet; + E.Attrs = ParamAttr::None; (yyval.ArgList)->push_back(E); CHECK_FOR_ERROR ;} break; - case 208: -#line 2108 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 244: +#line 2275 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = 0; CHECK_FOR_ERROR ;} break; - case 209: -#line 2114 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 245: +#line 2281 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - UnEscapeLexed((yyvsp[-6].StrVal)); - std::string FunctionName((yyvsp[-6].StrVal)); - free((yyvsp[-6].StrVal)); // Free strdup'd memory! + std::string FunctionName(*(yyvsp[(3) - (10)].StrVal)); + delete (yyvsp[(3) - (10)].StrVal); // Free strdup'd memory! // Check the function result for abstractness if this is a define. We should // have no abstract types at this point - if (!CurFun.isDeclare && CurModule.TypeIsUnresolved((yyvsp[-7].TypeVal))) - GEN_ERROR("Reference to abstract result: "+ (yyvsp[-7].TypeVal)->get()->getDescription()); + if (!CurFun.isDeclare && CurModule.TypeIsUnresolved((yyvsp[(2) - (10)].TypeVal))) + GEN_ERROR("Reference to abstract result: "+ (yyvsp[(2) - (10)].TypeVal)->get()->getDescription()); + if (!FunctionType::isValidReturnType(*(yyvsp[(2) - (10)].TypeVal))) + GEN_ERROR("Invalid result type for LLVM function"); + std::vector ParamTypeList; - std::vector ParamAttrs; - ParamAttrs.push_back((yyvsp[-2].ParamAttrs)); - if ((yyvsp[-4].ArgList)) { // If there are arguments... - for (ArgListType::iterator I = (yyvsp[-4].ArgList)->begin(); I != (yyvsp[-4].ArgList)->end(); ++I) { + SmallVector Attrs; + if ((yyvsp[(7) - (10)].ParamAttrs) != ParamAttr::None) + Attrs.push_back(ParamAttrsWithIndex::get(0, (yyvsp[(7) - (10)].ParamAttrs))); + if ((yyvsp[(5) - (10)].ArgList)) { // If there are arguments... + unsigned index = 1; + for (ArgListType::iterator I = (yyvsp[(5) - (10)].ArgList)->begin(); I != (yyvsp[(5) - (10)].ArgList)->end(); ++I, ++index) { const Type* Ty = I->Ty->get(); if (!CurFun.isDeclare && CurModule.TypeIsUnresolved(I->Ty)) GEN_ERROR("Reference to abstract argument: " + Ty->getDescription()); ParamTypeList.push_back(Ty); - if (Ty != Type::VoidTy) - ParamAttrs.push_back(I->Attrs); + if (Ty != Type::VoidTy && I->Attrs != ParamAttr::None) + Attrs.push_back(ParamAttrsWithIndex::get(index, I->Attrs)); } } bool isVarArg = ParamTypeList.size() && ParamTypeList.back() == Type::VoidTy; if (isVarArg) ParamTypeList.pop_back(); - FunctionType *FT = FunctionType::get(*(yyvsp[-7].TypeVal), ParamTypeList, isVarArg, - ParamAttrs); - const PointerType *PFT = PointerType::get(FT); - delete (yyvsp[-7].TypeVal); + PAListPtr PAL; + if (!Attrs.empty()) + PAL = PAListPtr::get(Attrs.begin(), Attrs.end()); + + FunctionType *FT = FunctionType::get(*(yyvsp[(2) - (10)].TypeVal), ParamTypeList, isVarArg); + const PointerType *PFT = PointerType::getUnqual(FT); + delete (yyvsp[(2) - (10)].TypeVal); ValID ID; if (!FunctionName.empty()) { @@ -4640,6 +5453,8 @@ yyreduce: // Move the function to the end of the list, from whereever it was // previously inserted. Fn = cast(FWRef); + assert(Fn->getParamAttrs().isEmpty() && + "Forward reference has parameter attributes!"); CurModule.CurrentModule->getFunctionList().remove(Fn); CurModule.CurrentModule->getFunctionList().push_back(Fn); } else if (!FunctionName.empty() && // Merge with an earlier prototype? @@ -4648,20 +5463,23 @@ yyreduce: // The existing function doesn't have the same type. This is an overload // error. GEN_ERROR("Overload of function '" + FunctionName + "' not permitted."); + } else if (Fn->getParamAttrs() != PAL) { + // The existing function doesn't have the same parameter attributes. + // This is an overload error. + GEN_ERROR("Overload of function '" + FunctionName + "' not permitted."); } else if (!CurFun.isDeclare && !Fn->isDeclaration()) { // Neither the existing or the current function is a declaration and they // have the same name and same type. Clearly this is a redefinition. GEN_ERROR("Redefinition of function '" + FunctionName + "'"); - } if (Fn->isDeclaration()) { + } else if (Fn->isDeclaration()) { // Make sure to strip off any argument names so we can't get conflicts. 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); - + Fn = Function::Create(FT, GlobalValue::ExternalWeakLinkage, FunctionName, + CurModule.CurrentModule); InsertValue(Fn, CurModule.Values); } @@ -4674,411 +5492,543 @@ yyreduce: Fn->setLinkage(CurFun.Linkage); Fn->setVisibility(CurFun.Visibility); } - Fn->setCallingConv((yyvsp[-8].UIntVal)); - Fn->setAlignment((yyvsp[0].UIntVal)); - if ((yyvsp[-1].StrVal)) { - Fn->setSection((yyvsp[-1].StrVal)); - free((yyvsp[-1].StrVal)); + Fn->setCallingConv((yyvsp[(1) - (10)].UIntVal)); + Fn->setParamAttrs(PAL); + Fn->setAlignment((yyvsp[(9) - (10)].UIntVal)); + if ((yyvsp[(8) - (10)].StrVal)) { + Fn->setSection(*(yyvsp[(8) - (10)].StrVal)); + delete (yyvsp[(8) - (10)].StrVal); + } + if ((yyvsp[(10) - (10)].StrVal)) { + Fn->setCollector((yyvsp[(10) - (10)].StrVal)->c_str()); + delete (yyvsp[(10) - (10)].StrVal); } // Add all of the arguments we parsed to the function... - if ((yyvsp[-4].ArgList)) { // Is null if empty... + if ((yyvsp[(5) - (10)].ArgList)) { // Is null if empty... if (isVarArg) { // Nuke the last entry - assert((yyvsp[-4].ArgList)->back().Ty->get() == Type::VoidTy && (yyvsp[-4].ArgList)->back().Name == 0 && + assert((yyvsp[(5) - (10)].ArgList)->back().Ty->get() == Type::VoidTy && (yyvsp[(5) - (10)].ArgList)->back().Name == 0 && "Not a varargs marker!"); - delete (yyvsp[-4].ArgList)->back().Ty; - (yyvsp[-4].ArgList)->pop_back(); // Delete the last entry + delete (yyvsp[(5) - (10)].ArgList)->back().Ty; + (yyvsp[(5) - (10)].ArgList)->pop_back(); // Delete the last entry } Function::arg_iterator ArgIt = Fn->arg_begin(); Function::arg_iterator ArgEnd = Fn->arg_end(); unsigned Idx = 1; - for (ArgListType::iterator I = (yyvsp[-4].ArgList)->begin(); - I != (yyvsp[-4].ArgList)->end() && ArgIt != ArgEnd; ++I, ++ArgIt) { + for (ArgListType::iterator I = (yyvsp[(5) - (10)].ArgList)->begin(); + I != (yyvsp[(5) - (10)].ArgList)->end() && ArgIt != ArgEnd; ++I, ++ArgIt) { delete I->Ty; // Delete the typeholder... - setValueName(ArgIt, I->Name); // Insert arg into symtab... + setValueName(ArgIt, I->Name); // Insert arg into symtab... CHECK_FOR_ERROR InsertValue(ArgIt); Idx++; } - delete (yyvsp[-4].ArgList); // We're now done with the argument list + delete (yyvsp[(5) - (10)].ArgList); // We're now done with the argument list } CHECK_FOR_ERROR ;} break; - case 212: -#line 2227 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 248: +#line 2411 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FunctionVal) = CurFun.CurrentFunction; // Make sure that we keep track of the linkage type even if there was a // previous "declare". - (yyval.FunctionVal)->setLinkage((yyvsp[-3].Linkage)); - (yyval.FunctionVal)->setVisibility((yyvsp[-2].Visibility)); + (yyval.FunctionVal)->setLinkage((yyvsp[(1) - (4)].Linkage)); + (yyval.FunctionVal)->setVisibility((yyvsp[(2) - (4)].Visibility)); ;} break; - case 215: -#line 2238 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 251: +#line 2422 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.FunctionVal) = (yyvsp[-1].FunctionVal); + (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); CHECK_FOR_ERROR ;} break; - case 216: -#line 2243 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 252: +#line 2427 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - CurFun.CurrentFunction->setLinkage((yyvsp[-2].Linkage)); - CurFun.CurrentFunction->setVisibility((yyvsp[-1].Visibility)); + CurFun.CurrentFunction->setLinkage((yyvsp[(1) - (3)].Linkage)); + CurFun.CurrentFunction->setVisibility((yyvsp[(2) - (3)].Visibility)); (yyval.FunctionVal) = CurFun.CurrentFunction; CurFun.FunctionDone(); CHECK_FOR_ERROR ;} break; - case 217: -#line 2255 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 253: +#line 2439 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + (yyval.BoolVal) = false; + CHECK_FOR_ERROR + ;} + break; + + case 254: +#line 2443 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + (yyval.BoolVal) = true; + CHECK_FOR_ERROR + ;} + break; + + case 255: +#line 2448 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { // A reference to a direct constant + (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val)); + CHECK_FOR_ERROR + ;} + break; + + case 256: +#line 2452 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val)); + CHECK_FOR_ERROR + ;} + break; + + case 257: +#line 2456 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { // Perhaps it's an FP constant? + (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal)); + CHECK_FOR_ERROR + ;} + break; + + case 258: +#line 2460 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue()); + CHECK_FOR_ERROR + ;} + break; + + case 259: +#line 2464 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse()); + CHECK_FOR_ERROR + ;} + break; + + case 260: +#line 2468 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + (yyval.ValIDVal) = ValID::createNull(); + CHECK_FOR_ERROR + ;} + break; + + case 261: +#line 2472 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + (yyval.ValIDVal) = ValID::createUndef(); + CHECK_FOR_ERROR + ;} + break; + + case 262: +#line 2476 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { // A vector zero constant. + (yyval.ValIDVal) = ValID::createZeroInit(); + CHECK_FOR_ERROR + ;} + break; + + case 263: +#line 2480 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { // Nonempty unsized packed vector + const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType(); + int NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); + + if (!ETy->isInteger() && !ETy->isFloatingPoint()) + GEN_ERROR("Invalid vector element type: " + ETy->getDescription()); + + VectorType* pt = VectorType::get(ETy, NumElements); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt)); + + // Verify all elements are correct type! + for (unsigned i = 0; i < (yyvsp[(2) - (3)].ConstVector)->size(); i++) { + if (ETy != (*(yyvsp[(2) - (3)].ConstVector))[i]->getType()) + GEN_ERROR("Element #" + utostr(i) + " is not of type '" + + ETy->getDescription() +"' as required!\nIt is of type '" + + (*(yyvsp[(2) - (3)].ConstVector))[i]->getType()->getDescription() + "'."); + } + + (yyval.ValIDVal) = ValID::create(ConstantVector::get(pt, *(yyvsp[(2) - (3)].ConstVector))); + delete PTy; delete (yyvsp[(2) - (3)].ConstVector); + CHECK_FOR_ERROR + ;} + break; + + case 264: +#line 2502 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { // Nonempty unsized arr + const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType(); + int NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); + + if (!ETy->isFirstClassType()) + GEN_ERROR("Invalid array element type: " + ETy->getDescription()); + + ArrayType *ATy = ArrayType::get(ETy, NumElements); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(ATy)); + + // Verify all elements are correct type! + for (unsigned i = 0; i < (yyvsp[(2) - (3)].ConstVector)->size(); i++) { + if (ETy != (*(yyvsp[(2) - (3)].ConstVector))[i]->getType()) + GEN_ERROR("Element #" + utostr(i) + " is not of type '" + + ETy->getDescription() +"' as required!\nIt is of type '"+ + (*(yyvsp[(2) - (3)].ConstVector))[i]->getType()->getDescription() + "'."); + } + + (yyval.ValIDVal) = ValID::create(ConstantArray::get(ATy, *(yyvsp[(2) - (3)].ConstVector))); + delete PTy; delete (yyvsp[(2) - (3)].ConstVector); + CHECK_FOR_ERROR + ;} + break; + + case 265: +#line 2524 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.BoolVal) = false; + (yyval.ValIDVal) = ValID::createUndef(); CHECK_FOR_ERROR ;} break; - case 218: -#line 2259 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 266: +#line 2528 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.BoolVal) = true; - CHECK_FOR_ERROR - ;} - break; + int NumElements = (yyvsp[(2) - (2)].StrVal)->length(); + const Type *ETy = Type::Int8Ty; - case 219: -#line 2264 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { // A reference to a direct constant - (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val)); + ArrayType *ATy = ArrayType::get(ETy, NumElements); + + std::vector Vals; + for (unsigned i = 0; i < (yyvsp[(2) - (2)].StrVal)->length(); ++i) + Vals.push_back(ConstantInt::get(ETy, (*(yyvsp[(2) - (2)].StrVal))[i])); + delete (yyvsp[(2) - (2)].StrVal); + (yyval.ValIDVal) = ValID::create(ConstantArray::get(ATy, Vals)); CHECK_FOR_ERROR ;} break; - case 220: -#line 2268 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 267: +#line 2541 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val)); - CHECK_FOR_ERROR - ;} - break; + std::vector Elements((yyvsp[(2) - (3)].ConstVector)->size()); + for (unsigned i = 0, e = (yyvsp[(2) - (3)].ConstVector)->size(); i != e; ++i) + Elements[i] = (*(yyvsp[(2) - (3)].ConstVector))[i]->getType(); - case 221: -#line 2272 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { // Perhaps it's an FP constant? - (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal)); + const StructType *STy = StructType::get(Elements); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(STy)); + + (yyval.ValIDVal) = ValID::create(ConstantStruct::get(STy, *(yyvsp[(2) - (3)].ConstVector))); + delete PTy; delete (yyvsp[(2) - (3)].ConstVector); CHECK_FOR_ERROR ;} break; - case 222: -#line 2276 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 268: +#line 2553 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue()); + const StructType *STy = StructType::get(std::vector()); + (yyval.ValIDVal) = ValID::create(ConstantStruct::get(STy, std::vector())); CHECK_FOR_ERROR ;} break; - case 223: -#line 2280 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 269: +#line 2558 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse()); + std::vector Elements((yyvsp[(3) - (5)].ConstVector)->size()); + for (unsigned i = 0, e = (yyvsp[(3) - (5)].ConstVector)->size(); i != e; ++i) + Elements[i] = (*(yyvsp[(3) - (5)].ConstVector))[i]->getType(); + + const StructType *STy = StructType::get(Elements, /*isPacked=*/true); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(STy)); + + (yyval.ValIDVal) = ValID::create(ConstantStruct::get(STy, *(yyvsp[(3) - (5)].ConstVector))); + delete PTy; delete (yyvsp[(3) - (5)].ConstVector); CHECK_FOR_ERROR ;} break; - case 224: -#line 2284 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 270: +#line 2570 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.ValIDVal) = ValID::createNull(); + const StructType *STy = StructType::get(std::vector(), + /*isPacked=*/true); + (yyval.ValIDVal) = ValID::create(ConstantStruct::get(STy, std::vector())); CHECK_FOR_ERROR ;} break; - case 225: -#line 2288 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 271: +#line 2576 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.ValIDVal) = ValID::createUndef(); + (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal)); CHECK_FOR_ERROR ;} break; - case 226: -#line 2292 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { // A vector zero constant. - (yyval.ValIDVal) = ValID::createZeroInit(); + case 272: +#line 2580 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + (yyval.ValIDVal) = ValID::createInlineAsm(*(yyvsp[(3) - (5)].StrVal), *(yyvsp[(5) - (5)].StrVal), (yyvsp[(2) - (5)].BoolVal)); + delete (yyvsp[(3) - (5)].StrVal); + delete (yyvsp[(5) - (5)].StrVal); CHECK_FOR_ERROR ;} break; - case 227: -#line 2296 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { // Nonempty unsized packed vector - const Type *ETy = (*(yyvsp[-1].ConstVector))[0]->getType(); - int NumElements = (yyvsp[-1].ConstVector)->size(); - - VectorType* pt = VectorType::get(ETy, NumElements); - PATypeHolder* PTy = new PATypeHolder( - HandleUpRefs( - VectorType::get( - ETy, - NumElements) - ) - ); - - // Verify all elements are correct type! - for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) { - if (ETy != (*(yyvsp[-1].ConstVector))[i]->getType()) - GEN_ERROR("Element #" + utostr(i) + " is not of type '" + - ETy->getDescription() +"' as required!\nIt is of type '" + - (*(yyvsp[-1].ConstVector))[i]->getType()->getDescription() + "'."); - } - - (yyval.ValIDVal) = ValID::create(ConstantVector::get(pt, *(yyvsp[-1].ConstVector))); - delete PTy; delete (yyvsp[-1].ConstVector); + case 273: +#line 2590 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { // Is it an integer reference...? + (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal)); CHECK_FOR_ERROR ;} break; - case 228: -#line 2321 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 274: +#line 2594 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal)); + (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal)); CHECK_FOR_ERROR ;} break; - case 229: -#line 2325 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { - char *End = UnEscapeLexed((yyvsp[-2].StrVal), true); - std::string AsmStr = std::string((yyvsp[-2].StrVal), End); - End = UnEscapeLexed((yyvsp[0].StrVal), true); - std::string Constraints = std::string((yyvsp[0].StrVal), End); - (yyval.ValIDVal) = ValID::createInlineAsm(AsmStr, Constraints, (yyvsp[-3].BoolVal)); - free((yyvsp[-2].StrVal)); - free((yyvsp[0].StrVal)); + case 275: +#line 2598 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { // Is it a named reference...? + (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)); + delete (yyvsp[(1) - (1)].StrVal); CHECK_FOR_ERROR ;} break; - case 230: -#line 2339 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { // Is it an integer reference...? - (yyval.ValIDVal) = ValID::createLocalID((yyvsp[0].UIntVal)); + case 276: +#line 2603 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { // Is it a named reference...? + (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[(1) - (1)].StrVal)); + delete (yyvsp[(1) - (1)].StrVal); CHECK_FOR_ERROR ;} break; - case 231: -#line 2343 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 279: +#line 2616 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[0].UIntVal)); - CHECK_FOR_ERROR - ;} - break; - - case 232: -#line 2347 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { // Is it a named reference...? - (yyval.ValIDVal) = ValID::createLocalName((yyvsp[0].StrVal)); + if (!UpRefs.empty()) + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); + (yyval.ValueVal) = getVal(*(yyvsp[(1) - (2)].TypeVal), (yyvsp[(2) - (2)].ValIDVal)); + delete (yyvsp[(1) - (2)].TypeVal); CHECK_FOR_ERROR ;} break; - case 233: -#line 2351 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { // Is it a named reference...? - (yyval.ValIDVal) = ValID::createGlobalName((yyvsp[0].StrVal)); + case 280: +#line 2625 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + (yyval.ValueList) = new std::vector(); + (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal)); CHECK_FOR_ERROR ;} break; - case 236: -#line 2363 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 281: +#line 2630 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription()); - (yyval.ValueVal) = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal)); - delete (yyvsp[-1].TypeVal); + ((yyval.ValueList)=(yyvsp[(1) - (3)].ValueList))->push_back((yyvsp[(3) - (3)].ValueVal)); CHECK_FOR_ERROR ;} break; - case 237: -#line 2372 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 282: +#line 2635 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.FunctionVal) = (yyvsp[-1].FunctionVal); + (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); CHECK_FOR_ERROR ;} break; - case 238: -#line 2376 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 283: +#line 2639 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Do not allow functions with 0 basic blocks - (yyval.FunctionVal) = (yyvsp[-1].FunctionVal); + (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); CHECK_FOR_ERROR ;} break; - case 239: -#line 2385 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 284: +#line 2648 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal)); + setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal)); CHECK_FOR_ERROR - InsertValue((yyvsp[0].TermInstVal)); - (yyvsp[-2].BasicBlockVal)->getInstList().push_back((yyvsp[0].TermInstVal)); - (yyval.BasicBlockVal) = (yyvsp[-2].BasicBlockVal); + InsertValue((yyvsp[(3) - (3)].TermInstVal)); + (yyvsp[(1) - (3)].BasicBlockVal)->getInstList().push_back((yyvsp[(3) - (3)].TermInstVal)); + (yyval.BasicBlockVal) = (yyvsp[(1) - (3)].BasicBlockVal); CHECK_FOR_ERROR ;} break; - case 240: -#line 2394 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 285: +#line 2657 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if (CastInst *CI1 = dyn_cast((yyvsp[0].InstVal))) + if (CastInst *CI1 = dyn_cast((yyvsp[(2) - (2)].InstVal))) if (CastInst *CI2 = dyn_cast(CI1->getOperand(0))) if (CI2->getParent() == 0) - (yyvsp[-1].BasicBlockVal)->getInstList().push_back(CI2); - (yyvsp[-1].BasicBlockVal)->getInstList().push_back((yyvsp[0].InstVal)); - (yyval.BasicBlockVal) = (yyvsp[-1].BasicBlockVal); + (yyvsp[(1) - (2)].BasicBlockVal)->getInstList().push_back(CI2); + (yyvsp[(1) - (2)].BasicBlockVal)->getInstList().push_back((yyvsp[(2) - (2)].InstVal)); + (yyval.BasicBlockVal) = (yyvsp[(1) - (2)].BasicBlockVal); CHECK_FOR_ERROR ;} break; - case 241: -#line 2403 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 286: +#line 2666 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Empty space between instruction lists (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum)); CHECK_FOR_ERROR ;} break; - case 242: -#line 2407 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 287: +#line 2670 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Labelled (named) basic block - (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName((yyvsp[0].StrVal))); + (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal))); + delete (yyvsp[(1) - (1)].StrVal); CHECK_FOR_ERROR + ;} break; - case 243: -#line 2412 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { // Return with a result... - (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal)); + case 288: +#line 2678 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { // Return with a result... + ValueList &VL = *(yyvsp[(2) - (2)].ValueList); + assert(!VL.empty() && "Invalid ret operands!"); + (yyval.TermInstVal) = ReturnInst::Create(&VL[0], VL.size()); + delete (yyvsp[(2) - (2)].ValueList); CHECK_FOR_ERROR ;} break; - case 244: -#line 2416 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 289: +#line 2685 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Return with no result... - (yyval.TermInstVal) = new ReturnInst(); + (yyval.TermInstVal) = ReturnInst::Create(); CHECK_FOR_ERROR ;} break; - case 245: -#line 2420 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 290: +#line 2689 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Unconditional Branch... - BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal)); + BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal)); CHECK_FOR_ERROR - (yyval.TermInstVal) = new BranchInst(tmpBB); + (yyval.TermInstVal) = BranchInst::Create(tmpBB); ;} break; - case 246: -#line 2425 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 291: +#line 2694 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - assert(cast((yyvsp[-7].PrimType))->getBitWidth() == 1 && "Not Bool?"); - BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal)); + if (cast((yyvsp[(2) - (9)].PrimType))->getBitWidth() != 1) + GEN_ERROR("Branch condition must have type i1"); + BasicBlock* tmpBBA = getBBVal((yyvsp[(6) - (9)].ValIDVal)); CHECK_FOR_ERROR - BasicBlock* tmpBBB = getBBVal((yyvsp[0].ValIDVal)); + BasicBlock* tmpBBB = getBBVal((yyvsp[(9) - (9)].ValIDVal)); CHECK_FOR_ERROR - Value* tmpVal = getVal(Type::Int1Ty, (yyvsp[-6].ValIDVal)); + Value* tmpVal = getVal(Type::Int1Ty, (yyvsp[(3) - (9)].ValIDVal)); CHECK_FOR_ERROR - (yyval.TermInstVal) = new BranchInst(tmpBBA, tmpBBB, tmpVal); + (yyval.TermInstVal) = BranchInst::Create(tmpBBA, tmpBBB, tmpVal); ;} break; - case 247: -#line 2435 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 292: +#line 2705 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - Value* tmpVal = getVal((yyvsp[-7].PrimType), (yyvsp[-6].ValIDVal)); + Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal)); CHECK_FOR_ERROR - BasicBlock* tmpBB = getBBVal((yyvsp[-3].ValIDVal)); + BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (9)].ValIDVal)); CHECK_FOR_ERROR - SwitchInst *S = new SwitchInst(tmpVal, tmpBB, (yyvsp[-1].JumpTable)->size()); + SwitchInst *S = SwitchInst::Create(tmpVal, tmpBB, (yyvsp[(8) - (9)].JumpTable)->size()); (yyval.TermInstVal) = S; - std::vector >::iterator I = (yyvsp[-1].JumpTable)->begin(), - E = (yyvsp[-1].JumpTable)->end(); + std::vector >::iterator I = (yyvsp[(8) - (9)].JumpTable)->begin(), + E = (yyvsp[(8) - (9)].JumpTable)->end(); for (; I != E; ++I) { if (ConstantInt *CI = dyn_cast(I->first)) S->addCase(CI, I->second); else GEN_ERROR("Switch case is constant, but not a simple integer"); } - delete (yyvsp[-1].JumpTable); + delete (yyvsp[(8) - (9)].JumpTable); CHECK_FOR_ERROR ;} break; - case 248: -#line 2454 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 293: +#line 2724 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - Value* tmpVal = getVal((yyvsp[-6].PrimType), (yyvsp[-5].ValIDVal)); + Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal)); CHECK_FOR_ERROR - BasicBlock* tmpBB = getBBVal((yyvsp[-2].ValIDVal)); + BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (8)].ValIDVal)); CHECK_FOR_ERROR - SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0); + SwitchInst *S = SwitchInst::Create(tmpVal, tmpBB, 0); (yyval.TermInstVal) = S; CHECK_FOR_ERROR ;} break; - case 249: -#line 2464 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 294: +#line 2734 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Handle the short syntax const PointerType *PFTy = 0; const FunctionType *Ty = 0; - if (!(PFTy = dyn_cast((yyvsp[-11].TypeVal)->get())) || + if (!(PFTy = dyn_cast((yyvsp[(3) - (14)].TypeVal)->get())) || !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - FunctionType::ParamAttrsList ParamAttrs; - ParamAttrs.push_back((yyvsp[-6].ParamAttrs)); - for (ValueRefList::iterator I = (yyvsp[-8].ValueRefList)->begin(), E = (yyvsp[-8].ValueRefList)->end(); I != E; ++I) { + ParamList::iterator I = (yyvsp[(6) - (14)].ParamList)->begin(), E = (yyvsp[(6) - (14)].ParamList)->end(); + for (; I != E; ++I) { const Type *Ty = I->Val->getType(); if (Ty == Type::VoidTy) GEN_ERROR("Short call syntax cannot be used with varargs"); ParamTypes.push_back(Ty); - ParamAttrs.push_back(I->Attrs); } + + if (!FunctionType::isValidReturnType(*(yyvsp[(3) - (14)].TypeVal))) + GEN_ERROR("Invalid result type for LLVM function"); - Ty = FunctionType::get((yyvsp[-11].TypeVal)->get(), ParamTypes, false, ParamAttrs); - PFTy = PointerType::get(Ty); + Ty = FunctionType::get((yyvsp[(3) - (14)].TypeVal)->get(), ParamTypes, false); + PFTy = PointerType::getUnqual(Ty); } - Value *V = getVal(PFTy, (yyvsp[-10].ValIDVal)); // Get the function we're calling... + delete (yyvsp[(3) - (14)].TypeVal); + + Value *V = getVal(PFTy, (yyvsp[(4) - (14)].ValIDVal)); // Get the function we're calling... CHECK_FOR_ERROR - BasicBlock *Normal = getBBVal((yyvsp[-3].ValIDVal)); + BasicBlock *Normal = getBBVal((yyvsp[(11) - (14)].ValIDVal)); CHECK_FOR_ERROR - BasicBlock *Except = getBBVal((yyvsp[0].ValIDVal)); + BasicBlock *Except = getBBVal((yyvsp[(14) - (14)].ValIDVal)); CHECK_FOR_ERROR + SmallVector Attrs; + if ((yyvsp[(8) - (14)].ParamAttrs) != ParamAttr::None) + Attrs.push_back(ParamAttrsWithIndex::get(0, (yyvsp[(8) - (14)].ParamAttrs))); + // Check the arguments ValueList Args; - if ((yyvsp[-8].ValueRefList)->empty()) { // Has no arguments? + if ((yyvsp[(6) - (14)].ParamList)->empty()) { // Has no arguments? // Make sure no arguments is a good thing! if (Ty->getNumParams() != 0) GEN_ERROR("No arguments passed to a function that " @@ -5088,562 +6038,736 @@ yyreduce: // correctly! FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); - ValueRefList::iterator ArgI = (yyvsp[-8].ValueRefList)->begin(), ArgE = (yyvsp[-8].ValueRefList)->end(); + ParamList::iterator ArgI = (yyvsp[(6) - (14)].ParamList)->begin(), ArgE = (yyvsp[(6) - (14)].ParamList)->end(); + unsigned index = 1; - for (; ArgI != ArgE && I != E; ++ArgI, ++I) { + for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) { if (ArgI->Val->getType() != *I) GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" + (*I)->getDescription() + "'"); Args.push_back(ArgI->Val); + if (ArgI->Attrs != ParamAttr::None) + Attrs.push_back(ParamAttrsWithIndex::get(index, ArgI->Attrs)); } if (Ty->isVarArg()) { if (I == E) - for (; ArgI != ArgE; ++ArgI) + for (; ArgI != ArgE; ++ArgI, ++index) { Args.push_back(ArgI->Val); // push the remaining varargs + if (ArgI->Attrs != ParamAttr::None) + Attrs.push_back(ParamAttrsWithIndex::get(index, ArgI->Attrs)); + } } else if (I != E || ArgI != ArgE) GEN_ERROR("Invalid number of parameters detected"); } + PAListPtr PAL; + if (!Attrs.empty()) + PAL = PAListPtr::get(Attrs.begin(), Attrs.end()); + // Create the InvokeInst - InvokeInst *II = new InvokeInst(V, Normal, Except, &Args[0], Args.size()); - II->setCallingConv((yyvsp[-12].UIntVal)); + InvokeInst *II = InvokeInst::Create(V, Normal, Except, + Args.begin(), Args.end()); + II->setCallingConv((yyvsp[(2) - (14)].UIntVal)); + II->setParamAttrs(PAL); (yyval.TermInstVal) = II; - delete (yyvsp[-8].ValueRefList); + delete (yyvsp[(6) - (14)].ParamList); CHECK_FOR_ERROR ;} break; - case 250: -#line 2530 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 295: +#line 2819 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TermInstVal) = new UnwindInst(); CHECK_FOR_ERROR ;} break; - case 251: -#line 2534 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 296: +#line 2823 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TermInstVal) = new UnreachableInst(); CHECK_FOR_ERROR ;} break; - case 252: -#line 2541 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 297: +#line 2830 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.JumpTable) = (yyvsp[-5].JumpTable); - Constant *V = cast(getExistingVal((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal))); + (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable); + Constant *V = cast(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal))); CHECK_FOR_ERROR if (V == 0) GEN_ERROR("May only switch on a constant pool value"); - BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal)); + BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (6)].ValIDVal)); CHECK_FOR_ERROR (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB)); ;} break; - case 253: -#line 2552 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 298: +#line 2841 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.JumpTable) = new std::vector >(); - Constant *V = cast(getExistingVal((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal))); + Constant *V = cast(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal))); CHECK_FOR_ERROR if (V == 0) GEN_ERROR("May only switch on a constant pool value"); - BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal)); + BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (5)].ValIDVal)); CHECK_FOR_ERROR (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB)); ;} break; - case 254: -#line 2565 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 299: +#line 2854 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Is this definition named?? if so, assign the name... - setValueName((yyvsp[0].InstVal), (yyvsp[-1].StrVal)); + setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal)); CHECK_FOR_ERROR - InsertValue((yyvsp[0].InstVal)); - (yyval.InstVal) = (yyvsp[0].InstVal); + InsertValue((yyvsp[(2) - (2)].InstVal)); + (yyval.InstVal) = (yyvsp[(2) - (2)].InstVal); CHECK_FOR_ERROR ;} break; - case 255: -#line 2575 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 300: +#line 2864 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Used for PHI nodes if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-5].TypeVal))->getDescription()); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription()); (yyval.PHIList) = new std::list >(); - Value* tmpVal = getVal(*(yyvsp[-5].TypeVal), (yyvsp[-3].ValIDVal)); + Value* tmpVal = getVal(*(yyvsp[(1) - (6)].TypeVal), (yyvsp[(3) - (6)].ValIDVal)); CHECK_FOR_ERROR - BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal)); + BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (6)].ValIDVal)); CHECK_FOR_ERROR (yyval.PHIList)->push_back(std::make_pair(tmpVal, tmpBB)); - delete (yyvsp[-5].TypeVal); + delete (yyvsp[(1) - (6)].TypeVal); ;} break; - case 256: -#line 2586 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 301: +#line 2875 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.PHIList) = (yyvsp[-6].PHIList); - Value* tmpVal = getVal((yyvsp[-6].PHIList)->front().first->getType(), (yyvsp[-3].ValIDVal)); + (yyval.PHIList) = (yyvsp[(1) - (7)].PHIList); + Value* tmpVal = getVal((yyvsp[(1) - (7)].PHIList)->front().first->getType(), (yyvsp[(4) - (7)].ValIDVal)); CHECK_FOR_ERROR - BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal)); + BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (7)].ValIDVal)); CHECK_FOR_ERROR - (yyvsp[-6].PHIList)->push_back(std::make_pair(tmpVal, tmpBB)); + (yyvsp[(1) - (7)].PHIList)->push_back(std::make_pair(tmpVal, tmpBB)); ;} break; - case 257: -#line 2596 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { + case 302: +#line 2885 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription()); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription()); // Used for call and invoke instructions - (yyval.ValueRefList) = new ValueRefList(); - ValueRefListEntry E; E.Attrs = (yyvsp[0].ParamAttrs); E.Val = getVal((yyvsp[-2].TypeVal)->get(), (yyvsp[-1].ValIDVal)); - (yyval.ValueRefList)->push_back(E); + (yyval.ParamList) = new ParamList(); + ParamListEntry E; E.Attrs = (yyvsp[(2) - (4)].ParamAttrs) | (yyvsp[(4) - (4)].ParamAttrs); E.Val = getVal((yyvsp[(1) - (4)].TypeVal)->get(), (yyvsp[(3) - (4)].ValIDVal)); + (yyval.ParamList)->push_back(E); + delete (yyvsp[(1) - (4)].TypeVal); + CHECK_FOR_ERROR ;} break; - case 258: -#line 2604 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 303: +#line 2896 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 + // Labels are only valid in ASMs + (yyval.ParamList) = new ParamList(); + ParamListEntry E; E.Attrs = (yyvsp[(2) - (4)].ParamAttrs) | (yyvsp[(4) - (4)].ParamAttrs); E.Val = getBBVal((yyvsp[(3) - (4)].ValIDVal)); + (yyval.ParamList)->push_back(E); + CHECK_FOR_ERROR + ;} + break; + + case 304: +#line 2904 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription()); - (yyval.ValueRefList) = (yyvsp[-4].ValueRefList); - ValueRefListEntry E; E.Attrs = (yyvsp[0].ParamAttrs); E.Val = getVal((yyvsp[-2].TypeVal)->get(), (yyvsp[-1].ValIDVal)); - (yyval.ValueRefList)->push_back(E); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); + (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList); + ParamListEntry E; E.Attrs = (yyvsp[(4) - (6)].ParamAttrs) | (yyvsp[(6) - (6)].ParamAttrs); E.Val = getVal((yyvsp[(3) - (6)].TypeVal)->get(), (yyvsp[(5) - (6)].ValIDVal)); + (yyval.ParamList)->push_back(E); + delete (yyvsp[(3) - (6)].TypeVal); CHECK_FOR_ERROR ;} break; - case 259: -#line 2612 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" - { (yyval.ValueRefList) = new ValueRefList(); ;} + case 305: +#line 2914 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 + (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList); + ParamListEntry E; E.Attrs = (yyvsp[(4) - (6)].ParamAttrs) | (yyvsp[(6) - (6)].ParamAttrs); E.Val = getBBVal((yyvsp[(5) - (6)].ValIDVal)); + (yyval.ParamList)->push_back(E); + CHECK_FOR_ERROR + ;} break; - case 260: -#line 2615 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 306: +#line 2921 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { (yyval.ParamList) = new ParamList(); ;} + break; + + case 307: +#line 2924 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValueList) = new std::vector(); ;} break; - case 261: -#line 2616 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 308: +#line 2925 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.ValueList) = (yyvsp[-2].ValueList); - (yyval.ValueList)->push_back((yyvsp[0].ValueVal)); + (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList); + (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal)); CHECK_FOR_ERROR ;} break; - case 262: -#line 2623 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 309: +#line 2933 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + (yyval.ConstantList) = new std::vector(); + if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val)) + GEN_ERROR("Index " + utostr((yyvsp[(2) - (2)].UInt64Val)) + " is not valid for insertvalue or extractvalue."); + (yyval.ConstantList)->push_back((yyvsp[(2) - (2)].UInt64Val)); + ;} + break; + + case 310: +#line 2939 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + (yyval.ConstantList) = (yyvsp[(1) - (3)].ConstantList); + if ((unsigned)(yyvsp[(3) - (3)].UInt64Val) != (yyvsp[(3) - (3)].UInt64Val)) + GEN_ERROR("Index " + utostr((yyvsp[(3) - (3)].UInt64Val)) + " is not valid for insertvalue or extractvalue."); + (yyval.ConstantList)->push_back((yyvsp[(3) - (3)].UInt64Val)); + CHECK_FOR_ERROR + ;} + break; + + case 311: +#line 2948 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; CHECK_FOR_ERROR ;} break; - case 263: -#line 2627 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 312: +#line 2952 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; CHECK_FOR_ERROR ;} break; - case 264: -#line 2632 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 313: +#line 2957 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription()); - if (!(*(yyvsp[-3].TypeVal))->isInteger() && !(*(yyvsp[-3].TypeVal))->isFloatingPoint() && - !isa((*(yyvsp[-3].TypeVal)).get())) + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription()); + if (!(*(yyvsp[(2) - (5)].TypeVal))->isInteger() && !(*(yyvsp[(2) - (5)].TypeVal))->isFloatingPoint() && + !isa((*(yyvsp[(2) - (5)].TypeVal)).get())) GEN_ERROR( "Arithmetic operator requires integer, FP, or packed operands"); - if (isa((*(yyvsp[-3].TypeVal)).get()) && - ((yyvsp[-4].BinaryOpVal) == Instruction::URem || - (yyvsp[-4].BinaryOpVal) == Instruction::SRem || - (yyvsp[-4].BinaryOpVal) == Instruction::FRem)) - GEN_ERROR("Remainder not supported on vector types"); - Value* val1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal)); + Value* val1 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(3) - (5)].ValIDVal)); CHECK_FOR_ERROR - Value* val2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal)); + Value* val2 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(5) - (5)].ValIDVal)); CHECK_FOR_ERROR - (yyval.InstVal) = BinaryOperator::create((yyvsp[-4].BinaryOpVal), val1, val2); + (yyval.InstVal) = BinaryOperator::Create((yyvsp[(1) - (5)].BinaryOpVal), val1, val2); if ((yyval.InstVal) == 0) GEN_ERROR("binary operator returned null"); - delete (yyvsp[-3].TypeVal); + delete (yyvsp[(2) - (5)].TypeVal); ;} break; - case 265: -#line 2653 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 314: +#line 2973 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription()); - if (!(*(yyvsp[-3].TypeVal))->isInteger()) { - if (Instruction::isShift((yyvsp[-4].BinaryOpVal)) || !isa((yyvsp[-3].TypeVal)->get()) || - !cast((yyvsp[-3].TypeVal)->get())->getElementType()->isInteger()) + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription()); + if (!(*(yyvsp[(2) - (5)].TypeVal))->isInteger()) { + if (Instruction::isShift((yyvsp[(1) - (5)].BinaryOpVal)) || !isa((yyvsp[(2) - (5)].TypeVal)->get()) || + !cast((yyvsp[(2) - (5)].TypeVal)->get())->getElementType()->isInteger()) GEN_ERROR("Logical operator requires integral operands"); } - Value* tmpVal1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal)); + Value* tmpVal1 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(3) - (5)].ValIDVal)); CHECK_FOR_ERROR - Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal)); + Value* tmpVal2 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(5) - (5)].ValIDVal)); CHECK_FOR_ERROR - (yyval.InstVal) = BinaryOperator::create((yyvsp[-4].BinaryOpVal), tmpVal1, tmpVal2); + (yyval.InstVal) = BinaryOperator::Create((yyvsp[(1) - (5)].BinaryOpVal), tmpVal1, tmpVal2); if ((yyval.InstVal) == 0) GEN_ERROR("binary operator returned null"); - delete (yyvsp[-3].TypeVal); + delete (yyvsp[(2) - (5)].TypeVal); ;} break; - case 266: -#line 2670 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 315: +#line 2990 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription()); - if (isa((*(yyvsp[-3].TypeVal)).get())) + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); + if (isa((*(yyvsp[(3) - (6)].TypeVal)).get())) GEN_ERROR("Vector types not supported by icmp instruction"); - Value* tmpVal1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal)); + Value* tmpVal1 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(4) - (6)].ValIDVal)); CHECK_FOR_ERROR - Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal)); + Value* tmpVal2 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(6) - (6)].ValIDVal)); CHECK_FOR_ERROR - (yyval.InstVal) = CmpInst::create((yyvsp[-5].OtherOpVal), (yyvsp[-4].IPredicate), tmpVal1, tmpVal2); + (yyval.InstVal) = CmpInst::Create((yyvsp[(1) - (6)].OtherOpVal), (yyvsp[(2) - (6)].IPredicate), tmpVal1, tmpVal2); if ((yyval.InstVal) == 0) GEN_ERROR("icmp operator returned null"); + delete (yyvsp[(3) - (6)].TypeVal); ;} break; - case 267: -#line 2683 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 316: +#line 3004 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription()); - if (isa((*(yyvsp[-3].TypeVal)).get())) + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); + if (isa((*(yyvsp[(3) - (6)].TypeVal)).get())) GEN_ERROR("Vector types not supported by fcmp instruction"); - Value* tmpVal1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal)); + Value* tmpVal1 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(4) - (6)].ValIDVal)); CHECK_FOR_ERROR - Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal)); + Value* tmpVal2 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(6) - (6)].ValIDVal)); CHECK_FOR_ERROR - (yyval.InstVal) = CmpInst::create((yyvsp[-5].OtherOpVal), (yyvsp[-4].FPredicate), tmpVal1, tmpVal2); + (yyval.InstVal) = CmpInst::Create((yyvsp[(1) - (6)].OtherOpVal), (yyvsp[(2) - (6)].FPredicate), tmpVal1, tmpVal2); if ((yyval.InstVal) == 0) GEN_ERROR("fcmp operator returned null"); + delete (yyvsp[(3) - (6)].TypeVal); ;} break; - case 268: -#line 2696 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 317: +#line 3018 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + if (!UpRefs.empty()) + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); + if (!isa((*(yyvsp[(3) - (6)].TypeVal)).get())) + GEN_ERROR("Scalar types not supported by vicmp instruction"); + Value* tmpVal1 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(4) - (6)].ValIDVal)); + CHECK_FOR_ERROR + Value* tmpVal2 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(6) - (6)].ValIDVal)); + CHECK_FOR_ERROR + (yyval.InstVal) = CmpInst::Create((yyvsp[(1) - (6)].OtherOpVal), (yyvsp[(2) - (6)].IPredicate), tmpVal1, tmpVal2); + if ((yyval.InstVal) == 0) + GEN_ERROR("icmp operator returned null"); + delete (yyvsp[(3) - (6)].TypeVal); + ;} + break; + + case 318: +#line 3032 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + if (!UpRefs.empty()) + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); + if (!isa((*(yyvsp[(3) - (6)].TypeVal)).get())) + GEN_ERROR("Scalar types not supported by vfcmp instruction"); + Value* tmpVal1 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(4) - (6)].ValIDVal)); + CHECK_FOR_ERROR + Value* tmpVal2 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(6) - (6)].ValIDVal)); + CHECK_FOR_ERROR + (yyval.InstVal) = CmpInst::Create((yyvsp[(1) - (6)].OtherOpVal), (yyvsp[(2) - (6)].FPredicate), tmpVal1, tmpVal2); + if ((yyval.InstVal) == 0) + GEN_ERROR("fcmp operator returned null"); + delete (yyvsp[(3) - (6)].TypeVal); + ;} + break; + + case 319: +#line 3046 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription()); - Value* Val = (yyvsp[-2].ValueVal); - const Type* DestTy = (yyvsp[0].TypeVal)->get(); - if (!CastInst::castIsValid((yyvsp[-3].CastOpVal), Val, DestTy)) + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription()); + Value* Val = (yyvsp[(2) - (4)].ValueVal); + const Type* DestTy = (yyvsp[(4) - (4)].TypeVal)->get(); + if (!CastInst::castIsValid((yyvsp[(1) - (4)].CastOpVal), Val, DestTy)) GEN_ERROR("invalid cast opcode for cast from '" + Val->getType()->getDescription() + "' to '" + DestTy->getDescription() + "'"); - (yyval.InstVal) = CastInst::create((yyvsp[-3].CastOpVal), Val, DestTy); - delete (yyvsp[0].TypeVal); + (yyval.InstVal) = CastInst::Create((yyvsp[(1) - (4)].CastOpVal), Val, DestTy); + delete (yyvsp[(4) - (4)].TypeVal); ;} break; - case 269: -#line 2708 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 320: +#line 3058 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[-4].ValueVal)->getType() != Type::Int1Ty) + if ((yyvsp[(2) - (6)].ValueVal)->getType() != Type::Int1Ty) GEN_ERROR("select condition must be boolean"); - if ((yyvsp[-2].ValueVal)->getType() != (yyvsp[0].ValueVal)->getType()) + if ((yyvsp[(4) - (6)].ValueVal)->getType() != (yyvsp[(6) - (6)].ValueVal)->getType()) GEN_ERROR("select value types should match"); - (yyval.InstVal) = new SelectInst((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)); + (yyval.InstVal) = SelectInst::Create((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)); CHECK_FOR_ERROR ;} break; - case 270: -#line 2716 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 321: +#line 3066 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription()); - (yyval.InstVal) = new VAArgInst((yyvsp[-2].ValueVal), *(yyvsp[0].TypeVal)); - delete (yyvsp[0].TypeVal); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription()); + (yyval.InstVal) = new VAArgInst((yyvsp[(2) - (4)].ValueVal), *(yyvsp[(4) - (4)].TypeVal)); + delete (yyvsp[(4) - (4)].TypeVal); CHECK_FOR_ERROR ;} break; - case 271: -#line 2723 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 322: +#line 3073 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal))) + if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal))) GEN_ERROR("Invalid extractelement operands"); - (yyval.InstVal) = new ExtractElementInst((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)); + (yyval.InstVal) = new ExtractElementInst((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal)); CHECK_FOR_ERROR ;} break; - case 272: -#line 2729 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 323: +#line 3079 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal))) + if (!InsertElementInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal))) GEN_ERROR("Invalid insertelement operands"); - (yyval.InstVal) = new InsertElementInst((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)); + (yyval.InstVal) = InsertElementInst::Create((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)); CHECK_FOR_ERROR ;} break; - case 273: -#line 2735 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 324: +#line 3085 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal))) + if (!ShuffleVectorInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal))) GEN_ERROR("Invalid shufflevector operands"); - (yyval.InstVal) = new ShuffleVectorInst((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)); + (yyval.InstVal) = new ShuffleVectorInst((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)); CHECK_FOR_ERROR ;} break; - case 274: -#line 2741 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 325: +#line 3091 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - const Type *Ty = (yyvsp[0].PHIList)->front().first->getType(); + const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType(); if (!Ty->isFirstClassType()) GEN_ERROR("PHI node operands must be of first class type"); - (yyval.InstVal) = new PHINode(Ty); - ((PHINode*)(yyval.InstVal))->reserveOperandSpace((yyvsp[0].PHIList)->size()); - while ((yyvsp[0].PHIList)->begin() != (yyvsp[0].PHIList)->end()) { - if ((yyvsp[0].PHIList)->front().first->getType() != Ty) + (yyval.InstVal) = PHINode::Create(Ty); + ((PHINode*)(yyval.InstVal))->reserveOperandSpace((yyvsp[(2) - (2)].PHIList)->size()); + while ((yyvsp[(2) - (2)].PHIList)->begin() != (yyvsp[(2) - (2)].PHIList)->end()) { + if ((yyvsp[(2) - (2)].PHIList)->front().first->getType() != Ty) GEN_ERROR("All elements of a PHI node must be of the same type"); - cast((yyval.InstVal))->addIncoming((yyvsp[0].PHIList)->front().first, (yyvsp[0].PHIList)->front().second); - (yyvsp[0].PHIList)->pop_front(); + cast((yyval.InstVal))->addIncoming((yyvsp[(2) - (2)].PHIList)->front().first, (yyvsp[(2) - (2)].PHIList)->front().second); + (yyvsp[(2) - (2)].PHIList)->pop_front(); } - delete (yyvsp[0].PHIList); // Free the list... + delete (yyvsp[(2) - (2)].PHIList); // Free the list... CHECK_FOR_ERROR ;} break; - case 275: -#line 2757 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 326: +#line 3107 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Handle the short syntax const PointerType *PFTy = 0; const FunctionType *Ty = 0; - if (!(PFTy = dyn_cast((yyvsp[-5].TypeVal)->get())) || + if (!(PFTy = dyn_cast((yyvsp[(3) - (8)].TypeVal)->get())) || !(Ty = dyn_cast(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector ParamTypes; - FunctionType::ParamAttrsList ParamAttrs; - ParamAttrs.push_back((yyvsp[0].ParamAttrs)); - for (ValueRefList::iterator I = (yyvsp[-2].ValueRefList)->begin(), E = (yyvsp[-2].ValueRefList)->end(); I != E; ++I) { + ParamList::iterator I = (yyvsp[(6) - (8)].ParamList)->begin(), E = (yyvsp[(6) - (8)].ParamList)->end(); + for (; I != E; ++I) { const Type *Ty = I->Val->getType(); if (Ty == Type::VoidTy) GEN_ERROR("Short call syntax cannot be used with varargs"); ParamTypes.push_back(Ty); - ParamAttrs.push_back(I->Attrs); } - Ty = FunctionType::get((yyvsp[-5].TypeVal)->get(), ParamTypes, false, ParamAttrs); - PFTy = PointerType::get(Ty); + if (!FunctionType::isValidReturnType(*(yyvsp[(3) - (8)].TypeVal))) + GEN_ERROR("Invalid result type for LLVM function"); + + Ty = FunctionType::get((yyvsp[(3) - (8)].TypeVal)->get(), ParamTypes, false); + PFTy = PointerType::getUnqual(Ty); } - Value *V = getVal(PFTy, (yyvsp[-4].ValIDVal)); // Get the function we're calling... + Value *V = getVal(PFTy, (yyvsp[(4) - (8)].ValIDVal)); // Get the function we're calling... CHECK_FOR_ERROR + // Check for call to invalid intrinsic to avoid crashing later. + if (Function *theF = dyn_cast(V)) { + if (theF->hasName() && (theF->getValueName()->getKeyLength() >= 5) && + (0 == strncmp(theF->getValueName()->getKeyData(), "llvm.", 5)) && + !theF->getIntrinsicID(true)) + GEN_ERROR("Call to invalid LLVM intrinsic function '" + + theF->getName() + "'"); + } + + // Set up the ParamAttrs for the function + SmallVector Attrs; + if ((yyvsp[(8) - (8)].ParamAttrs) != ParamAttr::None) + Attrs.push_back(ParamAttrsWithIndex::get(0, (yyvsp[(8) - (8)].ParamAttrs))); // Check the arguments ValueList Args; - if ((yyvsp[-2].ValueRefList)->empty()) { // Has no arguments? + if ((yyvsp[(6) - (8)].ParamList)->empty()) { // Has no arguments? // Make sure no arguments is a good thing! if (Ty->getNumParams() != 0) GEN_ERROR("No arguments passed to a function that " "expects arguments"); } else { // Has arguments? // Loop through FunctionType's arguments and ensure they are specified - // correctly! - // + // correctly. Also, gather any parameter attributes. FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); - ValueRefList::iterator ArgI = (yyvsp[-2].ValueRefList)->begin(), ArgE = (yyvsp[-2].ValueRefList)->end(); + ParamList::iterator ArgI = (yyvsp[(6) - (8)].ParamList)->begin(), ArgE = (yyvsp[(6) - (8)].ParamList)->end(); + unsigned index = 1; - for (; ArgI != ArgE && I != E; ++ArgI, ++I) { + for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) { if (ArgI->Val->getType() != *I) GEN_ERROR("Parameter " + ArgI->Val->getName()+ " is not of type '" + (*I)->getDescription() + "'"); Args.push_back(ArgI->Val); + if (ArgI->Attrs != ParamAttr::None) + Attrs.push_back(ParamAttrsWithIndex::get(index, ArgI->Attrs)); } if (Ty->isVarArg()) { if (I == E) - for (; ArgI != ArgE; ++ArgI) + for (; ArgI != ArgE; ++ArgI, ++index) { Args.push_back(ArgI->Val); // push the remaining varargs + if (ArgI->Attrs != ParamAttr::None) + Attrs.push_back(ParamAttrsWithIndex::get(index, ArgI->Attrs)); + } } else if (I != E || ArgI != ArgE) GEN_ERROR("Invalid number of parameters detected"); } + + // Finish off the ParamAttrs and check them + PAListPtr PAL; + if (!Attrs.empty()) + PAL = PAListPtr::get(Attrs.begin(), Attrs.end()); + // Create the call node - CallInst *CI = new CallInst(V, &Args[0], Args.size()); - CI->setTailCall((yyvsp[-7].BoolVal)); - CI->setCallingConv((yyvsp[-6].UIntVal)); + CallInst *CI = CallInst::Create(V, Args.begin(), Args.end()); + CI->setTailCall((yyvsp[(1) - (8)].BoolVal)); + CI->setCallingConv((yyvsp[(2) - (8)].UIntVal)); + CI->setParamAttrs(PAL); (yyval.InstVal) = CI; - delete (yyvsp[-2].ValueRefList); - delete (yyvsp[-5].TypeVal); + delete (yyvsp[(6) - (8)].ParamList); + delete (yyvsp[(3) - (8)].TypeVal); CHECK_FOR_ERROR ;} break; - case 276: -#line 2820 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 327: +#line 3196 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - (yyval.InstVal) = (yyvsp[0].InstVal); + (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal); CHECK_FOR_ERROR ;} break; - case 277: -#line 2825 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 328: +#line 3201 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; CHECK_FOR_ERROR ;} break; - case 278: -#line 2829 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 329: +#line 3205 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; CHECK_FOR_ERROR ;} break; - case 279: -#line 2836 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 330: +#line 3212 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription()); - (yyval.InstVal) = new MallocInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal)); - delete (yyvsp[-1].TypeVal); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription()); + (yyval.InstVal) = new MallocInst(*(yyvsp[(2) - (3)].TypeVal), 0, (yyvsp[(3) - (3)].UIntVal)); + delete (yyvsp[(2) - (3)].TypeVal); CHECK_FOR_ERROR ;} break; - case 280: -#line 2843 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 331: +#line 3219 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription()); - Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal)); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription()); + if ((yyvsp[(4) - (6)].PrimType) != Type::Int32Ty) + GEN_ERROR("Malloc array size is not a 32-bit integer!"); + Value* tmpVal = getVal((yyvsp[(4) - (6)].PrimType), (yyvsp[(5) - (6)].ValIDVal)); CHECK_FOR_ERROR - (yyval.InstVal) = new MallocInst(*(yyvsp[-4].TypeVal), tmpVal, (yyvsp[0].UIntVal)); - delete (yyvsp[-4].TypeVal); + (yyval.InstVal) = new MallocInst(*(yyvsp[(2) - (6)].TypeVal), tmpVal, (yyvsp[(6) - (6)].UIntVal)); + delete (yyvsp[(2) - (6)].TypeVal); ;} break; - case 281: -#line 2851 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 332: +#line 3229 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription()); - (yyval.InstVal) = new AllocaInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal)); - delete (yyvsp[-1].TypeVal); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription()); + (yyval.InstVal) = new AllocaInst(*(yyvsp[(2) - (3)].TypeVal), 0, (yyvsp[(3) - (3)].UIntVal)); + delete (yyvsp[(2) - (3)].TypeVal); CHECK_FOR_ERROR ;} break; - case 282: -#line 2858 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 333: +#line 3236 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription()); - Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal)); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription()); + if ((yyvsp[(4) - (6)].PrimType) != Type::Int32Ty) + GEN_ERROR("Alloca array size is not a 32-bit integer!"); + Value* tmpVal = getVal((yyvsp[(4) - (6)].PrimType), (yyvsp[(5) - (6)].ValIDVal)); CHECK_FOR_ERROR - (yyval.InstVal) = new AllocaInst(*(yyvsp[-4].TypeVal), tmpVal, (yyvsp[0].UIntVal)); - delete (yyvsp[-4].TypeVal); + (yyval.InstVal) = new AllocaInst(*(yyvsp[(2) - (6)].TypeVal), tmpVal, (yyvsp[(6) - (6)].UIntVal)); + delete (yyvsp[(2) - (6)].TypeVal); ;} break; - case 283: -#line 2866 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 334: +#line 3246 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { - if (!isa((yyvsp[0].ValueVal)->getType())) + if (!isa((yyvsp[(2) - (2)].ValueVal)->getType())) GEN_ERROR("Trying to free nonpointer type " + - (yyvsp[0].ValueVal)->getType()->getDescription() + ""); - (yyval.InstVal) = new FreeInst((yyvsp[0].ValueVal)); + (yyvsp[(2) - (2)].ValueVal)->getType()->getDescription() + ""); + (yyval.InstVal) = new FreeInst((yyvsp[(2) - (2)].ValueVal)); CHECK_FOR_ERROR ;} break; - case 284: -#line 2874 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 335: +#line 3254 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription()); - if (!isa((yyvsp[-1].TypeVal)->get())) + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription()); + if (!isa((yyvsp[(3) - (5)].TypeVal)->get())) GEN_ERROR("Can't load from nonpointer type: " + - (*(yyvsp[-1].TypeVal))->getDescription()); - if (!cast((yyvsp[-1].TypeVal)->get())->getElementType()->isFirstClassType()) + (*(yyvsp[(3) - (5)].TypeVal))->getDescription()); + if (!cast((yyvsp[(3) - (5)].TypeVal)->get())->getElementType()->isFirstClassType()) GEN_ERROR("Can't load from pointer of non-first-class type: " + - (*(yyvsp[-1].TypeVal))->getDescription()); - Value* tmpVal = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal)); + (*(yyvsp[(3) - (5)].TypeVal))->getDescription()); + Value* tmpVal = getVal(*(yyvsp[(3) - (5)].TypeVal), (yyvsp[(4) - (5)].ValIDVal)); CHECK_FOR_ERROR - (yyval.InstVal) = new LoadInst(tmpVal, "", (yyvsp[-3].BoolVal)); - delete (yyvsp[-1].TypeVal); + (yyval.InstVal) = new LoadInst(tmpVal, "", (yyvsp[(1) - (5)].BoolVal), (yyvsp[(5) - (5)].UIntVal)); + delete (yyvsp[(3) - (5)].TypeVal); ;} break; - case 285: -#line 2888 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 336: +#line 3268 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription()); - const PointerType *PT = dyn_cast((yyvsp[-1].TypeVal)->get()); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription()); + const PointerType *PT = dyn_cast((yyvsp[(5) - (7)].TypeVal)->get()); if (!PT) GEN_ERROR("Can't store to a nonpointer type: " + - (*(yyvsp[-1].TypeVal))->getDescription()); + (*(yyvsp[(5) - (7)].TypeVal))->getDescription()); const Type *ElTy = PT->getElementType(); - if (ElTy != (yyvsp[-3].ValueVal)->getType()) - GEN_ERROR("Can't store '" + (yyvsp[-3].ValueVal)->getType()->getDescription() + + if (ElTy != (yyvsp[(3) - (7)].ValueVal)->getType()) + GEN_ERROR("Can't store '" + (yyvsp[(3) - (7)].ValueVal)->getType()->getDescription() + "' into space of type '" + ElTy->getDescription() + "'"); - Value* tmpVal = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal)); + Value* tmpVal = getVal(*(yyvsp[(5) - (7)].TypeVal), (yyvsp[(6) - (7)].ValIDVal)); CHECK_FOR_ERROR - (yyval.InstVal) = new StoreInst((yyvsp[-3].ValueVal), tmpVal, (yyvsp[-5].BoolVal)); - delete (yyvsp[-1].TypeVal); + (yyval.InstVal) = new StoreInst((yyvsp[(3) - (7)].ValueVal), tmpVal, (yyvsp[(1) - (7)].BoolVal), (yyvsp[(7) - (7)].UIntVal)); + delete (yyvsp[(5) - (7)].TypeVal); ;} break; - case 286: -#line 2905 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" + case 337: +#line 3285 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + Value *TmpVal = getVal((yyvsp[(2) - (5)].TypeVal)->get(), (yyvsp[(3) - (5)].ValIDVal)); + if (!GetResultInst::isValidOperands(TmpVal, (yyvsp[(5) - (5)].UInt64Val))) + GEN_ERROR("Invalid getresult operands"); + (yyval.InstVal) = new GetResultInst(TmpVal, (yyvsp[(5) - (5)].UInt64Val)); + delete (yyvsp[(2) - (5)].TypeVal); + CHECK_FOR_ERROR + ;} + break; + + case 338: +#line 3293 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription()); - if (!isa((yyvsp[-2].TypeVal)->get())) + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription()); + if (!isa((yyvsp[(2) - (4)].TypeVal)->get())) GEN_ERROR("getelementptr insn requires pointer operand"); - if (!GetElementPtrInst::getIndexedType(*(yyvsp[-2].TypeVal), &(*(yyvsp[0].ValueList))[0], (yyvsp[0].ValueList)->size(), true)) + if (!GetElementPtrInst::getIndexedType(*(yyvsp[(2) - (4)].TypeVal), (yyvsp[(4) - (4)].ValueList)->begin(), (yyvsp[(4) - (4)].ValueList)->end())) GEN_ERROR("Invalid getelementptr indices for type '" + - (*(yyvsp[-2].TypeVal))->getDescription()+ "'"); - Value* tmpVal = getVal(*(yyvsp[-2].TypeVal), (yyvsp[-1].ValIDVal)); + (*(yyvsp[(2) - (4)].TypeVal))->getDescription()+ "'"); + Value* tmpVal = getVal(*(yyvsp[(2) - (4)].TypeVal), (yyvsp[(3) - (4)].ValIDVal)); CHECK_FOR_ERROR - (yyval.InstVal) = new GetElementPtrInst(tmpVal, &(*(yyvsp[0].ValueList))[0], (yyvsp[0].ValueList)->size()); - delete (yyvsp[-2].TypeVal); - delete (yyvsp[0].ValueList); + (yyval.InstVal) = GetElementPtrInst::Create(tmpVal, (yyvsp[(4) - (4)].ValueList)->begin(), (yyvsp[(4) - (4)].ValueList)->end()); + delete (yyvsp[(2) - (4)].TypeVal); + delete (yyvsp[(4) - (4)].ValueList); ;} break; + case 339: +#line 3308 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + if (!UpRefs.empty()) + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription()); + if (!isa((yyvsp[(2) - (4)].TypeVal)->get()) && !isa((yyvsp[(2) - (4)].TypeVal)->get())) + GEN_ERROR("extractvalue insn requires an aggregate operand"); - default: break; - } + if (!ExtractValueInst::getIndexedType(*(yyvsp[(2) - (4)].TypeVal), (yyvsp[(4) - (4)].ConstantList)->begin(), (yyvsp[(4) - (4)].ConstantList)->end())) + GEN_ERROR("Invalid extractvalue indices for type '" + + (*(yyvsp[(2) - (4)].TypeVal))->getDescription()+ "'"); + Value* tmpVal = getVal(*(yyvsp[(2) - (4)].TypeVal), (yyvsp[(3) - (4)].ValIDVal)); + CHECK_FOR_ERROR + (yyval.InstVal) = ExtractValueInst::Create(tmpVal, (yyvsp[(4) - (4)].ConstantList)->begin(), (yyvsp[(4) - (4)].ConstantList)->end()); + delete (yyvsp[(2) - (4)].TypeVal); + delete (yyvsp[(4) - (4)].ConstantList); + ;} + break; -/* Line 1126 of yacc.c. */ -#line 5642 "llvmAsmParser.tab.c" - - yyvsp -= yylen; - yyssp -= yylen; + case 340: +#line 3323 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + if (!UpRefs.empty()) + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (7)].TypeVal))->getDescription()); + if (!isa((yyvsp[(2) - (7)].TypeVal)->get()) && !isa((yyvsp[(2) - (7)].TypeVal)->get())) + GEN_ERROR("extractvalue insn requires an aggregate operand"); + + if (ExtractValueInst::getIndexedType(*(yyvsp[(2) - (7)].TypeVal), (yyvsp[(7) - (7)].ConstantList)->begin(), (yyvsp[(7) - (7)].ConstantList)->end()) != (yyvsp[(5) - (7)].TypeVal)->get()) + GEN_ERROR("Invalid insertvalue indices for type '" + + (*(yyvsp[(2) - (7)].TypeVal))->getDescription()+ "'"); + Value* aggVal = getVal(*(yyvsp[(2) - (7)].TypeVal), (yyvsp[(3) - (7)].ValIDVal)); + Value* tmpVal = getVal(*(yyvsp[(5) - (7)].TypeVal), (yyvsp[(6) - (7)].ValIDVal)); + CHECK_FOR_ERROR + (yyval.InstVal) = InsertValueInst::Create(aggVal, tmpVal, (yyvsp[(7) - (7)].ConstantList)->begin(), (yyvsp[(7) - (7)].ConstantList)->end()); + delete (yyvsp[(2) - (7)].TypeVal); + delete (yyvsp[(5) - (7)].TypeVal); + delete (yyvsp[(7) - (7)].ConstantList); + ;} + break; +/* Line 1267 of yacc.c. */ +#line 6765 "llvmAsmParser.tab.c" + default: break; + } + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + + YYPOPSTACK (yylen); + yylen = 0; YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; @@ -5672,110 +6796,41 @@ yyerrlab: if (!yyerrstatus) { ++yynerrs; -#if YYERROR_VERBOSE - yyn = yypact[yystate]; - - if (YYPACT_NINF < yyn && yyn < YYLAST) - { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - char *yymsg = 0; -# define YYERROR_VERBOSE_ARGS_MAXIMUM 5 - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -#if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -#endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) +#if ! YYERROR_VERBOSE + yyerror (YY_("syntax error")); +#else + { + YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); + if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) + { + YYSIZE_T yyalloc = 2 * yysize; + if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) + yyalloc = YYSTACK_ALLOC_MAXIMUM; + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yyalloc); + if (yymsg) + yymsg_alloc = yyalloc; + else { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= yysize1 < yysize; - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; } + } - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= yysize1 < yysize; - yysize = yysize1; - - if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM) - yymsg = (char *) YYSTACK_ALLOC (yysize); - if (yymsg) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yymsg; - int yyi = 0; - while ((*yyp = *yyf)) - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - yyerror (yymsg); - YYSTACK_FREE (yymsg); - } - else - { - yyerror (YY_("syntax error")); + if (0 < yysize && yysize <= yymsg_alloc) + { + (void) yysyntax_error (yymsg, yystate, yychar); + yyerror (yymsg); + } + else + { + yyerror (YY_("syntax error")); + if (yysize != 0) goto yyexhaustedlab; - } - } - else -#endif /* YYERROR_VERBOSE */ - yyerror (YY_("syntax error")); + } + } +#endif } @@ -5786,14 +6841,15 @@ yyerrlab: error, discard it. */ if (yychar <= YYEOF) - { + { /* Return failure if at end of input. */ if (yychar == YYEOF) YYABORT; - } + } else { - yydestruct ("Error: discarding", yytoken, &yylval); + yydestruct ("Error: discarding", + yytoken, &yylval); yychar = YYEMPTY; } } @@ -5811,11 +6867,14 @@ yyerrorlab: /* Pacify compilers like GCC when the user code never invokes YYERROR and the label yyerrorlab therefore never appears in user code. */ - if (0) + if (/*CONSTCOND*/ 0) goto yyerrorlab; -yyvsp -= yylen; - yyssp -= yylen; + /* Do not reclaim the symbols of the rule which action triggered + this YYERROR. */ + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); yystate = *yyssp; goto yyerrlab1; @@ -5845,8 +6904,9 @@ yyerrlab1: YYABORT; - yydestruct ("Error: popping", yystos[yystate], yyvsp); - YYPOPSTACK; + yydestruct ("Error: popping", + yystos[yystate], yyvsp); + YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } @@ -5857,7 +6917,7 @@ yyerrlab1: *++yyvsp = yylval; - /* Shift the error token. */ + /* Shift the error token. */ YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); yystate = yyn; @@ -5892,32 +6952,35 @@ yyreturn: if (yychar != YYEOF && yychar != YYEMPTY) yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval); + /* Do not reclaim the symbols of the rule which action triggered + this YYABORT or YYACCEPT. */ + YYPOPSTACK (yylen); + YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", yystos[*yyssp], yyvsp); - YYPOPSTACK; + YYPOPSTACK (1); } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif - return yyresult; +#if YYERROR_VERBOSE + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); +#endif + /* Make sure YYID is used. */ + return YYID (yyresult); } -#line 2922 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y" +#line 3342 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" // common code from the two 'RunVMAsmParser' functions static Module* RunParser(Module * M) { - - llvmAsmlineno = 1; // Reset the current line number... CurModule.CurrentModule = M; -#if YYDEBUG - yydebug = Debug; -#endif - // Check to make sure the parser succeeded if (yyparse()) { if (ParserResult) @@ -5925,6 +6988,38 @@ static Module* RunParser(Module * M) { return 0; } + // 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::LocalName) { + GenerateError("Undefined type remains at eof: '"+DID.getName() + "'"); + } else { + GenerateError("Undefined type remains at eof: #" + itostr(DID.Num)); + } + if (ParserResult) + delete ParserResult; + return 0; + } + + // Emit an error if there are any unresolved values left. + if (!CurModule.LateResolveValues.empty()) { + Value *V = CurModule.LateResolveValues.back(); + std::map >::iterator I = + CurModule.PlaceHolderInfo.find(V); + + if (I != CurModule.PlaceHolderInfo.end()) { + ValID &DID = I->second.first; + if (DID.Type == ValID::LocalName) { + GenerateError("Undefined value remains at eof: "+DID.getName() + "'"); + } else { + GenerateError("Undefined value remains at eof: #" + itostr(DID.Num)); + } + if (ParserResult) + delete ParserResult; + return 0; + } + } + // Check to make sure that parsing produced a result if (!ParserResult) return 0; @@ -5937,21 +7032,21 @@ static Module* RunParser(Module * M) { } void llvm::GenerateError(const std::string &message, int LineNo) { - if (LineNo == -1) LineNo = llvmAsmlineno; + if (LineNo == -1) LineNo = LLLgetLineNo(); // TODO: column number in exception if (TheParseError) - TheParseError->setError(CurFilename, message, LineNo); + TheParseError->setError(LLLgetFilename(), message, LineNo); TriggerError = 1; } int yyerror(const char *ErrorMsg) { - std::string where - = std::string((CurFilename == "-") ? std::string("") : CurFilename) - + ":" + utostr((unsigned) llvmAsmlineno) + ": "; + std::string where = LLLgetFilename() + ":" + utostr(LLLgetLineNo()) + ": "; std::string errMsg = where + "error: " + std::string(ErrorMsg); - if (yychar != YYEMPTY && yychar != 0) - errMsg += " while reading token: '" + std::string(llvmAsmtext, llvmAsmleng)+ - "'"; + if (yychar != YYEMPTY && yychar != 0) { + errMsg += " while reading token: '"; + errMsg += std::string(LLLgetTokenStart(), + LLLgetTokenStart()+LLLgetTokenLength()) + "'"; + } GenerateError(errMsg); return 0; }