diff options
author | Reid Spencer <rspencer@reidspencer.com> | 2006-12-03 05:46:11 +0000 |
---|---|---|
committer | Reid Spencer <rspencer@reidspencer.com> | 2006-12-03 05:46:11 +0000 |
commit | e2c32da07526cc6649a7dcd44aafbc62aafc5e0c (patch) | |
tree | 8f89890f1db71880eecb16cc76e9d9e265ef9b2c /llvm/lib/AsmParser/llvmAsmParser.cpp.cvs | |
parent | 812724efa432b5d0bc39e385e7f3c5460d88307f (diff) | |
download | bcm5719-llvm-e2c32da07526cc6649a7dcd44aafbc62aafc5e0c.tar.gz bcm5719-llvm-e2c32da07526cc6649a7dcd44aafbc62aafc5e0c.zip |
Regenerate.
llvm-svn: 32145
Diffstat (limited to 'llvm/lib/AsmParser/llvmAsmParser.cpp.cvs')
-rw-r--r-- | llvm/lib/AsmParser/llvmAsmParser.cpp.cvs | 3187 |
1 files changed, 1583 insertions, 1604 deletions
diff --git a/llvm/lib/AsmParser/llvmAsmParser.cpp.cvs b/llvm/lib/AsmParser/llvmAsmParser.cpp.cvs index d06b5228baf..125ece66d5d 100644 --- a/llvm/lib/AsmParser/llvmAsmParser.cpp.cvs +++ b/llvm/lib/AsmParser/llvmAsmParser.cpp.cvs @@ -157,35 +157,61 @@ SETGT = 348, SETEQ = 349, SETNE = 350, - MALLOC = 351, - ALLOCA = 352, - FREE = 353, - LOAD = 354, - STORE = 355, - GETELEMENTPTR = 356, - TRUNC = 357, - ZEXT = 358, - SEXT = 359, - FPTRUNC = 360, - FPEXT = 361, - BITCAST = 362, - UITOFP = 363, - SITOFP = 364, - FPTOUI = 365, - FPTOSI = 366, - INTTOPTR = 367, - PTRTOINT = 368, - PHI_TOK = 369, - SELECT = 370, - SHL = 371, - LSHR = 372, - ASHR = 373, - VAARG = 374, - EXTRACTELEMENT = 375, - INSERTELEMENT = 376, - SHUFFLEVECTOR = 377, - VAARG_old = 378, - VANEXT_old = 379 + ICMP = 351, + FCMP = 352, + EQ = 353, + NE = 354, + SLT = 355, + SGT = 356, + SLE = 357, + SGE = 358, + ULT = 359, + UGT = 360, + ULE = 361, + UGE = 362, + ORDEQ = 363, + ORDNE = 364, + ORDLT = 365, + ORDGT = 366, + ORDLE = 367, + ORDGE = 368, + ORD = 369, + UNO = 370, + UNOEQ = 371, + UNONE = 372, + UNOLT = 373, + UNOGT = 374, + UNOLE = 375, + UNOGE = 376, + MALLOC = 377, + ALLOCA = 378, + FREE = 379, + LOAD = 380, + STORE = 381, + GETELEMENTPTR = 382, + TRUNC = 383, + ZEXT = 384, + SEXT = 385, + FPTRUNC = 386, + FPEXT = 387, + BITCAST = 388, + UITOFP = 389, + SITOFP = 390, + FPTOUI = 391, + FPTOSI = 392, + INTTOPTR = 393, + PTRTOINT = 394, + PHI_TOK = 395, + SELECT = 396, + SHL = 397, + LSHR = 398, + ASHR = 399, + VAARG = 400, + EXTRACTELEMENT = 401, + INSERTELEMENT = 402, + SHUFFLEVECTOR = 403, + VAARG_old = 404, + VANEXT_old = 405 }; #endif /* Tokens. */ @@ -282,35 +308,61 @@ #define SETGT 348 #define SETEQ 349 #define SETNE 350 -#define MALLOC 351 -#define ALLOCA 352 -#define FREE 353 -#define LOAD 354 -#define STORE 355 -#define GETELEMENTPTR 356 -#define TRUNC 357 -#define ZEXT 358 -#define SEXT 359 -#define FPTRUNC 360 -#define FPEXT 361 -#define BITCAST 362 -#define UITOFP 363 -#define SITOFP 364 -#define FPTOUI 365 -#define FPTOSI 366 -#define INTTOPTR 367 -#define PTRTOINT 368 -#define PHI_TOK 369 -#define SELECT 370 -#define SHL 371 -#define LSHR 372 -#define ASHR 373 -#define VAARG 374 -#define EXTRACTELEMENT 375 -#define INSERTELEMENT 376 -#define SHUFFLEVECTOR 377 -#define VAARG_old 378 -#define VANEXT_old 379 +#define ICMP 351 +#define FCMP 352 +#define EQ 353 +#define NE 354 +#define SLT 355 +#define SGT 356 +#define SLE 357 +#define SGE 358 +#define ULT 359 +#define UGT 360 +#define ULE 361 +#define UGE 362 +#define ORDEQ 363 +#define ORDNE 364 +#define ORDLT 365 +#define ORDGT 366 +#define ORDLE 367 +#define ORDGE 368 +#define ORD 369 +#define UNO 370 +#define UNOEQ 371 +#define UNONE 372 +#define UNOLT 373 +#define UNOGT 374 +#define UNOLE 375 +#define UNOGE 376 +#define MALLOC 377 +#define ALLOCA 378 +#define FREE 379 +#define LOAD 380 +#define STORE 381 +#define GETELEMENTPTR 382 +#define TRUNC 383 +#define ZEXT 384 +#define SEXT 385 +#define FPTRUNC 386 +#define FPEXT 387 +#define BITCAST 388 +#define UITOFP 389 +#define SITOFP 390 +#define FPTOUI 391 +#define FPTOSI 392 +#define INTTOPTR 393 +#define PTRTOINT 394 +#define PHI_TOK 395 +#define SELECT 396 +#define SHL 397 +#define LSHR 398 +#define ASHR 399 +#define VAARG 400 +#define EXTRACTELEMENT 401 +#define INSERTELEMENT 402 +#define SHUFFLEVECTOR 403 +#define VAARG_old 404 +#define VANEXT_old 405 @@ -430,11 +482,6 @@ 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++); - Values.clear(); // Clear out function local definitions Types.clear(); CurrentModule = 0; @@ -560,7 +607,7 @@ static const Type *getTypeVal(const ValID &D, bool DoNotImprovise = false) { Type *Typ = OpaqueType::get(); CurModule.LateResolveTypes.insert(std::make_pair(D, Typ)); return Typ; -} + } static Value *lookupInSymbolTable(const Type *Ty, const std::string &Name) { SymbolTable &SymTab = @@ -1119,71 +1166,6 @@ static PATypeHolder HandleUpRefs(const Type *ty) { return Ty; } -/// This function is used to obtain the correct opcode for an instruction when -/// an obsolete opcode is encountered. The OI parameter (OpcodeInfo) has both -/// an opcode and an "obsolete" flag. These are generated by the lexer and -/// the "obsolete" member will be true when the lexer encounters the token for -/// an obsolete opcode. For example, "div" was replaced by [usf]div but we need -/// to maintain backwards compatibility for asm files that still have the "div" -/// instruction. This function handles converting div -> [usf]div appropriately. -/// @brief Convert obsolete BinaryOps opcodes to new values -static void -sanitizeOpcode(OpcodeInfo<Instruction::BinaryOps> &OI, const Type *Ty) -{ - // If its not obsolete, don't do anything - if (!OI.obsolete) - return; - - // If its a packed type we want to use the element type - if (const PackedType *PTy = dyn_cast<PackedType>(Ty)) - Ty = PTy->getElementType(); - - // Depending on the opcode .. - switch (OI.opcode) { - default: - GenerateError("Invalid obsolete opCode (check Lexer.l)"); - break; - case Instruction::UDiv: - // Handle cases where the opcode needs to change - if (Ty->isFloatingPoint()) - OI.opcode = Instruction::FDiv; - else if (Ty->isSigned()) - OI.opcode = Instruction::SDiv; - break; - case Instruction::URem: - if (Ty->isFloatingPoint()) - OI.opcode = Instruction::FRem; - else if (Ty->isSigned()) - OI.opcode = Instruction::SRem; - break; - } - // Its not obsolete any more, we fixed it. - OI.obsolete = false; -} - -/// This function is similar to the previous overload of sanitizeOpcode but -/// operates on Instruction::OtherOps instead of Instruction::BinaryOps. -/// @brief Convert obsolete OtherOps opcodes to new values -static void -sanitizeOpcode(OpcodeInfo<Instruction::OtherOps> &OI, const Type *Ty) -{ - // If its not obsolete, don't do anything - if (!OI.obsolete) - return; - - switch (OI.opcode) { - default: - GenerateError("Invalid obsolete opcode (check Lexer.l)"); - break; - case Instruction::LShr: - if (Ty->isSigned()) - OI.opcode = Instruction::AShr; - break; - } - // Its not obsolete any more, we fixed it. - OI.obsolete = false; -} - // common code from the two 'RunVMAsmParser' functions static Module* RunParser(Module * M) { @@ -1360,25 +1342,28 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 1038 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" +#line 968 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" typedef union YYSTYPE { llvm::Module *ModuleVal; llvm::Function *FunctionVal; - std::pair<TypeInfo, char*> *ArgVal; + std::pair<llvm::PATypeHolder*, char*> *ArgVal; llvm::BasicBlock *BasicBlockVal; llvm::TerminatorInst *TermInstVal; llvm::Instruction *InstVal; - ConstInfo ConstVal; - TypeInfo TypeVal; - ValueInfo ValueVal; + llvm::Constant *ConstVal; - std::vector<std::pair<TypeInfo,char*> >*ArgList; - std::vector<ValueInfo> *ValueList; - std::list<TypeInfo> *TypeList; + const llvm::Type *PrimType; + llvm::PATypeHolder *TypeVal; + llvm::Value *ValueVal; + + std::vector<std::pair<llvm::PATypeHolder*,char*> > *ArgList; + std::vector<llvm::Value*> *ValueList; + std::list<llvm::PATypeHolder> *TypeList; // Represent the RHS of PHI node - std::list<std::pair<llvm::Value*, llvm::BasicBlock*> > *PHIList; + std::list<std::pair<llvm::Value*, + llvm::BasicBlock*> > *PHIList; std::vector<std::pair<llvm::Constant*, llvm::BasicBlock*> > *JumpTable; - std::vector<ConstInfo> *ConstVector; + std::vector<llvm::Constant*> *ConstVector; llvm::GlobalValue::LinkageTypes Linkage; int64_t SInt64Val; @@ -1391,15 +1376,17 @@ typedef union YYSTYPE { char *StrVal; // This memory is strdup'd! llvm::ValID ValIDVal; // strdup'd memory maybe! - BinaryOpInfo BinaryOpVal; - TermOpInfo TermOpVal; - MemOpInfo MemOpVal; - CastOpInfo CastOpVal; - OtherOpInfo OtherOpVal; + llvm::Instruction::BinaryOps BinaryOpVal; + llvm::Instruction::TermOps TermOpVal; + llvm::Instruction::MemoryOps MemOpVal; + llvm::Instruction::CastOps CastOpVal; + llvm::Instruction::OtherOps OtherOpVal; llvm::Module::Endianness Endianness; + llvm::ICmpInst::Predicate IPredicate; + llvm::FCmpInst::Predicate FPredicate; } YYSTYPE; /* Line 196 of yacc.c. */ -#line 1403 "llvmAsmParser.tab.c" +#line 1390 "llvmAsmParser.tab.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -1411,7 +1398,7 @@ typedef union YYSTYPE { /* Line 219 of yacc.c. */ -#line 1415 "llvmAsmParser.tab.c" +#line 1402 "llvmAsmParser.tab.c" #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) # define YYSIZE_T __SIZE_TYPE__ @@ -1562,20 +1549,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 4 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1410 +#define YYLAST 1503 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 139 +#define YYNTOKENS 165 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 76 +#define YYNNTS 78 /* YYNRULES -- Number of rules. */ -#define YYNRULES 269 +#define YYNRULES 297 /* YYNRULES -- Number of states. */ -#define YYNSTATES 534 +#define YYNSTATES 586 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 379 +#define YYMAXUTOK 405 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -1587,15 +1574,15 @@ static const unsigned char yytranslate[] = 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, - 128, 129, 137, 2, 126, 2, 2, 2, 2, 2, + 154, 155, 163, 2, 152, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 133, 125, 134, 2, 2, 2, 2, 2, 2, 2, + 159, 151, 160, 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, 130, 127, 132, 2, 2, 2, 2, 2, 138, + 2, 156, 153, 158, 2, 2, 2, 2, 2, 164, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 131, 2, 2, 135, 2, 136, 2, 2, 2, 2, + 157, 2, 2, 161, 2, 162, 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, @@ -1620,7 +1607,10 @@ static const unsigned char yytranslate[] = 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 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 + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 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 }; #if YYDEBUG @@ -1633,151 +1623,165 @@ static const unsigned short int yyprhs[] = 39, 41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 89, 91, 93, 95, 97, - 99, 101, 104, 105, 107, 109, 111, 113, 115, 117, - 119, 120, 121, 123, 125, 127, 129, 131, 133, 136, - 137, 140, 141, 145, 148, 149, 151, 152, 156, 158, - 161, 163, 165, 167, 169, 171, 173, 175, 177, 179, - 181, 183, 185, 187, 189, 191, 193, 195, 197, 199, - 201, 203, 206, 211, 217, 223, 227, 230, 233, 235, - 239, 241, 245, 247, 248, 253, 257, 261, 266, 271, - 275, 278, 281, 284, 287, 290, 293, 296, 299, 302, - 305, 312, 318, 327, 334, 341, 348, 355, 362, 371, - 380, 384, 386, 388, 390, 392, 395, 398, 403, 406, - 408, 413, 416, 421, 422, 430, 431, 439, 440, 448, - 449, 457, 461, 466, 467, 469, 471, 473, 477, 481, - 485, 489, 493, 497, 499, 500, 502, 504, 506, 507, - 510, 514, 516, 518, 522, 524, 525, 534, 536, 538, - 542, 544, 546, 549, 550, 552, 554, 555, 560, 561, - 563, 565, 567, 569, 571, 573, 575, 577, 579, 583, - 585, 591, 593, 595, 597, 599, 602, 605, 608, 612, - 615, 616, 618, 621, 624, 628, 638, 648, 657, 671, - 673, 675, 682, 688, 691, 698, 706, 708, 712, 714, - 715, 718, 720, 726, 732, 738, 741, 746, 751, 758, - 763, 768, 773, 778, 785, 792, 795, 803, 805, 808, - 809, 811, 812, 816, 823, 827, 834, 837, 842, 849 + 99, 101, 103, 105, 107, 109, 111, 113, 115, 117, + 119, 121, 123, 125, 127, 129, 131, 133, 135, 137, + 139, 141, 143, 145, 147, 149, 152, 153, 155, 157, + 159, 161, 163, 165, 167, 168, 169, 171, 173, 175, + 177, 179, 181, 184, 185, 188, 189, 193, 196, 197, + 199, 200, 204, 206, 209, 211, 213, 215, 217, 219, + 221, 223, 225, 227, 229, 231, 233, 235, 237, 239, + 241, 243, 245, 247, 249, 251, 254, 259, 265, 271, + 275, 278, 281, 283, 287, 289, 293, 295, 296, 301, + 305, 309, 314, 319, 323, 326, 329, 332, 335, 338, + 341, 344, 347, 350, 353, 360, 366, 375, 382, 389, + 396, 405, 414, 421, 428, 437, 446, 450, 452, 454, + 456, 458, 461, 464, 469, 472, 474, 479, 482, 487, + 488, 496, 497, 505, 506, 514, 515, 523, 527, 532, + 533, 535, 537, 539, 543, 547, 551, 555, 559, 563, + 565, 566, 568, 570, 572, 573, 576, 580, 582, 584, + 588, 590, 591, 600, 602, 604, 608, 610, 612, 615, + 616, 618, 620, 621, 626, 627, 629, 631, 633, 635, + 637, 639, 641, 643, 645, 649, 651, 657, 659, 661, + 663, 665, 668, 671, 674, 678, 681, 682, 684, 687, + 690, 694, 704, 714, 723, 737, 739, 741, 748, 754, + 757, 764, 772, 774, 778, 780, 781, 784, 786, 792, + 798, 804, 811, 818, 821, 826, 831, 838, 843, 848, + 853, 858, 865, 872, 875, 883, 885, 888, 889, 891, + 892, 896, 903, 907, 914, 917, 922, 929 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const short int yyrhs[] = { - 171, 0, -1, 5, -1, 6, -1, 3, -1, 4, + 199, 0, -1, 5, -1, 6, -1, 3, -1, 4, -1, 78, -1, 79, -1, 80, -1, 81, -1, 82, -1, 83, -1, 84, -1, 85, -1, 86, -1, 87, -1, 88, -1, 89, -1, 90, -1, 91, -1, 92, - -1, 93, -1, 94, -1, 95, -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, 116, -1, 117, -1, 118, -1, 16, -1, 14, - -1, 12, -1, 10, -1, 17, -1, 15, -1, 13, - -1, 11, -1, 147, -1, 148, -1, 18, -1, 19, - -1, 183, 125, -1, -1, 41, -1, 42, -1, 43, - -1, 44, -1, 45, -1, 46, -1, 47, -1, -1, - -1, 65, -1, 66, -1, 67, -1, 68, -1, 69, - -1, 70, -1, 64, 4, -1, -1, 57, 4, -1, - -1, 126, 57, 4, -1, 34, 24, -1, -1, 156, - -1, -1, 126, 159, 158, -1, 156, -1, 57, 4, - -1, 162, -1, 8, -1, 164, -1, 8, -1, 164, - -1, 9, -1, 10, -1, 11, -1, 12, -1, 13, - -1, 14, -1, 15, -1, 16, -1, 17, -1, 18, - -1, 19, -1, 20, -1, 21, -1, 48, -1, 163, - -1, 198, -1, 127, 4, -1, 161, 128, 166, 129, - -1, 130, 4, 131, 164, 132, -1, 133, 4, 131, - 164, 134, -1, 135, 165, 136, -1, 135, 136, -1, - 164, 137, -1, 164, -1, 165, 126, 164, -1, 165, - -1, 165, 126, 37, -1, 37, -1, -1, 162, 130, - 169, 132, -1, 162, 130, 132, -1, 162, 138, 24, - -1, 162, 133, 169, 134, -1, 162, 135, 169, 136, - -1, 162, 135, 136, -1, 162, 38, -1, 162, 39, - -1, 162, 198, -1, 162, 168, -1, 162, 26, -1, - 147, 141, -1, 148, 4, -1, 9, 27, -1, 9, - 28, -1, 150, 7, -1, 145, 128, 167, 36, 162, - 129, -1, 101, 128, 167, 212, 129, -1, 115, 128, - 167, 126, 167, 126, 167, 129, -1, 142, 128, 167, - 126, 167, 129, -1, 143, 128, 167, 126, 167, 129, - -1, 144, 128, 167, 126, 167, 129, -1, 146, 128, - 167, 126, 167, 129, -1, 120, 128, 167, 126, 167, - 129, -1, 121, 128, 167, 126, 167, 126, 167, 129, - -1, 122, 128, 167, 126, 167, 126, 167, 129, -1, - 169, 126, 167, -1, 167, -1, 32, -1, 33, -1, - 172, -1, 172, 192, -1, 172, 194, -1, 172, 62, - 61, 178, -1, 172, 25, -1, 173, -1, 173, 151, - 20, 160, -1, 173, 194, -1, 173, 62, 61, 178, - -1, -1, 173, 151, 152, 170, 167, 174, 158, -1, - -1, 173, 151, 50, 170, 162, 175, 158, -1, -1, - 173, 151, 45, 170, 162, 176, 158, -1, -1, 173, - 151, 47, 170, 162, 177, 158, -1, 173, 51, 180, - -1, 173, 58, 125, 181, -1, -1, 24, -1, 56, - -1, 55, -1, 53, 125, 179, -1, 54, 125, 4, - -1, 52, 125, 24, -1, 71, 125, 24, -1, 130, - 182, 132, -1, 182, 126, 24, -1, 24, -1, -1, - 22, -1, 24, -1, 183, -1, -1, 162, 184, -1, - 186, 126, 185, -1, 185, -1, 186, -1, 186, 126, - 37, -1, 37, -1, -1, 153, 160, 183, 128, 187, - 129, 157, 154, -1, 29, -1, 135, -1, 152, 188, - 189, -1, 30, -1, 136, -1, 201, 191, -1, -1, - 45, -1, 47, -1, -1, 31, 195, 193, 188, -1, - -1, 63, -1, 3, -1, 4, -1, 7, -1, 27, - -1, 28, -1, 38, -1, 39, -1, 26, -1, 133, - 169, 134, -1, 168, -1, 61, 196, 24, 126, 24, - -1, 140, -1, 183, -1, 198, -1, 197, -1, 162, - 199, -1, 201, 202, -1, 190, 202, -1, 203, 151, - 204, -1, 203, 206, -1, -1, 23, -1, 72, 200, - -1, 72, 8, -1, 73, 21, 199, -1, 73, 9, - 199, 126, 21, 199, 126, 21, 199, -1, 74, 149, - 199, 126, 21, 199, 130, 205, 132, -1, 74, 149, - 199, 126, 21, 199, 130, 132, -1, 75, 153, 160, - 199, 128, 209, 129, 36, 21, 199, 76, 21, 199, - -1, 76, -1, 77, -1, 205, 149, 197, 126, 21, - 199, -1, 149, 197, 126, 21, 199, -1, 151, 211, - -1, 162, 130, 199, 126, 199, 132, -1, 207, 126, - 130, 199, 126, 199, 132, -1, 200, -1, 208, 126, - 200, -1, 208, -1, -1, 60, 59, -1, 59, -1, - 142, 162, 199, 126, 199, -1, 143, 162, 199, 126, - 199, -1, 144, 162, 199, 126, 199, -1, 49, 200, - -1, 146, 200, 126, 200, -1, 145, 200, 36, 162, - -1, 115, 200, 126, 200, 126, 200, -1, 119, 200, - 126, 162, -1, 123, 200, 126, 162, -1, 124, 200, - 126, 162, -1, 120, 200, 126, 200, -1, 121, 200, - 126, 200, 126, 200, -1, 122, 200, 126, 200, 126, - 200, -1, 114, 207, -1, 210, 153, 160, 199, 128, - 209, 129, -1, 214, -1, 126, 208, -1, -1, 35, - -1, -1, 96, 162, 155, -1, 96, 162, 126, 15, - 199, 155, -1, 97, 162, 155, -1, 97, 162, 126, - 15, 199, 155, -1, 98, 200, -1, 213, 99, 162, - 199, -1, 213, 100, 200, 126, 162, 199, -1, 101, - 162, 199, 212, -1 + -1, 93, -1, 94, -1, 95, -1, 128, -1, 129, + -1, 130, -1, 131, -1, 132, -1, 133, -1, 134, + -1, 135, -1, 136, -1, 137, -1, 138, -1, 139, + -1, 142, -1, 143, -1, 144, -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, 114, + -1, 115, -1, 116, -1, 117, -1, 118, -1, 119, + -1, 120, -1, 121, -1, 16, -1, 14, -1, 12, + -1, 10, -1, 17, -1, 15, -1, 13, -1, 11, + -1, 175, -1, 176, -1, 18, -1, 19, -1, 211, + 151, -1, -1, 41, -1, 42, -1, 43, -1, 44, + -1, 45, -1, 46, -1, 47, -1, -1, -1, 65, + -1, 66, -1, 67, -1, 68, -1, 69, -1, 70, + -1, 64, 4, -1, -1, 57, 4, -1, -1, 152, + 57, 4, -1, 34, 24, -1, -1, 184, -1, -1, + 152, 187, 186, -1, 184, -1, 57, 4, -1, 190, + -1, 8, -1, 192, -1, 8, -1, 192, -1, 9, + -1, 10, -1, 11, -1, 12, -1, 13, -1, 14, + -1, 15, -1, 16, -1, 17, -1, 18, -1, 19, + -1, 20, -1, 21, -1, 48, -1, 191, -1, 226, + -1, 153, 4, -1, 189, 154, 194, 155, -1, 156, + 4, 157, 192, 158, -1, 159, 4, 157, 192, 160, + -1, 161, 193, 162, -1, 161, 162, -1, 192, 163, + -1, 192, -1, 193, 152, 192, -1, 193, -1, 193, + 152, 37, -1, 37, -1, -1, 190, 156, 197, 158, + -1, 190, 156, 158, -1, 190, 164, 24, -1, 190, + 159, 197, 160, -1, 190, 161, 197, 162, -1, 190, + 161, 162, -1, 190, 38, -1, 190, 39, -1, 190, + 226, -1, 190, 196, -1, 190, 26, -1, 175, 167, + -1, 176, 4, -1, 9, 27, -1, 9, 28, -1, + 178, 7, -1, 171, 154, 195, 36, 190, 155, -1, + 127, 154, 195, 240, 155, -1, 141, 154, 195, 152, + 195, 152, 195, 155, -1, 168, 154, 195, 152, 195, + 155, -1, 169, 154, 195, 152, 195, 155, -1, 170, + 154, 195, 152, 195, 155, -1, 96, 154, 173, 152, + 195, 152, 195, 155, -1, 97, 154, 174, 152, 195, + 152, 195, 155, -1, 172, 154, 195, 152, 195, 155, + -1, 146, 154, 195, 152, 195, 155, -1, 147, 154, + 195, 152, 195, 152, 195, 155, -1, 148, 154, 195, + 152, 195, 152, 195, 155, -1, 197, 152, 195, -1, + 195, -1, 32, -1, 33, -1, 200, -1, 200, 220, + -1, 200, 222, -1, 200, 62, 61, 206, -1, 200, + 25, -1, 201, -1, 201, 179, 20, 188, -1, 201, + 222, -1, 201, 62, 61, 206, -1, -1, 201, 179, + 180, 198, 195, 202, 186, -1, -1, 201, 179, 50, + 198, 190, 203, 186, -1, -1, 201, 179, 45, 198, + 190, 204, 186, -1, -1, 201, 179, 47, 198, 190, + 205, 186, -1, 201, 51, 208, -1, 201, 58, 151, + 209, -1, -1, 24, -1, 56, -1, 55, -1, 53, + 151, 207, -1, 54, 151, 4, -1, 52, 151, 24, + -1, 71, 151, 24, -1, 156, 210, 158, -1, 210, + 152, 24, -1, 24, -1, -1, 22, -1, 24, -1, + 211, -1, -1, 190, 212, -1, 214, 152, 213, -1, + 213, -1, 214, -1, 214, 152, 37, -1, 37, -1, + -1, 181, 188, 211, 154, 215, 155, 185, 182, -1, + 29, -1, 161, -1, 180, 216, 217, -1, 30, -1, + 162, -1, 229, 219, -1, -1, 45, -1, 47, -1, + -1, 31, 223, 221, 216, -1, -1, 63, -1, 3, + -1, 4, -1, 7, -1, 27, -1, 28, -1, 38, + -1, 39, -1, 26, -1, 159, 197, 160, -1, 196, + -1, 61, 224, 24, 152, 24, -1, 166, -1, 211, + -1, 226, -1, 225, -1, 190, 227, -1, 229, 230, + -1, 218, 230, -1, 231, 179, 232, -1, 231, 234, + -1, -1, 23, -1, 72, 228, -1, 72, 8, -1, + 73, 21, 227, -1, 73, 9, 227, 152, 21, 227, + 152, 21, 227, -1, 74, 177, 227, 152, 21, 227, + 156, 233, 158, -1, 74, 177, 227, 152, 21, 227, + 156, 158, -1, 75, 181, 188, 227, 154, 237, 155, + 36, 21, 227, 76, 21, 227, -1, 76, -1, 77, + -1, 233, 177, 225, 152, 21, 227, -1, 177, 225, + 152, 21, 227, -1, 179, 239, -1, 190, 156, 227, + 152, 227, 158, -1, 235, 152, 156, 227, 152, 227, + 158, -1, 228, -1, 236, 152, 228, -1, 236, -1, + -1, 60, 59, -1, 59, -1, 168, 190, 227, 152, + 227, -1, 169, 190, 227, 152, 227, -1, 170, 190, + 227, 152, 227, -1, 96, 173, 190, 227, 152, 227, + -1, 97, 174, 190, 227, 152, 227, -1, 49, 228, + -1, 172, 228, 152, 228, -1, 171, 228, 36, 190, + -1, 141, 228, 152, 228, 152, 228, -1, 145, 228, + 152, 190, -1, 149, 228, 152, 190, -1, 150, 228, + 152, 190, -1, 146, 228, 152, 228, -1, 147, 228, + 152, 228, 152, 228, -1, 148, 228, 152, 228, 152, + 228, -1, 140, 235, -1, 238, 181, 188, 227, 154, + 237, 155, -1, 242, -1, 152, 236, -1, -1, 35, + -1, -1, 122, 190, 183, -1, 122, 190, 152, 15, + 227, 183, -1, 123, 190, 183, -1, 123, 190, 152, + 15, 227, 183, -1, 124, 228, -1, 241, 125, 190, + 227, -1, 241, 126, 228, 152, 190, 227, -1, 127, + 190, 227, 240, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short int yyrline[] = { - 0, 1164, 1164, 1165, 1173, 1174, 1184, 1184, 1184, 1184, - 1184, 1184, 1184, 1184, 1184, 1185, 1185, 1185, 1186, 1186, - 1186, 1186, 1186, 1186, 1187, 1187, 1187, 1187, 1187, 1187, - 1188, 1188, 1188, 1188, 1188, 1188, 1189, 1189, 1189, 1193, - 1193, 1193, 1193, 1194, 1194, 1194, 1194, 1195, 1195, 1196, - 1196, 1199, 1203, 1208, 1209, 1210, 1211, 1212, 1213, 1214, - 1215, 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1233, - 1234, 1240, 1241, 1249, 1257, 1258, 1263, 1264, 1265, 1270, - 1284, 1284, 1288, 1288, 1293, 1304, 1304, 1304, 1304, 1304, - 1304, 1304, 1305, 1305, 1305, 1305, 1305, 1305, 1306, 1311, - 1315, 1324, 1333, 1348, 1355, 1369, 1380, 1385, 1397, 1402, - 1408, 1409, 1415, 1421, 1432, 1463, 1478, 1509, 1539, 1564, - 1578, 1589, 1595, 1657, 1664, 1674, 1681, 1688, 1693, 1698, - 1707, 1733, 1755, 1764, 1793, 1805, 1812, 1824, 1831, 1838, - 1848, 1852, 1860, 1860, 1870, 1878, 1883, 1887, 1891, 1895, - 1910, 1932, 1935, 1938, 1938, 1946, 1946, 1955, 1955, 1964, - 1964, 1974, 1977, 1980, 1984, 1997, 1998, 2000, 2004, 2013, - 2017, 2022, 2024, 2029, 2034, 2043, 2043, 2044, 2044, 2046, - 2053, 2059, 2066, 2070, 2078, 2086, 2091, 2185, 2185, 2187, - 2195, 2195, 2197, 2202, 2203, 2204, 2206, 2206, 2216, 2220, - 2225, 2229, 2233, 2237, 2241, 2245, 2249, 2253, 2257, 2280, - 2284, 2298, 2302, 2308, 2308, 2314, 2321, 2325, 2334, 2345, - 2354, 2366, 2379, 2383, 2387, 2392, 2401, 2420, 2429, 2494, - 2498, 2505, 2516, 2529, 2538, 2547, 2557, 2561, 2568, 2571, - 2575, 2579, 2584, 2606, 2621, 2635, 2648, 2659, 2685, 2693, - 2699, 2719, 2742, 2748, 2754, 2760, 2775, 2848, 2855, 2858, - 2863, 2867, 2874, 2879, 2885, 2890, 2896, 2904, 2916, 2931 + 0, 1105, 1105, 1106, 1114, 1115, 1125, 1125, 1125, 1125, + 1125, 1125, 1125, 1125, 1125, 1126, 1126, 1126, 1127, 1127, + 1127, 1127, 1127, 1127, 1128, 1128, 1128, 1128, 1128, 1128, + 1129, 1129, 1129, 1129, 1129, 1129, 1130, 1130, 1130, 1131, + 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1132, + 1132, 1132, 1132, 1132, 1132, 1132, 1132, 1133, 1133, 1133, + 1133, 1133, 1133, 1137, 1137, 1137, 1137, 1138, 1138, 1138, + 1138, 1139, 1139, 1140, 1140, 1143, 1147, 1152, 1153, 1154, + 1155, 1156, 1157, 1158, 1159, 1161, 1162, 1163, 1164, 1165, + 1166, 1167, 1168, 1177, 1178, 1184, 1185, 1193, 1201, 1202, + 1207, 1208, 1209, 1214, 1228, 1228, 1229, 1229, 1231, 1241, + 1241, 1241, 1241, 1241, 1241, 1241, 1242, 1242, 1242, 1242, + 1242, 1242, 1243, 1247, 1251, 1259, 1267, 1280, 1285, 1297, + 1307, 1311, 1322, 1327, 1333, 1334, 1338, 1342, 1353, 1379, + 1393, 1423, 1449, 1470, 1483, 1493, 1498, 1559, 1566, 1574, + 1580, 1586, 1590, 1594, 1602, 1614, 1646, 1654, 1678, 1689, + 1695, 1700, 1705, 1714, 1720, 1726, 1735, 1739, 1747, 1747, + 1757, 1765, 1770, 1774, 1778, 1782, 1797, 1819, 1822, 1825, + 1825, 1833, 1833, 1841, 1841, 1849, 1849, 1858, 1861, 1864, + 1868, 1881, 1882, 1884, 1888, 1897, 1901, 1906, 1908, 1913, + 1918, 1927, 1927, 1928, 1928, 1930, 1937, 1943, 1950, 1954, + 1960, 1965, 1970, 2065, 2065, 2067, 2075, 2075, 2077, 2082, + 2083, 2084, 2086, 2086, 2096, 2100, 2105, 2109, 2113, 2117, + 2121, 2125, 2129, 2133, 2137, 2162, 2166, 2180, 2184, 2190, + 2190, 2196, 2201, 2205, 2214, 2225, 2234, 2246, 2259, 2263, + 2267, 2272, 2281, 2300, 2309, 2365, 2369, 2376, 2387, 2400, + 2409, 2418, 2428, 2432, 2439, 2439, 2441, 2445, 2450, 2469, + 2484, 2498, 2509, 2520, 2533, 2542, 2553, 2561, 2567, 2587, + 2610, 2616, 2622, 2628, 2643, 2702, 2709, 2712, 2717, 2721, + 2728, 2733, 2739, 2744, 2750, 2758, 2770, 2785 }; #endif @@ -1800,7 +1804,10 @@ static const char *const yytname[] = "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", "SETLE", "SETGE", "SETLT", "SETGT", "SETEQ", "SETNE", "MALLOC", + "XOR", "SETLE", "SETGE", "SETLT", "SETGT", "SETEQ", "SETNE", "ICMP", + "FCMP", "EQ", "NE", "SLT", "SGT", "SLE", "SGE", "ULT", "UGT", "ULE", + "UGE", "ORDEQ", "ORDNE", "ORDLT", "ORDGT", "ORDLE", "ORDGE", "ORD", + "UNO", "UNOEQ", "UNONE", "UNOLT", "UNOGT", "UNOLE", "UNOGE", "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE", "GETELEMENTPTR", "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT", "BITCAST", "UITOFP", "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR", "PTRTOINT", "PHI_TOK", "SELECT", "SHL", "LSHR", @@ -1808,17 +1815,17 @@ static const char *const yytname[] = "VAARG_old", "VANEXT_old", "'='", "','", "'\\\\'", "'('", "')'", "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'", "'*'", "'c'", "$accept", "INTVAL", "EINT64VAL", "ArithmeticOps", "LogicalOps", "SetCondOps", - "CastOps", "ShiftOps", "SIntType", "UIntType", "IntType", "FPType", - "OptAssign", "OptLinkage", "OptCallingConv", "OptAlign", "OptCAlign", - "SectionString", "OptSection", "GlobalVarAttributes", - "GlobalVarAttribute", "TypesV", "UpRTypesV", "Types", "PrimType", - "UpRTypes", "TypeListI", "ArgTypeListI", "ConstVal", "ConstExpr", - "ConstVector", "GlobalType", "Module", "FunctionList", "ConstPool", "@1", - "@2", "@3", "@4", "AsmBlock", "BigOrLittle", "TargetDefinition", - "LibrariesDefinition", "LibList", "Name", "OptName", "ArgVal", - "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader", - "END", "Function", "FnDeclareLinkage", "FunctionProto", "@5", - "OptSideEffect", "ConstValueRef", "SymbolicValueRef", "ValueRef", + "CastOps", "ShiftOps", "IPredicates", "FPredicates", "SIntType", + "UIntType", "IntType", "FPType", "OptAssign", "OptLinkage", + "OptCallingConv", "OptAlign", "OptCAlign", "SectionString", "OptSection", + "GlobalVarAttributes", "GlobalVarAttribute", "TypesV", "UpRTypesV", + "Types", "PrimType", "UpRTypes", "TypeListI", "ArgTypeListI", "ConstVal", + "ConstExpr", "ConstVector", "GlobalType", "Module", "FunctionList", + "ConstPool", "@1", "@2", "@3", "@4", "AsmBlock", "BigOrLittle", + "TargetDefinition", "LibrariesDefinition", "LibList", "Name", "OptName", + "ArgVal", "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", + "FunctionHeader", "END", "Function", "FnDeclareLinkage", "FunctionProto", + "@5", "OptSideEffect", "ConstValueRef", "SymbolicValueRef", "ValueRef", "ResolvedVal", "BasicBlockList", "BasicBlock", "InstructionList", "BBTerminatorInst", "JumpTable", "Inst", "PHIList", "ValueRefList", "ValueRefListE", "OptTailCall", "InstVal", "IndexList", "OptVolatile", @@ -1843,41 +1850,47 @@ static const unsigned short int yytoknum[] = 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 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, 61, 44, 92, 40, 41, - 91, 120, 93, 60, 62, 123, 125, 42, 99 + 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, + 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, + 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, + 405, 61, 44, 92, 40, 41, 91, 120, 93, 60, + 62, 123, 125, 42, 99 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 139, 140, 140, 141, 141, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 143, 143, 143, 144, 144, - 144, 144, 144, 144, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 146, 146, 146, 147, - 147, 147, 147, 148, 148, 148, 148, 149, 149, 150, - 150, 151, 151, 152, 152, 152, 152, 152, 152, 152, - 152, 153, 153, 153, 153, 153, 153, 153, 153, 154, - 154, 155, 155, 156, 157, 157, 158, 158, 159, 159, - 160, 160, 161, 161, 162, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 164, 164, - 164, 164, 164, 164, 164, 164, 164, 164, 165, 165, - 166, 166, 166, 166, 167, 167, 167, 167, 167, 167, - 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 169, 169, 170, 170, 171, 172, 172, 172, 172, 172, - 173, 173, 173, 174, 173, 175, 173, 176, 173, 177, - 173, 173, 173, 173, 178, 179, 179, 180, 180, 180, - 180, 181, 182, 182, 182, 183, 183, 184, 184, 185, - 186, 186, 187, 187, 187, 187, 188, 189, 189, 190, - 191, 191, 192, 193, 193, 193, 195, 194, 196, 196, - 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, - 197, 198, 198, 199, 199, 200, 201, 201, 202, 203, - 203, 203, 204, 204, 204, 204, 204, 204, 204, 204, - 204, 205, 205, 206, 207, 207, 208, 208, 209, 209, - 210, 210, 211, 211, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 212, 212, - 213, 213, 214, 214, 214, 214, 214, 214, 214, 214 + 0, 165, 166, 166, 167, 167, 168, 168, 168, 168, + 168, 168, 168, 168, 168, 169, 169, 169, 170, 170, + 170, 170, 170, 170, 171, 171, 171, 171, 171, 171, + 171, 171, 171, 171, 171, 171, 172, 172, 172, 173, + 173, 173, 173, 173, 173, 173, 173, 173, 173, 174, + 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, + 174, 174, 174, 175, 175, 175, 175, 176, 176, 176, + 176, 177, 177, 178, 178, 179, 179, 180, 180, 180, + 180, 180, 180, 180, 180, 181, 181, 181, 181, 181, + 181, 181, 181, 182, 182, 183, 183, 184, 185, 185, + 186, 186, 187, 187, 188, 188, 189, 189, 190, 191, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 191, 191, 192, 192, 192, 192, 192, 192, 192, 192, + 192, 192, 193, 193, 194, 194, 194, 194, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 196, 196, 196, 196, 196, 196, + 196, 196, 196, 196, 196, 196, 197, 197, 198, 198, + 199, 200, 200, 200, 200, 200, 201, 201, 201, 202, + 201, 203, 201, 204, 201, 205, 201, 201, 201, 201, + 206, 207, 207, 208, 208, 208, 208, 209, 210, 210, + 210, 211, 211, 212, 212, 213, 214, 214, 215, 215, + 215, 215, 216, 217, 217, 218, 219, 219, 220, 221, + 221, 221, 223, 222, 224, 224, 225, 225, 225, 225, + 225, 225, 225, 225, 225, 225, 225, 226, 226, 227, + 227, 228, 229, 229, 230, 231, 231, 231, 232, 232, + 232, 232, 232, 232, 232, 232, 232, 233, 233, 234, + 235, 235, 236, 236, 237, 237, 238, 238, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 240, 240, 241, 241, + 242, 242, 242, 242, 242, 242, 242, 242 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1888,28 +1901,31 @@ 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, 2, 0, 1, 1, 1, 1, 1, 1, 1, - 0, 0, 1, 1, 1, 1, 1, 1, 2, 0, - 2, 0, 3, 2, 0, 1, 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 4, 5, 5, 3, 2, 2, 1, 3, - 1, 3, 1, 0, 4, 3, 3, 4, 4, 3, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 6, 5, 8, 6, 6, 6, 6, 6, 8, 8, - 3, 1, 1, 1, 1, 2, 2, 4, 2, 1, - 4, 2, 4, 0, 7, 0, 7, 0, 7, 0, - 7, 3, 4, 0, 1, 1, 1, 3, 3, 3, - 3, 3, 3, 1, 0, 1, 1, 1, 0, 2, - 3, 1, 1, 3, 1, 0, 8, 1, 1, 3, - 1, 1, 2, 0, 1, 1, 0, 4, 0, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, - 5, 1, 1, 1, 1, 2, 2, 2, 3, 2, - 0, 1, 2, 2, 3, 9, 9, 8, 13, 1, - 1, 6, 5, 2, 6, 7, 1, 3, 1, 0, - 2, 1, 5, 5, 5, 2, 4, 4, 6, 4, - 4, 4, 4, 6, 6, 2, 7, 1, 2, 0, - 1, 0, 3, 6, 3, 6, 2, 4, 6, 4 + 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, + 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, + 1, 1, 2, 0, 2, 0, 3, 2, 0, 1, + 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 4, 5, 5, 3, + 2, 2, 1, 3, 1, 3, 1, 0, 4, 3, + 3, 4, 4, 3, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 6, 5, 8, 6, 6, 6, + 8, 8, 6, 6, 8, 8, 3, 1, 1, 1, + 1, 2, 2, 4, 2, 1, 4, 2, 4, 0, + 7, 0, 7, 0, 7, 0, 7, 3, 4, 0, + 1, 1, 1, 3, 3, 3, 3, 3, 3, 1, + 0, 1, 1, 1, 0, 2, 3, 1, 1, 3, + 1, 0, 8, 1, 1, 3, 1, 1, 2, 0, + 1, 1, 0, 4, 0, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 3, 1, 5, 1, 1, 1, + 1, 2, 2, 2, 3, 2, 0, 1, 2, 2, + 3, 9, 9, 8, 13, 1, 1, 6, 5, 2, + 6, 7, 1, 3, 1, 0, 2, 1, 5, 5, + 5, 6, 6, 2, 4, 4, 6, 4, 4, 4, + 4, 6, 6, 2, 7, 1, 2, 0, 1, 0, + 3, 6, 3, 6, 2, 4, 6, 4 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -1917,504 +1933,537 @@ static const unsigned char yyr2[] = means the default is an error. */ static const unsigned short int yydefact[] = { - 163, 0, 60, 149, 1, 148, 196, 53, 54, 55, - 56, 57, 58, 59, 0, 61, 220, 145, 146, 220, - 175, 176, 0, 0, 0, 60, 0, 151, 193, 0, - 0, 62, 63, 64, 65, 66, 67, 0, 0, 221, - 217, 52, 190, 191, 192, 216, 0, 0, 0, 0, - 161, 0, 0, 0, 0, 0, 0, 0, 51, 194, - 195, 61, 164, 147, 68, 2, 3, 81, 85, 86, - 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, - 97, 98, 0, 0, 0, 0, 211, 0, 0, 80, - 99, 84, 212, 100, 187, 188, 189, 261, 219, 0, - 0, 0, 0, 174, 162, 152, 150, 142, 143, 0, - 0, 0, 0, 197, 101, 0, 0, 83, 106, 108, - 0, 0, 113, 107, 260, 0, 241, 0, 0, 0, - 0, 61, 229, 230, 6, 7, 8, 9, 10, 11, + 189, 0, 84, 175, 1, 174, 222, 77, 78, 79, + 80, 81, 82, 83, 0, 85, 246, 171, 172, 246, + 201, 202, 0, 0, 0, 84, 0, 177, 219, 0, + 0, 86, 87, 88, 89, 90, 91, 0, 0, 247, + 243, 76, 216, 217, 218, 242, 0, 0, 0, 0, + 187, 0, 0, 0, 0, 0, 0, 0, 75, 220, + 221, 85, 190, 173, 92, 2, 3, 105, 109, 110, + 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, + 121, 122, 0, 0, 0, 0, 237, 0, 0, 104, + 123, 108, 238, 124, 213, 214, 215, 289, 245, 0, + 0, 0, 0, 200, 188, 178, 176, 168, 169, 0, + 0, 0, 0, 223, 125, 0, 0, 107, 130, 132, + 0, 0, 137, 131, 288, 0, 267, 0, 0, 0, + 0, 85, 255, 256, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 22, 23, 0, 0, 0, 0, 24, 25, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 0, 0, - 36, 37, 38, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 218, 61, 233, 0, 257, 169, - 166, 165, 167, 168, 170, 173, 0, 157, 159, 155, - 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 0, 0, 0, 0, 153, 0, 0, 0, 105, - 185, 112, 110, 0, 0, 245, 240, 223, 222, 0, - 0, 42, 46, 41, 45, 40, 44, 39, 43, 47, - 48, 0, 0, 71, 71, 266, 0, 0, 255, 0, + 22, 23, 0, 0, 0, 0, 0, 0, 24, 25, + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + 0, 0, 36, 37, 38, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 244, 85, 259, 0, + 285, 195, 192, 191, 193, 194, 196, 199, 0, 183, + 185, 181, 109, 110, 111, 112, 113, 114, 115, 116, + 117, 118, 119, 0, 0, 0, 0, 179, 0, 0, + 0, 129, 211, 136, 134, 0, 0, 273, 266, 249, + 248, 0, 0, 66, 70, 65, 69, 64, 68, 63, + 67, 71, 72, 0, 0, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 0, 49, 50, 51, 52, + 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, + 0, 95, 95, 294, 0, 0, 283, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 171, 76, 76, 76, 127, - 128, 4, 5, 125, 126, 129, 124, 120, 121, 0, + 0, 0, 0, 197, 100, 100, 100, 151, 152, 4, + 5, 149, 150, 153, 148, 144, 145, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 123, 122, 76, 82, 82, 109, 184, - 178, 181, 182, 0, 0, 102, 200, 201, 202, 207, - 203, 204, 205, 206, 198, 0, 209, 214, 213, 215, - 0, 224, 0, 0, 0, 262, 0, 264, 259, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 172, 0, 158, 160, - 156, 0, 0, 0, 0, 0, 115, 141, 0, 0, - 119, 0, 116, 0, 0, 0, 0, 0, 154, 103, - 104, 177, 179, 0, 74, 111, 199, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 269, 0, 0, 0, - 249, 252, 0, 0, 250, 251, 0, 0, 0, 247, - 246, 0, 267, 0, 0, 0, 78, 76, 259, 0, - 0, 0, 0, 0, 114, 117, 118, 0, 0, 0, - 0, 0, 183, 180, 75, 69, 0, 208, 0, 0, - 239, 71, 72, 71, 236, 258, 0, 0, 0, 0, - 0, 242, 243, 244, 239, 0, 73, 79, 77, 0, - 0, 0, 0, 0, 140, 0, 0, 0, 0, 0, - 0, 186, 0, 0, 0, 238, 0, 0, 263, 265, - 0, 0, 0, 248, 253, 254, 0, 268, 131, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 70, 210, - 0, 0, 0, 237, 234, 0, 256, 0, 137, 0, - 0, 133, 134, 135, 130, 136, 0, 227, 0, 0, - 0, 235, 0, 0, 0, 225, 0, 226, 0, 0, - 132, 138, 139, 0, 0, 0, 0, 0, 0, 232, - 0, 0, 231, 228 + 0, 0, 0, 147, 146, 100, 106, 106, 133, 210, + 204, 207, 208, 0, 0, 126, 226, 227, 228, 233, + 229, 230, 231, 232, 224, 0, 235, 240, 239, 241, + 0, 250, 0, 0, 0, 0, 0, 290, 0, 292, + 287, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 198, 0, + 184, 186, 182, 0, 0, 0, 0, 0, 0, 0, + 139, 167, 0, 0, 143, 0, 140, 0, 0, 0, + 0, 0, 180, 127, 128, 203, 205, 0, 98, 135, + 225, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 297, 0, 0, 0, 277, 280, 0, 0, + 278, 279, 0, 0, 0, 275, 274, 0, 295, 0, + 0, 0, 102, 100, 0, 0, 287, 0, 0, 0, + 0, 0, 138, 141, 142, 0, 0, 0, 0, 0, + 209, 206, 99, 93, 0, 234, 0, 0, 265, 0, + 0, 95, 96, 95, 262, 286, 0, 0, 0, 0, + 0, 268, 269, 270, 265, 0, 97, 103, 101, 0, + 0, 0, 0, 0, 0, 0, 166, 0, 0, 0, + 0, 0, 0, 212, 0, 0, 0, 264, 0, 271, + 272, 0, 291, 293, 0, 0, 0, 276, 281, 282, + 0, 296, 0, 0, 155, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 94, 236, 0, 0, 0, 263, + 260, 0, 284, 0, 0, 0, 163, 0, 0, 157, + 158, 159, 154, 162, 0, 253, 0, 0, 0, 261, + 0, 0, 0, 0, 0, 251, 0, 252, 0, 0, + 160, 161, 156, 164, 165, 0, 0, 0, 0, 0, + 0, 258, 0, 0, 257, 254 }; /* YYDEFGOTO[NTERM-NUM]. */ static const short int yydefgoto[] = { - -1, 86, 273, 288, 289, 290, 291, 292, 211, 212, - 241, 213, 25, 15, 37, 461, 325, 406, 425, 348, - 407, 87, 88, 214, 90, 91, 120, 223, 357, 316, - 358, 109, 1, 2, 3, 295, 268, 266, 267, 63, - 192, 50, 104, 196, 92, 372, 301, 302, 303, 38, - 96, 16, 44, 17, 61, 18, 28, 377, 317, 93, - 319, 434, 19, 40, 41, 184, 509, 98, 248, 465, - 466, 185, 186, 386, 187, 188 + -1, 86, 301, 318, 319, 320, 321, 322, 255, 270, + 213, 214, 243, 215, 25, 15, 37, 503, 357, 442, + 463, 380, 443, 87, 88, 216, 90, 91, 120, 225, + 391, 346, 392, 109, 1, 2, 3, 325, 296, 294, + 295, 63, 194, 50, 104, 198, 92, 406, 331, 332, + 333, 38, 96, 16, 44, 17, 61, 18, 28, 411, + 347, 93, 349, 474, 19, 40, 41, 186, 557, 98, + 276, 507, 508, 187, 188, 422, 189, 190 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -472 +#define YYPACT_NINF -531 static const short int yypact[] = { - -472, 24, 395, 501, -472, -472, -472, -472, -472, -472, - -472, -472, -472, -472, -13, 112, 46, -472, -472, -11, - -472, -472, -18, -41, 45, 51, -1, -472, 40, 106, - 131, -472, -472, -472, -472, -472, -472, 1136, -23, -472, - -472, 81, -472, -472, -472, -472, 30, 33, 49, 61, - -472, 57, 106, 1136, 78, 78, 78, 78, -472, -472, - -472, 112, -472, -472, -472, -472, -472, 62, -472, -472, - -472, -472, -472, -472, -472, -472, -472, -472, -472, -472, - -472, -472, 185, 187, 188, 619, -472, 81, 67, -472, - -472, -71, -472, -472, -472, -472, -472, 1286, -472, 174, - 58, 196, 177, 178, -472, -472, -472, -472, -472, 1177, - 1177, 1177, 1197, -472, -472, 72, 73, -472, -472, -71, - -89, 79, 151, -472, -472, 1177, -472, 147, 1222, 12, - 218, 112, -472, -472, -472, -472, -472, -472, -472, -472, - -472, -472, -472, -472, -472, -472, -472, -472, -472, -472, - -472, -472, 1177, 1177, 1177, 1177, -472, -472, -472, -472, - -472, -472, -472, -472, -472, -472, -472, -472, 1177, 1177, - -472, -472, -472, 1177, 1177, 1177, 1177, 1177, 1177, 1177, - 1177, 1177, 1177, 1177, -472, 112, -472, -55, -472, -472, - -472, -472, -472, -472, -472, -472, -62, -472, -472, -472, - 95, 123, 204, 125, 205, 130, 206, 149, 207, 208, - 210, 181, 209, 214, 488, -472, 1177, 1177, 1177, -472, - 944, -472, 88, 93, 698, -472, -472, 62, -472, 698, - 698, -472, -472, -472, -472, -472, -472, -472, -472, -472, - -472, 698, 1136, 97, 110, -472, 698, 108, 113, 114, - 120, 121, 124, 126, 133, 136, 698, 698, 698, 213, - 139, 1136, 1177, 1177, 227, -472, 140, 140, 140, -472, - -472, -472, -472, -472, -472, -472, -472, -472, -472, 141, - 142, 143, 145, 146, 985, 1197, 639, 243, 148, 154, - 155, 157, 165, -472, -472, 140, -28, -51, -71, -472, - 81, -472, 153, 172, 1005, -472, -472, -472, -472, -472, - -472, -472, -472, -472, 244, 1197, -472, -472, -472, -472, - 180, -472, 182, 698, -7, -472, -6, -472, 183, 698, - 138, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 184, 186, - 189, 1177, 1177, 698, 698, 190, -472, -17, -472, -472, - -472, 1197, 1197, 1197, 1197, 1197, -472, -472, -24, -85, - -472, -80, -472, 1197, 1197, 1197, 1197, 1197, -472, -472, - -472, -472, -472, 1046, 277, -472, -472, 289, -27, 293, - 296, 191, 698, 314, 698, 1177, -472, 194, 698, 195, - -472, -472, 200, 201, -472, -472, 698, 698, 698, -472, - -472, 202, -472, 1177, 298, 324, -472, 140, 183, 203, - 211, 212, 224, 1197, -472, -472, -472, 225, 226, 230, - 295, 232, -472, -472, -472, 275, 233, -472, 698, 698, - 1177, 235, -472, 235, -472, 239, 698, 241, 1177, 1177, - 1177, -472, -472, -472, 1177, 698, -472, -472, -472, 215, - 1197, 1197, 1197, 1197, -472, 1197, 1197, 1197, 1177, 1197, - 329, -472, 310, 242, 223, 239, 240, 278, -472, -472, - 1177, 238, 698, -472, -472, -472, 247, -472, -472, 245, - 250, 246, 255, 254, 256, 257, 259, 262, -472, -472, - 318, 15, 337, -472, -472, 252, -472, 1197, -472, 1197, - 1197, -472, -472, -472, -472, -472, 698, -472, 818, 65, - 371, -472, 265, 267, 268, -472, 272, -472, 818, 698, - -472, -472, -472, 378, 274, 328, 698, 384, 385, -472, - 698, 698, -472, -472 + -531, 114, 234, 65, -531, -531, -531, -531, -531, -531, + -531, -531, -531, -531, 74, 132, 47, -531, -531, -13, + -531, -531, 24, -15, 98, 145, 13, -531, 84, 153, + 175, -531, -531, -531, -531, -531, -531, 1181, -24, -531, + -531, 108, -531, -531, -531, -531, 29, 30, 32, 33, + -531, 26, 153, 1181, 10, 10, 10, 10, -531, -531, + -531, 132, -531, -531, -531, -531, -531, 50, -531, -531, + -531, -531, -531, -531, -531, -531, -531, -531, -531, -531, + -531, -531, 202, 204, 205, 593, -531, 108, 56, -531, + -531, -70, -531, -531, -531, -531, -531, 1353, -531, 187, + 70, 209, 190, 192, -531, -531, -531, -531, -531, 1201, + 1201, 1201, 1242, -531, -531, 62, 63, -531, -531, -70, + -140, 68, 982, -531, -531, 1201, -531, 164, 1262, 0, + 273, 132, -531, -531, -531, -531, -531, -531, -531, -531, + -531, -531, -531, -531, -531, -531, -531, -531, -531, -531, + -531, -531, 216, 516, 1201, 1201, 1201, 1201, -531, -531, + -531, -531, -531, -531, -531, -531, -531, -531, -531, -531, + 1201, 1201, -531, -531, -531, 1201, 1201, 1201, 1201, 1201, + 1201, 1201, 1201, 1201, 1201, 1201, -531, 132, -531, 31, + -531, -531, -531, -531, -531, -531, -531, -531, -72, -531, + -531, -531, 133, 159, 220, 163, 221, 165, 222, 167, + 223, 225, 228, 172, 224, 229, 433, -531, 1201, 1201, + 1201, -531, 1023, -531, 85, 83, 684, -531, -531, 50, + -531, 684, 684, -531, -531, -531, -531, -531, -531, -531, + -531, -531, -531, 684, 1181, -531, -531, -531, -531, -531, + -531, -531, -531, -531, -531, 1201, -531, -531, -531, -531, + -531, -531, -531, -531, -531, -531, -531, -531, -531, -531, + 1201, 88, 89, -531, 684, 86, 91, 92, 93, 95, + 99, 103, 104, 106, 684, 684, 684, 226, 109, 1181, + 1201, 1201, 236, -531, 116, 116, 116, -531, -531, -531, + -531, -531, -531, -531, -531, -531, -531, 117, 118, 120, + 143, 144, 148, 154, 927, 1242, 648, 246, 155, 156, + 157, 170, 171, -531, -531, 116, -59, -39, -70, -531, + 108, -531, 147, 179, 1084, -531, -531, -531, -531, -531, + -531, -531, -531, -531, 272, 1242, -531, -531, -531, -531, + 186, -531, 188, 684, 684, 684, -1, -531, 9, -531, + 189, 684, 183, 1201, 1201, 1201, 1201, 1201, 1201, 1201, + 193, 194, 195, 1201, 1201, 684, 684, 196, -531, -19, + -531, -531, -531, 216, 516, 1242, 1242, 1242, 1242, 1242, + -531, -531, -30, -60, -531, -83, -531, 1242, 1242, 1242, + 1242, 1242, -531, -531, -531, -531, -531, 1140, 308, -531, + -531, 320, -47, 328, 329, 198, 206, 207, 684, 352, + 684, 1201, -531, 208, 684, 212, -531, -531, 213, 215, + -531, -531, 684, 684, 684, -531, -531, 214, -531, 1201, + 345, 367, -531, 116, 230, 231, 189, 233, 235, 237, + 238, 1242, -531, -531, -531, 239, 240, 241, 336, 242, + -531, -531, -531, 316, 254, -531, 684, 684, 1201, 684, + 684, 258, -531, 258, -531, 259, 684, 260, 1201, 1201, + 1201, -531, -531, -531, 1201, 684, -531, -531, -531, 1242, + 1242, 219, 1242, 1242, 1242, 1242, -531, 1242, 1242, 1242, + 1201, 1242, 372, -531, 353, 261, 232, 259, 262, -531, + -531, 321, -531, -531, 1201, 256, 684, -531, -531, -531, + 263, -531, 264, 267, -531, 268, 266, 274, 275, 270, + 277, 278, 279, 280, -531, -531, 360, 20, 350, -531, + -531, 257, -531, 1242, 1242, 1242, -531, 1242, 1242, -531, + -531, -531, -531, -531, 684, -531, 830, 35, 415, -531, + 282, 285, 291, 293, 297, -531, 304, -531, 830, 684, + -531, -531, -531, -531, -531, 437, 309, 384, 684, 441, + 443, -531, 684, 684, -531, -531 }; /* YYPGOTO[NTERM-NUM]. */ static const short int yypgoto[] = { - -472, -472, -472, 311, 312, 313, 315, 317, -129, -127, - -471, -472, 370, 392, -120, -472, -237, 50, -472, -253, - -472, -49, -472, -37, -472, -67, 301, -472, -110, 220, - -263, 64, -472, -472, -472, -472, -472, -472, -472, 373, - -472, -472, -472, -472, 2, -472, 70, -472, -472, 374, - -472, -472, -472, -472, -472, 441, -472, -472, -418, 34, - 31, -115, -472, 426, -472, -472, -472, -472, -472, 63, - 3, -472, -472, 38, -472, -472 + -531, -531, -531, 368, 369, 370, 371, 373, 90, 94, + -129, -128, -530, -531, 428, 449, -112, -531, -268, 67, + -531, -231, -531, -50, -531, -37, -531, -65, 354, -531, + -94, 265, -290, 46, -531, -531, -531, -531, -531, -531, + -531, 427, -531, -531, -531, -531, 3, -531, 73, -531, + -531, 421, -531, -531, -531, -531, -531, 480, -531, -531, + -515, -203, 69, -117, -531, 465, -531, -531, -531, -531, + -531, 64, 2, -531, -531, 42, -531, -531 }; /* 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 -145 +#define YYTABLE_NINF -171 static const short int yytable[] = { - 89, 239, 215, 240, 106, 26, 94, 327, 382, 384, - 225, 242, 39, 228, 349, 350, 89, 404, 119, 42, - 508, 229, 359, 361, 4, 231, 232, 233, 234, 235, - 236, 237, 238, 230, 46, 47, 48, 218, 518, 245, - 405, 413, 368, 26, 262, 263, 413, 219, 29, 415, - 383, 383, 378, 49, 249, 119, 416, -82, 250, 251, - 252, 253, 254, 255, 264, 261, 123, 259, 260, 39, - 265, 53, 197, 198, 199, 231, 232, 233, 234, 235, - 236, 237, 238, 370, 51, 59, 123, 60, 224, 121, - 516, 224, 7, 8, 9, 10, 54, 12, 55, 413, - 524, 56, 413, 20, 369, 21, 52, 427, 414, 123, - 107, 108, 95, 190, 191, 243, 244, 224, 246, 110, - 111, 112, 269, 270, 58, 43, -42, -42, -41, -41, - 62, 247, 224, -40, -40, 64, 224, 224, 224, 224, - 224, 224, 256, 257, 258, 224, 224, 507, 345, 296, - 297, 298, -39, -39, 448, 99, 65, 66, 100, 117, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 20, 101, 21, 30, 31, 32, 33, - 34, 35, 36, 300, 271, 272, 102, 103, 221, 114, - -83, 115, 116, 323, 468, 122, 469, 517, 189, 81, - 193, 194, 195, 216, 217, 89, 226, 220, -46, -45, - -44, -43, 343, 274, 304, -49, 389, -50, 391, 392, - 393, 275, 305, 324, 89, 344, 224, 400, 231, 232, - 233, 234, 235, 236, 237, 238, 326, 298, 329, 330, - 331, 408, 409, 410, 411, 412, 332, 333, 294, 341, - 334, 346, 335, 417, 418, 419, 420, 421, 318, 336, - 320, 321, 337, 318, 318, 342, 347, 362, 388, 351, - 352, 353, 322, 354, 355, 318, 363, 328, 82, 373, - 318, 83, 364, 365, 84, 366, 85, 338, 339, 340, - 318, 318, 318, 367, 224, 390, 224, 224, 224, 394, - 395, 374, 371, 454, 399, 224, 379, 376, 380, 385, - 396, 404, 397, 426, 428, 398, 403, 429, 432, 430, - 436, 438, 446, 473, 474, 475, 439, 440, 447, 450, - 444, 458, 460, 488, 489, 383, 300, 451, 452, 506, - 479, 480, 481, 482, 478, 483, 484, 485, 224, 487, - 453, 455, 456, 491, 381, 493, 457, 318, 459, 462, - 387, 467, 239, 318, 240, 470, 445, 472, 490, 492, - 494, 497, 499, 510, 401, 402, 496, 318, 318, 498, - 239, 500, 240, 501, 511, 502, 503, 512, 504, 513, - 514, 505, 519, 224, 520, -144, 521, 522, 523, 526, - 527, 224, 224, 224, 528, 530, 531, 224, 179, 180, - 181, 97, 182, 431, 183, 433, 318, 57, 318, 437, - 5, 486, 318, 222, 424, 105, 6, 441, 442, 443, - 318, 318, 318, 224, 293, 113, 7, 8, 9, 10, - 11, 12, 13, 423, 27, 45, 449, 476, 435, 0, - 0, 0, 0, 0, 0, 0, 0, 14, 0, 463, - 464, 0, 318, 318, 0, 0, 0, 471, 0, 0, - 318, 0, 0, 0, 0, 0, 477, 0, 0, 318, + 89, 241, 242, 106, 359, 94, 26, 556, 227, 231, + 39, 230, 220, 324, 418, 440, 89, 42, 217, 244, + 119, 232, 221, 348, 420, 393, 395, 568, 348, 348, + 233, 234, 235, 236, 237, 238, 239, 240, 441, 273, + 348, 566, 107, 108, 26, 233, 234, 235, 236, 237, + 238, 239, 240, 576, 277, 412, 419, 119, 278, 279, + 280, 281, 282, 283, 381, 382, 419, 287, 288, 451, + 39, 348, 199, 200, 201, 289, 46, 47, 48, 454, + 292, 348, 348, 348, -106, -76, 293, 20, 226, 21, + 121, 226, 451, 123, 402, 49, 6, -76, -76, 403, + 453, 110, 111, 112, 123, 451, -76, -76, -76, -76, + -76, -76, -76, 465, 4, -76, 22, 271, 272, 226, + 274, 404, 451, 23, 123, 192, 193, 24, 452, 59, + 20, 60, 21, 275, 226, 29, 51, 95, 226, 226, + 226, 226, 226, 226, 284, 285, 286, 226, 226, 43, + 348, 348, 348, 326, 327, 328, 290, 291, 348, 52, + 297, 298, -66, -66, 58, 53, -65, -65, -64, -64, + -63, -63, 348, 348, 377, 299, 300, 62, 555, 64, + 99, 100, 103, 101, 102, 330, 7, 8, 9, 10, + 54, 12, 55, 567, 353, 56, 30, 31, 32, 33, + 34, 35, 36, 512, -107, 513, 114, 89, 115, 116, + 122, 191, 488, 195, 196, 348, 197, 348, 354, 218, + 219, 348, 222, 228, -70, -69, -68, -67, 302, 348, + 348, 348, -73, 355, -170, -74, 303, 334, 335, 375, + 356, 358, 361, 362, 363, 364, 425, 365, 427, 428, + 429, 366, 89, 376, 226, 367, 368, 436, 369, 5, + 378, 374, 373, 348, 348, 6, 348, 348, 379, 328, + 396, 383, 384, 348, 385, 7, 8, 9, 10, 11, + 12, 13, 348, 233, 234, 235, 236, 237, 238, 239, + 240, 446, 447, 448, 449, 450, 14, 386, 387, 407, + 350, 351, 388, 455, 456, 457, 458, 459, 389, 397, + 398, 399, 352, 348, 245, 246, 247, 248, 249, 250, + 251, 252, 253, 254, 400, 401, 226, 426, 226, 226, + 226, 430, 431, 405, 408, 410, 435, 226, 413, 424, + 414, 421, 440, 360, 464, 432, 433, 434, 439, 466, + 467, 348, 468, 370, 371, 372, 472, 496, 469, 470, + 476, 517, 518, 519, 478, 479, 348, 480, 484, 486, + 330, 487, 500, 502, 524, 348, 534, 535, 419, 348, + 348, 554, 489, 490, 226, 492, 558, 493, 537, 494, + 495, 497, 498, 499, 501, 522, 523, 539, 525, 526, + 527, 528, 485, 529, 530, 531, 504, 533, 241, 242, + 511, 514, 516, 536, 540, 559, 543, 538, 542, 544, + 545, 546, 415, 416, 417, 549, 547, 548, 241, 242, + 423, 226, 550, 551, 552, 553, 569, 570, 65, 66, + 571, 226, 226, 226, 437, 438, 572, 226, 573, 560, + 561, 562, 574, 563, 564, 20, 575, 21, 578, 304, + 580, 579, 582, 532, 583, 181, 182, 183, 184, 97, + 185, 305, 306, 444, 57, 462, 224, 226, 445, 105, + 461, 323, 113, 27, 45, 475, 520, 471, 491, 473, + 0, 0, 0, 477, 0, 0, 0, 0, 0, 0, + 0, 481, 482, 483, 0, 0, 0, 0, 0, 0, + 0, 134, 135, 136, 137, 138, 139, 140, 141, 142, + 143, 144, 145, 146, 147, 148, 149, 150, 151, 307, + 308, 0, 0, 0, 0, 505, 506, 0, 509, 510, + 0, 0, 0, 0, 0, 515, 0, 0, 0, 0, + 0, 0, 0, 0, 521, 0, 0, 0, 0, 0, + 309, 158, 159, 160, 161, 162, 163, 164, 165, 166, + 167, 168, 169, 0, 310, 172, 173, 174, 0, 311, + 312, 313, 0, 0, 0, 541, 0, 0, 0, 314, + 0, 0, 315, 0, 316, 0, 0, 317, 65, 66, + 0, 117, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 20, 0, 21, 0, 0, + 0, 0, 0, 565, 256, 257, 258, 259, 260, 261, + 262, 263, 264, 265, 266, 267, 268, 269, 577, 0, + 0, 81, 0, 0, 0, 0, 0, 581, 0, 0, + 0, 584, 585, 65, 66, 0, 117, 202, 203, 204, + 205, 206, 207, 208, 209, 210, 211, 212, 79, 80, + 20, 0, 21, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 336, 337, 65, + 66, 338, 0, 0, 0, 0, 81, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 20, 0, 21, 0, + 339, 340, 341, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 342, 343, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 65, 66, 0, 0, 0, 0, 0, - 0, 0, 0, 495, 0, 0, 318, 0, 0, 0, - 20, 0, 21, 0, 276, 0, 0, 0, 0, 0, - 0, -52, 0, 20, 0, 21, 277, 278, 0, 0, - 0, 0, 6, -52, -52, 0, 0, 515, 0, 0, - 318, 0, -52, -52, -52, -52, -52, -52, -52, 0, - 525, -52, 22, 318, 0, 0, 0, 529, 0, 23, - 318, 532, 533, 24, 318, 318, 134, 135, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 151, 0, 0, 0, 0, 0, 279, - 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, - 166, 167, 0, 280, 170, 171, 172, 0, 281, 282, - 283, 0, 0, 0, 0, 0, 0, 0, 284, 0, - 0, 285, 0, 286, 65, 66, 287, 117, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 20, 0, 21, 65, 66, 0, 117, 200, 201, - 202, 203, 204, 205, 206, 207, 208, 209, 210, 79, - 80, 20, 0, 21, 0, 0, 0, 81, 0, 0, + 0, 0, 0, 0, 0, 344, 82, 0, 0, 83, + 0, 0, 84, 0, 85, 118, 0, 0, 0, 0, + 0, 0, 134, 135, 136, 137, 138, 139, 140, 141, + 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, + 307, 308, 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, 81, 0, 0, + 0, 82, 0, 0, 83, 0, 0, 84, 0, 85, + 394, 309, 158, 159, 160, 161, 162, 163, 164, 165, + 166, 167, 168, 169, 0, 310, 172, 173, 174, 0, + 311, 312, 313, 336, 337, 0, 0, 338, 0, 0, + 0, 0, 0, 345, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 339, 340, 341, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 342, 343, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 306, 307, 65, 66, 308, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 20, 0, 21, 0, 309, 310, 311, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 312, 313, 0, 0, - 0, 0, 0, 0, 0, 0, 82, 0, 0, 83, - 0, 0, 84, 0, 85, 118, 0, 0, 0, 314, - 0, 0, 0, 0, 0, 0, 82, 0, 0, 83, - 0, 0, 84, 0, 85, 360, 134, 135, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 151, 0, 0, 0, 0, 0, 279, - 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, - 166, 167, 0, 280, 170, 171, 172, 0, 281, 282, - 283, 306, 307, 0, 0, 308, 0, 0, 0, 0, - 0, 315, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 309, 310, 311, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 312, 313, 0, 0, + 0, 344, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 134, 135, + 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, + 146, 147, 148, 149, 150, 151, 307, 308, 0, 0, + 0, 0, 65, 66, 0, 117, 202, 203, 204, 205, + 206, 207, 208, 209, 210, 211, 212, 79, 80, 20, + 0, 21, 0, 0, 0, 0, 0, 309, 158, 159, + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, + 0, 310, 172, 173, 174, 81, 311, 312, 313, 0, + 0, 0, 0, 0, 0, 0, 0, 65, 66, 345, + 117, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 77, 78, 79, 80, 20, 0, 21, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, + 0, 0, 0, 0, 0, 0, 0, 0, 65, 66, + 81, 117, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 20, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 314, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 134, 135, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 151, 0, 0, 0, 0, 0, 279, - 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, - 166, 167, 0, 280, 170, 171, 172, 0, 281, 282, - 283, 0, 0, 0, 0, 0, 0, 0, 0, 65, - 66, 315, 117, 68, 69, 70, 71, 72, 73, 74, + 329, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 81, 0, 0, 0, 0, 0, 0, 0, 0, + 82, 0, 0, 83, 0, 390, 84, 0, 85, 65, + 66, 0, 117, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 20, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 299, 0, 0, 0, 0, 0, 0, 0, 0, - 65, 66, 81, 117, 200, 201, 202, 203, 204, 205, - 206, 207, 208, 209, 210, 79, 80, 20, 0, 21, - 65, 66, 0, 117, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 77, 78, 79, 80, 20, 0, 21, - 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, - 0, 0, 375, 0, 0, 0, 0, 0, 0, 0, - 0, 65, 66, 81, 117, 68, 69, 70, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 20, 0, - 21, 82, 0, 0, 83, 0, 0, 84, 0, 85, - 0, 0, 0, 422, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 82, 0, 0, 83, 0, 356, 84, 0, - 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 82, 0, 0, 83, 0, 0, 84, 0, - 85, 65, 66, 0, 67, 68, 69, 70, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 20, 0, - 21, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 82, 0, 0, 83, 0, 0, 84, - 0, 85, 65, 66, 81, 117, 68, 69, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 20, - 0, 21, 65, 66, 0, 117, 200, 201, 202, 203, - 204, 205, 206, 207, 208, 209, 210, 79, 80, 20, - 0, 21, 0, 0, 0, 81, 0, 65, 66, 0, - 227, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 80, 20, 81, 21, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 82, 0, 0, 83, 0, 0, 84, - 81, 85, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 409, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 81, 0, 0, 82, 0, 0, 83, 0, + 0, 84, 0, 85, 0, 65, 66, 0, 117, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 20, 0, 21, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 82, 460, 0, 83, + 0, 0, 84, 0, 85, 0, 65, 66, 81, 67, + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, + 78, 79, 80, 20, 0, 21, 65, 66, 0, 117, + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, + 78, 79, 80, 20, 0, 21, 0, 0, 0, 81, + 0, 0, 0, 0, 0, 0, 0, 82, 0, 0, + 83, 0, 0, 84, 0, 85, 0, 65, 66, 81, + 117, 202, 203, 204, 205, 206, 207, 208, 209, 210, + 211, 212, 79, 80, 20, 0, 21, 65, 66, 0, + 229, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 77, 78, 79, 80, 20, 0, 21, 0, 0, 0, + 81, 0, 0, 82, 0, 0, 83, 0, 0, 84, + 0, 85, 0, 0, 0, 0, 0, 0, 0, 0, + 81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 82, 0, 0, 83, 0, 0, 84, 0, 85, 0, 0, 0, 0, 0, 0, 0, - 0, 124, 0, 0, 82, 0, 0, 83, 0, 0, - 84, 0, 85, 0, 0, 125, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 126, 127, 0, 0, 82, - 0, 0, 83, 0, 0, 84, 0, 85, 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, 0, 0, 155, 156, 157, - 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178 + 0, 0, 0, 0, 82, 0, 0, 83, 0, 0, + 84, 0, 85, 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, 124, 0, + 0, 0, 0, 0, 0, 82, 0, 0, 83, 0, + 0, 84, 125, 85, 0, 0, 0, 0, 0, 0, + 0, 0, 126, 127, 0, 82, 0, 0, 83, 0, + 0, 84, 0, 85, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 154, 155, 156, 0, 0, + 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, + 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, + 177, 178, 179, 180 }; static const short int yycheck[] = { - 37, 130, 112, 130, 53, 3, 29, 244, 15, 15, - 125, 131, 23, 128, 267, 268, 53, 34, 85, 30, - 491, 9, 285, 286, 0, 10, 11, 12, 13, 14, - 15, 16, 17, 21, 52, 53, 54, 126, 509, 154, - 57, 126, 295, 41, 99, 100, 126, 136, 61, 134, - 57, 57, 315, 71, 169, 122, 136, 128, 173, 174, - 175, 176, 177, 178, 126, 185, 137, 182, 183, 23, - 132, 20, 109, 110, 111, 10, 11, 12, 13, 14, - 15, 16, 17, 134, 125, 45, 137, 47, 125, 87, - 508, 128, 41, 42, 43, 44, 45, 46, 47, 126, - 518, 50, 126, 22, 132, 24, 61, 134, 132, 137, - 32, 33, 135, 55, 56, 152, 153, 154, 155, 55, - 56, 57, 27, 28, 125, 136, 3, 4, 3, 4, - 24, 168, 169, 3, 4, 4, 173, 174, 175, 176, - 177, 178, 179, 180, 181, 182, 183, 132, 263, 216, - 217, 218, 3, 4, 407, 125, 5, 6, 125, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 125, 24, 64, 65, 66, 67, - 68, 69, 70, 220, 3, 4, 125, 130, 37, 4, - 128, 4, 4, 242, 431, 128, 433, 132, 24, 48, - 4, 24, 24, 131, 131, 242, 59, 128, 4, 4, - 4, 4, 261, 4, 126, 7, 331, 7, 333, 334, - 335, 7, 129, 126, 261, 262, 263, 342, 10, 11, - 12, 13, 14, 15, 16, 17, 126, 304, 130, 126, - 126, 351, 352, 353, 354, 355, 126, 126, 214, 36, - 126, 24, 126, 363, 364, 365, 366, 367, 224, 126, - 229, 230, 126, 229, 230, 126, 126, 24, 130, 128, - 128, 128, 241, 128, 128, 241, 128, 246, 127, 126, - 246, 130, 128, 128, 133, 128, 135, 256, 257, 258, - 256, 257, 258, 128, 331, 332, 333, 334, 335, 336, - 337, 129, 300, 413, 341, 342, 126, 63, 126, 126, - 126, 34, 126, 24, 21, 126, 126, 21, 4, 128, - 126, 126, 24, 438, 439, 440, 126, 126, 4, 126, - 128, 36, 57, 4, 24, 57, 373, 126, 126, 21, - 450, 451, 452, 453, 129, 455, 456, 457, 385, 459, - 126, 126, 126, 130, 323, 470, 126, 323, 126, 126, - 329, 126, 491, 329, 491, 126, 403, 126, 126, 129, - 132, 126, 126, 36, 343, 344, 129, 343, 344, 129, - 509, 126, 509, 129, 132, 129, 129, 497, 129, 499, - 500, 129, 21, 430, 129, 0, 129, 129, 126, 21, - 126, 438, 439, 440, 76, 21, 21, 444, 97, 97, - 97, 41, 97, 382, 97, 384, 382, 25, 384, 388, - 25, 458, 388, 122, 374, 52, 31, 396, 397, 398, - 396, 397, 398, 470, 214, 61, 41, 42, 43, 44, - 45, 46, 47, 373, 3, 19, 408, 444, 385, -1, - -1, -1, -1, -1, -1, -1, -1, 62, -1, 428, - 429, -1, 428, 429, -1, -1, -1, 436, -1, -1, - 436, -1, -1, -1, -1, -1, 445, -1, -1, 445, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 5, 6, -1, -1, -1, -1, -1, - -1, -1, -1, 472, -1, -1, 472, -1, -1, -1, - 22, -1, 24, -1, 26, -1, -1, -1, -1, -1, - -1, 20, -1, 22, -1, 24, 38, 39, -1, -1, - -1, -1, 31, 32, 33, -1, -1, 506, -1, -1, - 506, -1, 41, 42, 43, 44, 45, 46, 47, -1, - 519, 50, 51, 519, -1, -1, -1, 526, -1, 58, - 526, 530, 531, 62, 530, 531, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, - 92, 93, 94, 95, -1, -1, -1, -1, -1, 101, - 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, - 112, 113, -1, 115, 116, 117, 118, -1, 120, 121, - 122, -1, -1, -1, -1, -1, -1, -1, 130, -1, - -1, 133, -1, 135, 5, 6, 138, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, -1, 24, 5, 6, -1, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, -1, 24, -1, -1, -1, 48, -1, -1, + 37, 130, 130, 53, 272, 29, 3, 537, 125, 9, + 23, 128, 152, 216, 15, 34, 53, 30, 112, 131, + 85, 21, 162, 226, 15, 315, 316, 557, 231, 232, + 10, 11, 12, 13, 14, 15, 16, 17, 57, 156, + 243, 556, 32, 33, 41, 10, 11, 12, 13, 14, + 15, 16, 17, 568, 171, 345, 57, 122, 175, 176, + 177, 178, 179, 180, 295, 296, 57, 184, 185, 152, + 23, 274, 109, 110, 111, 187, 52, 53, 54, 162, + 152, 284, 285, 286, 154, 20, 158, 22, 125, 24, + 87, 128, 152, 163, 325, 71, 31, 32, 33, 158, + 160, 55, 56, 57, 163, 152, 41, 42, 43, 44, + 45, 46, 47, 160, 0, 50, 51, 154, 155, 156, + 157, 160, 152, 58, 163, 55, 56, 62, 158, 45, + 22, 47, 24, 170, 171, 61, 151, 161, 175, 176, + 177, 178, 179, 180, 181, 182, 183, 184, 185, 162, + 353, 354, 355, 218, 219, 220, 125, 126, 361, 61, + 27, 28, 3, 4, 151, 20, 3, 4, 3, 4, + 3, 4, 375, 376, 291, 3, 4, 24, 158, 4, + 151, 151, 156, 151, 151, 222, 41, 42, 43, 44, + 45, 46, 47, 158, 244, 50, 64, 65, 66, 67, + 68, 69, 70, 471, 154, 473, 4, 244, 4, 4, + 154, 24, 443, 4, 24, 418, 24, 420, 255, 157, + 157, 424, 154, 59, 4, 4, 4, 4, 4, 432, + 433, 434, 7, 270, 0, 7, 7, 152, 155, 289, + 152, 152, 156, 152, 152, 152, 363, 152, 365, 366, + 367, 152, 289, 290, 291, 152, 152, 374, 152, 25, + 24, 152, 36, 466, 467, 31, 469, 470, 152, 334, + 24, 154, 154, 476, 154, 41, 42, 43, 44, 45, + 46, 47, 485, 10, 11, 12, 13, 14, 15, 16, + 17, 385, 386, 387, 388, 389, 62, 154, 154, 152, + 231, 232, 154, 397, 398, 399, 400, 401, 154, 154, + 154, 154, 243, 516, 98, 99, 100, 101, 102, 103, + 104, 105, 106, 107, 154, 154, 363, 364, 365, 366, + 367, 368, 369, 330, 155, 63, 373, 374, 152, 156, + 152, 152, 34, 274, 24, 152, 152, 152, 152, 21, + 21, 554, 154, 284, 285, 286, 4, 451, 152, 152, + 152, 478, 479, 480, 152, 152, 569, 152, 154, 24, + 407, 4, 36, 57, 155, 578, 4, 24, 57, 582, + 583, 21, 152, 152, 421, 152, 36, 152, 156, 152, + 152, 152, 152, 152, 152, 489, 490, 514, 492, 493, + 494, 495, 439, 497, 498, 499, 152, 501, 537, 537, + 152, 152, 152, 152, 158, 158, 152, 155, 155, 152, + 152, 155, 353, 354, 355, 155, 152, 152, 557, 557, + 361, 468, 155, 155, 155, 155, 21, 155, 5, 6, + 155, 478, 479, 480, 375, 376, 155, 484, 155, 543, + 544, 545, 155, 547, 548, 22, 152, 24, 21, 26, + 76, 152, 21, 500, 21, 97, 97, 97, 97, 41, + 97, 38, 39, 383, 25, 408, 122, 514, 384, 52, + 407, 216, 61, 3, 19, 421, 484, 418, 446, 420, + -1, -1, -1, 424, -1, -1, -1, -1, -1, -1, + -1, 432, 433, 434, -1, -1, -1, -1, -1, -1, + -1, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, -1, -1, -1, -1, 466, 467, -1, 469, 470, + -1, -1, -1, -1, -1, 476, -1, -1, -1, -1, + -1, -1, -1, -1, 485, -1, -1, -1, -1, -1, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 137, 138, 139, -1, 141, 142, 143, 144, -1, 146, + 147, 148, -1, -1, -1, 516, -1, -1, -1, 156, + -1, -1, 159, -1, 161, -1, -1, 164, 5, 6, + -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, -1, 24, -1, -1, + -1, -1, -1, 554, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 569, -1, + -1, 48, -1, -1, -1, -1, -1, 578, -1, -1, + -1, 582, 583, 5, 6, -1, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, -1, 24, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 3, 4, 5, + 6, 7, -1, -1, -1, -1, 48, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 22, -1, 24, -1, + 26, 27, 28, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 38, 39, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 48, -1, -1, + -1, -1, -1, -1, -1, 61, 153, -1, -1, 156, + -1, -1, 159, -1, 161, 162, -1, -1, -1, -1, + -1, -1, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 3, 4, 5, 6, 7, -1, -1, -1, -1, + -1, 153, -1, -1, 156, -1, -1, 159, -1, 161, + 162, 127, 128, 129, 130, 131, 132, 133, 134, 135, + 136, 137, 138, 139, -1, 141, 142, 143, 144, -1, + 146, 147, 148, 3, 4, -1, -1, 7, -1, -1, + -1, -1, -1, 159, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 26, 27, 28, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 38, 39, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 22, -1, 24, -1, 26, 27, 28, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 38, 39, -1, -1, - -1, -1, -1, -1, -1, -1, 127, -1, -1, 130, - -1, -1, 133, -1, 135, 136, -1, -1, -1, 61, - -1, -1, -1, -1, -1, -1, 127, -1, -1, 130, - -1, -1, 133, -1, 135, 136, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, - 92, 93, 94, 95, -1, -1, -1, -1, -1, 101, - 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, - 112, 113, -1, 115, 116, 117, 118, -1, 120, 121, - 122, 3, 4, -1, -1, 7, -1, -1, -1, -1, - -1, 133, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 26, 27, 28, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 38, 39, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 61, + -1, 61, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + 90, 91, 92, 93, 94, 95, 96, 97, -1, -1, + -1, -1, 5, 6, -1, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, + -1, 24, -1, -1, -1, -1, -1, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + -1, 141, 142, 143, 144, 48, 146, 147, 148, -1, + -1, -1, -1, -1, -1, -1, -1, 5, 6, 159, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, -1, 24, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 37, + -1, -1, -1, -1, -1, -1, -1, -1, 5, 6, + 48, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, -1, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, - 92, 93, 94, 95, -1, -1, -1, -1, -1, 101, - 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, - 112, 113, -1, 115, 116, 117, 118, -1, 120, 121, - 122, -1, -1, -1, -1, -1, -1, -1, -1, 5, - 6, 133, 8, 9, 10, 11, 12, 13, 14, 15, + 37, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 48, -1, -1, -1, -1, -1, -1, -1, -1, + 153, -1, -1, 156, -1, 158, 159, -1, 161, 5, + 6, -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, -1, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 37, -1, -1, -1, -1, -1, -1, -1, -1, - 5, 6, 48, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, -1, 24, - 5, 6, -1, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, -1, 24, - -1, -1, -1, 48, -1, -1, -1, -1, -1, -1, - -1, -1, 37, -1, -1, -1, -1, -1, -1, -1, - -1, 5, 6, 48, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, -1, - 24, 127, -1, -1, 130, -1, -1, 133, -1, 135, - -1, -1, -1, 37, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 48, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 127, -1, -1, 130, -1, 132, 133, -1, - 135, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 127, -1, -1, 130, -1, -1, 133, -1, - 135, 5, 6, -1, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, -1, - 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 127, -1, -1, 130, -1, -1, 133, - -1, 135, 5, 6, 48, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - -1, 24, 5, 6, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - -1, 24, -1, -1, -1, 48, -1, 5, 6, -1, + -1, -1, 48, -1, -1, 153, -1, -1, 156, -1, + -1, 159, -1, 161, -1, 5, 6, -1, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, -1, 24, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 153, 37, -1, 156, + -1, -1, 159, -1, 161, -1, 5, 6, 48, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, -1, 24, 5, 6, -1, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, -1, 24, -1, -1, -1, 48, + -1, -1, -1, -1, -1, -1, -1, 153, -1, -1, + 156, -1, -1, 159, -1, 161, -1, 5, 6, 48, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 48, 24, -1, -1, -1, + 18, 19, 20, 21, 22, -1, 24, 5, 6, -1, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, -1, 24, -1, -1, -1, + 48, -1, -1, 153, -1, -1, 156, -1, -1, 159, + -1, 161, -1, -1, -1, -1, -1, -1, -1, -1, + 48, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 127, -1, -1, 130, -1, -1, 133, - 48, 135, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 153, -1, -1, 156, -1, -1, + 159, -1, 161, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 153, -1, -1, 156, -1, -1, + 159, -1, 161, -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, 35, -1, + -1, -1, -1, -1, -1, 153, -1, -1, 156, -1, + -1, 159, 49, 161, -1, -1, -1, -1, -1, -1, + -1, -1, 59, 60, -1, 153, -1, -1, 156, -1, + -1, 159, -1, 161, -1, 72, 73, 74, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 127, -1, -1, 130, -1, -1, - 133, -1, 135, -1, -1, -1, -1, -1, -1, -1, - -1, 35, -1, -1, 127, -1, -1, 130, -1, -1, - 133, -1, 135, -1, -1, 49, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 59, 60, -1, -1, 127, - -1, -1, 130, -1, -1, 133, -1, 135, 72, 73, - 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, - 94, 95, 96, 97, 98, -1, -1, 101, 102, 103, - 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, - 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, - 124 + -1, -1, -1, -1, -1, 122, 123, 124, -1, -1, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, + 147, 148, 149, 150 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const unsigned char yystos[] = { - 0, 171, 172, 173, 0, 25, 31, 41, 42, 43, - 44, 45, 46, 47, 62, 152, 190, 192, 194, 201, - 22, 24, 51, 58, 62, 151, 183, 194, 195, 61, - 64, 65, 66, 67, 68, 69, 70, 153, 188, 23, - 202, 203, 30, 136, 191, 202, 52, 53, 54, 71, - 180, 125, 61, 20, 45, 47, 50, 152, 125, 45, - 47, 193, 24, 178, 4, 5, 6, 8, 9, 10, + 0, 199, 200, 201, 0, 25, 31, 41, 42, 43, + 44, 45, 46, 47, 62, 180, 218, 220, 222, 229, + 22, 24, 51, 58, 62, 179, 211, 222, 223, 61, + 64, 65, 66, 67, 68, 69, 70, 181, 216, 23, + 230, 231, 30, 162, 219, 230, 52, 53, 54, 71, + 208, 151, 61, 20, 45, 47, 50, 180, 151, 45, + 47, 221, 24, 206, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 48, 127, 130, 133, 135, 140, 160, 161, 162, - 163, 164, 183, 198, 29, 135, 189, 151, 206, 125, - 125, 125, 125, 130, 181, 178, 160, 32, 33, 170, - 170, 170, 170, 188, 4, 4, 4, 8, 136, 164, - 165, 183, 128, 137, 35, 49, 59, 60, 72, 73, + 21, 48, 153, 156, 159, 161, 166, 188, 189, 190, + 191, 192, 211, 226, 29, 161, 217, 179, 234, 151, + 151, 151, 151, 156, 209, 206, 188, 32, 33, 198, + 198, 198, 198, 216, 4, 4, 4, 8, 162, 192, + 193, 211, 154, 163, 35, 49, 59, 60, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, - 94, 95, 96, 97, 98, 101, 102, 103, 104, 105, - 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, - 116, 117, 118, 119, 120, 121, 122, 123, 124, 142, - 143, 144, 145, 146, 204, 210, 211, 213, 214, 24, - 55, 56, 179, 4, 24, 24, 182, 162, 162, 162, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 147, 148, 150, 162, 167, 131, 131, 126, 136, - 128, 37, 165, 166, 162, 200, 59, 8, 200, 9, - 21, 10, 11, 12, 13, 14, 15, 16, 17, 147, - 148, 149, 153, 162, 162, 200, 162, 162, 207, 200, - 200, 200, 200, 200, 200, 200, 162, 162, 162, 200, - 200, 153, 99, 100, 126, 132, 176, 177, 175, 27, - 28, 3, 4, 141, 4, 7, 26, 38, 39, 101, - 115, 120, 121, 122, 130, 133, 135, 138, 142, 143, - 144, 145, 146, 168, 198, 174, 164, 164, 164, 37, - 162, 185, 186, 187, 126, 129, 3, 4, 7, 26, - 27, 28, 38, 39, 61, 133, 168, 197, 198, 199, - 199, 199, 199, 160, 126, 155, 126, 155, 199, 130, - 126, 126, 126, 126, 126, 126, 126, 126, 199, 199, - 199, 36, 126, 160, 162, 200, 24, 126, 158, 158, - 158, 128, 128, 128, 128, 128, 132, 167, 169, 169, - 136, 169, 24, 128, 128, 128, 128, 128, 158, 132, - 134, 183, 184, 126, 129, 37, 63, 196, 169, 126, - 126, 199, 15, 57, 15, 126, 212, 199, 130, 200, - 162, 200, 200, 200, 162, 162, 126, 126, 126, 162, - 200, 199, 199, 126, 34, 57, 156, 159, 167, 167, - 167, 167, 167, 126, 132, 134, 136, 167, 167, 167, - 167, 167, 37, 185, 156, 157, 24, 134, 21, 21, - 128, 199, 4, 199, 200, 208, 126, 199, 126, 126, - 126, 199, 199, 199, 128, 162, 24, 4, 158, 212, - 126, 126, 126, 126, 167, 126, 126, 126, 36, 126, - 57, 154, 126, 199, 199, 208, 209, 126, 155, 155, - 126, 199, 126, 200, 200, 200, 209, 199, 129, 167, - 167, 167, 167, 167, 167, 167, 162, 167, 4, 24, - 126, 130, 129, 200, 132, 199, 129, 126, 129, 126, - 126, 129, 129, 129, 129, 129, 21, 132, 149, 205, - 36, 132, 167, 167, 167, 199, 197, 132, 149, 21, - 129, 129, 129, 126, 197, 199, 21, 126, 76, 199, - 21, 21, 199, 199 + 94, 95, 96, 97, 122, 123, 124, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, + 150, 168, 169, 170, 171, 172, 232, 238, 239, 241, + 242, 24, 55, 56, 207, 4, 24, 24, 210, 190, + 190, 190, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 175, 176, 178, 190, 195, 157, 157, + 152, 162, 154, 37, 193, 194, 190, 228, 59, 8, + 228, 9, 21, 10, 11, 12, 13, 14, 15, 16, + 17, 175, 176, 177, 181, 98, 99, 100, 101, 102, + 103, 104, 105, 106, 107, 173, 108, 109, 110, 111, + 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, + 174, 190, 190, 228, 190, 190, 235, 228, 228, 228, + 228, 228, 228, 228, 190, 190, 190, 228, 228, 181, + 125, 126, 152, 158, 204, 205, 203, 27, 28, 3, + 4, 167, 4, 7, 26, 38, 39, 96, 97, 127, + 141, 146, 147, 148, 156, 159, 161, 164, 168, 169, + 170, 171, 172, 196, 226, 202, 192, 192, 192, 37, + 190, 213, 214, 215, 152, 155, 3, 4, 7, 26, + 27, 28, 38, 39, 61, 159, 196, 225, 226, 227, + 227, 227, 227, 188, 190, 190, 152, 183, 152, 183, + 227, 156, 152, 152, 152, 152, 152, 152, 152, 152, + 227, 227, 227, 36, 152, 188, 190, 228, 24, 152, + 186, 186, 186, 154, 154, 154, 154, 154, 154, 154, + 158, 195, 197, 197, 162, 197, 24, 154, 154, 154, + 154, 154, 186, 158, 160, 211, 212, 152, 155, 37, + 63, 224, 197, 152, 152, 227, 227, 227, 15, 57, + 15, 152, 240, 227, 156, 228, 190, 228, 228, 228, + 190, 190, 152, 152, 152, 190, 228, 227, 227, 152, + 34, 57, 184, 187, 173, 174, 195, 195, 195, 195, + 195, 152, 158, 160, 162, 195, 195, 195, 195, 195, + 37, 213, 184, 185, 24, 160, 21, 21, 154, 152, + 152, 227, 4, 227, 228, 236, 152, 227, 152, 152, + 152, 227, 227, 227, 154, 190, 24, 4, 186, 152, + 152, 240, 152, 152, 152, 152, 195, 152, 152, 152, + 36, 152, 57, 182, 152, 227, 227, 236, 237, 227, + 227, 152, 183, 183, 152, 227, 152, 228, 228, 228, + 237, 227, 195, 195, 155, 195, 195, 195, 195, 195, + 195, 195, 190, 195, 4, 24, 152, 156, 155, 228, + 158, 227, 155, 152, 152, 152, 155, 152, 152, 155, + 155, 155, 155, 155, 21, 158, 177, 233, 36, 158, + 195, 195, 195, 195, 195, 227, 225, 158, 177, 21, + 155, 155, 155, 155, 155, 152, 225, 227, 21, 152, + 76, 227, 21, 21, 227, 227 }; #define yyerrok (yyerrstatus = 0) @@ -3084,7 +3133,7 @@ yyreduce: switch (yyn) { case 3: -#line 1165 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" +#line 1106 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[0].UIntVal) > (uint32_t)INT32_MAX) // Outside of my range! GEN_ERROR("Value too large for type!"); @@ -3094,7 +3143,7 @@ yyreduce: break; case 5: -#line 1174 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" +#line 1115 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[0].UInt64Val) > (uint64_t)INT64_MAX) // Outside of my range! GEN_ERROR("Value too large for type!"); @@ -3103,99 +3152,99 @@ yyreduce: ;} break; - case 51: -#line 1199 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 75: +#line 1143 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = (yyvsp[-1].StrVal); CHECK_FOR_ERROR ;} break; - case 52: -#line 1203 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 76: +#line 1147 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; CHECK_FOR_ERROR ;} break; - case 53: -#line 1208 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 77: +#line 1152 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::InternalLinkage; ;} break; - case 54: -#line 1209 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 78: +#line 1153 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;} break; - case 55: -#line 1210 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 79: +#line 1154 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::WeakLinkage; ;} break; - case 56: -#line 1211 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 80: +#line 1155 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;} break; - case 57: -#line 1212 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 81: +#line 1156 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;} break; - case 58: -#line 1213 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 82: +#line 1157 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;} break; - case 59: -#line 1214 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 83: +#line 1158 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;} break; - case 60: -#line 1215 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 84: +#line 1159 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; - case 61: -#line 1217 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 85: +#line 1161 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::C; ;} break; - case 62: -#line 1218 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 86: +#line 1162 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::C; ;} break; - case 63: -#line 1219 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 87: +#line 1163 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::CSRet; ;} break; - case 64: -#line 1220 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 88: +#line 1164 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::Fast; ;} break; - case 65: -#line 1221 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 89: +#line 1165 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::Cold; ;} break; - case 66: -#line 1222 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 90: +#line 1166 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::X86_StdCall; ;} break; - case 67: -#line 1223 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 91: +#line 1167 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::X86_FastCall; ;} break; - case 68: -#line 1224 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 92: +#line 1168 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val)) GEN_ERROR("Calling conv too large!"); @@ -3204,13 +3253,13 @@ yyreduce: ;} break; - case 69: -#line 1233 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 93: +#line 1177 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = 0; ;} break; - case 70: -#line 1234 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 94: +#line 1178 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = (yyvsp[0].UInt64Val); if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal))) @@ -3219,13 +3268,13 @@ yyreduce: ;} break; - case 71: -#line 1240 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 95: +#line 1184 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = 0; ;} break; - case 72: -#line 1241 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 96: +#line 1185 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = (yyvsp[0].UInt64Val); if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal))) @@ -3234,8 +3283,8 @@ yyreduce: ;} break; - case 73: -#line 1249 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 97: +#line 1193 "/proj/llvm/llvm-4/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] == '\\') @@ -3245,28 +3294,28 @@ yyreduce: ;} break; - case 74: -#line 1257 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 98: +#line 1201 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; ;} break; - case 75: -#line 1258 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 99: +#line 1202 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = (yyvsp[0].StrVal); ;} break; - case 76: -#line 1263 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 100: +#line 1207 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" {;} break; - case 77: -#line 1264 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 101: +#line 1208 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" {;} break; - case 78: -#line 1265 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 102: +#line 1209 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CurGV->setSection((yyvsp[0].StrVal)); free((yyvsp[0].StrVal)); @@ -3274,8 +3323,8 @@ yyreduce: ;} break; - case 79: -#line 1270 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 103: +#line 1214 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[0].UInt64Val))) GEN_ERROR("Alignment must be a power of two!"); @@ -3284,209 +3333,186 @@ yyreduce: ;} break; - case 81: -#line 1284 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" - { - (yyval.TypeVal).type = new PATypeHolder((yyvsp[0].TypeVal).type->get()); - (yyval.TypeVal).signedness = (yyvsp[0].TypeVal).signedness; -;} + case 105: +#line 1228 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + { (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType)); ;} break; - case 83: -#line 1288 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" - { - (yyval.TypeVal).type = new PATypeHolder((yyvsp[0].TypeVal).type->get()); - (yyval.TypeVal).signedness = (yyvsp[0].TypeVal).signedness; -;} + case 107: +#line 1229 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + { (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType)); ;} break; - case 84: -#line 1293 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 108: +#line 1231 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) - GEN_ERROR("Invalid upreference in type: " + - ((yyvsp[0].TypeVal).type->get())->getDescription()); + GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription()); (yyval.TypeVal) = (yyvsp[0].TypeVal); CHECK_FOR_ERROR -;} + ;} break; - case 98: -#line 1306 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 122: +#line 1243 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - (yyval.TypeVal).type = new PATypeHolder(OpaqueType::get()); - (yyval.TypeVal).signedness = isSignless; + (yyval.TypeVal) = new PATypeHolder(OpaqueType::get()); CHECK_FOR_ERROR ;} break; - case 99: -#line 1311 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 123: +#line 1247 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - (yyval.TypeVal) = (yyvsp[0].TypeVal); + (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType)); CHECK_FOR_ERROR ;} break; - case 100: -#line 1315 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 124: +#line 1251 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Named types are also simple types... const Type* tmp = getTypeVal((yyvsp[0].ValIDVal)); CHECK_FOR_ERROR - (yyval.TypeVal).type = new PATypeHolder(tmp); - (yyval.TypeVal).signedness = isSignless; + (yyval.TypeVal) = new PATypeHolder(tmp); ;} break; - case 101: -#line 1324 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 125: +#line 1259 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Type UpReference if ((yyvsp[0].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... - (yyval.TypeVal).type = new PATypeHolder(OT); - (yyval.TypeVal).signedness = isSignless; + (yyval.TypeVal) = new PATypeHolder(OT); UR_OUT("New Upreference!\n"); CHECK_FOR_ERROR ;} break; - case 102: -#line 1333 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 126: +#line 1267 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Function derived type? std::vector<const Type*> Params; - for (std::list<TypeInfo>::iterator I = (yyvsp[-1].TypeList)->begin(), + for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(), E = (yyvsp[-1].TypeList)->end(); I != E; ++I) - Params.push_back(I->type->get()); + Params.push_back(*I); bool isVarArg = Params.size() && Params.back() == Type::VoidTy; if (isVarArg) Params.pop_back(); - (yyval.TypeVal).type = new PATypeHolder(HandleUpRefs( - FunctionType::get((yyvsp[-3].TypeVal).type->get(),Params,isVarArg))); - (yyval.TypeVal).signedness = isSignless; + (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FunctionType::get(*(yyvsp[-3].TypeVal),Params,isVarArg))); delete (yyvsp[-1].TypeList); // Delete the argument list - delete (yyvsp[-3].TypeVal).type; + delete (yyvsp[-3].TypeVal); // Delete the return type handle CHECK_FOR_ERROR ;} break; - case 103: -#line 1348 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 127: +#line 1280 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Sized array type? - (yyval.TypeVal).type = new PATypeHolder(HandleUpRefs( - ArrayType::get((yyvsp[-1].TypeVal).type->get(), (unsigned)(yyvsp[-3].UInt64Val)))); - (yyval.TypeVal).signedness = isSignless; - delete (yyvsp[-1].TypeVal).type; + (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val)))); + delete (yyvsp[-1].TypeVal); CHECK_FOR_ERROR ;} break; - case 104: -#line 1355 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 128: +#line 1285 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Packed array type? - const llvm::Type* ElemTy = (yyvsp[-1].TypeVal).type->get(); - if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val)) - GEN_ERROR("Unsigned result not equal to signed result"); - if (!ElemTy->isPrimitiveType()) - GEN_ERROR("Elemental type of a PackedType must be primitive"); - if (!isPowerOf2_32((yyvsp[-3].UInt64Val))) - GEN_ERROR("Vector length should be a power of 2!"); - (yyval.TypeVal).type = new PATypeHolder(HandleUpRefs( - PackedType::get((yyvsp[-1].TypeVal).type->get(), (unsigned)(yyvsp[-3].UInt64Val)))); - (yyval.TypeVal).signedness = isSignless; - delete (yyvsp[-1].TypeVal).type; - CHECK_FOR_ERROR + const llvm::Type* ElemTy = (yyvsp[-1].TypeVal)->get(); + if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val)) + GEN_ERROR("Unsigned result not equal to signed result"); + if (!ElemTy->isPrimitiveType()) + GEN_ERROR("Elemental type of a PackedType must be primitive"); + if (!isPowerOf2_32((yyvsp[-3].UInt64Val))) + GEN_ERROR("Vector length should be a power of 2!"); + (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(PackedType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val)))); + delete (yyvsp[-1].TypeVal); + CHECK_FOR_ERROR ;} break; - case 105: -#line 1369 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 129: +#line 1297 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Structure type? std::vector<const Type*> Elements; - for (std::list<TypeInfo>::iterator I = (yyvsp[-1].TypeList)->begin(), + for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(), E = (yyvsp[-1].TypeList)->end(); I != E; ++I) - Elements.push_back((*I).type->get()); + Elements.push_back(*I); - (yyval.TypeVal).type = new PATypeHolder(HandleUpRefs(StructType::get(Elements))); - (yyval.TypeVal).signedness = isSignless; + (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(StructType::get(Elements))); delete (yyvsp[-1].TypeList); CHECK_FOR_ERROR ;} break; - case 106: -#line 1380 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 130: +#line 1307 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Empty structure type? - (yyval.TypeVal).type = new PATypeHolder(StructType::get(std::vector<const Type*>())); - (yyval.TypeVal).signedness = isSignless; + (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>())); CHECK_FOR_ERROR ;} break; - case 107: -#line 1385 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 131: +#line 1311 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Pointer type? - if ((yyvsp[-1].TypeVal).type->get() == Type::LabelTy) + if (*(yyvsp[-1].TypeVal) == Type::LabelTy) GEN_ERROR("Cannot form a pointer to a basic block"); - (yyval.TypeVal).type = new PATypeHolder(HandleUpRefs(PointerType::get((yyvsp[-1].TypeVal).type->get()))); - (yyval.TypeVal).signedness = isSignless; - delete (yyvsp[-1].TypeVal).type; + (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(PointerType::get(*(yyvsp[-1].TypeVal)))); + delete (yyvsp[-1].TypeVal); CHECK_FOR_ERROR ;} break; - case 108: -#line 1397 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 132: +#line 1322 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - (yyval.TypeList) = new std::list<TypeInfo>(); - (yyval.TypeList)->push_back((yyvsp[0].TypeVal)); + (yyval.TypeList) = new std::list<PATypeHolder>(); + (yyval.TypeList)->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal); CHECK_FOR_ERROR ;} break; - case 109: -#line 1402 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 133: +#line 1327 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back((yyvsp[0].TypeVal)); + ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal); CHECK_FOR_ERROR ;} break; - case 111: -#line 1409 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 135: +#line 1334 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - TypeInfo TI; - TI.type = new PATypeHolder(Type::VoidTy); TI.signedness = isSignless; - ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(TI); + ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(Type::VoidTy); CHECK_FOR_ERROR ;} break; - case 112: -#line 1415 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 136: +#line 1338 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - TypeInfo TI; - TI.type = new PATypeHolder(Type::VoidTy); TI.signedness = isSignless; - ((yyval.TypeList) = new std::list<TypeInfo>())->push_back(TI); + ((yyval.TypeList) = new std::list<PATypeHolder>())->push_back(Type::VoidTy); CHECK_FOR_ERROR ;} break; - case 113: -#line 1421 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 137: +#line 1342 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - (yyval.TypeList) = new std::list<TypeInfo>(); + (yyval.TypeList) = new std::list<PATypeHolder>(); CHECK_FOR_ERROR ;} break; - case 114: -#line 1432 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 138: +#line 1353 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Nonempty unsized arr - const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-3].TypeVal).type->get()); + const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-3].TypeVal)->get()); if (ATy == 0) GEN_ERROR("Cannot make array constant with type: '" + - ((yyvsp[-3].TypeVal).type->get())->getDescription() + "'!"); + (*(yyvsp[-3].TypeVal))->getDescription() + "'!"); const Type *ETy = ATy->getElementType(); int NumElements = ATy->getNumElements(); @@ -3497,50 +3523,44 @@ yyreduce: itostr(NumElements) + "!"); // Verify all elements are correct type! - std::vector<Constant*> elems; for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) { - if (ETy != (*(yyvsp[-1].ConstVector))[i].cnst->getType()) { + 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].cnst->getType()->getDescription() + "'."); - } else { - elems.push_back((*(yyvsp[-1].ConstVector))[i].cnst); - } + (*(yyvsp[-1].ConstVector))[i]->getType()->getDescription() + "'."); } - (yyval.ConstVal).cnst = ConstantArray::get(ATy, elems); - (yyval.ConstVal).signedness = isSignless; - delete (yyvsp[-3].TypeVal).type; delete (yyvsp[-1].ConstVector); + (yyval.ConstVal) = ConstantArray::get(ATy, *(yyvsp[-1].ConstVector)); + delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector); CHECK_FOR_ERROR ;} break; - case 115: -#line 1463 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 139: +#line 1379 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal).type->get()); + const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get()); if (ATy == 0) GEN_ERROR("Cannot make array constant with type: '" + - ((yyvsp[-2].TypeVal).type->get())->getDescription() + "'!"); + (*(yyvsp[-2].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).cnst = ConstantArray::get(ATy, std::vector<llvm::Constant*>()); - (yyval.ConstVal).signedness = isSignless; - delete (yyvsp[-2].TypeVal).type; + (yyval.ConstVal) = ConstantArray::get(ATy, std::vector<Constant*>()); + delete (yyvsp[-2].TypeVal); CHECK_FOR_ERROR ;} break; - case 116: -#line 1478 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 140: +#line 1393 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal).type->get()); + const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get()); if (ATy == 0) GEN_ERROR("Cannot make array constant with type: '" + - ((yyvsp[-2].TypeVal).type->get())->getDescription() + "'!"); + (*(yyvsp[-2].TypeVal))->getDescription() + "'!"); int NumElements = ATy->getNumElements(); const Type *ETy = ATy->getElementType(); @@ -3562,20 +3582,19 @@ yyreduce: GEN_ERROR("Cannot build string arrays of non byte sized elements!"); } free((yyvsp[0].StrVal)); - (yyval.ConstVal).cnst = ConstantArray::get(ATy, Vals); - (yyval.ConstVal).signedness = isSignless; - delete (yyvsp[-2].TypeVal).type; + (yyval.ConstVal) = ConstantArray::get(ATy, Vals); + delete (yyvsp[-2].TypeVal); CHECK_FOR_ERROR ;} break; - case 117: -#line 1509 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 141: +#line 1423 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Nonempty unsized arr - const PackedType *PTy = dyn_cast<PackedType>((yyvsp[-3].TypeVal).type->get()); + const PackedType *PTy = dyn_cast<PackedType>((yyvsp[-3].TypeVal)->get()); if (PTy == 0) GEN_ERROR("Cannot make packed constant with type: '" + - (yyvsp[-3].TypeVal).type->get()->getDescription() + "'!"); + (*(yyvsp[-3].TypeVal))->getDescription() + "'!"); const Type *ETy = PTy->getElementType(); int NumElements = PTy->getNumElements(); @@ -3586,99 +3605,88 @@ yyreduce: itostr(NumElements) + "!"); // Verify all elements are correct type! - std::vector<Constant*> elems; for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) { - if (ETy != (*(yyvsp[-1].ConstVector))[i].cnst->getType()) { + 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].cnst->getType()->getDescription() + "'."); - } else - elems.push_back((*(yyvsp[-1].ConstVector))[i].cnst); + (*(yyvsp[-1].ConstVector))[i]->getType()->getDescription() + "'."); } - (yyval.ConstVal).cnst = ConstantPacked::get(PTy, elems); - (yyval.ConstVal).signedness = isSignless; - delete (yyvsp[-3].TypeVal).type; delete (yyvsp[-1].ConstVector); + (yyval.ConstVal) = ConstantPacked::get(PTy, *(yyvsp[-1].ConstVector)); + delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector); CHECK_FOR_ERROR ;} break; - case 118: -#line 1539 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 142: +#line 1449 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal).type->get()); + const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal)->get()); if (STy == 0) GEN_ERROR("Cannot make struct constant with type: '" + - (yyvsp[-3].TypeVal).type->get()->getDescription() + "'!"); + (*(yyvsp[-3].TypeVal))->getDescription() + "'!"); if ((yyvsp[-1].ConstVector)->size() != STy->getNumContainedTypes()) GEN_ERROR("Illegal number of initializers for structure type!"); // Check to ensure that constants are compatible with the type initializer! - std::vector<Constant*> elems; for (unsigned i = 0, e = (yyvsp[-1].ConstVector)->size(); i != e; ++i) - if ((*(yyvsp[-1].ConstVector))[i].cnst->getType() != STy->getElementType(i)) { + if ((*(yyvsp[-1].ConstVector))[i]->getType() != STy->getElementType(i)) GEN_ERROR("Expected type '" + STy->getElementType(i)->getDescription() + "' for element #" + utostr(i) + " of structure initializer!"); - } else - elems.push_back((*(yyvsp[-1].ConstVector))[i].cnst); - (yyval.ConstVal).cnst = ConstantStruct::get(STy, elems); - (yyval.ConstVal).signedness = isSignless; - delete (yyvsp[-3].TypeVal).type; delete (yyvsp[-1].ConstVector); + (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[-1].ConstVector)); + delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector); CHECK_FOR_ERROR ;} break; - case 119: -#line 1564 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 143: +#line 1470 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - const StructType *STy = dyn_cast<StructType>((yyvsp[-2].TypeVal).type->get()); + const StructType *STy = dyn_cast<StructType>((yyvsp[-2].TypeVal)->get()); if (STy == 0) GEN_ERROR("Cannot make struct constant with type: '" + - (yyvsp[-2].TypeVal).type->get()->getDescription() + "'!"); + (*(yyvsp[-2].TypeVal))->getDescription() + "'!"); if (STy->getNumContainedTypes() != 0) GEN_ERROR("Illegal number of initializers for structure type!"); - (yyval.ConstVal).cnst = ConstantStruct::get(STy, std::vector<Constant*>()); - (yyval.ConstVal).signedness = isSignless; - delete (yyvsp[-2].TypeVal).type; + (yyval.ConstVal) = ConstantStruct::get(STy, std::vector<Constant*>()); + delete (yyvsp[-2].TypeVal); CHECK_FOR_ERROR ;} break; - case 120: -#line 1578 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 144: +#line 1483 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal).type->get()); + const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get()); if (PTy == 0) GEN_ERROR("Cannot make null pointer constant with type: '" + - (yyvsp[-1].TypeVal).type->get()->getDescription() + "'!"); + (*(yyvsp[-1].TypeVal))->getDescription() + "'!"); - (yyval.ConstVal).cnst = ConstantPointerNull::get(PTy); - (yyval.ConstVal).signedness = isSignless; - delete (yyvsp[-1].TypeVal).type; + (yyval.ConstVal) = ConstantPointerNull::get(PTy); + delete (yyvsp[-1].TypeVal); CHECK_FOR_ERROR ;} break; - case 121: -#line 1589 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 145: +#line 1493 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - (yyval.ConstVal).cnst = UndefValue::get((yyvsp[-1].TypeVal).type->get()); - (yyval.ConstVal).signedness = isSignless; - delete (yyvsp[-1].TypeVal).type; + (yyval.ConstVal) = UndefValue::get((yyvsp[-1].TypeVal)->get()); + delete (yyvsp[-1].TypeVal); CHECK_FOR_ERROR ;} break; - case 122: -#line 1595 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 146: +#line 1498 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - const PointerType *Ty = dyn_cast<PointerType>((yyvsp[-1].TypeVal).type->get()); + const PointerType *Ty = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get()); if (Ty == 0) GEN_ERROR("Global const reference must be a pointer type!"); @@ -3734,173 +3742,158 @@ yyreduce: } } - (yyval.ConstVal).cnst = cast<GlobalValue>(V); - (yyval.ConstVal).signedness = (yyvsp[-1].TypeVal).signedness; - delete (yyvsp[-1].TypeVal).type; // Free the type handle + (yyval.ConstVal) = cast<GlobalValue>(V); + delete (yyvsp[-1].TypeVal); // Free the type handle CHECK_FOR_ERROR ;} break; - case 123: -#line 1657 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 147: +#line 1559 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[-1].TypeVal).type->get() != (yyvsp[0].ConstVal).cnst->getType()) + if ((yyvsp[-1].TypeVal)->get() != (yyvsp[0].ConstVal)->getType()) GEN_ERROR("Mismatched types for constant expression!"); (yyval.ConstVal) = (yyvsp[0].ConstVal); - delete (yyvsp[-1].TypeVal).type; + delete (yyvsp[-1].TypeVal); CHECK_FOR_ERROR ;} break; - case 124: -#line 1664 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 148: +#line 1566 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - const Type *Ty = (yyvsp[-1].TypeVal).type->get(); + const Type *Ty = (yyvsp[-1].TypeVal)->get(); if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty)) GEN_ERROR("Cannot create a null initialized value of this type!"); - (yyval.ConstVal).cnst = Constant::getNullValue(Ty); - (yyval.ConstVal).signedness = isSignless; - delete (yyvsp[-1].TypeVal).type; + (yyval.ConstVal) = Constant::getNullValue(Ty); + delete (yyvsp[-1].TypeVal); CHECK_FOR_ERROR ;} break; - case 125: -#line 1674 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 149: +#line 1574 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // integral constants - if (!ConstantInt::isValueValidForType((yyvsp[-1].TypeVal).type->get(), (yyvsp[0].SInt64Val))) + if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val))) GEN_ERROR("Constant value doesn't fit in type!"); - (yyval.ConstVal).cnst = ConstantInt::get((yyvsp[-1].TypeVal).type->get(), (yyvsp[0].SInt64Val)); - (yyval.ConstVal).signedness = (yyvsp[-1].TypeVal).signedness; + (yyval.ConstVal) = ConstantInt::get((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val)); CHECK_FOR_ERROR ;} break; - case 126: -#line 1681 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 150: +#line 1580 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // integral constants - if (!ConstantInt::isValueValidForType((yyvsp[-1].TypeVal).type->get(), (yyvsp[0].UInt64Val))) + if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val))) GEN_ERROR("Constant value doesn't fit in type!"); - (yyval.ConstVal).cnst = ConstantInt::get((yyvsp[-1].TypeVal).type->get(), (yyvsp[0].UInt64Val)); - (yyval.ConstVal).signedness = (yyvsp[-1].TypeVal).signedness; + (yyval.ConstVal) = ConstantInt::get((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val)); CHECK_FOR_ERROR ;} break; - case 127: -#line 1688 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 151: +#line 1586 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Boolean constants - (yyval.ConstVal).cnst = ConstantBool::getTrue(); - (yyval.ConstVal).signedness = isSignless; + (yyval.ConstVal) = ConstantBool::getTrue(); CHECK_FOR_ERROR ;} break; - case 128: -#line 1693 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 152: +#line 1590 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Boolean constants - (yyval.ConstVal).cnst = ConstantBool::getFalse(); - (yyval.ConstVal).signedness = isSignless; + (yyval.ConstVal) = ConstantBool::getFalse(); CHECK_FOR_ERROR ;} break; - case 129: -#line 1698 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 153: +#line 1594 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Float & Double constants - if (!ConstantFP::isValueValidForType((yyvsp[-1].TypeVal).type->get(), (yyvsp[0].FPVal))) + if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].FPVal))) GEN_ERROR("Floating point constant invalid for type!!"); - (yyval.ConstVal).cnst = ConstantFP::get((yyvsp[-1].TypeVal).type->get(), (yyvsp[0].FPVal)); - (yyval.ConstVal).signedness = isSignless; + (yyval.ConstVal) = ConstantFP::get((yyvsp[-1].PrimType), (yyvsp[0].FPVal)); CHECK_FOR_ERROR ;} break; - case 130: -#line 1707 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 154: +#line 1602 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - Constant *Val = (yyvsp[-3].ConstVal).cnst; - const Type *Ty = (yyvsp[-1].TypeVal).type->get(); + Constant *Val = (yyvsp[-3].ConstVal); + const Type *Ty = (yyvsp[-1].TypeVal)->get(); if (!Val->getType()->isFirstClassType()) GEN_ERROR("cast constant expression from a non-primitive type: '" + Val->getType()->getDescription() + "'!"); if (!Ty->isFirstClassType()) GEN_ERROR("cast constant expression to a non-primitive type: '" + Ty->getDescription() + "'!"); - if ((yyvsp[-5].CastOpVal).obsolete) { - if (Ty == Type::BoolTy) { - // The previous definition of cast to bool was a compare against zero. - // We have to retain that semantic so we do it here. - (yyval.ConstVal).cnst = ConstantExpr::get(Instruction::SetNE, Val, - Constant::getNullValue(Val->getType())); - } else if (Val->getType()->isFloatingPoint() && isa<PointerType>(Ty)) { - Constant *CE = ConstantExpr::getFPToUI(Val, Type::ULongTy); - (yyval.ConstVal).cnst = ConstantExpr::getIntToPtr(CE, Ty); - } else { - (yyval.ConstVal).cnst = ConstantExpr::getCast(Val, Ty); - } - } else { - (yyval.ConstVal).cnst = ConstantExpr::getCast((yyvsp[-5].CastOpVal).opcode, (yyvsp[-3].ConstVal).cnst, (yyvsp[-1].TypeVal).type->get()); - } - delete (yyvsp[-1].TypeVal).type; + (yyval.ConstVal) = ConstantExpr::getCast((yyvsp[-5].CastOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].TypeVal)->get()); + delete (yyvsp[-1].TypeVal); ;} break; - case 131: -#line 1733 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 155: +#line 1614 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if (!isa<PointerType>((yyvsp[-2].ConstVal).cnst->getType())) + if (!isa<PointerType>((yyvsp[-2].ConstVal)->getType())) GEN_ERROR("GetElementPtr requires a pointer operand!"); - std::vector<llvm::Value*> IdxVec; - for (unsigned i = 0, e = (yyvsp[-1].ValueList)->size(); i < e; ++i) - if (Constant *C = dyn_cast<Constant>((*(yyvsp[-1].ValueList))[i].val)) - IdxVec.push_back(C); - else - GEN_ERROR("Indices to constant getelementptr must be constants!"); + // LLVM 1.2 and earlier used ubyte struct indices. Convert any ubyte struct + // indices to uint struct indices for compatibility. + generic_gep_type_iterator<std::vector<Value*>::iterator> + GTI = gep_type_begin((yyvsp[-2].ConstVal)->getType(), (yyvsp[-1].ValueList)->begin(), (yyvsp[-1].ValueList)->end()), + GTE = gep_type_end((yyvsp[-2].ConstVal)->getType(), (yyvsp[-1].ValueList)->begin(), (yyvsp[-1].ValueList)->end()); + for (unsigned i = 0, e = (yyvsp[-1].ValueList)->size(); i != e && GTI != GTE; ++i, ++GTI) + if (isa<StructType>(*GTI)) // Only change struct indices + if (ConstantInt *CUI = dyn_cast<ConstantInt>((*(yyvsp[-1].ValueList))[i])) + if (CUI->getType() == Type::UByteTy) + (*(yyvsp[-1].ValueList))[i] = ConstantExpr::getCast(CUI, Type::UIntTy); const Type *IdxTy = - GetElementPtrInst::getIndexedType((yyvsp[-2].ConstVal).cnst->getType(), IdxVec, true); + GetElementPtrInst::getIndexedType((yyvsp[-2].ConstVal)->getType(), *(yyvsp[-1].ValueList), true); if (!IdxTy) GEN_ERROR("Index list invalid for constant getelementptr!"); + std::vector<Constant*> IdxVec; + for (unsigned i = 0, e = (yyvsp[-1].ValueList)->size(); i != e; ++i) + if (Constant *C = dyn_cast<Constant>((*(yyvsp[-1].ValueList))[i])) + IdxVec.push_back(C); + else + GEN_ERROR("Indices to constant getelementptr must be constants!"); + delete (yyvsp[-1].ValueList); - (yyval.ConstVal).cnst = ConstantExpr::getGetElementPtr((yyvsp[-2].ConstVal).cnst, IdxVec); - (yyval.ConstVal).signedness = isSignless; + (yyval.ConstVal) = ConstantExpr::getGetElementPtr((yyvsp[-2].ConstVal), IdxVec); CHECK_FOR_ERROR ;} break; - case 132: -#line 1755 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 156: +#line 1646 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[-5].ConstVal).cnst->getType() != Type::BoolTy) + if ((yyvsp[-5].ConstVal)->getType() != Type::BoolTy) GEN_ERROR("Select condition must be of boolean type!"); - if ((yyvsp[-3].ConstVal).cnst->getType() != (yyvsp[-1].ConstVal).cnst->getType()) + if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType()) GEN_ERROR("Select operand types must match!"); - (yyval.ConstVal).cnst = ConstantExpr::getSelect((yyvsp[-5].ConstVal).cnst, (yyvsp[-3].ConstVal).cnst, (yyvsp[-1].ConstVal).cnst); - (yyval.ConstVal).signedness = isSignless; + (yyval.ConstVal) = ConstantExpr::getSelect((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); CHECK_FOR_ERROR ;} break; - case 133: -#line 1764 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 157: +#line 1654 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[-3].ConstVal).cnst->getType() != (yyvsp[-1].ConstVal).cnst->getType()) + if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType()) GEN_ERROR("Binary operator types must match!"); - // First, make sure we're dealing with the right opcode by upgrading from - // obsolete versions. - sanitizeOpcode((yyvsp[-5].BinaryOpVal), (yyvsp[-3].ConstVal).cnst->getType()); CHECK_FOR_ERROR; // HACK: llvm 1.3 and earlier used to emit invalid pointer constant exprs. // To retain backward compatibility with these early compilers, we emit a // cast to the appropriate integer type automatically if we are in the // broken case. See PR424 for more information. - if (!isa<PointerType>((yyvsp[-3].ConstVal).cnst->getType())) { - (yyval.ConstVal).cnst = ConstantExpr::get((yyvsp[-5].BinaryOpVal).opcode, (yyvsp[-3].ConstVal).cnst, (yyvsp[-1].ConstVal).cnst); + if (!isa<PointerType>((yyvsp[-3].ConstVal)->getType())) { + (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); } else { const Type *IntPtrTy = 0; switch (CurModule.CurrentModule->getPointerSize()) { @@ -3908,121 +3901,129 @@ yyreduce: case Module::Pointer64: IntPtrTy = Type::LongTy; break; default: GEN_ERROR("invalid pointer binary constant expr!"); } - (yyval.ConstVal).cnst = ConstantExpr::get((yyvsp[-5].BinaryOpVal).opcode, - ConstantExpr::getCast((yyvsp[-3].ConstVal).cnst, IntPtrTy), - ConstantExpr::getCast((yyvsp[-1].ConstVal).cnst, IntPtrTy)); - (yyval.ConstVal).cnst = ConstantExpr::getCast((yyval.ConstVal).cnst, (yyvsp[-3].ConstVal).cnst->getType()); + (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), ConstantExpr::getCast((yyvsp[-3].ConstVal), IntPtrTy), + ConstantExpr::getCast((yyvsp[-1].ConstVal), IntPtrTy)); + (yyval.ConstVal) = ConstantExpr::getCast((yyval.ConstVal), (yyvsp[-3].ConstVal)->getType()); } - (yyval.ConstVal).signedness = (yyvsp[-3].ConstVal).signedness; CHECK_FOR_ERROR ;} break; - case 134: -#line 1793 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 158: +#line 1678 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[-3].ConstVal).cnst->getType() != (yyvsp[-1].ConstVal).cnst->getType()) + if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType()) GEN_ERROR("Logical operator types must match!"); - if (!(yyvsp[-3].ConstVal).cnst->getType()->isIntegral()) { - if (!isa<PackedType>((yyvsp[-3].ConstVal).cnst->getType()) || - !cast<PackedType>((yyvsp[-3].ConstVal).cnst->getType())->getElementType()->isIntegral()) + if (!(yyvsp[-3].ConstVal)->getType()->isIntegral()) { + if (!isa<PackedType>((yyvsp[-3].ConstVal)->getType()) || + !cast<PackedType>((yyvsp[-3].ConstVal)->getType())->getElementType()->isIntegral()) GEN_ERROR("Logical operator requires integral operands!"); } - (yyval.ConstVal).cnst = ConstantExpr::get((yyvsp[-5].BinaryOpVal).opcode, (yyvsp[-3].ConstVal).cnst, (yyvsp[-1].ConstVal).cnst); - (yyval.ConstVal).signedness = (yyvsp[-3].ConstVal).signedness; + (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); CHECK_FOR_ERROR ;} break; - case 135: -#line 1805 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 159: +#line 1689 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[-3].ConstVal).cnst->getType() != (yyvsp[-1].ConstVal).cnst->getType()) + if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType()) GEN_ERROR("setcc operand types must match!"); - (yyval.ConstVal).cnst = ConstantExpr::get((yyvsp[-5].BinaryOpVal).opcode, (yyvsp[-3].ConstVal).cnst, (yyvsp[-1].ConstVal).cnst); - (yyval.ConstVal).signedness = isSignless; + (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); CHECK_FOR_ERROR ;} break; - case 136: -#line 1812 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 160: +#line 1695 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[-1].ConstVal).cnst->getType() != Type::UByteTy) + if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType()) + GEN_ERROR("icmp operand types must match!"); + (yyval.ConstVal) = ConstantExpr::getICmp((yyvsp[-5].IPredicate), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); + ;} + break; + + case 161: +#line 1700 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + { + if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType()) + GEN_ERROR("fcmp operand types must match!"); + (yyval.ConstVal) = ConstantExpr::getFCmp((yyvsp[-5].FPredicate), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); + ;} + break; + + case 162: +#line 1705 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + { + if ((yyvsp[-1].ConstVal)->getType() != Type::UByteTy) GEN_ERROR("Shift count for shift constant must be unsigned byte!"); - if (!(yyvsp[-3].ConstVal).cnst->getType()->isInteger()) + if (!(yyvsp[-3].ConstVal)->getType()->isInteger()) GEN_ERROR("Shift constant expression requires integer operand!"); - // Handle opcode upgrade situations - sanitizeOpcode((yyvsp[-5].OtherOpVal), (yyvsp[-3].ConstVal).cnst->getType()); CHECK_FOR_ERROR; - (yyval.ConstVal).cnst = ConstantExpr::get((yyvsp[-5].OtherOpVal).opcode, (yyvsp[-3].ConstVal).cnst, (yyvsp[-1].ConstVal).cnst); - (yyval.ConstVal).signedness = (yyvsp[-3].ConstVal).signedness; + (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].OtherOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); CHECK_FOR_ERROR ;} break; - case 137: -#line 1824 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 163: +#line 1714 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal).cnst, (yyvsp[-1].ConstVal).cnst)) + if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal))) GEN_ERROR("Invalid extractelement operands!"); - (yyval.ConstVal).cnst = ConstantExpr::getExtractElement((yyvsp[-3].ConstVal).cnst, (yyvsp[-1].ConstVal).cnst); - (yyval.ConstVal).signedness = (yyvsp[-3].ConstVal).signedness; + (yyval.ConstVal) = ConstantExpr::getExtractElement((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); CHECK_FOR_ERROR ;} break; - case 138: -#line 1831 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 164: +#line 1720 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal).cnst, (yyvsp[-3].ConstVal).cnst, (yyvsp[-1].ConstVal).cnst)) + if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal))) GEN_ERROR("Invalid insertelement operands!"); - (yyval.ConstVal).cnst = ConstantExpr::getInsertElement((yyvsp[-5].ConstVal).cnst, (yyvsp[-3].ConstVal).cnst, (yyvsp[-1].ConstVal).cnst); - (yyval.ConstVal).signedness = isSignless; + (yyval.ConstVal) = ConstantExpr::getInsertElement((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); CHECK_FOR_ERROR ;} break; - case 139: -#line 1838 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 165: +#line 1726 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal).cnst, (yyvsp[-3].ConstVal).cnst, (yyvsp[-1].ConstVal).cnst)) + if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal))) GEN_ERROR("Invalid shufflevector operands!"); - (yyval.ConstVal).cnst = ConstantExpr::getShuffleVector((yyvsp[-5].ConstVal).cnst, (yyvsp[-3].ConstVal).cnst, (yyvsp[-1].ConstVal).cnst); - (yyval.ConstVal).signedness = isSignless; + (yyval.ConstVal) = ConstantExpr::getShuffleVector((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)); CHECK_FOR_ERROR ;} break; - case 140: -#line 1848 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 166: +#line 1735 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal)); CHECK_FOR_ERROR ;} break; - case 141: -#line 1852 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 167: +#line 1739 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - (yyval.ConstVector) = new std::vector<ConstInfo>(); + (yyval.ConstVector) = new std::vector<Constant*>(); (yyval.ConstVector)->push_back((yyvsp[0].ConstVal)); CHECK_FOR_ERROR ;} break; - case 142: -#line 1860 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 168: +#line 1747 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; ;} break; - case 143: -#line 1860 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 169: +#line 1747 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; ;} break; - case 144: -#line 1870 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 170: +#line 1757 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ModuleVal) = ParserResult = (yyvsp[0].ModuleVal); CurModule.ModuleDone(); @@ -4030,8 +4031,8 @@ yyreduce: ;} break; - case 145: -#line 1878 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 171: +#line 1765 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal); CurFun.FunctionDone(); @@ -4039,32 +4040,32 @@ yyreduce: ;} break; - case 146: -#line 1883 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 172: +#line 1770 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal); CHECK_FOR_ERROR ;} break; - case 147: -#line 1887 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 173: +#line 1774 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ModuleVal) = (yyvsp[-3].ModuleVal); CHECK_FOR_ERROR ;} break; - case 148: -#line 1891 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 174: +#line 1778 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal); CHECK_FOR_ERROR ;} break; - case 149: -#line 1895 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 175: +#line 1782 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ModuleVal) = CurModule.CurrentModule; // Emit an error if there are any unresolved types left. @@ -4080,8 +4081,8 @@ yyreduce: ;} break; - case 150: -#line 1910 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 176: +#line 1797 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Eagerly resolve types. This is not an optimization, this is a // requirement that is due to the fact that we could have this: @@ -4092,128 +4093,125 @@ 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).type->get()); + ResolveTypeTo((yyvsp[-2].StrVal), *(yyvsp[0].TypeVal)); - if (!setTypeName((yyvsp[0].TypeVal).type->get(), (yyvsp[-2].StrVal)) && !(yyvsp[-2].StrVal)) { + if (!setTypeName(*(yyvsp[0].TypeVal), (yyvsp[-2].StrVal)) && !(yyvsp[-2].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).type)); - } else { - delete (yyvsp[0].TypeVal).type; + CurModule.Types.push_back(*(yyvsp[0].TypeVal)); } + + delete (yyvsp[0].TypeVal); CHECK_FOR_ERROR ;} break; - case 151: -#line 1932 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 177: +#line 1819 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Function prototypes can be in const pool CHECK_FOR_ERROR ;} break; - case 152: -#line 1935 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 178: +#line 1822 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Asm blocks can be in the const pool CHECK_FOR_ERROR ;} break; - case 153: -#line 1938 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 179: +#line 1825 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[0].ConstVal).cnst == 0) + if ((yyvsp[0].ConstVal) == 0) GEN_ERROR("Global value initializer is not a constant!"); - CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), (yyvsp[-2].Linkage), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal).cnst->getType(), (yyvsp[0].ConstVal).cnst); + CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), (yyvsp[-2].Linkage), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal)->getType(), (yyvsp[0].ConstVal)); CHECK_FOR_ERROR ;} break; - case 154: -#line 1943 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 180: +#line 1830 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CurGV = 0; ;} break; - case 155: -#line 1946 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 181: +#line 1833 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalLinkage, (yyvsp[-1].BoolVal), - (yyvsp[0].TypeVal).type->get(), 0); + CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0); CHECK_FOR_ERROR - delete (yyvsp[0].TypeVal).type; + delete (yyvsp[0].TypeVal); ;} break; - case 156: -#line 1951 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 182: +#line 1837 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CurGV = 0; CHECK_FOR_ERROR ;} break; - case 157: -#line 1955 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 183: +#line 1841 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::DLLImportLinkage, (yyvsp[-1].BoolVal), - (yyvsp[0].TypeVal).type->get(), 0); + CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::DLLImportLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0); CHECK_FOR_ERROR - delete (yyvsp[0].TypeVal).type; + delete (yyvsp[0].TypeVal); ;} break; - case 158: -#line 1960 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 184: +#line 1845 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CurGV = 0; CHECK_FOR_ERROR ;} break; - case 159: -#line 1964 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 185: +#line 1849 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CurGV = - ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalWeakLinkage, (yyvsp[-1].BoolVal), - (yyvsp[0].TypeVal).type->get(), 0); + ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalWeakLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0); CHECK_FOR_ERROR - delete (yyvsp[0].TypeVal).type; + delete (yyvsp[0].TypeVal); ;} break; - case 160: -#line 1970 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 186: +#line 1854 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CurGV = 0; CHECK_FOR_ERROR ;} break; - case 161: -#line 1974 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 187: +#line 1858 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; - case 162: -#line 1977 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 188: +#line 1861 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; - case 163: -#line 1980 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 189: +#line 1864 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { ;} break; - case 164: -#line 1984 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 190: +#line 1868 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm(); char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true); @@ -4228,26 +4226,26 @@ yyreduce: ;} break; - case 165: -#line 1997 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 191: +#line 1881 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.Endianness) = Module::BigEndian; ;} break; - case 166: -#line 1998 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 192: +#line 1882 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.Endianness) = Module::LittleEndian; ;} break; - case 167: -#line 2000 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 193: +#line 1884 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->setEndianness((yyvsp[0].Endianness)); CHECK_FOR_ERROR ;} break; - case 168: -#line 2004 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 194: +#line 1888 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[0].UInt64Val) == 32) CurModule.CurrentModule->setPointerSize(Module::Pointer32); @@ -4259,24 +4257,24 @@ yyreduce: ;} break; - case 169: -#line 2013 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 195: +#line 1897 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal)); free((yyvsp[0].StrVal)); ;} break; - case 170: -#line 2017 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 196: +#line 1901 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal)); free((yyvsp[0].StrVal)); ;} break; - case 172: -#line 2024 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 198: +#line 1908 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal)); free((yyvsp[0].StrVal)); @@ -4284,8 +4282,8 @@ yyreduce: ;} break; - case 173: -#line 2029 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 199: +#line 1913 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal)); free((yyvsp[0].StrVal)); @@ -4293,30 +4291,30 @@ yyreduce: ;} break; - case 174: -#line 2034 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 200: +#line 1918 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; - case 178: -#line 2044 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 204: +#line 1928 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; ;} break; - case 179: -#line 2046 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 205: +#line 1930 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[-1].TypeVal).type->get() == Type::VoidTy) + if (*(yyvsp[-1].TypeVal) == Type::VoidTy) GEN_ERROR("void typed arguments are invalid!"); - (yyval.ArgVal) = new std::pair<TypeInfo, char*>((yyvsp[-1].TypeVal), (yyvsp[0].StrVal)); + (yyval.ArgVal) = new std::pair<PATypeHolder*, char*>((yyvsp[-1].TypeVal), (yyvsp[0].StrVal)); CHECK_FOR_ERROR ;} break; - case 180: -#line 2053 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 206: +#line 1937 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = (yyvsp[-2].ArgList); (yyvsp[-2].ArgList)->push_back(*(yyvsp[0].ArgVal)); @@ -4325,80 +4323,74 @@ yyreduce: ;} break; - case 181: -#line 2059 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 207: +#line 1943 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - (yyval.ArgList) = new std::vector<std::pair<TypeInfo,char*> >(); + (yyval.ArgList) = new std::vector<std::pair<PATypeHolder*,char*> >(); (yyval.ArgList)->push_back(*(yyvsp[0].ArgVal)); delete (yyvsp[0].ArgVal); CHECK_FOR_ERROR ;} break; - case 182: -#line 2066 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 208: +#line 1950 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = (yyvsp[0].ArgList); CHECK_FOR_ERROR ;} break; - case 183: -#line 2070 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 209: +#line 1954 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = (yyvsp[-2].ArgList); - TypeInfo TI; - TI.type = new PATypeHolder(Type::VoidTy); - TI.signedness = isSignless; - (yyval.ArgList)->push_back(std::pair<TypeInfo,char*>(TI,(char*)0)); + (yyval.ArgList)->push_back(std::pair<PATypeHolder*, + char*>(new PATypeHolder(Type::VoidTy), 0)); CHECK_FOR_ERROR ;} break; - case 184: -#line 2078 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 210: +#line 1960 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - (yyval.ArgList) = new std::vector<std::pair<TypeInfo,char*> >(); - TypeInfo TI; - TI.type = new PATypeHolder(Type::VoidTy); - TI.signedness = isSignless; - (yyval.ArgList)->push_back(std::make_pair(TI, (char*)0)); + (yyval.ArgList) = new std::vector<std::pair<PATypeHolder*,char*> >(); + (yyval.ArgList)->push_back(std::make_pair(new PATypeHolder(Type::VoidTy), (char*)0)); CHECK_FOR_ERROR ;} break; - case 185: -#line 2086 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 211: +#line 1965 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = 0; CHECK_FOR_ERROR ;} break; - case 186: -#line 2092 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 212: +#line 1971 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { UnEscapeLexed((yyvsp[-5].StrVal)); std::string FunctionName((yyvsp[-5].StrVal)); free((yyvsp[-5].StrVal)); // Free strdup'd memory! - if (!((yyvsp[-6].TypeVal).type->get())->isFirstClassType() && (yyvsp[-6].TypeVal).type->get() != Type::VoidTy) + if (!(*(yyvsp[-6].TypeVal))->isFirstClassType() && *(yyvsp[-6].TypeVal) != Type::VoidTy) GEN_ERROR("LLVM functions cannot return aggregate types!"); std::vector<const Type*> ParamTypeList; if ((yyvsp[-3].ArgList)) { // If there are arguments... - for (std::vector<std::pair<TypeInfo,char*> >::iterator I = (yyvsp[-3].ArgList)->begin(); + for (std::vector<std::pair<PATypeHolder*,char*> >::iterator I = (yyvsp[-3].ArgList)->begin(); I != (yyvsp[-3].ArgList)->end(); ++I) - ParamTypeList.push_back(I->first.type->get()); + ParamTypeList.push_back(I->first->get()); } bool isVarArg = ParamTypeList.size() && ParamTypeList.back() == Type::VoidTy; if (isVarArg) ParamTypeList.pop_back(); - const FunctionType *FT = FunctionType::get((yyvsp[-6].TypeVal).type->get(), ParamTypeList, - isVarArg); + const FunctionType *FT = FunctionType::get(*(yyvsp[-6].TypeVal), ParamTypeList, isVarArg); const PointerType *PFT = PointerType::get(FT); - delete (yyvsp[-6].TypeVal).type; + delete (yyvsp[-6].TypeVal); ValID ID; if (!FunctionName.empty()) { @@ -4452,27 +4444,29 @@ yyreduce: // Add all of the arguments we parsed to the function... if ((yyvsp[-3].ArgList)) { // Is null if empty... if (isVarArg) { // Nuke the last entry - assert((yyvsp[-3].ArgList)->back().first.type->get() == Type::VoidTy && - (yyvsp[-3].ArgList)->back().second == 0 && "Not a varargs marker!"); - delete (yyvsp[-3].ArgList)->back().first.type; + assert((yyvsp[-3].ArgList)->back().first->get() == Type::VoidTy && (yyvsp[-3].ArgList)->back().second == 0&& + "Not a varargs marker!"); + delete (yyvsp[-3].ArgList)->back().first; (yyvsp[-3].ArgList)->pop_back(); // Delete the last entry } Function::arg_iterator ArgIt = Fn->arg_begin(); - for (std::vector<std::pair<TypeInfo,char*> >::iterator I = (yyvsp[-3].ArgList)->begin(); + for (std::vector<std::pair<PATypeHolder*,char*> >::iterator I = (yyvsp[-3].ArgList)->begin(); I != (yyvsp[-3].ArgList)->end(); ++I, ++ArgIt) { - delete I->first.type; // Delete the typeholder... + delete I->first; // Delete the typeholder... + setValueName(ArgIt, I->second); // Insert arg into symtab... CHECK_FOR_ERROR InsertValue(ArgIt); } + delete (yyvsp[-3].ArgList); // We're now done with the argument list } CHECK_FOR_ERROR ;} break; - case 189: -#line 2187 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 215: +#line 2067 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.FunctionVal) = CurFun.CurrentFunction; @@ -4482,31 +4476,31 @@ yyreduce: ;} break; - case 192: -#line 2197 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 218: +#line 2077 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.FunctionVal) = (yyvsp[-1].FunctionVal); CHECK_FOR_ERROR ;} break; - case 194: -#line 2203 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 220: +#line 2083 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CurFun.Linkage = GlobalValue::DLLImportLinkage; ;} break; - case 195: -#line 2204 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 221: +#line 2084 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CurFun.Linkage = GlobalValue::ExternalWeakLinkage; ;} break; - case 196: -#line 2206 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 222: +#line 2086 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { CurFun.isDeclare = true; ;} break; - case 197: -#line 2206 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 223: +#line 2086 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.FunctionVal) = CurFun.CurrentFunction; CurFun.FunctionDone(); @@ -4514,123 +4508,125 @@ yyreduce: ;} break; - case 198: -#line 2216 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 224: +#line 2096 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; CHECK_FOR_ERROR ;} break; - case 199: -#line 2220 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 225: +#line 2100 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; CHECK_FOR_ERROR ;} break; - case 200: -#line 2225 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 226: +#line 2105 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // A reference to a direct constant (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val)); CHECK_FOR_ERROR ;} break; - case 201: -#line 2229 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 227: +#line 2109 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val)); CHECK_FOR_ERROR ;} break; - case 202: -#line 2233 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 228: +#line 2113 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Perhaps it's an FP constant? (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal)); CHECK_FOR_ERROR ;} break; - case 203: -#line 2237 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 229: +#line 2117 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::create(ConstantBool::getTrue()); CHECK_FOR_ERROR ;} break; - case 204: -#line 2241 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 230: +#line 2121 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::create(ConstantBool::getFalse()); CHECK_FOR_ERROR ;} break; - case 205: -#line 2245 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 231: +#line 2125 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::createNull(); CHECK_FOR_ERROR ;} break; - case 206: -#line 2249 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 232: +#line 2129 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::createUndef(); CHECK_FOR_ERROR ;} break; - case 207: -#line 2253 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 233: +#line 2133 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // A vector zero constant. (yyval.ValIDVal) = ValID::createZeroInit(); CHECK_FOR_ERROR ;} break; - case 208: -#line 2257 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 234: +#line 2137 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Nonempty unsized packed vector - const Type *ETy = (*(yyvsp[-1].ConstVector))[0].cnst->getType(); + const Type *ETy = (*(yyvsp[-1].ConstVector))[0]->getType(); int NumElements = (yyvsp[-1].ConstVector)->size(); PackedType* pt = PackedType::get(ETy, NumElements); PATypeHolder* PTy = new PATypeHolder( - HandleUpRefs(PackedType::get( ETy, NumElements))); + HandleUpRefs( + PackedType::get( + ETy, + NumElements) + ) + ); // Verify all elements are correct type! - std::vector<Constant*> elems; for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) { - if (ETy != (*(yyvsp[-1].ConstVector))[i].cnst->getType()) { + 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].cnst->getType()->getDescription() + "'."); - } else - elems.push_back((*(yyvsp[-1].ConstVector))[i].cnst); + (*(yyvsp[-1].ConstVector))[i]->getType()->getDescription() + "'."); } - (yyval.ValIDVal) = ValID::create(ConstantPacked::get(pt, elems)); + (yyval.ValIDVal) = ValID::create(ConstantPacked::get(pt, *(yyvsp[-1].ConstVector))); delete PTy; delete (yyvsp[-1].ConstVector); CHECK_FOR_ERROR ;} break; - case 209: -#line 2280 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 235: +#line 2162 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal).cnst); + (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal)); CHECK_FOR_ERROR ;} break; - case 210: -#line 2284 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 236: +#line 2166 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { char *End = UnEscapeLexed((yyvsp[-2].StrVal), true); std::string AsmStr = std::string((yyvsp[-2].StrVal), End); @@ -4643,50 +4639,48 @@ yyreduce: ;} break; - case 211: -#line 2298 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 237: +#line 2180 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Is it an integer reference...? (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal)); CHECK_FOR_ERROR ;} break; - case 212: -#line 2302 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 238: +#line 2184 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Is it a named reference...? (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal)); CHECK_FOR_ERROR ;} break; - case 215: -#line 2314 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 241: +#line 2196 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - (yyval.ValueVal).val = getVal((yyvsp[-1].TypeVal).type->get(), (yyvsp[0].ValIDVal)); - delete (yyvsp[-1].TypeVal).type; + (yyval.ValueVal) = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal)); delete (yyvsp[-1].TypeVal); CHECK_FOR_ERROR - (yyval.ValueVal).signedness = (yyvsp[-1].TypeVal).signedness; ;} break; - case 216: -#line 2321 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 242: +#line 2201 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.FunctionVal) = (yyvsp[-1].FunctionVal); CHECK_FOR_ERROR ;} break; - case 217: -#line 2325 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 243: +#line 2205 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Do not allow functions with 0 basic blocks (yyval.FunctionVal) = (yyvsp[-1].FunctionVal); CHECK_FOR_ERROR ;} break; - case 218: -#line 2334 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 244: +#line 2214 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal)); CHECK_FOR_ERROR @@ -4699,8 +4693,8 @@ yyreduce: ;} break; - case 219: -#line 2345 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 245: +#line 2225 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[0].InstVal))) if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0))) @@ -4712,8 +4706,8 @@ yyreduce: ;} break; - case 220: -#line 2354 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 246: +#line 2234 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++), true); CHECK_FOR_ERROR @@ -4728,8 +4722,8 @@ yyreduce: ;} break; - case 221: -#line 2366 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 247: +#line 2246 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((yyvsp[0].StrVal)), true); CHECK_FOR_ERROR @@ -4744,24 +4738,24 @@ yyreduce: ;} break; - case 222: -#line 2379 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 248: +#line 2259 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Return with a result... - (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal).val); + (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal)); CHECK_FOR_ERROR ;} break; - case 223: -#line 2383 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 249: +#line 2263 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Return with no result... (yyval.TermInstVal) = new ReturnInst(); CHECK_FOR_ERROR ;} break; - case 224: -#line 2387 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 250: +#line 2267 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Unconditional Branch... BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal)); CHECK_FOR_ERROR @@ -4769,8 +4763,8 @@ yyreduce: ;} break; - case 225: -#line 2392 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 251: +#line 2272 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal)); CHECK_FOR_ERROR @@ -4782,10 +4776,10 @@ yyreduce: ;} break; - case 226: -#line 2401 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 252: +#line 2281 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - Value* tmpVal = getVal((yyvsp[-7].TypeVal).type->get(), (yyvsp[-6].ValIDVal)); + Value* tmpVal = getVal((yyvsp[-7].PrimType), (yyvsp[-6].ValIDVal)); CHECK_FOR_ERROR BasicBlock* tmpBB = getBBVal((yyvsp[-3].ValIDVal)); CHECK_FOR_ERROR @@ -4805,10 +4799,10 @@ yyreduce: ;} break; - case 227: -#line 2420 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 253: +#line 2300 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - Value* tmpVal = getVal((yyvsp[-6].TypeVal).type->get(), (yyvsp[-5].ValIDVal)); + Value* tmpVal = getVal((yyvsp[-6].PrimType), (yyvsp[-5].ValIDVal)); CHECK_FOR_ERROR BasicBlock* tmpBB = getBBVal((yyvsp[-2].ValIDVal)); CHECK_FOR_ERROR @@ -4818,26 +4812,26 @@ yyreduce: ;} break; - case 228: -#line 2430 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 254: +#line 2310 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { const PointerType *PFTy; const FunctionType *Ty; - if (!(PFTy = dyn_cast<PointerType>((yyvsp[-10].TypeVal).type->get())) || + if (!(PFTy = dyn_cast<PointerType>((yyvsp[-10].TypeVal)->get())) || !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector<const Type*> ParamTypes; if ((yyvsp[-7].ValueList)) { - for (std::vector<ValueInfo>::iterator I = (yyvsp[-7].ValueList)->begin(), E = (yyvsp[-7].ValueList)->end(); + for (std::vector<Value*>::iterator I = (yyvsp[-7].ValueList)->begin(), E = (yyvsp[-7].ValueList)->end(); I != E; ++I) - ParamTypes.push_back((*I).val->getType()); + ParamTypes.push_back((*I)->getType()); } bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy; if (isVarArg) ParamTypes.pop_back(); - Ty = FunctionType::get((yyvsp[-10].TypeVal).type->get(), ParamTypes, isVarArg); + Ty = FunctionType::get((yyvsp[-10].TypeVal)->get(), ParamTypes, isVarArg); PFTy = PointerType::get(Ty); } @@ -4857,56 +4851,47 @@ yyreduce: // FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); - std::vector<ValueInfo>::iterator ArgI = (yyvsp[-7].ValueList)->begin(), ArgE = (yyvsp[-7].ValueList)->end(); - - std::vector<Value*> args; - for (; ArgI != ArgE; ++ArgI) - if (I == E) { - if (Ty->isVarArg()) { - args.push_back((*ArgI).val); - } else { - GEN_ERROR("Too many parameters for function of type " + - Ty->getDescription()); - } - } else { - if ((*ArgI).val->getType() != *I) { - GEN_ERROR("Parameter " + (*ArgI).val->getName() + - " is not of type '" + (*I)->getDescription() + "'!"); - } else - args.push_back((*ArgI).val); - ++I; - } - (yyval.TermInstVal) = new InvokeInst(V, Normal, Except, args); + std::vector<Value*>::iterator ArgI = (yyvsp[-7].ValueList)->begin(), ArgE = (yyvsp[-7].ValueList)->end(); + + for (; ArgI != ArgE && I != E; ++ArgI, ++I) + if ((*ArgI)->getType() != *I) + GEN_ERROR("Parameter " +(*ArgI)->getName()+ " is not of type '" + + (*I)->getDescription() + "'!"); + + if (I != E || (ArgI != ArgE && !Ty->isVarArg())) + GEN_ERROR("Invalid number of parameters detected!"); + + (yyval.TermInstVal) = new InvokeInst(V, Normal, Except, *(yyvsp[-7].ValueList)); } cast<InvokeInst>((yyval.TermInstVal))->setCallingConv((yyvsp[-11].UIntVal)); - delete (yyvsp[-10].TypeVal).type; + delete (yyvsp[-10].TypeVal); delete (yyvsp[-7].ValueList); CHECK_FOR_ERROR ;} break; - case 229: -#line 2494 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 255: +#line 2365 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.TermInstVal) = new UnwindInst(); CHECK_FOR_ERROR ;} break; - case 230: -#line 2498 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 256: +#line 2369 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.TermInstVal) = new UnreachableInst(); CHECK_FOR_ERROR ;} break; - case 231: -#line 2505 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 257: +#line 2376 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.JumpTable) = (yyvsp[-5].JumpTable); - Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].TypeVal).type->get(), (yyvsp[-3].ValIDVal))); + Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal))); CHECK_FOR_ERROR if (V == 0) GEN_ERROR("May only switch on a constant pool value!"); @@ -4917,11 +4902,11 @@ yyreduce: ;} break; - case 232: -#line 2516 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 258: +#line 2387 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >(); - Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].TypeVal).type->get(), (yyvsp[-3].ValIDVal))); + Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal))); CHECK_FOR_ERROR if (V == 0) @@ -4933,8 +4918,8 @@ yyreduce: ;} break; - case 233: -#line 2529 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 259: +#line 2400 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Is this definition named?? if so, assign the name... setValueName((yyvsp[0].InstVal), (yyvsp[-1].StrVal)); @@ -4945,21 +4930,21 @@ yyreduce: ;} break; - case 234: -#line 2538 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 260: +#line 2409 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Used for PHI nodes (yyval.PHIList) = new std::list<std::pair<Value*, BasicBlock*> >(); - Value* tmpVal = getVal((yyvsp[-5].TypeVal).type->get(), (yyvsp[-3].ValIDVal)); + Value* tmpVal = getVal(*(yyvsp[-5].TypeVal), (yyvsp[-3].ValIDVal)); CHECK_FOR_ERROR BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal)); CHECK_FOR_ERROR (yyval.PHIList)->push_back(std::make_pair(tmpVal, tmpBB)); - delete (yyvsp[-5].TypeVal).type; + delete (yyvsp[-5].TypeVal); ;} break; - case 235: -#line 2547 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 261: +#line 2418 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.PHIList) = (yyvsp[-6].PHIList); Value* tmpVal = getVal((yyvsp[-6].PHIList)->front().first->getType(), (yyvsp[-3].ValIDVal)); @@ -4970,16 +4955,16 @@ yyreduce: ;} break; - case 236: -#line 2557 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 262: +#line 2428 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { // Used for call statements, and memory insts... - (yyval.ValueList) = new std::vector<ValueInfo>(); + (yyval.ValueList) = new std::vector<Value*>(); (yyval.ValueList)->push_back((yyvsp[0].ValueVal)); ;} break; - case 237: -#line 2561 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 263: +#line 2432 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ValueList) = (yyvsp[-2].ValueList); (yyvsp[-2].ValueList)->push_back((yyvsp[0].ValueVal)); @@ -4987,188 +4972,189 @@ yyreduce: ;} break; - case 238: -#line 2568 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" - { - (yyval.ValueList) = (yyvsp[0].ValueList); - ;} - break; - - case 239: -#line 2571 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" - { - (yyval.ValueList) = 0; - ;} + case 265: +#line 2439 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + { (yyval.ValueList) = 0; ;} break; - case 240: -#line 2575 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 266: +#line 2441 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; CHECK_FOR_ERROR ;} break; - case 241: -#line 2579 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 267: +#line 2445 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; CHECK_FOR_ERROR ;} break; - case 242: -#line 2584 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 268: +#line 2450 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if (!(yyvsp[-3].TypeVal).type->get()->isInteger() && !(yyvsp[-3].TypeVal).type->get()->isFloatingPoint() && - !isa<PackedType>((yyvsp[-3].TypeVal).type->get())) + if (!(*(yyvsp[-3].TypeVal))->isInteger() && !(*(yyvsp[-3].TypeVal))->isFloatingPoint() && + !isa<PackedType>((*(yyvsp[-3].TypeVal)).get())) GEN_ERROR( "Arithmetic operator requires integer, FP, or packed operands!"); - if (isa<PackedType>((yyvsp[-3].TypeVal).type->get()) && - ((yyvsp[-4].BinaryOpVal).opcode == Instruction::URem || - (yyvsp[-4].BinaryOpVal).opcode == Instruction::SRem || - (yyvsp[-4].BinaryOpVal).opcode == Instruction::FRem)) + if (isa<PackedType>((*(yyvsp[-3].TypeVal)).get()) && + ((yyvsp[-4].BinaryOpVal) == Instruction::URem || + (yyvsp[-4].BinaryOpVal) == Instruction::SRem || + (yyvsp[-4].BinaryOpVal) == Instruction::FRem)) GEN_ERROR("U/S/FRem not supported on packed types!"); - // Upgrade the opcode from obsolete versions before we do anything with it. - sanitizeOpcode((yyvsp[-4].BinaryOpVal),(yyvsp[-3].TypeVal).type->get()); - CHECK_FOR_ERROR; - Value* val1 = getVal((yyvsp[-3].TypeVal).type->get(), (yyvsp[-2].ValIDVal)); + Value* val1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal)); CHECK_FOR_ERROR - Value* val2 = getVal((yyvsp[-3].TypeVal).type->get(), (yyvsp[0].ValIDVal)); + Value* val2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal)); CHECK_FOR_ERROR - (yyval.InstVal) = BinaryOperator::create((yyvsp[-4].BinaryOpVal).opcode, val1, val2); + (yyval.InstVal) = BinaryOperator::create((yyvsp[-4].BinaryOpVal), val1, val2); if ((yyval.InstVal) == 0) GEN_ERROR("binary operator returned null!"); - delete (yyvsp[-3].TypeVal).type; + delete (yyvsp[-3].TypeVal); ;} break; - case 243: -#line 2606 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 269: +#line 2469 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if (!(yyvsp[-3].TypeVal).type->get()->isIntegral()) { - if (!isa<PackedType>((yyvsp[-3].TypeVal).type->get()) || - !cast<PackedType>((yyvsp[-3].TypeVal).type->get())->getElementType()->isIntegral()) + if (!(*(yyvsp[-3].TypeVal))->isIntegral()) { + if (!isa<PackedType>((yyvsp[-3].TypeVal)->get()) || + !cast<PackedType>((yyvsp[-3].TypeVal)->get())->getElementType()->isIntegral()) GEN_ERROR("Logical operator requires integral operands!"); } - Value* tmpVal1 = getVal((yyvsp[-3].TypeVal).type->get(), (yyvsp[-2].ValIDVal)); + Value* tmpVal1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal)); CHECK_FOR_ERROR - Value* tmpVal2 = getVal((yyvsp[-3].TypeVal).type->get(), (yyvsp[0].ValIDVal)); + Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal)); CHECK_FOR_ERROR - (yyval.InstVal) = BinaryOperator::create((yyvsp[-4].BinaryOpVal).opcode, tmpVal1, tmpVal2); + (yyval.InstVal) = BinaryOperator::create((yyvsp[-4].BinaryOpVal), tmpVal1, tmpVal2); if ((yyval.InstVal) == 0) GEN_ERROR("binary operator returned null!"); - delete (yyvsp[-3].TypeVal).type; + delete (yyvsp[-3].TypeVal); ;} break; - case 244: -#line 2621 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 270: +#line 2484 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if(isa<PackedType>((yyvsp[-3].TypeVal).type->get())) { + if(isa<PackedType>((*(yyvsp[-3].TypeVal)).get())) { GEN_ERROR( "PackedTypes currently not supported in setcc instructions!"); } - Value* tmpVal1 = getVal((yyvsp[-3].TypeVal).type->get(), (yyvsp[-2].ValIDVal)); + Value* tmpVal1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal)); CHECK_FOR_ERROR - Value* tmpVal2 = getVal((yyvsp[-3].TypeVal).type->get(), (yyvsp[0].ValIDVal)); + Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal)); CHECK_FOR_ERROR - (yyval.InstVal) = new SetCondInst((yyvsp[-4].BinaryOpVal).opcode, tmpVal1, tmpVal2); + (yyval.InstVal) = new SetCondInst((yyvsp[-4].BinaryOpVal), tmpVal1, tmpVal2); if ((yyval.InstVal) == 0) GEN_ERROR("binary operator returned null!"); - delete (yyvsp[-3].TypeVal).type; + delete (yyvsp[-3].TypeVal); ;} break; - case 245: -#line 2635 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 271: +#line 2498 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + { + if (isa<PackedType>((*(yyvsp[-3].TypeVal)).get())) + GEN_ERROR("Packed types not supported by icmp instruction"); + Value* tmpVal1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal)); + CHECK_FOR_ERROR + Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal)); + CHECK_FOR_ERROR + (yyval.InstVal) = CmpInst::create((yyvsp[-5].OtherOpVal), (yyvsp[-4].IPredicate), tmpVal1, tmpVal2); + if ((yyval.InstVal) == 0) + GEN_ERROR("icmp operator returned null!"); + ;} + break; + + case 272: +#line 2509 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + { + if (isa<PackedType>((*(yyvsp[-3].TypeVal)).get())) + GEN_ERROR("Packed types not supported by fcmp instruction"); + Value* tmpVal1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal)); + CHECK_FOR_ERROR + Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal)); + CHECK_FOR_ERROR + (yyval.InstVal) = CmpInst::create((yyvsp[-5].OtherOpVal), (yyvsp[-4].FPredicate), tmpVal1, tmpVal2); + if ((yyval.InstVal) == 0) + GEN_ERROR("fcmp operator returned null!"); + ;} + break; + + case 273: +#line 2520 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { llvm_cerr << "WARNING: Use of eliminated 'not' instruction:" << " Replacing with 'xor'.\n"; - Value *Ones = ConstantIntegral::getAllOnesValue((yyvsp[0].ValueVal).val->getType()); + Value *Ones = ConstantIntegral::getAllOnesValue((yyvsp[0].ValueVal)->getType()); if (Ones == 0) GEN_ERROR("Expected integral type for not instruction!"); - (yyval.InstVal) = BinaryOperator::create(Instruction::Xor, (yyvsp[0].ValueVal).val, Ones); + (yyval.InstVal) = BinaryOperator::create(Instruction::Xor, (yyvsp[0].ValueVal), Ones); if ((yyval.InstVal) == 0) GEN_ERROR("Could not create a xor instruction!"); CHECK_FOR_ERROR ;} break; - case 246: -#line 2648 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 274: +#line 2533 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[0].ValueVal).val->getType() != Type::UByteTy) + if ((yyvsp[0].ValueVal)->getType() != Type::UByteTy) GEN_ERROR("Shift amount must be ubyte!"); - if (!(yyvsp[-2].ValueVal).val->getType()->isInteger()) + if (!(yyvsp[-2].ValueVal)->getType()->isInteger()) GEN_ERROR("Shift constant expression requires integer operand!"); - // Handle opcode upgrade situations - sanitizeOpcode((yyvsp[-3].OtherOpVal), (yyvsp[-2].ValueVal).val->getType()); CHECK_FOR_ERROR; - (yyval.InstVal) = new ShiftInst((yyvsp[-3].OtherOpVal).opcode, (yyvsp[-2].ValueVal).val, (yyvsp[0].ValueVal).val); + (yyval.InstVal) = new ShiftInst((yyvsp[-3].OtherOpVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)); CHECK_FOR_ERROR ;} break; - case 247: -#line 2659 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 275: +#line 2542 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - Value* Val = (yyvsp[-2].ValueVal).val; - const Type* Ty = (yyvsp[0].TypeVal).type->get(); + Value* Val = (yyvsp[-2].ValueVal); + const Type* Ty = (yyvsp[0].TypeVal)->get(); if (!Val->getType()->isFirstClassType()) GEN_ERROR("cast from a non-primitive type: '" + Val->getType()->getDescription() + "'!"); if (!Ty->isFirstClassType()) GEN_ERROR("cast to a non-primitive type: '" + Ty->getDescription() +"'!"); - - if ((yyvsp[-3].CastOpVal).obsolete) { - if (Ty == Type::BoolTy) { - // The previous definition of cast to bool was a compare against zero. - // We have to retain that semantic so we do it here. - (yyval.InstVal) = new SetCondInst(Instruction::SetNE, (yyvsp[-2].ValueVal).val, - Constant::getNullValue((yyvsp[-2].ValueVal).val->getType())); - } else if (Val->getType()->isFloatingPoint() && isa<PointerType>(Ty)) { - CastInst *CI = new FPToUIInst(Val, Type::ULongTy); - (yyval.InstVal) = new IntToPtrInst(CI, Ty); - } else { - (yyval.InstVal) = CastInst::createInferredCast(Val, Ty); - } - } else { - (yyval.InstVal) = CastInst::create((yyvsp[-3].CastOpVal).opcode, (yyvsp[-2].ValueVal).val, (yyvsp[0].TypeVal).type->get()); - } - delete (yyvsp[0].TypeVal).type; + (yyval.InstVal) = CastInst::create((yyvsp[-3].CastOpVal), (yyvsp[-2].ValueVal), (yyvsp[0].TypeVal)->get()); + delete (yyvsp[0].TypeVal); ;} break; - case 248: -#line 2685 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 276: +#line 2553 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if ((yyvsp[-4].ValueVal).val->getType() != Type::BoolTy) + if ((yyvsp[-4].ValueVal)->getType() != Type::BoolTy) GEN_ERROR("select condition must be boolean!"); - if ((yyvsp[-2].ValueVal).val->getType() != (yyvsp[0].ValueVal).val->getType()) + if ((yyvsp[-2].ValueVal)->getType() != (yyvsp[0].ValueVal)->getType()) GEN_ERROR("select value types should match!"); - (yyval.InstVal) = new SelectInst((yyvsp[-4].ValueVal).val, (yyvsp[-2].ValueVal).val, (yyvsp[0].ValueVal).val); + (yyval.InstVal) = new SelectInst((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)); CHECK_FOR_ERROR ;} break; - case 249: -#line 2693 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 277: +#line 2561 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { NewVarArgs = true; - (yyval.InstVal) = new VAArgInst((yyvsp[-2].ValueVal).val, (yyvsp[0].TypeVal).type->get()); - delete (yyvsp[0].TypeVal).type; + (yyval.InstVal) = new VAArgInst((yyvsp[-2].ValueVal), *(yyvsp[0].TypeVal)); + delete (yyvsp[0].TypeVal); CHECK_FOR_ERROR ;} break; - case 250: -#line 2699 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 278: +#line 2567 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { ObsoleteVarArgs = true; - const Type* ArgTy = (yyvsp[-2].ValueVal).val->getType(); + const Type* ArgTy = (yyvsp[-2].ValueVal)->getType(); Function* NF = CurModule.CurrentModule-> getOrInsertFunction("llvm.va_copy", ArgTy, ArgTy, (Type *)0); @@ -5179,20 +5165,20 @@ yyreduce: //b = vaarg foo, t AllocaInst* foo = new AllocaInst(ArgTy, 0, "vaarg.fix"); CurBB->getInstList().push_back(foo); - CallInst* bar = new CallInst(NF, (yyvsp[-2].ValueVal).val); + CallInst* bar = new CallInst(NF, (yyvsp[-2].ValueVal)); CurBB->getInstList().push_back(bar); CurBB->getInstList().push_back(new StoreInst(bar, foo)); - (yyval.InstVal) = new VAArgInst(foo, (yyvsp[0].TypeVal).type->get()); - delete (yyvsp[0].TypeVal).type; + (yyval.InstVal) = new VAArgInst(foo, *(yyvsp[0].TypeVal)); + delete (yyvsp[0].TypeVal); CHECK_FOR_ERROR ;} break; - case 251: -#line 2719 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 279: +#line 2587 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { ObsoleteVarArgs = true; - const Type* ArgTy = (yyvsp[-2].ValueVal).val->getType(); + const Type* ArgTy = (yyvsp[-2].ValueVal)->getType(); Function* NF = CurModule.CurrentModule-> getOrInsertFunction("llvm.va_copy", ArgTy, ArgTy, (Type *)0); @@ -5204,49 +5190,49 @@ yyreduce: //b = load foo AllocaInst* foo = new AllocaInst(ArgTy, 0, "vanext.fix"); CurBB->getInstList().push_back(foo); - CallInst* bar = new CallInst(NF, (yyvsp[-2].ValueVal).val); + CallInst* bar = new CallInst(NF, (yyvsp[-2].ValueVal)); CurBB->getInstList().push_back(bar); CurBB->getInstList().push_back(new StoreInst(bar, foo)); - Instruction* tmp = new VAArgInst(foo, (yyvsp[0].TypeVal).type->get()); + Instruction* tmp = new VAArgInst(foo, *(yyvsp[0].TypeVal)); CurBB->getInstList().push_back(tmp); (yyval.InstVal) = new LoadInst(foo); - delete (yyvsp[0].TypeVal).type; + delete (yyvsp[0].TypeVal); CHECK_FOR_ERROR ;} break; - case 252: -#line 2742 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 280: +#line 2610 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal).val, (yyvsp[0].ValueVal).val)) + if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal))) GEN_ERROR("Invalid extractelement operands!"); - (yyval.InstVal) = new ExtractElementInst((yyvsp[-2].ValueVal).val, (yyvsp[0].ValueVal).val); + (yyval.InstVal) = new ExtractElementInst((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)); CHECK_FOR_ERROR ;} break; - case 253: -#line 2748 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 281: +#line 2616 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal).val, (yyvsp[-2].ValueVal).val, (yyvsp[0].ValueVal).val)) + if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal))) GEN_ERROR("Invalid insertelement operands!"); - (yyval.InstVal) = new InsertElementInst((yyvsp[-4].ValueVal).val, (yyvsp[-2].ValueVal).val, (yyvsp[0].ValueVal).val); + (yyval.InstVal) = new InsertElementInst((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)); CHECK_FOR_ERROR ;} break; - case 254: -#line 2754 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 282: +#line 2622 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal).val, (yyvsp[-2].ValueVal).val, (yyvsp[0].ValueVal).val)) + if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal))) GEN_ERROR("Invalid shufflevector operands!"); - (yyval.InstVal) = new ShuffleVectorInst((yyvsp[-4].ValueVal).val, (yyvsp[-2].ValueVal).val, (yyvsp[0].ValueVal).val); + (yyval.InstVal) = new ShuffleVectorInst((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)); CHECK_FOR_ERROR ;} break; - case 255: -#line 2760 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 283: +#line 2628 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { const Type *Ty = (yyvsp[0].PHIList)->front().first->getType(); if (!Ty->isFirstClassType()) @@ -5264,30 +5250,29 @@ yyreduce: ;} break; - case 256: -#line 2775 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 284: +#line 2643 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { const PointerType *PFTy = 0; const FunctionType *Ty = 0; - if (!(PFTy = dyn_cast<PointerType>((yyvsp[-4].TypeVal).type->get())) || + if (!(PFTy = dyn_cast<PointerType>((yyvsp[-4].TypeVal)->get())) || !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) { // Pull out the types of all of the arguments... std::vector<const Type*> ParamTypes; if ((yyvsp[-1].ValueList)) { - for (std::vector<ValueInfo>::iterator I = (yyvsp[-1].ValueList)->begin(), E = (yyvsp[-1].ValueList)->end(); + for (std::vector<Value*>::iterator I = (yyvsp[-1].ValueList)->begin(), E = (yyvsp[-1].ValueList)->end(); I != E; ++I) - ParamTypes.push_back((*I).val->getType()); + ParamTypes.push_back((*I)->getType()); } bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy; if (isVarArg) ParamTypes.pop_back(); - if (!(yyvsp[-4].TypeVal).type->get()->isFirstClassType() && - (yyvsp[-4].TypeVal).type->get() != Type::VoidTy) + if (!(*(yyvsp[-4].TypeVal))->isFirstClassType() && *(yyvsp[-4].TypeVal) != Type::VoidTy) GEN_ERROR("LLVM functions cannot return aggregate types!"); - Ty = FunctionType::get((yyvsp[-4].TypeVal).type->get(), ParamTypes, isVarArg); + Ty = FunctionType::get((yyvsp[-4].TypeVal)->get(), ParamTypes, isVarArg); PFTy = PointerType::get(Ty); } @@ -5308,180 +5293,174 @@ yyreduce: // FunctionType::param_iterator I = Ty->param_begin(); FunctionType::param_iterator E = Ty->param_end(); - std::vector<ValueInfo>::iterator ArgI = (yyvsp[-1].ValueList)->begin(), ArgE = (yyvsp[-1].ValueList)->end(); - - std::vector<Value*> args; - for (; ArgI != ArgE ; ++ArgI) - if (I == E) { - if (Ty->isVarArg()) { - args.push_back((*ArgI).val); - } else { - GEN_ERROR("Too many parameters for function of type " + - Ty->getDescription()); - } - } else { - if ((*ArgI).val->getType() != *I) { - GEN_ERROR("Parameter " + (*ArgI).val->getName() + - " is not of type '" + (*I)->getDescription() + "'!"); - } else - args.push_back((*ArgI).val); - ++I; - } + std::vector<Value*>::iterator ArgI = (yyvsp[-1].ValueList)->begin(), ArgE = (yyvsp[-1].ValueList)->end(); + + for (; ArgI != ArgE && I != E; ++ArgI, ++I) + if ((*ArgI)->getType() != *I) + GEN_ERROR("Parameter " +(*ArgI)->getName()+ " is not of type '" + + (*I)->getDescription() + "'!"); if (I != E || (ArgI != ArgE && !Ty->isVarArg())) GEN_ERROR("Invalid number of parameters detected!"); - (yyval.InstVal) = new CallInst(V, args); + (yyval.InstVal) = new CallInst(V, *(yyvsp[-1].ValueList)); } cast<CallInst>((yyval.InstVal))->setTailCall((yyvsp[-6].BoolVal)); cast<CallInst>((yyval.InstVal))->setCallingConv((yyvsp[-5].UIntVal)); - delete (yyvsp[-4].TypeVal).type; + delete (yyvsp[-4].TypeVal); delete (yyvsp[-1].ValueList); CHECK_FOR_ERROR ;} break; - case 257: -#line 2848 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 285: +#line 2702 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.InstVal) = (yyvsp[0].InstVal); CHECK_FOR_ERROR ;} break; - case 258: -#line 2855 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 286: +#line 2709 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.ValueList) = (yyvsp[0].ValueList); CHECK_FOR_ERROR ;} break; - case 259: -#line 2858 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 287: +#line 2712 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - (yyval.ValueList) = new std::vector<ValueInfo>(); + (yyval.ValueList) = new std::vector<Value*>(); CHECK_FOR_ERROR ;} break; - case 260: -#line 2863 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 288: +#line 2717 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; CHECK_FOR_ERROR ;} break; - case 261: -#line 2867 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 289: +#line 2721 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; CHECK_FOR_ERROR ;} break; - case 262: -#line 2874 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 290: +#line 2728 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - (yyval.InstVal) = new MallocInst((yyvsp[-1].TypeVal).type->get(), 0, (yyvsp[0].UIntVal)); - delete (yyvsp[-1].TypeVal).type; + (yyval.InstVal) = new MallocInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal)); + delete (yyvsp[-1].TypeVal); CHECK_FOR_ERROR ;} break; - case 263: -#line 2879 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 291: +#line 2733 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - Value* tmpVal = getVal((yyvsp[-2].TypeVal).type->get(), (yyvsp[-1].ValIDVal)); + Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal)); CHECK_FOR_ERROR - (yyval.InstVal) = new MallocInst((yyvsp[-4].TypeVal).type->get(), tmpVal, (yyvsp[0].UIntVal)); - delete (yyvsp[-4].TypeVal).type; + (yyval.InstVal) = new MallocInst(*(yyvsp[-4].TypeVal), tmpVal, (yyvsp[0].UIntVal)); + delete (yyvsp[-4].TypeVal); ;} break; - case 264: -#line 2885 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 292: +#line 2739 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - (yyval.InstVal) = new AllocaInst((yyvsp[-1].TypeVal).type->get(), 0, (yyvsp[0].UIntVal)); - delete (yyvsp[-1].TypeVal).type; + (yyval.InstVal) = new AllocaInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal)); + delete (yyvsp[-1].TypeVal); CHECK_FOR_ERROR ;} break; - case 265: -#line 2890 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 293: +#line 2744 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - Value* tmpVal = getVal((yyvsp[-2].TypeVal).type->get(), (yyvsp[-1].ValIDVal)); + Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal)); CHECK_FOR_ERROR - (yyval.InstVal) = new AllocaInst((yyvsp[-4].TypeVal).type->get(), tmpVal, (yyvsp[0].UIntVal)); - delete (yyvsp[-4].TypeVal).type; + (yyval.InstVal) = new AllocaInst(*(yyvsp[-4].TypeVal), tmpVal, (yyvsp[0].UIntVal)); + delete (yyvsp[-4].TypeVal); ;} break; - case 266: -#line 2896 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 294: +#line 2750 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if (!isa<PointerType>((yyvsp[0].ValueVal).val->getType())) + if (!isa<PointerType>((yyvsp[0].ValueVal)->getType())) GEN_ERROR("Trying to free nonpointer type " + - (yyvsp[0].ValueVal).val->getType()->getDescription() + "!"); - (yyval.InstVal) = new FreeInst((yyvsp[0].ValueVal).val); + (yyvsp[0].ValueVal)->getType()->getDescription() + "!"); + (yyval.InstVal) = new FreeInst((yyvsp[0].ValueVal)); CHECK_FOR_ERROR ;} break; - case 267: -#line 2904 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 295: +#line 2758 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if (!isa<PointerType>((yyvsp[-1].TypeVal).type->get())) + if (!isa<PointerType>((yyvsp[-1].TypeVal)->get())) GEN_ERROR("Can't load from nonpointer type: " + - (yyvsp[-1].TypeVal).type->get()->getDescription()); - if (!cast<PointerType>((yyvsp[-1].TypeVal).type->get())->getElementType()->isFirstClassType()) + (*(yyvsp[-1].TypeVal))->getDescription()); + if (!cast<PointerType>((yyvsp[-1].TypeVal)->get())->getElementType()->isFirstClassType()) GEN_ERROR("Can't load from pointer of non-first-class type: " + - (yyvsp[-1].TypeVal).type->get()->getDescription()); - Value* tmpVal = getVal((yyvsp[-1].TypeVal).type->get(), (yyvsp[0].ValIDVal)); + (*(yyvsp[-1].TypeVal))->getDescription()); + Value* tmpVal = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal)); CHECK_FOR_ERROR (yyval.InstVal) = new LoadInst(tmpVal, "", (yyvsp[-3].BoolVal)); - delete (yyvsp[-1].TypeVal).type; + delete (yyvsp[-1].TypeVal); ;} break; - case 268: -#line 2916 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 296: +#line 2770 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - const PointerType *PT = dyn_cast<PointerType>((yyvsp[-1].TypeVal).type->get()); + const PointerType *PT = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get()); if (!PT) GEN_ERROR("Can't store to a nonpointer type: " + - ((yyvsp[-1].TypeVal).type->get())->getDescription()); + (*(yyvsp[-1].TypeVal))->getDescription()); const Type *ElTy = PT->getElementType(); - if (ElTy != (yyvsp[-3].ValueVal).val->getType()) - GEN_ERROR("Can't store '" + (yyvsp[-3].ValueVal).val->getType()->getDescription() + + if (ElTy != (yyvsp[-3].ValueVal)->getType()) + GEN_ERROR("Can't store '" + (yyvsp[-3].ValueVal)->getType()->getDescription() + "' into space of type '" + ElTy->getDescription() + "'!"); - Value* tmpVal = getVal((yyvsp[-1].TypeVal).type->get(), (yyvsp[0].ValIDVal)); + Value* tmpVal = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal)); CHECK_FOR_ERROR - (yyval.InstVal) = new StoreInst((yyvsp[-3].ValueVal).val, tmpVal, (yyvsp[-5].BoolVal)); - delete (yyvsp[-1].TypeVal).type; + (yyval.InstVal) = new StoreInst((yyvsp[-3].ValueVal), tmpVal, (yyvsp[-5].BoolVal)); + delete (yyvsp[-1].TypeVal); ;} break; - case 269: -#line 2931 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" + case 297: +#line 2785 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" { - if (!isa<PointerType>((yyvsp[-2].TypeVal).type->get())) + if (!isa<PointerType>((yyvsp[-2].TypeVal)->get())) GEN_ERROR("getelementptr insn requires pointer operand!"); - std::vector<Value*> indices; - for (unsigned i = 0, e = (yyvsp[0].ValueList)->size(); i != e; ++i) - indices.push_back((*(yyvsp[0].ValueList))[i].val); - - if (!GetElementPtrInst::getIndexedType((yyvsp[-2].TypeVal).type->get(), indices, true)) + // LLVM 1.2 and earlier used ubyte struct indices. Convert any ubyte struct + // indices to uint struct indices for compatibility. + generic_gep_type_iterator<std::vector<Value*>::iterator> + GTI = gep_type_begin((yyvsp[-2].TypeVal)->get(), (yyvsp[0].ValueList)->begin(), (yyvsp[0].ValueList)->end()), + GTE = gep_type_end((yyvsp[-2].TypeVal)->get(), (yyvsp[0].ValueList)->begin(), (yyvsp[0].ValueList)->end()); + for (unsigned i = 0, e = (yyvsp[0].ValueList)->size(); i != e && GTI != GTE; ++i, ++GTI) + if (isa<StructType>(*GTI)) // Only change struct indices + if (ConstantInt *CUI = dyn_cast<ConstantInt>((*(yyvsp[0].ValueList))[i])) + if (CUI->getType() == Type::UByteTy) + (*(yyvsp[0].ValueList))[i] = ConstantExpr::getCast(CUI, Type::UIntTy); + + if (!GetElementPtrInst::getIndexedType(*(yyvsp[-2].TypeVal), *(yyvsp[0].ValueList), true)) GEN_ERROR("Invalid getelementptr indices for type '" + - (yyvsp[-2].TypeVal).type->get()->getDescription()+ "'!"); - Value* tmpVal = getVal((yyvsp[-2].TypeVal).type->get(), (yyvsp[-1].ValIDVal)); + (*(yyvsp[-2].TypeVal))->getDescription()+ "'!"); + Value* tmpVal = getVal(*(yyvsp[-2].TypeVal), (yyvsp[-1].ValIDVal)); CHECK_FOR_ERROR - (yyval.InstVal) = new GetElementPtrInst(tmpVal, indices); - delete (yyvsp[-2].TypeVal).type; + (yyval.InstVal) = new GetElementPtrInst(tmpVal, *(yyvsp[0].ValueList)); + delete (yyvsp[-2].TypeVal); delete (yyvsp[0].ValueList); ;} break; @@ -5491,7 +5470,7 @@ yyreduce: } /* Line 1126 of yacc.c. */ -#line 5495 "llvmAsmParser.tab.c" +#line 5474 "llvmAsmParser.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -5759,7 +5738,7 @@ yyreturn: } -#line 2950 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" +#line 2811 "/proj/llvm/llvm-4/lib/AsmParser/llvmAsmParser.y" void llvm::GenerateError(const std::string &message, int LineNo) { |