From nicholas at mxc.ca Mon Mar 10 00:01:35 2008 From: nicholas at mxc.ca (Nick Lewycky) Date: Mon, 10 Mar 2008 05:01:35 -0000 Subject: [llvm-commits] [llvm] r48128 - in /llvm/trunk/lib/AsmParser: llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y.cvs Message-ID: <200803100501.m2A51ZdL031455@zion.cs.uiuc.edu> Author: nicholas Date: Mon Mar 10 00:01:34 2008 New Revision: 48128 URL: http://llvm.org/viewvc/llvm-project?rev=48128&view=rev Log: Update the .cvs files to match today's asm syntax change. Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs?rev=48128&r1=48127&r2=48128&view=diff ============================================================================== --- llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs (original) +++ llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs Mon Mar 10 00:01:34 2008 @@ -139,7 +139,7 @@ X86_STDCALLCC_TOK = 320, X86_FASTCALLCC_TOK = 321, DATALAYOUT = 322, - UNWIND_TO = 323, + UNWINDS = 323, RET = 324, BR = 325, SWITCH = 326, @@ -291,7 +291,7 @@ #define X86_STDCALLCC_TOK 320 #define X86_FASTCALLCC_TOK 321 #define DATALAYOUT 322 -#define UNWIND_TO 323 +#define UNWINDS 323 #define RET 324 #define BR 325 #define SWITCH 326 @@ -380,7 +380,7 @@ /* Copy the first part of user declarations. */ -#line 14 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 14 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" #include "ParserInternals.h" #include "llvm/CallingConv.h" @@ -1338,7 +1338,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 951 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 951 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { llvm::Module *ModuleVal; llvm::Function *FunctionVal; @@ -1385,7 +1385,7 @@ llvm::ICmpInst::Predicate IPredicate; llvm::FCmpInst::Predicate FPredicate; } -/* Line 193 of yacc.c. */ +/* Line 187 of yacc.c. */ #line 1390 "llvmAsmParser.tab.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -1449,7 +1449,7 @@ #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if defined YYENABLE_NLS && YYENABLE_NLS +# if YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -1614,7 +1614,7 @@ /* YYFINAL -- State number of the termination state. */ #define YYFINAL 43 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2038 +#define YYLAST 2015 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 166 @@ -1623,7 +1623,7 @@ /* YYNRULES -- Number of rules. */ #define YYNRULES 324 /* YYNRULES -- Number of states. */ -#define YYNSTATES 633 +#define YYNSTATES 635 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -1710,12 +1710,12 @@ 664, 675, 677, 679, 684, 686, 688, 691, 695, 696, 698, 700, 702, 704, 706, 708, 710, 712, 714, 718, 720, 726, 728, 730, 732, 734, 736, 738, 741, 743, - 747, 750, 753, 757, 760, 761, 764, 766, 770, 773, - 776, 780, 790, 800, 809, 824, 826, 828, 835, 841, - 844, 851, 859, 864, 869, 876, 883, 884, 885, 889, - 892, 894, 900, 906, 913, 920, 925, 932, 937, 942, - 949, 956, 959, 968, 970, 972, 973, 977, 984, 988, - 995, 998, 1004, 1012, 1018 + 747, 750, 753, 757, 760, 761, 765, 767, 772, 775, + 778, 782, 792, 802, 811, 826, 828, 830, 837, 843, + 846, 853, 861, 866, 871, 878, 885, 886, 887, 891, + 894, 896, 902, 908, 915, 922, 927, 934, 939, 944, + 951, 958, 961, 970, 972, 974, 975, 979, 986, 990, + 997, 1000, 1006, 1014, 1020 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -1797,33 +1797,33 @@ 174, -1, 178, -1, 234, -1, 233, -1, 200, 235, -1, 236, -1, 237, 155, 236, -1, 238, 239, -1, 228, 239, -1, 240, 177, 241, -1, 240, 243, -1, - -1, 68, 235, -1, 21, -1, 21, 68, 235, -1, - 69, 237, -1, 69, 10, -1, 70, 17, 235, -1, - 70, 11, 235, 155, 17, 235, 155, 17, 235, -1, - 71, 172, 235, 155, 17, 235, 158, 242, 160, -1, - 71, 172, 235, 155, 17, 235, 158, 160, -1, 72, - 187, 202, 235, 152, 245, 153, 191, 38, 17, 235, - 73, 17, 235, -1, 73, -1, 74, -1, 242, 172, - 233, 155, 17, 235, -1, 172, 233, 155, 17, 235, - -1, 177, 248, -1, 200, 158, 235, 155, 235, 160, - -1, 244, 155, 158, 235, 155, 235, 160, -1, 200, - 189, 235, 189, -1, 17, 189, 235, 189, -1, 245, - 155, 200, 189, 235, 189, -1, 245, 155, 17, 189, - 235, 189, -1, -1, -1, 246, 155, 236, -1, 57, - 56, -1, 56, -1, 167, 200, 235, 155, 235, -1, - 168, 200, 235, 155, 235, -1, 90, 170, 200, 235, - 155, 235, -1, 91, 171, 200, 235, 155, 235, -1, - 169, 236, 38, 200, -1, 131, 236, 155, 236, 155, - 236, -1, 132, 236, 155, 200, -1, 133, 236, 155, - 236, -1, 134, 236, 155, 236, 155, 236, -1, 135, - 236, 155, 236, 155, 236, -1, 130, 244, -1, 247, - 187, 202, 235, 152, 245, 153, 191, -1, 250, -1, - 36, -1, -1, 112, 200, 194, -1, 112, 200, 155, - 11, 235, 194, -1, 113, 200, 194, -1, 113, 200, - 155, 11, 235, 194, -1, 114, 236, -1, 249, 115, - 200, 235, 194, -1, 249, 116, 236, 155, 200, 235, - 194, -1, 136, 200, 234, 155, 4, -1, 117, 200, - 235, 246, -1 + -1, 68, 38, 235, -1, 21, -1, 21, 68, 38, + 235, -1, 69, 237, -1, 69, 10, -1, 70, 17, + 235, -1, 70, 11, 235, 155, 17, 235, 155, 17, + 235, -1, 71, 172, 235, 155, 17, 235, 158, 242, + 160, -1, 71, 172, 235, 155, 17, 235, 158, 160, + -1, 72, 187, 202, 235, 152, 245, 153, 191, 38, + 17, 235, 73, 17, 235, -1, 73, -1, 74, -1, + 242, 172, 233, 155, 17, 235, -1, 172, 233, 155, + 17, 235, -1, 177, 248, -1, 200, 158, 235, 155, + 235, 160, -1, 244, 155, 158, 235, 155, 235, 160, + -1, 200, 189, 235, 189, -1, 17, 189, 235, 189, + -1, 245, 155, 200, 189, 235, 189, -1, 245, 155, + 17, 189, 235, 189, -1, -1, -1, 246, 155, 236, + -1, 57, 56, -1, 56, -1, 167, 200, 235, 155, + 235, -1, 168, 200, 235, 155, 235, -1, 90, 170, + 200, 235, 155, 235, -1, 91, 171, 200, 235, 155, + 235, -1, 169, 236, 38, 200, -1, 131, 236, 155, + 236, 155, 236, -1, 132, 236, 155, 200, -1, 133, + 236, 155, 236, -1, 134, 236, 155, 236, 155, 236, + -1, 135, 236, 155, 236, 155, 236, -1, 130, 244, + -1, 247, 187, 202, 235, 152, 245, 153, 191, -1, + 250, -1, 36, -1, -1, 112, 200, 194, -1, 112, + 200, 155, 11, 235, 194, -1, 113, 200, 194, -1, + 113, 200, 155, 11, 235, 194, -1, 114, 236, -1, + 249, 115, 200, 235, 194, -1, 249, 116, 236, 155, + 200, 235, 194, -1, 136, 200, 234, 155, 4, -1, + 117, 200, 235, 246, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -1882,7 +1882,7 @@ "EXTERNAL", "TARGET", "TRIPLE", "ALIGN", "ADDRSPACE", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE", "SIDEEFFECT", "CC_TOK", "CCC_TOK", "FASTCC_TOK", "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", - "DATALAYOUT", "UNWIND_TO", "RET", "BR", "SWITCH", "INVOKE", "UNWIND", + "DATALAYOUT", "UNWINDS", "RET", "BR", "SWITCH", "INVOKE", "UNWIND", "UNREACHABLE", "ADD", "SUB", "MUL", "UDIV", "SDIV", "FDIV", "UREM", "SREM", "FREM", "AND", "OR", "XOR", "SHL", "LSHR", "ASHR", "ICMP", "FCMP", "EQ", "NE", "SLT", "SGT", "SLE", "SGE", "ULT", "UGT", "ULE", @@ -2010,7 +2010,7 @@ 10, 1, 1, 4, 1, 1, 2, 3, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 5, 1, 1, 1, 1, 1, 1, 2, 1, 3, - 2, 2, 3, 2, 0, 2, 1, 3, 2, 2, + 2, 2, 3, 2, 0, 3, 1, 4, 2, 2, 3, 9, 9, 8, 14, 1, 1, 6, 5, 2, 6, 7, 4, 4, 6, 6, 0, 0, 3, 2, 1, 5, 5, 6, 6, 4, 6, 4, 4, 6, @@ -2036,156 +2036,156 @@ 232, 0, 166, 149, 0, 0, 0, 0, 155, 167, 0, 0, 166, 0, 0, 0, 97, 96, 0, 201, 202, 0, 0, 99, 100, 101, 102, 103, 0, 247, - 0, 0, 250, 251, 252, 257, 253, 254, 255, 256, - 248, 2, 3, 4, 5, 6, 7, 8, 9, 10, - 14, 15, 16, 11, 12, 13, 0, 0, 0, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, - 28, 0, 0, 0, 0, 0, 0, 0, 0, 259, - 266, 265, 275, 315, 273, 0, 230, 165, 115, 161, + 0, 0, 0, 315, 273, 0, 230, 165, 115, 161, 163, 0, 0, 0, 0, 0, 0, 154, 0, 0, 147, 0, 0, 160, 0, 159, 0, 224, 138, 139, 140, 143, 142, 141, 0, 0, 67, 67, 104, 0, - 241, 242, 243, 277, 249, 0, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 0, 53, 54, 49, - 50, 51, 52, 39, 40, 41, 42, 43, 44, 45, - 46, 47, 48, 0, 0, 0, 0, 0, 0, 200, - 0, 0, 0, 0, 314, 300, 0, 0, 0, 0, - 98, 285, 286, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 272, - 98, 289, 0, 313, 231, 158, 0, 123, 67, 67, - 157, 0, 168, 0, 123, 67, 67, 0, 205, 186, - 187, 182, 184, 183, 185, 188, 181, 177, 178, 0, - 0, 0, 0, 180, 179, 218, 0, 0, 0, 0, - 297, 0, 0, 0, 0, 0, 258, 0, 0, 0, - 299, 279, 67, 268, 278, 0, 0, 55, 0, 0, - 0, 0, 129, 129, 320, 67, 67, 311, 0, 0, - 0, 0, 0, 67, 67, 67, 0, 0, 0, 0, - 0, 106, 108, 107, 105, 109, 110, 111, 112, 113, - 116, 164, 162, 151, 152, 153, 156, 66, 150, 220, - 222, 0, 170, 0, 0, 0, 174, 0, 171, 134, - 239, 0, 0, 0, 0, 0, 0, 0, 0, 199, + 241, 242, 243, 0, 250, 251, 252, 257, 253, 254, + 255, 256, 248, 2, 3, 4, 5, 6, 7, 8, + 9, 10, 14, 15, 16, 11, 12, 13, 0, 0, + 0, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 27, 28, 0, 0, 0, 0, 0, 0, 0, + 0, 259, 266, 265, 275, 314, 300, 0, 0, 0, + 0, 98, 285, 286, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 272, 98, 289, 0, 313, 231, 158, 0, 123, 67, + 67, 157, 0, 168, 0, 123, 67, 67, 0, 205, + 186, 187, 182, 184, 183, 185, 188, 181, 177, 178, + 0, 0, 0, 0, 180, 179, 218, 0, 277, 249, + 0, 29, 30, 31, 32, 33, 34, 35, 36, 37, + 38, 0, 53, 54, 49, 50, 51, 52, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 0, 0, + 0, 0, 0, 0, 200, 0, 0, 0, 0, 299, + 279, 67, 268, 278, 0, 0, 55, 0, 0, 0, + 0, 129, 129, 320, 67, 67, 311, 0, 0, 0, + 0, 0, 67, 67, 67, 0, 0, 0, 0, 0, + 106, 108, 107, 105, 109, 110, 111, 112, 113, 116, + 164, 162, 151, 152, 153, 156, 66, 150, 220, 222, + 0, 170, 0, 0, 0, 174, 0, 171, 134, 239, + 0, 0, 0, 297, 0, 0, 0, 0, 0, 258, 0, 0, 0, 267, 0, 0, 280, 0, 0, 67, 67, 0, 316, 0, 318, 297, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 67, 0, 114, 120, 119, 117, 118, 121, 122, 124, 134, 134, 0, 169, 155, 167, 0, 172, 173, 0, 219, 238, - 115, 236, 0, 260, 0, 0, 190, 0, 0, 0, - 0, 0, 0, 0, 67, 269, 0, 0, 0, 0, + 115, 236, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 199, 0, 0, 0, 269, 0, 0, 0, 0, 0, 0, 0, 0, 324, 0, 0, 0, 307, 308, 0, 0, 0, 0, 0, 305, 0, 129, 0, 221, 223, 67, 176, 0, 0, 0, 136, 134, 65, 0, - 123, 0, 0, 298, 0, 196, 0, 0, 192, 193, - 189, 0, 0, 296, 0, 0, 129, 130, 129, 0, - 0, 0, 0, 0, 323, 301, 302, 296, 0, 321, - 67, 206, 175, 131, 137, 135, 64, 235, 237, 115, - 132, 194, 195, 0, 0, 0, 0, 0, 115, 115, - 0, 303, 304, 317, 319, 0, 0, 306, 309, 310, - 0, 129, 65, 133, 127, 191, 197, 198, 0, 0, - 0, 0, 123, 0, 290, 0, 123, 322, 234, 0, - 125, 0, 283, 0, 0, 106, 108, 115, 115, 0, - 115, 115, 291, 312, 128, 0, 240, 281, 0, 282, - 0, 293, 292, 0, 0, 0, 126, 0, 0, 0, - 115, 115, 0, 0, 0, 295, 294, 288, 0, 0, - 287, 0, 284 + 123, 260, 0, 0, 190, 0, 0, 0, 0, 0, + 0, 0, 67, 0, 0, 296, 0, 0, 129, 130, + 129, 0, 0, 0, 0, 0, 323, 301, 302, 296, + 0, 321, 67, 206, 175, 131, 137, 135, 64, 235, + 237, 115, 132, 0, 0, 298, 0, 196, 0, 0, + 192, 193, 189, 0, 0, 115, 115, 0, 303, 304, + 317, 319, 0, 0, 306, 309, 310, 0, 129, 65, + 133, 127, 194, 195, 0, 0, 0, 0, 0, 0, + 0, 123, 0, 290, 0, 123, 322, 234, 0, 125, + 191, 197, 198, 0, 283, 0, 0, 106, 108, 115, + 115, 0, 115, 115, 291, 312, 128, 0, 240, 281, + 0, 282, 0, 293, 292, 0, 0, 0, 126, 0, + 0, 0, 115, 115, 0, 0, 0, 295, 294, 288, + 0, 0, 287, 0, 284 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 176, 177, 178, 236, 253, 214, 215, 78, 547, + -1, 218, 219, 220, 301, 318, 164, 165, 78, 539, 113, 12, 79, 14, 15, 40, 41, 42, 47, 53, - 118, 128, 380, 295, 447, 383, 606, 590, 422, 506, - 574, 458, 507, 80, 216, 189, 206, 190, 191, 110, - 259, 179, 260, 121, 87, 207, 16, 17, 18, 20, - 19, 399, 448, 449, 62, 23, 60, 101, 461, 462, - 129, 222, 54, 96, 55, 48, 225, 180, 82, 182, - 343, 344, 56, 92, 93, 289, 594, 184, 357, 560, - 404, 290, 291, 292, 293 + 118, 128, 369, 256, 437, 372, 608, 589, 412, 496, + 571, 448, 497, 80, 166, 139, 156, 140, 141, 110, + 324, 221, 325, 121, 87, 157, 16, 17, 18, 20, + 19, 388, 438, 439, 62, 23, 60, 101, 451, 452, + 129, 172, 54, 96, 55, 48, 290, 222, 82, 224, + 332, 333, 56, 92, 93, 250, 596, 134, 346, 557, + 456, 251, 252, 253, 254 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -565 +#define YYPACT_NINF -524 static const yytype_int16 yypact[] = { - 641, -565, -565, -565, -565, -565, -565, -565, -29, -130, - -24, -105, 35, -59, 335, -565, 103, 1109, -565, 53, - 231, -28, 10, -565, 31, 139, -565, 1574, -565, -565, - -565, -565, -565, -565, -565, -565, -565, -565, -565, -565, - 95, 95, 164, -565, -565, -565, -565, 95, -565, -565, - -565, -565, -565, 95, -12, -565, 7, 151, 155, 181, - -565, -565, -565, -565, -565, -68, -565, -565, -565, -565, - -565, -565, -565, -565, 205, 225, 9, 108, -565, -565, - -565, 50, -565, 149, 149, 242, -565, 182, 414, 414, - 166, 965, -565, 198, -565, -565, -565, -565, -565, -565, - -565, -110, 1185, -565, 89, 118, 590, -68, -565, 50, - -81, 69, 1185, 82, 182, 182, -565, -565, 1139, -565, - -565, 1592, 281, -565, -565, -565, -565, -565, 1632, -565, - -21, 965, -565, -565, -565, -565, -565, -565, -565, -565, - 228, -565, -565, -565, -565, -565, -565, -565, -565, -565, - -565, -565, -565, -565, -565, -565, 395, 547, 143, -565, - -565, -565, -565, -565, -565, -565, -565, -565, -565, -565, - -565, 154, 159, 163, 169, 1592, 177, 184, 188, -565, - -565, -565, -565, 1902, -565, 311, -565, -565, 50, -565, - 189, 192, 1691, 1691, 196, -74, 1691, -565, 346, 203, - -565, 1592, 1691, -68, 199, 50, 411, -565, 343, 350, - 354, 355, 356, 357, 314, 358, 1241, 319, -565, 12, - -565, -565, -565, -565, -565, 353, -565, -565, -565, -565, - -565, -565, -565, -565, -565, -565, 224, -565, -565, -565, - -565, -565, -565, -565, -565, -565, -565, -565, -565, -565, - -565, -565, -565, 232, 1592, 1592, 1592, 1592, 1592, -565, - -50, 1592, 1592, 1592, -565, -565, 336, 1749, 62, 382, - 414, -565, -565, 395, 547, 1691, 1691, 1691, 1691, 1691, - 1691, 1691, 1691, 1691, 1691, 1691, 1691, 1691, 1691, -565, - 414, -565, 148, -565, -565, 393, 1473, -565, -43, -15, - -565, 233, 50, 243, -565, 319, -39, 1139, -565, -565, - -565, -565, -565, -565, -565, -565, -565, -565, -565, 47, - 1789, 769, 375, -565, -565, -565, 248, 246, 1592, 1592, - -565, 253, 254, 257, 261, 1592, -565, 266, 267, 369, - -565, -68, 825, -565, 268, 965, 965, -565, 965, 1632, - 1691, 1691, 23, 28, -565, 825, -44, 270, 271, 274, - 277, 282, 283, 174, 825, 825, 398, 1632, 1691, 1691, - 435, -565, -565, -565, -565, -565, -565, -565, -565, -565, - -565, -565, -565, 323, -565, -565, -565, -565, 323, -565, - 82, 402, -565, 40, 874, 57, -565, -70, -565, 287, - 1513, 421, 290, 294, 141, 1592, 1592, 1592, 1592, -565, - 1592, 1592, 1691, -565, 1691, 296, -565, 297, 965, 825, - 825, 15, -565, 19, -565, -565, 965, 295, 1691, 1691, - 1691, 1691, 1691, 299, 309, 313, 1691, 965, 825, 316, - -565, -565, -565, -565, -565, -565, -565, -565, 287, 287, - 1691, -565, 320, 1094, -64, -565, -565, -1, -565, -565, - 50, 318, 328, -565, 1592, 1592, -565, 1691, 344, 345, - 347, 348, 351, 363, 84, -565, 484, 492, 365, 364, - 368, 965, 506, 965, 371, 372, 965, 374, 50, -565, - 377, 380, 514, 965, 965, 50, 389, 387, 1691, -565, - -565, 87, -565, 362, 521, 540, -565, 287, 194, 1534, - -565, 392, 394, -565, 1592, -565, 1592, 1592, -565, -565, - -565, 965, 965, 1807, 965, 965, 387, -565, 387, 965, - 391, 1691, 1691, 1691, -565, -565, -565, 1807, 497, -565, - 825, -565, -565, -565, -565, -565, -565, -565, -565, 50, - -3, -565, -565, 399, 401, 405, 396, 397, 79, 50, - 175, -565, -565, -565, -565, 400, 965, -565, -565, -565, - 202, 387, 194, -565, 508, -565, -565, -565, 542, 3, - 682, 682, -565, 1850, -565, 403, -565, -565, -565, 560, - 418, 965, -565, 1382, 5, 415, 416, -565, -565, 252, - 79, 50, -565, 323, -565, 548, -565, -565, 420, -565, - 1382, 393, 393, 552, 682, 682, -565, 554, 422, 965, - -565, -565, 965, 559, 505, 393, 393, -565, 965, 562, - -565, 965, -565 + 369, -524, -524, -524, -524, -524, -524, -524, 46, -130, + 11, -89, 62, -59, 258, -524, 135, 506, -524, 227, + 130, -12, 26, -524, -1, 180, -524, 1572, -524, -524, + -524, -524, -524, -524, -524, -524, -524, -524, -524, -524, + 119, 119, 250, -524, -524, -524, -524, 119, -524, -524, + -524, -524, -524, 119, 39, -524, -2, 214, 221, 229, + -524, -524, -524, -524, -524, 59, -524, -524, -524, -524, + -524, -524, -524, -524, 262, 268, 8, 35, -524, -524, + -524, 9, -524, 195, 195, 244, -524, 162, 233, 233, + 186, 238, -524, 127, -524, -524, -524, -524, -524, -524, + -524, 50, 1126, -524, 133, 161, 815, 59, -524, 9, + -88, 172, 1126, 181, 162, 162, -524, -524, 1372, -524, + -524, 1612, 337, -524, -524, -524, -524, -524, 1652, -524, + -3, 314, 906, 1867, -524, 334, -524, -524, 9, -524, + 205, 208, 1692, 1692, 200, -64, 1692, -524, 359, 211, + -524, 1612, 1692, 59, 216, 9, 410, -524, 223, 357, + 361, 362, 363, 365, 275, 366, 1182, 329, -524, 97, + -524, -524, -524, 906, -524, -524, -524, -524, -524, -524, + -524, -524, 324, -524, -524, -524, -524, -524, -524, -524, + -524, -524, -524, -524, -524, -524, -524, -524, 511, 491, + 234, -524, -524, -524, -524, -524, -524, -524, -524, -524, + -524, -524, -524, 252, 253, 259, 260, 1612, 263, 267, + 271, -524, -524, -524, -524, -524, -524, 354, 1732, 68, + 374, 233, -524, -524, 511, 491, 1692, 1692, 1692, 1692, + 1692, 1692, 1692, 1692, 1692, 1692, 1692, 1692, 1692, 1692, + -524, 233, -524, 197, -524, -524, 210, 1452, -524, -31, + 2, -524, 264, 9, 237, -524, 329, -25, 1372, -524, + -524, -524, -524, -524, -524, -524, -524, -524, -524, -524, + 1412, 1772, 855, 403, -524, -524, -524, 279, -524, -524, + 405, -524, -524, -524, -524, -524, -524, -524, -524, -524, + -524, 284, -524, -524, -524, -524, -524, -524, -524, -524, + -524, -524, -524, -524, -524, -524, -524, -524, 285, 1612, + 1612, 1612, 1612, 1612, -524, -46, 1612, 1612, 1612, -524, + 59, 766, -524, 287, 906, 906, -524, 906, 1652, 1692, + 1692, 45, 51, -524, 766, 17, 290, 294, 295, 297, + 298, 299, 14, 766, 766, 417, 1652, 1692, 1692, 452, + -524, -524, -524, -524, -524, -524, -524, -524, -524, -524, + -524, -524, 189, -524, -524, -524, -524, 189, -524, 181, + 421, -524, 102, 1080, -32, -524, -49, -524, 305, 1492, + 306, 1612, 1612, -524, 308, 311, 315, 316, 1612, -524, + 317, 318, 431, -524, 1692, 319, -524, 321, 906, 766, + 766, 24, -524, 28, -524, -524, 906, 320, 1692, 1692, + 1692, 1692, 1692, 322, 325, 327, 1692, 906, 766, 328, + -524, -524, -524, -524, -524, -524, -524, -524, 305, 305, + 1692, -524, 323, 1035, -17, -524, -524, 30, -524, -524, + 9, 331, 326, 462, 332, 333, 154, 1612, 1612, 1612, + 1612, -524, 1612, 1612, 1692, -524, 472, 473, 340, 339, + 341, 906, 493, 906, 347, 348, 906, 349, 9, -524, + 352, 353, 507, 906, 906, 9, 343, 360, 1692, -524, + -524, 38, -524, 371, 494, 515, -524, 305, 115, 1532, + -524, -524, 1612, 1612, -524, 1692, 367, 368, 372, 379, + 382, 385, 56, 906, 906, 1812, 906, 906, 360, -524, + 360, 906, 384, 1692, 1692, 1692, -524, -524, -524, 1812, + 487, -524, 766, -524, -524, -524, -524, -524, -524, -524, + -524, 9, -6, 388, 389, -524, 1612, -524, 1612, 1612, + -524, -524, -524, 390, 386, 33, 9, 166, -524, -524, + -524, -524, 383, 906, -524, -524, -524, 170, 360, 115, + -524, 495, -524, -524, 396, 397, 399, 536, 3, 623, + 623, -524, 1852, -524, 395, -524, -524, -524, 552, 411, + -524, -524, -524, 906, -524, 1323, 7, 412, 414, -524, + -524, 6, 33, 9, -524, 189, -524, 540, -524, -524, + 413, -524, 1323, 210, 210, 550, 623, 623, -524, 553, + 416, 906, -524, -524, 906, 555, 500, 210, 210, -524, + 906, 557, -524, 906, -524 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -565, 404, 406, 407, 307, 308, -267, -565, 0, 14, - -195, 488, 4, -565, -565, -565, -565, 269, -565, -565, - -565, -243, -565, -452, -565, -299, -565, -565, -341, 34, - -565, -429, -565, -565, -26, 298, -125, -565, 479, 486, - -103, -210, -232, 153, 217, 286, -565, -565, 582, -565, - -565, -565, -565, -565, -565, -565, -565, -565, -565, -565, - 519, -565, -565, -565, -565, -565, -565, -564, -66, 102, - -240, -565, -565, 555, -565, -565, -565, -565, -565, 78, - 191, -565, -565, -565, -565 + -524, 443, 445, 446, 350, 346, -229, -524, 0, 16, + -141, 489, 13, -524, -524, -524, -524, 61, -524, -524, + -524, -190, -524, -444, -524, -263, -524, -524, -337, 41, + -524, -407, -524, -524, -24, 356, -108, -524, 474, 508, + -81, -150, -207, 228, 261, 351, -524, -524, 598, -524, + -524, -524, -524, -524, -524, -524, -524, -524, -524, -524, + 527, -524, -524, -524, -524, -524, -524, -523, -70, 104, + -234, -524, -524, 566, -524, -524, -524, -524, -524, 94, + 209, -524, -524, -524, -524 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -2195,418 +2195,414 @@ #define YYTABLE_NINF -209 static const yytype_int16 yytable[] = { - 11, 81, 348, 219, 13, 388, 323, 220, 508, 90, - 111, 111, 424, 105, 347, 111, 347, 11, 217, 499, - 500, 13, 325, 21, 24, 181, 481, 349, 90, 608, - 483, 504, 2, 504, 25, 4, 94, 354, 22, 111, - 358, 359, 360, 361, 362, 185, 618, 367, 366, 26, - 186, 109, 505, 27, 63, 64, 91, 107, 208, 209, - 210, 211, 212, 213, 72, 181, 1, 2, 482, 3, - 4, 5, 482, 345, 196, 91, 188, 111, 545, 346, - 109, 196, 111, 197, 102, 335, 188, 393, 395, 397, - 301, 335, 205, 11, 456, 28, 73, 572, 305, 45, - 503, 46, 205, 43, 111, 335, 580, 581, 112, 112, - 389, 390, 336, 112, 426, 63, 64, 384, 107, 66, - 67, 68, 69, 70, 71, 72, 57, 1, 2, 439, - 3, 4, 5, -144, 441, 442, 443, 112, 111, 444, - 308, 111, 221, 445, 446, 611, 612, 385, 614, 615, - 324, 330, 331, 332, 333, 334, 539, 73, 337, 338, - 339, 61, 454, 592, 58, 609, 298, 299, 625, 626, - 302, 95, 106, 98, 475, 112, 306, 99, 421, -67, - 112, 63, 64, 423, -67, 563, 86, 564, 487, 59, - 489, 490, 491, 1, 2, 335, 3, 4, 5, 85, - 451, 86, 112, 100, 74, 75, -67, 392, 76, 103, - 77, 550, 335, 1, 119, 120, 3, 1, 5, 455, - 3, 198, 5, 326, 418, 402, 403, 513, 111, 104, - 587, -144, 409, 223, 131, -144, 112, 520, 200, 112, - 541, 342, 437, 323, 37, 38, 39, 370, 192, 352, - 353, 342, 355, 356, 342, 342, 342, 342, 342, 363, - 364, 365, 342, 368, 369, 74, 75, 201, 202, 76, - 188, 77, 108, 49, 50, 51, 181, 193, 52, 181, - 181, 205, 181, 599, 116, 218, 117, 603, 224, 181, - 613, 567, 568, 569, 466, 254, 467, 433, 181, 181, - 114, 115, 468, 469, 470, 471, 255, 472, 473, 83, - 84, 256, 593, 371, 372, 257, 88, 311, 312, 313, - 314, 258, 89, 205, 419, 420, 112, 610, 582, 261, - 583, 373, 374, 294, 375, 376, 262, 377, 378, 379, - 263, 205, 438, 342, 296, 297, -55, -55, -55, -55, - 303, 307, 181, 181, 181, 586, 304, 583, 300, -56, - 181, 511, 512, -57, -60, -59, -58, 315, 453, 309, - 310, 181, 181, 111, 460, 327, 328, 29, 30, 31, - 32, 33, 34, 35, 329, 36, 474, 324, 342, 441, - 442, 443, 340, 347, 444, 386, 387, 398, 445, 446, - 400, 401, 342, 488, 342, 342, 342, 412, 405, 406, - 495, 553, 407, 554, 555, 181, 408, 181, 63, 64, - 181, 410, 411, 414, 501, 427, 428, 181, 181, 429, - 1, 2, 430, 3, 4, 5, 436, 431, 432, 440, - 450, 342, 457, 463, 413, 464, 370, 415, 416, 465, - 417, 476, 477, 486, 492, 181, 181, 425, 181, 181, - 441, 442, 443, 181, 493, 444, 434, 435, 494, 445, - 446, 498, 540, 509, 181, 122, 123, 124, 125, 126, - 127, 510, 502, 549, 37, 38, 39, 226, 227, 228, - 229, 230, 231, 232, 233, 234, 235, 559, 515, 514, - 181, 521, 516, 517, 518, 342, 342, 342, 546, 522, - 527, 559, 371, 372, 181, 181, 519, 523, 534, 524, - 478, 479, 480, 525, 542, 181, 467, 529, 485, 531, - 373, 374, 532, 375, 376, 533, 377, 378, 379, 496, - 497, 537, 538, 543, 544, 551, 566, 552, 181, 181, - 482, 578, 575, 181, 576, 579, 181, 601, 577, 591, - 584, 589, 181, 602, 604, 181, 605, -18, -19, 619, - 616, 622, 546, 237, 238, 617, 628, 623, 629, 631, - 350, 183, 351, 526, 573, 528, 588, 286, 530, 287, - 288, 199, 195, 391, 382, 535, 536, 63, 64, 44, - 107, 66, 67, 68, 69, 70, 71, 72, 130, 1, - 2, 97, 3, 4, 5, 570, 484, 0, 0, 0, - 0, 0, 0, 556, 557, 0, 561, 562, 0, 0, - 0, 565, 0, 0, 0, 0, 0, 0, 0, 73, - 0, -208, 571, 0, 0, 239, 240, 241, 242, 243, - 244, 245, 246, 247, 248, 249, 250, 251, 252, -69, - 1, 2, 0, 3, 4, 5, 0, 0, 585, 0, - 0, 6, 7, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 597, 598, 0, 132, 133, 0, 0, 63, - 64, 134, 8, 607, 0, 0, 9, 0, 0, 0, - 10, 1, 2, 0, 3, 4, 5, 135, 136, 137, - 0, 0, 0, 0, 0, 0, 620, 621, 0, 0, - 0, 624, 138, 139, 627, 0, 0, 0, 0, 0, - 630, 0, 0, 632, 0, 370, 0, 0, 0, 0, - 140, 0, 0, 0, 0, 0, 0, 74, 75, 0, - 0, 76, 0, 77, 194, 0, 0, 141, 142, 143, - 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, - 154, 155, 156, 157, 0, 0, 63, 64, 0, 107, - 208, 209, 210, 211, 212, 213, 72, 0, 1, 2, - 0, 3, 4, 5, 0, 0, 0, 0, 0, 158, - 159, 595, 596, 162, 163, 164, 165, 166, 167, 168, - 169, 170, 0, 171, 0, 172, 173, 174, 73, 373, - 374, 0, 375, 376, 0, 377, 378, 379, 132, 133, - 0, 0, 63, 64, 134, 0, 0, 0, 0, 0, - 0, 0, 0, 175, 1, 2, 0, 3, 4, 5, - 135, 136, 137, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 138, 139, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 111, - 0, 63, 64, 140, 107, 208, 209, 210, 211, 212, - 213, 72, 0, 1, 2, 0, 3, 4, 5, 0, - 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, - 151, 152, 153, 154, 155, 156, 157, 0, 0, 0, - 0, 0, 0, 73, 0, 0, 74, 75, 0, 0, - 76, 0, 77, 396, 0, 0, 0, 0, 0, 0, - 0, 0, 158, 159, 160, 161, 162, 163, 164, 165, - 166, 167, 168, 169, 170, 0, 171, 0, 172, 173, - 174, 0, 0, 0, 0, 0, 0, 0, 132, 133, - 0, 0, 63, 64, 134, 0, 0, 112, 0, 0, - 0, 0, 0, 0, 1, 2, 175, 3, 4, 5, - 135, 136, 137, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 138, 139, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 140, 0, 0, 0, 0, 0, 0, - 0, 74, 75, 0, 0, 76, 0, 77, 452, 0, - 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, - 151, 152, 153, 154, 155, 156, 157, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 11, 337, 377, 81, 343, 414, 498, 347, 348, 349, + 350, 351, 105, 13, 336, 355, 284, 11, 336, 90, + 169, 63, 64, 111, 24, 170, 286, 94, 494, 111, + 13, 489, 490, 1, 2, 471, 3, 4, 5, 473, + 167, 338, 63, 64, 615, 107, 66, 67, 68, 69, + 70, 71, 72, 109, 1, 2, 111, 3, 4, 5, + 90, 356, 223, 111, 494, 26, 91, 146, 111, 25, + 266, 111, 610, 382, 384, 386, 147, 472, 138, 334, + 27, 472, 109, 495, 73, 335, 269, -144, 138, 620, + 537, 146, 111, 11, 155, 28, 285, 569, 21, 111, + 262, 83, 84, 223, 155, 111, 398, 91, 88, 398, + 111, 579, 580, 22, 89, 446, 399, 2, 259, 260, + 4, 112, 263, 398, 429, 378, 379, 112, 267, 373, + 445, 431, 432, 433, 1, 43, 434, 3, 398, 5, + 435, 436, 57, 431, 432, 433, 1, 493, 434, 3, + 531, 5, 435, 436, 112, 613, 614, 59, 616, 617, + 171, 112, 95, 594, 374, -67, 112, 611, 359, 112, + 465, 106, 49, 50, 51, 416, 444, 52, 627, 628, + 58, 560, 287, 561, 477, -144, 479, 480, 481, -144, + 112, 533, 74, 75, 119, 120, 76, 112, 77, 108, + 411, -67, 61, 112, 331, 135, 413, -67, 112, 552, + 136, 102, 341, 342, 331, 344, 345, 331, 331, 331, + 331, 331, 352, 353, 354, 331, -55, -55, -55, -55, + 408, 586, 86, 138, 360, 361, 98, 542, 393, 394, + 395, 396, 397, 99, 155, 400, 401, 402, 427, 270, + 271, 100, 362, 363, 131, 364, 365, 398, 366, 367, + 368, 223, 441, 359, 223, 223, 103, 223, 37, 38, + 39, 545, 104, 45, 223, 46, 132, 288, 272, 273, + 274, 275, 423, 223, 223, 85, 116, 86, 117, 564, + 565, 566, 142, 284, 122, 123, 124, 125, 126, 127, + 29, 30, 31, 32, 33, 34, 35, 504, 36, 505, + 454, 455, 357, 358, 155, 409, 410, 461, 601, 581, + 143, 582, 605, 585, 148, 582, 431, 432, 433, 360, + 361, 434, 155, 428, 331, 435, 436, 150, 223, 223, + 223, 168, 151, 152, 114, 115, 223, 362, 363, 595, + 364, 365, 173, 366, 367, 368, 255, 223, 223, 443, + 257, 258, 261, 264, 265, 450, -56, 612, 268, -208, + -57, -60, -59, 285, -58, 276, 506, 507, 508, 509, + 331, 510, 511, 111, 289, 336, 319, -69, 1, 2, + 376, 3, 4, 5, 331, 478, 331, 331, 331, 6, + 7, 223, 485, 223, 320, 321, 223, 37, 38, 39, + 329, 322, 323, 223, 223, 326, 491, 63, 64, 327, + 8, 543, 544, 328, 9, 387, 375, 390, 10, 1, + 2, 389, 3, 4, 5, 403, 391, 392, 405, 406, + 512, 407, 404, 223, 223, 417, 223, 223, 415, 418, + 419, 223, 420, 421, 422, 426, 430, 424, 425, 440, + 447, 453, 223, 457, 532, 574, 458, 575, 576, 464, + 459, 460, 462, 463, 466, 541, 467, 482, 476, 500, + 483, 331, 484, 488, 501, 492, 499, 502, 503, 513, + 514, 556, 515, 223, 516, 529, 517, 519, 538, 331, + 331, 331, 505, 521, 523, 556, -207, 524, 525, 223, + 223, 526, 468, 469, 470, 530, 535, 302, 303, 536, + 475, 547, 546, 223, -69, 1, 2, 548, 3, 4, + 5, 486, 487, 534, 549, 550, 6, 7, 551, 563, + 472, 572, 573, 583, 578, 577, 223, 223, 588, 590, + 591, 223, 592, 593, 223, 604, 606, 8, 603, 607, + 223, 9, 618, 223, -18, 10, -19, 621, 619, 538, + 624, 625, 630, 631, 633, 518, 247, 520, 248, 249, + 522, 340, 133, 570, 339, 587, 149, 527, 528, 304, + 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, + 315, 316, 317, 291, 292, 293, 294, 295, 296, 297, + 298, 299, 300, 371, 145, 44, 130, 553, 554, 380, + 558, 559, 97, 567, 474, 562, 174, 175, 0, 0, + 63, 64, 176, 0, 0, 0, 568, 0, 0, 0, + 0, 0, 1, 2, 0, 3, 4, 5, 177, 178, + 179, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 180, 181, 0, 0, 584, 0, 0, + 0, 0, 0, 0, 0, 0, 359, 0, 0, 0, + 0, 182, 0, 599, 600, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 609, 183, 184, + 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, + 195, 196, 197, 198, 199, 0, 0, 0, 0, 0, + 622, 623, 0, 0, 0, 626, 0, 0, 629, 0, + 0, 0, 0, 0, 632, 0, 0, 634, 0, 0, + 200, 201, 597, 598, 204, 205, 206, 207, 208, 209, + 210, 211, 212, 0, 213, 0, 214, 215, 216, 0, + 362, 363, 0, 364, 365, 0, 366, 367, 368, 174, + 175, 0, 0, 63, 64, 176, 0, 0, 0, 0, + 0, 0, 0, 0, 217, 1, 2, 0, 3, 4, + 5, 177, 178, 179, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 180, 181, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 158, 159, 160, 161, 162, 163, 164, 165, - 166, 167, 168, 169, 170, 0, 171, 0, 172, 173, - 174, 63, 64, 0, 0, 0, 0, 0, 0, -207, - 0, 0, 0, 1, 2, 0, 3, 4, 5, 316, - 0, 0, 0, 0, 0, 0, 175, -69, 1, 2, - 0, 3, 4, 5, 317, 318, 0, 0, 0, 6, - 7, 0, 0, 0, 0, 0, 63, 64, 111, 203, - 66, 67, 68, 69, 70, 71, 72, 0, 1, 2, - 8, 3, 4, 5, 9, 0, 0, 0, 10, 141, - 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, - 152, 153, 154, 155, 156, 157, 0, 0, 73, 0, - 0, 0, 63, 64, 0, 107, 66, 67, 68, 69, + 111, 0, 63, 64, 182, 107, 66, 67, 68, 69, 70, 71, 72, 0, 1, 2, 0, 3, 4, 5, - 0, 158, 159, 160, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 187, 171, 0, 172, 173, 174, - 0, 0, 0, 0, 73, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 112, 0, 63, 64, - -67, 0, 319, 0, 0, 320, 0, 321, 0, 322, - 1, 2, 204, 3, 4, 5, 316, 0, 0, 0, + 0, 183, 184, 185, 186, 187, 188, 189, 190, 191, + 192, 193, 194, 195, 196, 197, 198, 199, 0, 0, + 0, 0, 63, 64, 73, 107, 158, 159, 160, 161, + 162, 163, 72, 0, 1, 2, 0, 3, 4, 5, + 0, 0, 0, 200, 201, 202, 203, 204, 205, 206, + 207, 208, 209, 210, 211, 212, 0, 213, 0, 214, + 215, 216, 0, 0, 73, 0, 0, 0, 0, 174, + 175, 0, 0, 63, 64, 176, 0, 0, 112, 0, + 0, 0, 0, 0, 0, 1, 2, 217, 3, 4, + 5, 177, 178, 179, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 180, 181, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 317, 318, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 111, 74, 75, 0, 0, - 76, 0, 77, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 141, 142, 143, 144, - 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 156, 157, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 74, 75, 0, 0, 76, 0, 77, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 158, 159, - 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, - 170, 0, 171, 0, 172, 173, 174, 0, 0, 0, - 0, 0, 0, 0, 0, 132, 133, 0, 0, 0, - 0, 134, 0, 112, 0, 0, 0, 0, 0, 319, - 0, 0, 320, 0, 321, 0, 322, 135, 136, 137, + 0, 0, 0, 0, 182, 0, 0, 0, 0, 0, + 0, 0, 74, 75, 0, 0, 76, 0, 77, 144, + 0, 183, 184, 185, 186, 187, 188, 189, 190, 191, + 192, 193, 194, 195, 196, 197, 198, 199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 138, 139, 0, 0, 0, 0, 0, 0, + 0, 0, 74, 75, 0, 0, 76, 0, 77, 385, + 0, 0, 0, 200, 201, 202, 203, 204, 205, 206, + 207, 208, 209, 210, 211, 212, 0, 213, 0, 214, + 215, 216, 63, 64, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 2, 0, 3, 4, 5, + 277, 0, 0, 0, 0, 0, 0, 217, 0, 0, + 0, 0, 0, 0, 0, 278, 279, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 63, 64, 111, + 107, 158, 159, 160, 161, 162, 163, 72, 0, 1, + 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 193, 194, 195, 196, 197, 198, 199, 0, 0, 73, + 0, 0, 0, 63, 64, 0, 107, 66, 67, 68, + 69, 70, 71, 72, 0, 1, 2, 0, 3, 4, + 5, 0, 200, 201, 202, 203, 204, 205, 206, 207, + 208, 209, 210, 211, 212, 137, 213, 0, 214, 215, + 216, 0, 0, 0, 0, 73, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 112, 0, 63, + 64, -67, 0, 280, 0, 0, 281, 0, 282, 0, + 283, 1, 2, 0, 3, 4, 5, 277, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 140, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 141, 142, 143, - 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, - 154, 155, 156, 157, 0, 0, 0, 0, 0, 0, - 63, 64, 0, 107, 66, 67, 68, 69, 70, 71, - 72, 0, 1, 2, 0, 3, 4, 5, 0, 158, - 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, - 169, 170, 381, 171, 0, 172, 173, 174, 0, 0, - 63, 64, 73, 107, 66, 67, 68, 69, 70, 71, - 72, 0, 1, 2, 0, 3, 4, 5, 0, 0, - 0, 63, 64, 175, 107, 66, 67, 68, 69, 70, - 71, 72, 459, 1, 2, 0, 3, 4, 5, 0, - 0, 0, 73, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 548, 0, 0, 0, 0, 0, 0, - 0, 63, 64, 73, 65, 66, 67, 68, 69, 70, - 71, 72, 0, 1, 2, 0, 3, 4, 5, 63, - 64, 0, 107, 208, 209, 210, 211, 212, 213, 72, + 0, 0, 278, 279, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 111, 74, 75, 0, + 0, 76, 0, 77, 442, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 183, 184, 185, + 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, + 196, 197, 198, 199, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 74, 75, 0, 0, 76, 0, 77, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 200, + 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, + 211, 212, 0, 213, 0, 214, 215, 216, 0, 0, + 0, 0, 0, 0, 0, 0, 174, 175, 0, 0, + 0, 0, 176, 0, 112, 0, 0, 0, 0, 0, + 280, 0, 0, 281, 0, 282, 0, 283, 177, 178, + 179, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 180, 181, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, + 64, 182, 153, 66, 67, 68, 69, 70, 71, 72, + 0, 1, 2, 0, 3, 4, 5, 0, 183, 184, + 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, + 195, 196, 197, 198, 199, 0, 0, 0, 0, 63, + 64, 73, 107, 158, 159, 160, 161, 162, 163, 72, 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, - 0, 0, 0, 73, 0, 0, 0, 0, 0, 0, - 74, 75, 0, 0, 76, 0, 77, 0, 0, 63, - 64, 73, 203, 66, 67, 68, 69, 70, 71, 72, + 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, + 210, 211, 212, 0, 213, 0, 214, 215, 216, 63, + 64, 73, 107, 66, 67, 68, 69, 70, 71, 72, + 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, + 0, 0, 0, 0, 217, 0, 0, 0, 0, 0, + 0, 370, 0, 0, 0, 154, 0, 0, 0, 63, + 64, 73, 107, 66, 67, 68, 69, 70, 71, 72, 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 74, 75, 0, 0, 76, 0, 77, 0, 0, 0, - 0, 73, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 74, 75, 0, 0, 76, 0, 77, 63, 64, - 0, 107, 66, 67, 68, 69, 70, 71, 72, 0, - 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 74, 75, 0, 0, 76, 0, 77, 0, 0, - 73, 0, 0, 0, 0, 0, 0, 0, 0, 74, - 75, 0, 0, 76, 0, 77, 63, 64, 0, 341, - 66, 67, 68, 69, 70, 71, 72, 0, 1, 2, - 0, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, - 75, 0, 0, 76, 0, 77, 63, 64, 73, 107, - 208, 209, 210, 211, 212, 213, 72, 0, 1, 2, - 0, 3, 4, 5, 63, 64, 0, 107, 66, 67, - 68, 69, 70, 71, 558, 0, 1, 2, 0, 3, - 4, 5, 0, 0, 0, 0, 0, 0, 73, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 74, 75, - 0, 0, 76, 0, 77, 0, 73, 63, 64, 0, - 107, 66, 67, 68, 69, 70, 71, 600, 0, 1, - 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 73, - 0, 0, 0, 0, 0, 0, 74, 75, 0, 0, - 76, 0, 77, 0, 0, 0, 0, 0, 0, 0, + 75, 449, 0, 76, 0, 77, 0, 0, 0, 63, + 64, 73, 107, 66, 67, 68, 69, 70, 71, 72, + 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, + 75, 540, 381, 76, 0, 77, 0, 0, 0, 63, + 64, 73, 65, 66, 67, 68, 69, 70, 71, 72, + 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, + 75, 0, 0, 76, 0, 77, 0, 0, 0, 63, + 64, 73, 107, 158, 159, 160, 161, 162, 163, 72, + 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, + 75, 0, 0, 76, 0, 77, 0, 0, 0, 63, + 64, 73, 153, 66, 67, 68, 69, 70, 71, 72, + 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, + 75, 0, 0, 76, 0, 77, 0, 0, 0, 63, + 64, 73, 107, 66, 67, 68, 69, 70, 71, 72, + 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, + 75, 0, 0, 76, 0, 77, 0, 0, 0, 63, + 64, 73, 330, 66, 67, 68, 69, 70, 71, 72, + 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, + 75, 0, 0, 76, 0, 77, 0, 0, 0, 63, + 64, 73, 107, 158, 159, 160, 161, 162, 163, 72, + 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, + 75, 0, 0, 76, 0, 77, 0, 0, 0, 63, + 64, 73, 107, 66, 67, 68, 69, 70, 71, 555, + 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, + 75, 0, 0, 76, 0, 77, 0, 0, 0, 63, + 64, 73, 107, 66, 67, 68, 69, 70, 71, 602, + 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, + 75, 0, 0, 76, 0, 77, 0, 0, 0, 0, + 0, 73, 0, 225, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 264, 0, - 0, 0, 0, 0, 0, 0, 74, 75, 0, 0, - 76, 0, 394, 0, 0, 0, 0, 0, 265, 266, - 0, 0, 0, 0, 74, 75, 0, 0, 76, 0, - 77, 267, 268, 269, 270, 271, 272, 141, 142, 143, - 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, - 154, 155, 273, 274, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 74, 75, 0, - 0, 76, 0, 77, 275, 276, 277, 0, 0, 278, - 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, - 169, 170, 279, 280, 281, 282, 283, 284, 285 + 0, 0, 0, 226, 227, 0, 0, 0, 0, 74, + 75, 0, 0, 76, 0, 383, 228, 229, 230, 231, + 232, 233, 183, 184, 185, 186, 187, 188, 189, 190, + 191, 192, 193, 194, 195, 196, 197, 234, 235, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, + 75, 0, 0, 76, 0, 77, 0, 0, 0, 236, + 237, 238, 0, 0, 239, 201, 202, 203, 204, 205, + 206, 207, 208, 209, 210, 211, 212, 240, 241, 242, + 243, 244, 245, 246, 0, 0, 0, 0, 0, 74, + 75, 0, 0, 76, 0, 77 }; static const yytype_int16 yycheck[] = { - 0, 27, 269, 128, 0, 304, 216, 28, 460, 21, - 54, 54, 353, 4, 11, 54, 11, 17, 121, 448, - 449, 17, 217, 52, 154, 91, 11, 270, 21, 593, - 11, 34, 20, 34, 58, 23, 29, 277, 67, 54, - 280, 281, 282, 283, 284, 155, 610, 290, 288, 154, - 160, 77, 53, 18, 7, 8, 68, 10, 11, 12, - 13, 14, 15, 16, 17, 131, 19, 20, 53, 22, - 23, 24, 53, 11, 155, 68, 102, 54, 507, 17, - 106, 155, 54, 164, 152, 155, 112, 319, 320, 321, - 164, 155, 118, 93, 164, 154, 49, 549, 201, 46, - 164, 48, 128, 0, 54, 155, 558, 559, 152, 152, - 305, 306, 162, 152, 158, 7, 8, 160, 10, 11, - 12, 13, 14, 15, 16, 17, 154, 19, 20, 369, - 22, 23, 24, 54, 137, 138, 139, 152, 54, 142, - 206, 54, 163, 146, 147, 597, 598, 162, 600, 601, - 216, 254, 255, 256, 257, 258, 497, 49, 261, 262, - 263, 22, 394, 160, 154, 160, 192, 193, 620, 621, - 196, 164, 163, 22, 414, 152, 202, 22, 155, 156, - 152, 7, 8, 155, 156, 526, 37, 528, 428, 158, - 430, 431, 432, 19, 20, 155, 22, 23, 24, 35, - 160, 37, 152, 22, 157, 158, 156, 160, 161, 4, - 163, 510, 155, 19, 32, 33, 22, 19, 24, 162, - 22, 152, 24, 219, 349, 328, 329, 467, 54, 4, - 571, 152, 335, 131, 68, 156, 152, 153, 156, 152, - 153, 267, 367, 453, 149, 150, 151, 53, 159, 275, - 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, - 286, 287, 288, 115, 116, 157, 158, 114, 115, 161, - 296, 163, 164, 42, 43, 44, 342, 159, 47, 345, - 346, 307, 348, 582, 42, 4, 44, 586, 60, 355, - 38, 531, 532, 533, 153, 152, 155, 363, 364, 365, - 83, 84, 405, 406, 407, 408, 152, 410, 411, 40, - 41, 152, 579, 119, 120, 152, 47, 3, 4, 5, - 6, 152, 53, 349, 350, 351, 152, 594, 153, 152, - 155, 137, 138, 22, 140, 141, 152, 143, 144, 145, - 152, 367, 368, 369, 155, 153, 3, 4, 5, 6, - 4, 152, 418, 419, 420, 153, 153, 155, 162, 9, - 426, 464, 465, 9, 9, 9, 9, 9, 394, 26, - 27, 437, 438, 54, 400, 22, 152, 42, 43, 44, - 45, 46, 47, 48, 152, 50, 412, 453, 414, 137, - 138, 139, 56, 11, 142, 162, 153, 22, 146, 147, - 152, 155, 428, 429, 430, 431, 432, 38, 155, 155, - 436, 514, 155, 516, 517, 481, 155, 483, 7, 8, - 486, 155, 155, 155, 450, 155, 155, 493, 494, 155, - 19, 20, 155, 22, 23, 24, 38, 155, 155, 4, - 38, 467, 155, 22, 342, 155, 53, 345, 346, 155, - 348, 155, 155, 158, 155, 521, 522, 355, 524, 525, - 137, 138, 139, 529, 155, 142, 364, 365, 155, 146, - 147, 155, 498, 155, 540, 61, 62, 63, 64, 65, - 66, 153, 162, 509, 149, 150, 151, 92, 93, 94, - 95, 96, 97, 98, 99, 100, 101, 523, 153, 155, - 566, 17, 155, 155, 153, 531, 532, 533, 508, 17, - 4, 537, 119, 120, 580, 581, 153, 152, 4, 155, - 418, 419, 420, 155, 162, 591, 155, 155, 426, 155, - 137, 138, 155, 140, 141, 155, 143, 144, 145, 437, - 438, 152, 155, 22, 4, 153, 155, 153, 614, 615, - 53, 155, 153, 619, 153, 158, 622, 583, 153, 17, - 160, 53, 628, 160, 4, 631, 148, 152, 152, 17, - 22, 17, 572, 26, 27, 155, 17, 155, 73, 17, - 273, 93, 274, 481, 550, 483, 572, 183, 486, 183, - 183, 112, 106, 307, 296, 493, 494, 7, 8, 17, - 10, 11, 12, 13, 14, 15, 16, 17, 89, 19, - 20, 56, 22, 23, 24, 537, 425, -1, -1, -1, - -1, -1, -1, 521, 522, -1, 524, 525, -1, -1, - -1, 529, -1, -1, -1, -1, -1, -1, -1, 49, - -1, 0, 540, -1, -1, 98, 99, 100, 101, 102, - 103, 104, 105, 106, 107, 108, 109, 110, 111, 18, - 19, 20, -1, 22, 23, 24, -1, -1, 566, -1, - -1, 30, 31, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 580, 581, -1, 3, 4, -1, -1, 7, - 8, 9, 51, 591, -1, -1, 55, -1, -1, -1, - 59, 19, 20, -1, 22, 23, 24, 25, 26, 27, - -1, -1, -1, -1, -1, -1, 614, 615, -1, -1, - -1, 619, 40, 41, 622, -1, -1, -1, -1, -1, - 628, -1, -1, 631, -1, 53, -1, -1, -1, -1, - 58, -1, -1, -1, -1, -1, -1, 157, 158, -1, - -1, 161, -1, 163, 164, -1, -1, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 91, -1, -1, 7, 8, -1, 10, - 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, - -1, 22, 23, 24, -1, -1, -1, -1, -1, 117, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, -1, 131, -1, 133, 134, 135, 49, 137, - 138, -1, 140, 141, -1, 143, 144, 145, 3, 4, - -1, -1, 7, 8, 9, -1, -1, -1, -1, -1, - -1, -1, -1, 161, 19, 20, -1, 22, 23, 24, - 25, 26, 27, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 40, 41, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 54, - -1, 7, 8, 58, 10, 11, 12, 13, 14, 15, - 16, 17, -1, 19, 20, -1, 22, 23, 24, -1, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 91, -1, -1, -1, - -1, -1, -1, 49, -1, -1, 157, 158, -1, -1, - 161, -1, 163, 164, -1, -1, -1, -1, -1, -1, - -1, -1, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, -1, 131, -1, 133, 134, - 135, -1, -1, -1, -1, -1, -1, -1, 3, 4, - -1, -1, 7, 8, 9, -1, -1, 152, -1, -1, - -1, -1, -1, -1, 19, 20, 161, 22, 23, 24, - 25, 26, 27, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 40, 41, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 58, -1, -1, -1, -1, -1, -1, - -1, 157, 158, -1, -1, 161, -1, 163, 164, -1, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 91, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 0, 230, 265, 27, 238, 342, 450, 241, 242, 243, + 244, 245, 4, 0, 11, 249, 166, 17, 11, 21, + 128, 7, 8, 54, 154, 28, 167, 29, 34, 54, + 17, 438, 439, 19, 20, 11, 22, 23, 24, 11, + 121, 231, 7, 8, 38, 10, 11, 12, 13, 14, + 15, 16, 17, 77, 19, 20, 54, 22, 23, 24, + 21, 251, 132, 54, 34, 154, 68, 155, 54, 58, + 151, 54, 595, 280, 281, 282, 164, 53, 102, 11, + 18, 53, 106, 53, 49, 17, 156, 54, 112, 612, + 497, 155, 54, 93, 118, 154, 166, 541, 52, 54, + 164, 40, 41, 173, 128, 54, 155, 68, 47, 155, + 54, 555, 556, 67, 53, 164, 162, 20, 142, 143, + 23, 152, 146, 155, 358, 266, 267, 152, 152, 160, + 162, 137, 138, 139, 19, 0, 142, 22, 155, 24, + 146, 147, 154, 137, 138, 139, 19, 164, 142, 22, + 487, 24, 146, 147, 152, 599, 600, 158, 602, 603, + 163, 152, 164, 160, 162, 156, 152, 160, 53, 152, + 404, 163, 42, 43, 44, 158, 383, 47, 622, 623, + 154, 518, 169, 520, 418, 152, 420, 421, 422, 156, + 152, 153, 157, 158, 32, 33, 161, 152, 163, 164, + 155, 156, 22, 152, 228, 155, 155, 156, 152, 153, + 160, 152, 236, 237, 238, 239, 240, 241, 242, 243, + 244, 245, 246, 247, 248, 249, 3, 4, 5, 6, + 338, 568, 37, 257, 119, 120, 22, 500, 319, 320, + 321, 322, 323, 22, 268, 326, 327, 328, 356, 26, + 27, 22, 137, 138, 68, 140, 141, 155, 143, 144, + 145, 331, 160, 53, 334, 335, 4, 337, 149, 150, + 151, 505, 4, 46, 344, 48, 38, 173, 3, 4, + 5, 6, 352, 353, 354, 35, 42, 37, 44, 523, + 524, 525, 159, 443, 61, 62, 63, 64, 65, 66, + 42, 43, 44, 45, 46, 47, 48, 153, 50, 155, + 391, 392, 115, 116, 338, 339, 340, 398, 581, 153, + 159, 155, 585, 153, 152, 155, 137, 138, 139, 119, + 120, 142, 356, 357, 358, 146, 147, 156, 408, 409, + 410, 4, 114, 115, 83, 84, 416, 137, 138, 578, + 140, 141, 38, 143, 144, 145, 22, 427, 428, 383, + 155, 153, 162, 4, 153, 389, 9, 596, 152, 0, + 9, 9, 9, 443, 9, 9, 457, 458, 459, 460, + 404, 462, 463, 54, 60, 11, 152, 18, 19, 20, + 153, 22, 23, 24, 418, 419, 420, 421, 422, 30, + 31, 471, 426, 473, 152, 152, 476, 149, 150, 151, + 56, 152, 152, 483, 484, 152, 440, 7, 8, 152, + 51, 502, 503, 152, 55, 22, 162, 22, 59, 19, + 20, 152, 22, 23, 24, 331, 152, 152, 334, 335, + 464, 337, 155, 513, 514, 155, 516, 517, 344, 155, + 155, 521, 155, 155, 155, 38, 4, 353, 354, 38, + 155, 155, 532, 155, 488, 546, 155, 548, 549, 38, + 155, 155, 155, 155, 155, 499, 155, 155, 158, 153, + 155, 505, 155, 155, 22, 162, 155, 155, 155, 17, + 17, 515, 152, 563, 155, 152, 155, 4, 498, 523, + 524, 525, 155, 155, 155, 529, 0, 155, 155, 579, + 580, 4, 408, 409, 410, 155, 22, 26, 27, 4, + 416, 153, 155, 593, 18, 19, 20, 155, 22, 23, + 24, 427, 428, 162, 155, 153, 30, 31, 153, 155, + 53, 153, 153, 160, 158, 155, 616, 617, 53, 153, + 153, 621, 153, 17, 624, 160, 4, 51, 582, 148, + 630, 55, 22, 633, 152, 59, 152, 17, 155, 569, + 17, 155, 17, 73, 17, 471, 133, 473, 133, 133, + 476, 235, 93, 542, 234, 569, 112, 483, 484, 98, + 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, + 109, 110, 111, 92, 93, 94, 95, 96, 97, 98, + 99, 100, 101, 257, 106, 17, 89, 513, 514, 268, + 516, 517, 56, 529, 415, 521, 3, 4, -1, -1, + 7, 8, 9, -1, -1, -1, 532, -1, -1, -1, + -1, -1, 19, 20, -1, 22, 23, 24, 25, 26, + 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 40, 41, -1, -1, 563, -1, -1, + -1, -1, -1, -1, -1, -1, 53, -1, -1, -1, + -1, 58, -1, 579, 580, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 593, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, -1, -1, -1, -1, -1, + 616, 617, -1, -1, -1, 621, -1, -1, 624, -1, + -1, -1, -1, -1, 630, -1, -1, 633, -1, -1, + 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, -1, 131, -1, 133, 134, 135, -1, + 137, 138, -1, 140, 141, -1, 143, 144, 145, 3, + 4, -1, -1, 7, 8, 9, -1, -1, -1, -1, + -1, -1, -1, -1, 161, 19, 20, -1, 22, 23, + 24, 25, 26, 27, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 40, 41, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, -1, 131, -1, 133, 134, - 135, 7, 8, -1, -1, -1, -1, -1, -1, 0, - -1, -1, -1, 19, 20, -1, 22, 23, 24, 25, - -1, -1, -1, -1, -1, -1, 161, 18, 19, 20, - -1, 22, 23, 24, 40, 41, -1, -1, -1, 30, - 31, -1, -1, -1, -1, -1, 7, 8, 54, 10, - 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, - 51, 22, 23, 24, 55, -1, -1, -1, 59, 75, - 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 87, 88, 89, 90, 91, -1, -1, 49, -1, - -1, -1, 7, 8, -1, 10, 11, 12, 13, 14, + 54, -1, 7, 8, 58, 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, 22, 23, 24, - -1, 117, 118, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 129, 39, 131, -1, 133, 134, 135, - -1, -1, -1, -1, 49, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 152, -1, 7, 8, - 156, -1, 158, -1, -1, 161, -1, 163, -1, 165, - 19, 20, 123, 22, 23, 24, 25, -1, -1, -1, + -1, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, -1, -1, + -1, -1, 7, 8, 49, 10, 11, 12, 13, 14, + 15, 16, 17, -1, 19, 20, -1, 22, 23, 24, + -1, -1, -1, 117, 118, 119, 120, 121, 122, 123, + 124, 125, 126, 127, 128, 129, -1, 131, -1, 133, + 134, 135, -1, -1, 49, -1, -1, -1, -1, 3, + 4, -1, -1, 7, 8, 9, -1, -1, 152, -1, + -1, -1, -1, -1, -1, 19, 20, 161, 22, 23, + 24, 25, 26, 27, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 40, 41, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 40, 41, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 54, 157, 158, -1, -1, - 161, -1, 163, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 89, 90, 91, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 157, 158, -1, -1, 161, -1, 163, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 117, 118, - 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, - 129, -1, 131, -1, 133, 134, 135, -1, -1, -1, - -1, -1, -1, -1, -1, 3, 4, -1, -1, -1, - -1, 9, -1, 152, -1, -1, -1, -1, -1, 158, - -1, -1, 161, -1, 163, -1, 165, 25, 26, 27, + -1, -1, -1, -1, 58, -1, -1, -1, -1, -1, + -1, -1, 157, 158, -1, -1, 161, -1, 163, 164, + -1, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 40, 41, -1, -1, -1, -1, -1, -1, + -1, -1, 157, 158, -1, -1, 161, -1, 163, 164, + -1, -1, -1, 117, 118, 119, 120, 121, 122, 123, + 124, 125, 126, 127, 128, 129, -1, 131, -1, 133, + 134, 135, 7, 8, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 19, 20, -1, 22, 23, 24, + 25, -1, -1, -1, -1, -1, -1, 161, -1, -1, + -1, -1, -1, -1, -1, 40, 41, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 7, 8, 54, + 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, + 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 91, -1, -1, 49, + -1, -1, -1, 7, 8, -1, 10, 11, 12, 13, + 14, 15, 16, 17, -1, 19, 20, -1, 22, 23, + 24, -1, 117, 118, 119, 120, 121, 122, 123, 124, + 125, 126, 127, 128, 129, 39, 131, -1, 133, 134, + 135, -1, -1, -1, -1, 49, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 152, -1, 7, + 8, 156, -1, 158, -1, -1, 161, -1, 163, -1, + 165, 19, 20, -1, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 58, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 40, 41, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 54, 157, 158, -1, + -1, 161, -1, 163, 164, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, -1, -1, -1, -1, -1, -1, - 7, 8, -1, 10, 11, 12, 13, 14, 15, 16, - 17, -1, 19, 20, -1, 22, 23, 24, -1, 117, + -1, -1, -1, 157, 158, -1, -1, 161, -1, 163, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 39, 131, -1, 133, 134, 135, -1, -1, - 7, 8, 49, 10, 11, 12, 13, 14, 15, 16, - 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, - -1, 7, 8, 161, 10, 11, 12, 13, 14, 15, - 16, 17, 39, 19, 20, -1, 22, 23, 24, -1, - -1, -1, 49, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 39, -1, -1, -1, -1, -1, -1, - -1, 7, 8, 49, 10, 11, 12, 13, 14, 15, - 16, 17, -1, 19, 20, -1, 22, 23, 24, 7, - 8, -1, 10, 11, 12, 13, 14, 15, 16, 17, + 128, 129, -1, 131, -1, 133, 134, 135, -1, -1, + -1, -1, -1, -1, -1, -1, 3, 4, -1, -1, + -1, -1, 9, -1, 152, -1, -1, -1, -1, -1, + 158, -1, -1, 161, -1, 163, -1, 165, 25, 26, + 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 40, 41, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 7, + 8, 58, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, -1, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, -1, -1, -1, -1, 7, + 8, 49, 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, - -1, -1, -1, 49, -1, -1, -1, -1, -1, -1, - 157, 158, -1, -1, 161, -1, 163, -1, -1, 7, + 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, -1, 131, -1, 133, 134, 135, 7, + 8, 49, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, + -1, -1, -1, -1, 161, -1, -1, -1, -1, -1, + -1, 39, -1, -1, -1, 123, -1, -1, -1, 7, 8, 49, 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 157, 158, -1, -1, 161, -1, 163, -1, -1, -1, - -1, 49, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 157, 158, -1, -1, 161, -1, 163, 7, 8, - -1, 10, 11, 12, 13, 14, 15, 16, 17, -1, - 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 157, 158, -1, -1, 161, -1, 163, -1, -1, - 49, -1, -1, -1, -1, -1, -1, -1, -1, 157, - 158, -1, -1, 161, -1, 163, 7, 8, -1, 10, - 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, - -1, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 157, - 158, -1, -1, 161, -1, 163, 7, 8, 49, 10, - 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, - -1, 22, 23, 24, 7, 8, -1, 10, 11, 12, - 13, 14, 15, 16, 17, -1, 19, 20, -1, 22, - 23, 24, -1, -1, -1, -1, -1, -1, 49, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 157, 158, - -1, -1, 161, -1, 163, -1, 49, 7, 8, -1, - 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, - 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 49, - -1, -1, -1, -1, -1, -1, 157, 158, -1, -1, - 161, -1, 163, -1, -1, -1, -1, -1, -1, -1, + 158, 39, -1, 161, -1, 163, -1, -1, -1, 7, + 8, 49, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 157, + 158, 39, 160, 161, -1, 163, -1, -1, -1, 7, + 8, 49, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 157, + 158, -1, -1, 161, -1, 163, -1, -1, -1, 7, + 8, 49, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 157, + 158, -1, -1, 161, -1, 163, -1, -1, -1, 7, + 8, 49, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 157, + 158, -1, -1, 161, -1, 163, -1, -1, -1, 7, + 8, 49, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 157, + 158, -1, -1, 161, -1, 163, -1, -1, -1, 7, + 8, 49, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 157, + 158, -1, -1, 161, -1, 163, -1, -1, -1, 7, + 8, 49, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 157, + 158, -1, -1, 161, -1, 163, -1, -1, -1, 7, + 8, 49, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 157, + 158, -1, -1, 161, -1, 163, -1, -1, -1, 7, + 8, 49, 10, 11, 12, 13, 14, 15, 16, 17, + -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 157, + 158, -1, -1, 161, -1, 163, -1, -1, -1, -1, + -1, 49, -1, 36, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 36, -1, - -1, -1, -1, -1, -1, -1, 157, 158, -1, -1, - 161, -1, 163, -1, -1, -1, -1, -1, 56, 57, - -1, -1, -1, -1, 157, 158, -1, -1, 161, -1, - 163, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 91, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 157, 158, -1, - -1, 161, -1, 163, 112, 113, 114, -1, -1, 117, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136 + -1, -1, -1, 56, 57, -1, -1, -1, -1, 157, + 158, -1, -1, 161, -1, 163, 69, 70, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 87, 88, 89, 90, 91, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 157, + 158, -1, -1, 161, -1, 163, -1, -1, -1, 112, + 113, 114, -1, -1, 117, 118, 119, 120, 121, 122, + 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, -1, -1, -1, -1, -1, 157, + 158, -1, -1, 161, -1, 163 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -2626,57 +2622,57 @@ 22, 223, 152, 4, 4, 4, 163, 10, 164, 200, 205, 54, 152, 176, 210, 210, 42, 44, 186, 32, 33, 209, 61, 62, 63, 64, 65, 66, 187, 226, - 226, 68, 3, 4, 9, 25, 26, 27, 40, 41, - 58, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, 89, 90, 91, 117, 118, - 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, - 129, 131, 133, 134, 135, 161, 167, 168, 169, 207, - 233, 234, 235, 177, 243, 155, 160, 39, 200, 201, + 226, 68, 38, 177, 243, 155, 160, 39, 200, 201, 203, 204, 159, 159, 164, 205, 155, 164, 152, 204, 156, 209, 209, 10, 123, 200, 202, 211, 11, 12, 13, 14, 15, 16, 172, 173, 200, 206, 4, 202, - 28, 163, 227, 235, 60, 232, 92, 93, 94, 95, - 96, 97, 98, 99, 100, 101, 170, 26, 27, 98, - 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, - 109, 110, 111, 171, 152, 152, 152, 152, 152, 206, - 208, 152, 152, 152, 36, 56, 57, 69, 70, 71, - 72, 73, 74, 90, 91, 112, 113, 114, 117, 130, - 131, 132, 133, 134, 135, 136, 167, 168, 169, 241, - 247, 248, 249, 250, 22, 189, 155, 153, 200, 200, - 162, 164, 200, 4, 153, 206, 200, 152, 234, 26, - 27, 3, 4, 5, 6, 9, 25, 40, 41, 158, - 161, 163, 165, 207, 234, 176, 178, 22, 152, 152, - 206, 206, 206, 206, 206, 155, 162, 206, 206, 206, - 56, 10, 200, 236, 237, 11, 17, 11, 172, 187, - 170, 171, 200, 200, 236, 200, 200, 244, 236, 236, - 236, 236, 236, 200, 200, 200, 236, 187, 115, 116, - 53, 119, 120, 137, 138, 140, 141, 143, 144, 145, - 188, 39, 201, 191, 160, 162, 162, 153, 191, 176, - 176, 211, 160, 208, 163, 208, 164, 208, 22, 217, - 152, 155, 206, 206, 246, 155, 155, 155, 155, 206, - 155, 155, 38, 235, 155, 235, 235, 235, 202, 200, + 28, 163, 227, 38, 3, 4, 9, 25, 26, 27, + 40, 41, 58, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, 131, 133, 134, 135, 161, 167, 168, + 169, 207, 233, 234, 235, 36, 56, 57, 69, 70, + 71, 72, 73, 74, 90, 91, 112, 113, 114, 117, + 130, 131, 132, 133, 134, 135, 136, 167, 168, 169, + 241, 247, 248, 249, 250, 22, 189, 155, 153, 200, + 200, 162, 164, 200, 4, 153, 206, 200, 152, 234, + 26, 27, 3, 4, 5, 6, 9, 25, 40, 41, + 158, 161, 163, 165, 207, 234, 176, 178, 235, 60, + 232, 92, 93, 94, 95, 96, 97, 98, 99, 100, + 101, 170, 26, 27, 98, 99, 100, 101, 102, 103, + 104, 105, 106, 107, 108, 109, 110, 111, 171, 152, + 152, 152, 152, 152, 206, 208, 152, 152, 152, 56, + 10, 200, 236, 237, 11, 17, 11, 172, 187, 170, + 171, 200, 200, 236, 200, 200, 244, 236, 236, 236, + 236, 236, 200, 200, 200, 236, 187, 115, 116, 53, + 119, 120, 137, 138, 140, 141, 143, 144, 145, 188, + 39, 201, 191, 160, 162, 162, 153, 191, 176, 176, + 211, 160, 208, 163, 208, 164, 208, 22, 217, 152, + 22, 152, 152, 206, 206, 206, 206, 206, 155, 162, + 206, 206, 206, 235, 155, 235, 235, 235, 202, 200, 200, 155, 194, 155, 194, 235, 158, 155, 155, 155, 155, 155, 155, 234, 235, 235, 38, 202, 200, 236, 4, 137, 138, 139, 142, 146, 147, 190, 218, 219, 38, 160, 164, 200, 208, 162, 164, 155, 197, 39, - 200, 224, 225, 22, 155, 155, 153, 155, 206, 206, - 206, 206, 206, 206, 200, 236, 155, 155, 235, 235, + 200, 224, 225, 155, 206, 206, 246, 155, 155, 155, + 155, 206, 155, 155, 38, 236, 155, 155, 235, 235, 235, 11, 53, 11, 246, 235, 158, 236, 200, 236, 236, 236, 155, 155, 155, 200, 235, 235, 155, 197, 197, 200, 162, 164, 34, 53, 195, 198, 189, 155, - 153, 206, 206, 236, 155, 153, 155, 155, 153, 153, - 153, 17, 17, 152, 155, 155, 235, 4, 235, 155, - 235, 155, 155, 155, 4, 235, 235, 152, 155, 194, - 200, 153, 162, 22, 4, 197, 174, 175, 39, 200, - 191, 153, 153, 206, 206, 206, 235, 235, 17, 200, - 245, 235, 235, 194, 194, 235, 155, 236, 236, 236, - 245, 235, 189, 195, 196, 153, 153, 153, 155, 158, - 189, 189, 153, 155, 160, 235, 153, 194, 175, 53, - 193, 17, 160, 172, 242, 119, 120, 235, 235, 191, - 17, 200, 160, 191, 4, 148, 192, 235, 233, 160, - 172, 189, 189, 38, 189, 189, 22, 155, 233, 17, - 235, 235, 17, 155, 235, 189, 189, 235, 17, 73, - 235, 17, 235 + 153, 22, 155, 155, 153, 155, 206, 206, 206, 206, + 206, 206, 200, 17, 17, 152, 155, 155, 235, 4, + 235, 155, 235, 155, 155, 155, 4, 235, 235, 152, + 155, 194, 200, 153, 162, 22, 4, 197, 174, 175, + 39, 200, 191, 206, 206, 236, 155, 153, 155, 155, + 153, 153, 153, 235, 235, 17, 200, 245, 235, 235, + 194, 194, 235, 155, 236, 236, 236, 245, 235, 189, + 195, 196, 153, 153, 206, 206, 206, 155, 158, 189, + 189, 153, 155, 160, 235, 153, 194, 175, 53, 193, + 153, 153, 153, 17, 160, 172, 242, 119, 120, 235, + 235, 191, 17, 200, 160, 191, 4, 148, 192, 235, + 233, 160, 172, 189, 189, 38, 189, 189, 22, 155, + 233, 17, 235, 235, 17, 155, 235, 189, 189, 235, + 17, 73, 235, 17, 235 }; #define yyerrok (yyerrstatus = 0) @@ -2750,7 +2746,7 @@ we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL +# if YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -3491,152 +3487,152 @@ switch (yyn) { case 29: -#line 1119 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1119 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;} break; case 30: -#line 1119 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1119 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;} break; case 31: -#line 1120 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1120 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;} break; case 32: -#line 1120 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1120 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;} break; case 33: -#line 1121 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1121 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;} break; case 34: -#line 1121 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1121 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;} break; case 35: -#line 1122 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1122 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;} break; case 36: -#line 1122 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1122 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;} break; case 37: -#line 1123 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1123 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;} break; case 38: -#line 1123 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1123 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;} break; case 39: -#line 1127 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1127 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;} break; case 40: -#line 1127 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1127 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;} break; case 41: -#line 1128 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1128 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;} break; case 42: -#line 1128 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1128 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;} break; case 43: -#line 1129 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1129 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;} break; case 44: -#line 1129 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1129 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;} break; case 45: -#line 1130 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1130 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;} break; case 46: -#line 1130 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1130 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;} break; case 47: -#line 1131 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1131 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;} break; case 48: -#line 1131 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1131 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;} break; case 49: -#line 1132 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1132 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;} break; case 50: -#line 1132 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1132 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;} break; case 51: -#line 1133 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1133 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;} break; case 52: -#line 1133 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1133 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;} break; case 53: -#line 1134 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1134 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;} break; case 54: -#line 1135 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1135 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;} break; case 65: -#line 1144 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1144 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; ;} break; case 66: -#line 1146 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1146 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal)=(yyvsp[(3) - (4)].UInt64Val); ;} break; case 67: -#line 1147 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1147 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal)=0; ;} break; case 68: -#line 1151 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1151 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal); CHECK_FOR_ERROR @@ -3644,7 +3640,7 @@ break; case 69: -#line 1155 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1155 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; CHECK_FOR_ERROR @@ -3652,7 +3648,7 @@ break; case 73: -#line 1163 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1163 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; CHECK_FOR_ERROR @@ -3660,7 +3656,7 @@ break; case 74: -#line 1168 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1168 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal); CHECK_FOR_ERROR @@ -3668,152 +3664,152 @@ break; case 75: -#line 1174 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1174 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::InternalLinkage; ;} break; case 76: -#line 1175 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1175 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::WeakLinkage; ;} break; case 77: -#line 1176 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1176 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;} break; case 78: -#line 1177 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1177 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;} break; case 79: -#line 1178 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1178 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;} break; case 80: -#line 1182 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1182 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;} break; case 81: -#line 1183 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1183 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;} break; case 82: -#line 1184 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1184 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; case 83: -#line 1188 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1188 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Visibility) = GlobalValue::DefaultVisibility; ;} break; case 84: -#line 1189 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1189 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Visibility) = GlobalValue::DefaultVisibility; ;} break; case 85: -#line 1190 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1190 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Visibility) = GlobalValue::HiddenVisibility; ;} break; case 86: -#line 1191 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1191 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Visibility) = GlobalValue::ProtectedVisibility; ;} break; case 87: -#line 1195 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1195 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; case 88: -#line 1196 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1196 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;} break; case 89: -#line 1197 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1197 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;} break; case 90: -#line 1201 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1201 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; case 91: -#line 1202 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1202 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::InternalLinkage; ;} break; case 92: -#line 1203 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1203 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;} break; case 93: -#line 1204 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1204 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::WeakLinkage; ;} break; case 94: -#line 1205 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1205 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;} break; case 95: -#line 1209 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1209 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;} break; case 96: -#line 1210 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1210 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::WeakLinkage; ;} break; case 97: -#line 1211 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1211 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.Linkage) = GlobalValue::InternalLinkage; ;} break; case 98: -#line 1214 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1214 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::C; ;} break; case 99: -#line 1215 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1215 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::C; ;} break; case 100: -#line 1216 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1216 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::Fast; ;} break; case 101: -#line 1217 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1217 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::Cold; ;} break; case 102: -#line 1218 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1218 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::X86_StdCall; ;} break; case 103: -#line 1219 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1219 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = CallingConv::X86_FastCall; ;} break; case 104: -#line 1220 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1220 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val)) GEN_ERROR("Calling conv too large"); @@ -3823,129 +3819,129 @@ break; case 105: -#line 1227 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1227 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::ZExt; ;} break; case 106: -#line 1228 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1228 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::ZExt; ;} break; case 107: -#line 1229 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1229 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::SExt; ;} break; case 108: -#line 1230 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1230 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::SExt; ;} break; case 109: -#line 1231 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1231 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::InReg; ;} break; case 110: -#line 1232 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1232 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::StructRet; ;} break; case 111: -#line 1233 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1233 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::NoAlias; ;} break; case 112: -#line 1234 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1234 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::ByVal; ;} break; case 113: -#line 1235 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1235 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::Nest; ;} break; case 114: -#line 1236 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1236 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::constructAlignmentFromInt((yyvsp[(2) - (2)].UInt64Val)); ;} break; case 115: -#line 1240 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1240 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::None; ;} break; case 116: -#line 1241 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1241 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs); ;} break; case 117: -#line 1246 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1246 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::NoReturn; ;} break; case 118: -#line 1247 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1247 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::NoUnwind; ;} break; case 119: -#line 1248 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1248 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::ZExt; ;} break; case 120: -#line 1249 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1249 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::SExt; ;} break; case 121: -#line 1250 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1250 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::ReadNone; ;} break; case 122: -#line 1251 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1251 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::ReadOnly; ;} break; case 123: -#line 1254 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1254 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = ParamAttr::None; ;} break; case 124: -#line 1255 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1255 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs); ;} break; case 125: -#line 1260 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1260 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; ;} break; case 126: -#line 1261 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1261 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal); ;} break; case 127: -#line 1268 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1268 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = 0; ;} break; case 128: -#line 1269 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1269 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val); if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal))) @@ -3955,12 +3951,12 @@ break; case 129: -#line 1275 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1275 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = 0; ;} break; case 130: -#line 1276 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1276 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val); if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal))) @@ -3970,7 +3966,7 @@ break; case 131: -#line 1285 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1285 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { for (unsigned i = 0, e = (yyvsp[(2) - (2)].StrVal)->length(); i != e; ++i) if ((*(yyvsp[(2) - (2)].StrVal))[i] == '"' || (*(yyvsp[(2) - (2)].StrVal))[i] == '\\') @@ -3981,27 +3977,27 @@ break; case 132: -#line 1293 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1293 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = 0; ;} break; case 133: -#line 1294 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1294 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;} break; case 134: -#line 1299 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1299 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" {;} break; case 135: -#line 1300 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1300 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" {;} break; case 136: -#line 1301 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1301 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CurGV->setSection(*(yyvsp[(1) - (1)].StrVal)); delete (yyvsp[(1) - (1)].StrVal); @@ -4010,7 +4006,7 @@ break; case 137: -#line 1306 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1306 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(2) - (2)].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[(2) - (2)].UInt64Val))) GEN_ERROR("Alignment must be a power of two"); @@ -4020,7 +4016,7 @@ break; case 145: -#line 1322 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1322 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeVal) = new PATypeHolder(OpaqueType::get()); CHECK_FOR_ERROR @@ -4028,7 +4024,7 @@ break; case 146: -#line 1326 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1326 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType)); CHECK_FOR_ERROR @@ -4036,7 +4032,7 @@ break; case 147: -#line 1330 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1330 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Pointer type? if (*(yyvsp[(1) - (3)].TypeVal) == Type::LabelTy) GEN_ERROR("Cannot form a pointer to a basic block"); @@ -4047,7 +4043,7 @@ break; case 148: -#line 1337 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1337 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Named types are also simple types... const Type* tmp = getTypeVal((yyvsp[(1) - (1)].ValIDVal)); CHECK_FOR_ERROR @@ -4056,7 +4052,7 @@ break; case 149: -#line 1342 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1342 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Type UpReference if ((yyvsp[(2) - (2)].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range"); OpaqueType *OT = OpaqueType::get(); // Use temporary placeholder @@ -4068,7 +4064,7 @@ break; case 150: -#line 1350 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1350 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Allow but ignore attributes on function types; this permits auto-upgrade. // FIXME: remove in LLVM 3.0. @@ -4102,7 +4098,7 @@ break; case 151: -#line 1380 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1380 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Allow but ignore attributes on function types; this permits auto-upgrade. // FIXME: remove in LLVM 3.0. @@ -4130,7 +4126,7 @@ break; case 152: -#line 1405 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1405 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Sized array type? (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[(4) - (5)].TypeVal), (unsigned)(yyvsp[(2) - (5)].UInt64Val)))); delete (yyvsp[(4) - (5)].TypeVal); @@ -4139,7 +4135,7 @@ break; case 153: -#line 1410 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1410 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Vector type? const llvm::Type* ElemTy = (yyvsp[(4) - (5)].TypeVal)->get(); if ((unsigned)(yyvsp[(2) - (5)].UInt64Val) != (yyvsp[(2) - (5)].UInt64Val)) @@ -4153,7 +4149,7 @@ break; case 154: -#line 1420 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1420 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Structure type? std::vector Elements; for (std::list::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(), @@ -4167,7 +4163,7 @@ break; case 155: -#line 1430 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1430 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Empty structure type? (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector())); CHECK_FOR_ERROR @@ -4175,7 +4171,7 @@ break; case 156: -#line 1434 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1434 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { std::vector Elements; for (std::list::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(), @@ -4189,7 +4185,7 @@ break; case 157: -#line 1444 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1444 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Empty structure type? (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector(), true)); CHECK_FOR_ERROR @@ -4197,7 +4193,7 @@ break; case 158: -#line 1451 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1451 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Allow but ignore attributes on function types; this permits auto-upgrade. // FIXME: remove in LLVM 3.0. @@ -4207,7 +4203,7 @@ break; case 159: -#line 1460 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1460 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription()); @@ -4218,14 +4214,14 @@ break; case 160: -#line 1467 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1467 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeVal) = new PATypeHolder(Type::VoidTy); ;} break; case 161: -#line 1472 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1472 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeWithAttrsList) = new TypeWithAttrsList(); (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs)); @@ -4234,7 +4230,7 @@ break; case 162: -#line 1477 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1477 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs)); CHECK_FOR_ERROR @@ -4242,7 +4238,7 @@ break; case 164: -#line 1485 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1485 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList); TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None; @@ -4253,7 +4249,7 @@ break; case 165: -#line 1492 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1492 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeWithAttrsList) = new TypeWithAttrsList; TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None; @@ -4264,7 +4260,7 @@ break; case 166: -#line 1499 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1499 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeWithAttrsList) = new TypeWithAttrsList(); CHECK_FOR_ERROR @@ -4272,7 +4268,7 @@ break; case 167: -#line 1507 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1507 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.TypeList) = new std::list(); (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal)); @@ -4282,7 +4278,7 @@ break; case 168: -#line 1513 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1513 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal)); delete (yyvsp[(3) - (3)].TypeVal); @@ -4291,7 +4287,7 @@ break; case 169: -#line 1525 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1525 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Nonempty unsized arr if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription()); @@ -4323,7 +4319,7 @@ break; case 170: -#line 1553 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1553 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); @@ -4343,7 +4339,7 @@ break; case 171: -#line 1569 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1569 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); @@ -4374,7 +4370,7 @@ break; case 172: -#line 1596 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1596 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Nonempty unsized arr if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription()); @@ -4406,7 +4402,7 @@ break; case 173: -#line 1624 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1624 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { const StructType *STy = dyn_cast((yyvsp[(1) - (4)].TypeVal)->get()); if (STy == 0) @@ -4436,7 +4432,7 @@ break; case 174: -#line 1650 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1650 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); @@ -4460,7 +4456,7 @@ break; case 175: -#line 1670 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1670 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { const StructType *STy = dyn_cast((yyvsp[(1) - (6)].TypeVal)->get()); if (STy == 0) @@ -4490,7 +4486,7 @@ break; case 176: -#line 1696 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1696 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription()); @@ -4514,7 +4510,7 @@ break; case 177: -#line 1716 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1716 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -4530,7 +4526,7 @@ break; case 178: -#line 1728 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1728 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -4541,7 +4537,7 @@ break; case 179: -#line 1735 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1735 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -4611,7 +4607,7 @@ break; case 180: -#line 1801 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1801 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -4625,7 +4621,7 @@ break; case 181: -#line 1811 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1811 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -4639,7 +4635,7 @@ break; case 182: -#line 1821 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1821 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // integral constants if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].SInt64Val))) GEN_ERROR("Constant value doesn't fit in type"); @@ -4649,7 +4645,7 @@ break; case 183: -#line 1827 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1827 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // arbitrary precision integer constants uint32_t BitWidth = cast((yyvsp[(1) - (2)].PrimType))->getBitWidth(); if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) { @@ -4663,7 +4659,7 @@ break; case 184: -#line 1837 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1837 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // integral constants if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].UInt64Val))) GEN_ERROR("Constant value doesn't fit in type"); @@ -4673,7 +4669,7 @@ break; case 185: -#line 1843 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1843 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // arbitrary precision integer constants uint32_t BitWidth = cast((yyvsp[(1) - (2)].PrimType))->getBitWidth(); if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) { @@ -4687,7 +4683,7 @@ break; case 186: -#line 1853 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1853 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Boolean constants assert(cast((yyvsp[(1) - (2)].PrimType))->getBitWidth() == 1 && "Not Bool?"); (yyval.ConstVal) = ConstantInt::getTrue(); @@ -4696,7 +4692,7 @@ break; case 187: -#line 1858 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1858 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Boolean constants assert(cast((yyvsp[(1) - (2)].PrimType))->getBitWidth() == 1 && "Not Bool?"); (yyval.ConstVal) = ConstantInt::getFalse(); @@ -4705,7 +4701,7 @@ break; case 188: -#line 1863 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1863 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Floating point constants if (!ConstantFP::isValueValidForType((yyvsp[(1) - (2)].PrimType), *(yyvsp[(2) - (2)].FPVal))) GEN_ERROR("Floating point constant invalid for type"); @@ -4720,7 +4716,7 @@ break; case 189: -#line 1876 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1876 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription()); @@ -4736,7 +4732,7 @@ break; case 190: -#line 1888 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1888 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!isa((yyvsp[(3) - (5)].ConstVal)->getType())) GEN_ERROR("GetElementPtr requires a pointer operand"); @@ -4762,7 +4758,7 @@ break; case 191: -#line 1910 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1910 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(3) - (8)].ConstVal)->getType() != Type::Int1Ty) GEN_ERROR("Select condition must be of boolean type"); @@ -4774,7 +4770,7 @@ break; case 192: -#line 1918 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1918 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType()) GEN_ERROR("Binary operator types must match"); @@ -4784,7 +4780,7 @@ break; case 193: -#line 1924 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1924 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType()) GEN_ERROR("Logical operator types must match"); @@ -4799,7 +4795,7 @@ break; case 194: -#line 1935 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1935 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType()) GEN_ERROR("icmp operand types must match"); @@ -4808,7 +4804,7 @@ break; case 195: -#line 1940 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1940 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType()) GEN_ERROR("fcmp operand types must match"); @@ -4817,7 +4813,7 @@ break; case 196: -#line 1945 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1945 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal))) GEN_ERROR("Invalid extractelement operands"); @@ -4827,7 +4823,7 @@ break; case 197: -#line 1951 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1951 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!InsertElementInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal))) GEN_ERROR("Invalid insertelement operands"); @@ -4837,7 +4833,7 @@ break; case 198: -#line 1957 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1957 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!ShuffleVectorInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal))) GEN_ERROR("Invalid shufflevector operands"); @@ -4847,7 +4843,7 @@ break; case 199: -#line 1966 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1966 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal)); CHECK_FOR_ERROR @@ -4855,7 +4851,7 @@ break; case 200: -#line 1970 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1970 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ConstVector) = new std::vector(); (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal)); @@ -4864,27 +4860,27 @@ break; case 201: -#line 1978 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1978 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; ;} break; case 202: -#line 1978 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1978 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; ;} break; case 203: -#line 1981 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1981 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; ;} break; case 204: -#line 1981 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1981 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; ;} break; case 205: -#line 1984 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1984 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { const Type* VTy = (yyvsp[(1) - (2)].TypeVal)->get(); Value *V = getVal(VTy, (yyvsp[(2) - (2)].ValIDVal)); @@ -4900,7 +4896,7 @@ break; case 206: -#line 1996 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 1996 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { Constant *Val = (yyvsp[(3) - (6)].ConstVal); const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get(); @@ -4916,7 +4912,7 @@ break; case 207: -#line 2017 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2017 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule; CurModule.ModuleDone(); @@ -4925,7 +4921,7 @@ break; case 208: -#line 2022 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2022 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule; CurModule.ModuleDone(); @@ -4934,12 +4930,12 @@ break; case 211: -#line 2035 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2035 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CurFun.isDeclare = false; ;} break; case 212: -#line 2035 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2035 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CurFun.FunctionDone(); CHECK_FOR_ERROR @@ -4947,26 +4943,26 @@ break; case 213: -#line 2039 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2039 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CurFun.isDeclare = true; ;} break; case 214: -#line 2039 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2039 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; case 215: -#line 2042 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2042 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; case 216: -#line 2045 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2045 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription()); @@ -4994,7 +4990,7 @@ break; case 217: -#line 2069 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2069 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { ResolveTypeTo((yyvsp[(1) - (3)].StrVal), (yyvsp[(3) - (3)].PrimType)); @@ -5009,7 +5005,7 @@ break; case 218: -#line 2081 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2081 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { /* "Externally Visible" Linkage */ if ((yyvsp[(5) - (6)].ConstVal) == 0) @@ -5021,14 +5017,14 @@ break; case 219: -#line 2088 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2088 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CurGV = 0; ;} break; case 220: -#line 2092 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2092 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(6) - (7)].ConstVal) == 0) GEN_ERROR("Global value initializer is not a constant"); @@ -5038,14 +5034,14 @@ break; case 221: -#line 2097 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2097 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CurGV = 0; ;} break; case 222: -#line 2101 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2101 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(6) - (7)].TypeVal))->getDescription()); @@ -5056,7 +5052,7 @@ break; case 223: -#line 2107 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2107 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CurGV = 0; CHECK_FOR_ERROR @@ -5064,7 +5060,7 @@ break; case 224: -#line 2111 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2111 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { std::string Name; if ((yyvsp[(1) - (5)].StrVal)) { @@ -5108,21 +5104,21 @@ break; case 225: -#line 2151 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2151 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; case 226: -#line 2154 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2154 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; case 227: -#line 2160 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2160 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm(); if (AsmSoFar.empty()) @@ -5135,7 +5131,7 @@ break; case 228: -#line 2170 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2170 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->setTargetTriple(*(yyvsp[(3) - (3)].StrVal)); delete (yyvsp[(3) - (3)].StrVal); @@ -5143,7 +5139,7 @@ break; case 229: -#line 2174 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2174 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->setDataLayout(*(yyvsp[(3) - (3)].StrVal)); delete (yyvsp[(3) - (3)].StrVal); @@ -5151,7 +5147,7 @@ break; case 231: -#line 2181 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2181 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->addLibrary(*(yyvsp[(3) - (3)].StrVal)); delete (yyvsp[(3) - (3)].StrVal); @@ -5160,7 +5156,7 @@ break; case 232: -#line 2186 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2186 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CurModule.CurrentModule->addLibrary(*(yyvsp[(1) - (1)].StrVal)); delete (yyvsp[(1) - (1)].StrVal); @@ -5169,14 +5165,14 @@ break; case 233: -#line 2191 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2191 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CHECK_FOR_ERROR ;} break; case 234: -#line 2200 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2200 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription()); @@ -5190,7 +5186,7 @@ break; case 235: -#line 2210 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2210 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription()); @@ -5204,7 +5200,7 @@ break; case 236: -#line 2221 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2221 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList); CHECK_FOR_ERROR @@ -5212,7 +5208,7 @@ break; case 237: -#line 2225 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2225 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList); struct ArgListEntry E; @@ -5225,7 +5221,7 @@ break; case 238: -#line 2234 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2234 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = new ArgListType; struct ArgListEntry E; @@ -5238,7 +5234,7 @@ break; case 239: -#line 2243 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2243 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ArgList) = 0; CHECK_FOR_ERROR @@ -5246,7 +5242,7 @@ break; case 240: -#line 2249 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2249 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { std::string FunctionName(*(yyvsp[(3) - (10)].StrVal)); delete (yyvsp[(3) - (10)].StrVal); // Free strdup'd memory! @@ -5382,7 +5378,7 @@ break; case 243: -#line 2384 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2384 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FunctionVal) = CurFun.CurrentFunction; @@ -5394,7 +5390,7 @@ break; case 246: -#line 2395 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2395 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); CHECK_FOR_ERROR @@ -5402,7 +5398,7 @@ break; case 247: -#line 2400 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2400 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { CurFun.CurrentFunction->setLinkage((yyvsp[(1) - (3)].Linkage)); CurFun.CurrentFunction->setVisibility((yyvsp[(2) - (3)].Visibility)); @@ -5413,7 +5409,7 @@ break; case 248: -#line 2412 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2412 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; CHECK_FOR_ERROR @@ -5421,7 +5417,7 @@ break; case 249: -#line 2416 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2416 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; CHECK_FOR_ERROR @@ -5429,7 +5425,7 @@ break; case 250: -#line 2421 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2421 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // A reference to a direct constant (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val)); CHECK_FOR_ERROR @@ -5437,7 +5433,7 @@ break; case 251: -#line 2425 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2425 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val)); CHECK_FOR_ERROR @@ -5445,7 +5441,7 @@ break; case 252: -#line 2429 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2429 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Perhaps it's an FP constant? (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal)); CHECK_FOR_ERROR @@ -5453,7 +5449,7 @@ break; case 253: -#line 2433 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2433 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue()); CHECK_FOR_ERROR @@ -5461,7 +5457,7 @@ break; case 254: -#line 2437 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2437 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse()); CHECK_FOR_ERROR @@ -5469,7 +5465,7 @@ break; case 255: -#line 2441 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2441 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::createNull(); CHECK_FOR_ERROR @@ -5477,7 +5473,7 @@ break; case 256: -#line 2445 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2445 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::createUndef(); CHECK_FOR_ERROR @@ -5485,7 +5481,7 @@ break; case 257: -#line 2449 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2449 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // A vector zero constant. (yyval.ValIDVal) = ValID::createZeroInit(); CHECK_FOR_ERROR @@ -5493,7 +5489,7 @@ break; case 258: -#line 2453 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2453 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Nonempty unsized packed vector const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType(); int NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); @@ -5522,7 +5518,7 @@ break; case 259: -#line 2478 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2478 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal)); CHECK_FOR_ERROR @@ -5530,7 +5526,7 @@ break; case 260: -#line 2482 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2482 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::createInlineAsm(*(yyvsp[(3) - (5)].StrVal), *(yyvsp[(5) - (5)].StrVal), (yyvsp[(2) - (5)].BoolVal)); delete (yyvsp[(3) - (5)].StrVal); @@ -5540,7 +5536,7 @@ break; case 261: -#line 2492 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2492 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Is it an integer reference...? (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal)); CHECK_FOR_ERROR @@ -5548,7 +5544,7 @@ break; case 262: -#line 2496 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2496 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal)); CHECK_FOR_ERROR @@ -5556,7 +5552,7 @@ break; case 263: -#line 2500 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2500 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Is it a named reference...? (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)); delete (yyvsp[(1) - (1)].StrVal); @@ -5565,7 +5561,7 @@ break; case 264: -#line 2505 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2505 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Is it a named reference...? (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[(1) - (1)].StrVal)); delete (yyvsp[(1) - (1)].StrVal); @@ -5574,7 +5570,7 @@ break; case 267: -#line 2518 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2518 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -5585,7 +5581,7 @@ break; case 268: -#line 2527 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2527 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ValueList) = new std::vector(); (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal)); @@ -5594,7 +5590,7 @@ break; case 269: -#line 2532 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2532 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { ((yyval.ValueList)=(yyvsp[(1) - (3)].ValueList))->push_back((yyvsp[(3) - (3)].ValueVal)); CHECK_FOR_ERROR @@ -5602,7 +5598,7 @@ break; case 270: -#line 2537 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2537 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); CHECK_FOR_ERROR @@ -5610,7 +5606,7 @@ break; case 271: -#line 2541 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2541 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Do not allow functions with 0 basic blocks (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); CHECK_FOR_ERROR @@ -5618,7 +5614,7 @@ break; case 272: -#line 2550 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2550 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal)); CHECK_FOR_ERROR @@ -5630,7 +5626,7 @@ break; case 273: -#line 2559 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2559 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (CastInst *CI1 = dyn_cast((yyvsp[(2) - (2)].InstVal))) if (CastInst *CI2 = dyn_cast(CI1->getOperand(0))) @@ -5643,7 +5639,7 @@ break; case 274: -#line 2568 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2568 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Empty space between instruction lists (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum), 0); CHECK_FOR_ERROR @@ -5651,15 +5647,15 @@ break; case 275: -#line 2572 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2572 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Only the unwind to block - (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum), getBBVal((yyvsp[(2) - (2)].ValIDVal))); + (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum), getBBVal((yyvsp[(3) - (3)].ValIDVal))); CHECK_FOR_ERROR ;} break; case 276: -#line 2576 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2576 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Labelled (named) basic block (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)), 0); delete (yyvsp[(1) - (1)].StrVal); @@ -5668,16 +5664,16 @@ break; case 277: -#line 2581 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2581 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { - (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (3)].StrVal)), getBBVal((yyvsp[(3) - (3)].ValIDVal))); - delete (yyvsp[(1) - (3)].StrVal); + (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (4)].StrVal)), getBBVal((yyvsp[(4) - (4)].ValIDVal))); + delete (yyvsp[(1) - (4)].StrVal); CHECK_FOR_ERROR ;} break; case 278: -#line 2588 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2588 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Return with a result... ValueList &VL = *(yyvsp[(2) - (2)].ValueList); assert(!VL.empty() && "Invalid ret operands!"); @@ -5688,7 +5684,7 @@ break; case 279: -#line 2595 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2595 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Return with no result... (yyval.TermInstVal) = new ReturnInst(); CHECK_FOR_ERROR @@ -5696,7 +5692,7 @@ break; case 280: -#line 2599 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2599 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Unconditional Branch... BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal)); CHECK_FOR_ERROR @@ -5705,7 +5701,7 @@ break; case 281: -#line 2604 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2604 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { assert(cast((yyvsp[(2) - (9)].PrimType))->getBitWidth() == 1 && "Not Bool?"); BasicBlock* tmpBBA = getBBVal((yyvsp[(6) - (9)].ValIDVal)); @@ -5719,7 +5715,7 @@ break; case 282: -#line 2614 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2614 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal)); CHECK_FOR_ERROR @@ -5742,7 +5738,7 @@ break; case 283: -#line 2633 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2633 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal)); CHECK_FOR_ERROR @@ -5755,7 +5751,7 @@ break; case 284: -#line 2643 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2643 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Handle the short syntax @@ -5849,7 +5845,7 @@ break; case 285: -#line 2733 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2733 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.TermInstVal) = new UnwindInst(); CHECK_FOR_ERROR @@ -5857,7 +5853,7 @@ break; case 286: -#line 2737 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2737 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.TermInstVal) = new UnreachableInst(); CHECK_FOR_ERROR @@ -5865,7 +5861,7 @@ break; case 287: -#line 2744 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2744 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable); Constant *V = cast(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal))); @@ -5880,7 +5876,7 @@ break; case 288: -#line 2755 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2755 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.JumpTable) = new std::vector >(); Constant *V = cast(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal))); @@ -5896,7 +5892,7 @@ break; case 289: -#line 2768 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2768 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Is this definition named?? if so, assign the name... setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal)); @@ -5908,7 +5904,7 @@ break; case 290: -#line 2778 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2778 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Used for PHI nodes if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription()); @@ -5923,7 +5919,7 @@ break; case 291: -#line 2789 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2789 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.PHIList) = (yyvsp[(1) - (7)].PHIList); Value* tmpVal = getVal((yyvsp[(1) - (7)].PHIList)->front().first->getType(), (yyvsp[(4) - (7)].ValIDVal)); @@ -5935,7 +5931,7 @@ break; case 292: -#line 2799 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2799 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) @@ -5950,7 +5946,7 @@ break; case 293: -#line 2810 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2810 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 // Labels are only valid in ASMs @@ -5962,7 +5958,7 @@ break; case 294: -#line 2818 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2818 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) @@ -5976,7 +5972,7 @@ break; case 295: -#line 2828 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2828 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList); @@ -5987,17 +5983,17 @@ break; case 296: -#line 2835 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2835 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamList) = new ParamList(); ;} break; case 297: -#line 2838 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2838 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ValueList) = new std::vector(); ;} break; case 298: -#line 2839 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2839 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList); (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal)); @@ -6006,7 +6002,7 @@ break; case 299: -#line 2846 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2846 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; CHECK_FOR_ERROR @@ -6014,7 +6010,7 @@ break; case 300: -#line 2850 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2850 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; CHECK_FOR_ERROR @@ -6022,7 +6018,7 @@ break; case 301: -#line 2855 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2855 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription()); @@ -6042,7 +6038,7 @@ break; case 302: -#line 2871 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2871 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription()); @@ -6063,7 +6059,7 @@ break; case 303: -#line 2888 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2888 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); @@ -6081,7 +6077,7 @@ break; case 304: -#line 2902 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2902 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); @@ -6099,7 +6095,7 @@ break; case 305: -#line 2916 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2916 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription()); @@ -6115,7 +6111,7 @@ break; case 306: -#line 2928 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2928 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(2) - (6)].ValueVal)->getType() != Type::Int1Ty) GEN_ERROR("select condition must be boolean"); @@ -6127,7 +6123,7 @@ break; case 307: -#line 2936 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2936 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription()); @@ -6138,7 +6134,7 @@ break; case 308: -#line 2943 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2943 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal))) GEN_ERROR("Invalid extractelement operands"); @@ -6148,7 +6144,7 @@ break; case 309: -#line 2949 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2949 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!InsertElementInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal))) GEN_ERROR("Invalid insertelement operands"); @@ -6158,7 +6154,7 @@ break; case 310: -#line 2955 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2955 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!ShuffleVectorInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal))) GEN_ERROR("Invalid shufflevector operands"); @@ -6168,7 +6164,7 @@ break; case 311: -#line 2961 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2961 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType(); if (!Ty->isFirstClassType()) @@ -6187,7 +6183,7 @@ break; case 312: -#line 2977 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2977 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { // Handle the short syntax @@ -6288,7 +6284,7 @@ break; case 313: -#line 3074 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3074 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal); CHECK_FOR_ERROR @@ -6296,7 +6292,7 @@ break; case 314: -#line 3079 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3079 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; CHECK_FOR_ERROR @@ -6304,7 +6300,7 @@ break; case 315: -#line 3083 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3083 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; CHECK_FOR_ERROR @@ -6312,7 +6308,7 @@ break; case 316: -#line 3090 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3090 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription()); @@ -6323,7 +6319,7 @@ break; case 317: -#line 3097 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3097 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription()); @@ -6335,7 +6331,7 @@ break; case 318: -#line 3105 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3105 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription()); @@ -6346,7 +6342,7 @@ break; case 319: -#line 3112 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3112 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription()); @@ -6358,7 +6354,7 @@ break; case 320: -#line 3120 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3120 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!isa((yyvsp[(2) - (2)].ValueVal)->getType())) GEN_ERROR("Trying to free nonpointer type " + @@ -6369,7 +6365,7 @@ break; case 321: -#line 3128 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3128 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription()); @@ -6387,7 +6383,7 @@ break; case 322: -#line 3142 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3142 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription()); @@ -6408,7 +6404,7 @@ break; case 323: -#line 3159 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3159 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { Value *TmpVal = getVal((yyvsp[(2) - (5)].TypeVal)->get(), (yyvsp[(3) - (5)].ValIDVal)); if (!GetResultInst::isValidOperands(TmpVal, (yyvsp[(5) - (5)].UInt64Val))) @@ -6420,7 +6416,7 @@ break; case 324: -#line 3167 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3167 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription()); @@ -6440,7 +6436,7 @@ /* Line 1267 of yacc.c. */ -#line 6444 "llvmAsmParser.tab.c" +#line 6440 "llvmAsmParser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -6654,7 +6650,7 @@ } -#line 3184 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3184 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" // common code from the two 'RunVMAsmParser' functions Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs?rev=48128&r1=48127&r2=48128&view=diff ============================================================================== --- llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs (original) +++ llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs Mon Mar 10 00:01:34 2008 @@ -104,7 +104,7 @@ X86_STDCALLCC_TOK = 320, X86_FASTCALLCC_TOK = 321, DATALAYOUT = 322, - UNWIND_TO = 323, + UNWINDS = 323, RET = 324, BR = 325, SWITCH = 326, @@ -256,7 +256,7 @@ #define X86_STDCALLCC_TOK 320 #define X86_FASTCALLCC_TOK 321 #define DATALAYOUT 322 -#define UNWIND_TO 323 +#define UNWINDS 323 #define RET 324 #define BR 325 #define SWITCH 326 @@ -346,7 +346,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 951 "/Volumes/Nanpura/mrv/llvm/lib/AsmParser/llvmAsmParser.y" +#line 951 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y" { llvm::Module *ModuleVal; llvm::Function *FunctionVal; @@ -393,7 +393,7 @@ llvm::ICmpInst::Predicate IPredicate; llvm::FCmpInst::Predicate FPredicate; } -/* Line 1529 of yacc.c. */ +/* Line 1489 of yacc.c. */ #line 398 "llvmAsmParser.tab.h" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs?rev=48128&r1=48127&r2=48128&view=diff ============================================================================== --- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original) +++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Mon Mar 10 00:01:34 2008 @@ -1064,7 +1064,7 @@ %token OPAQUE EXTERNAL TARGET TRIPLE ALIGN ADDRSPACE %token DEPLIBS CALL TAIL ASM_TOK MODULE SIDEEFFECT %token CC_TOK CCC_TOK FASTCC_TOK COLDCC_TOK X86_STDCALLCC_TOK X86_FASTCALLCC_TOK -%token DATALAYOUT UNWIND_TO +%token DATALAYOUT UNWINDS %type OptCallingConv %type OptParamAttrs ParamAttr %type OptFuncAttrs FuncAttr @@ -2569,8 +2569,8 @@ $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum), 0); CHECK_FOR_ERROR } - | UNWIND_TO ValueRef { // Only the unwind to block - $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum), getBBVal($2)); + | UNWINDS TO ValueRef { // Only the unwind to block + $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum), getBBVal($3)); CHECK_FOR_ERROR } | LABELSTR { // Labelled (named) basic block @@ -2578,8 +2578,8 @@ delete $1; CHECK_FOR_ERROR } - | LABELSTR UNWIND_TO ValueRef { - $$ = defineBBVal(ValID::createLocalName(*$1), getBBVal($3)); + | LABELSTR UNWINDS TO ValueRef { + $$ = defineBBVal(ValID::createLocalName(*$1), getBBVal($4)); delete $1; CHECK_FOR_ERROR }; From clattner at apple.com Mon Mar 10 00:17:37 2008 From: clattner at apple.com (Chris Lattner) Date: Sun, 9 Mar 2008 22:17:37 -0700 Subject: [llvm-commits] [llvm] r47658 - in /llvm/trunk: lib/Target/X86/README-X86-64.txt lib/Target/X86/X86Instr64bit.td test/CodeGen/X86/x86-64-and-mask.ll In-Reply-To: <4450BAA6-789F-4688-A998-39F41ACC16DB@gmail.com> References: <200802270547.m1R5ls0N001359@zion.cs.uiuc.edu> <76820C32-34B8-420A-997C-46CB591DA46E@apple.com> <4450BAA6-789F-4688-A998-39F41ACC16DB@gmail.com> Message-ID: <778635E2-7981-4E29-AFFD-B38D1765BDB5@apple.com> On Mar 9, 2008, at 9:28 PM, Christopher Lamb wrote: > I've prepared a change locally that allows you to write the following: > > // r & (2^32-1) > def : Pat<(and GR64:$src, i64immFFFFFFFF), > (INSERT_SUBREG x86_impl_val_zero, > (MOV32rr (EXTRACT_SUBREG GR64:$src, x86_subreg_32bit)), > x86_subreg_32bit)>; Woot, very nifty! In td files, we generally use lower case for nodes, should 'INSERT_SUBREG' -> 'insert_subreg'? -Chris > > On Mar 8, 2008, at 2:18 PM, Chris Lattner wrote: > >> One very simple and nice thing we could do is replace the >> duplicated instruction with a Pat pattern. This would mean that >> there is only one instruction and the magic just happens in the >> isel. This would give us something like this: >> >> def : Pat<(and GR64:$src, i64immFFFFFFFF), >> (x86_64_bit_part_of_32_bit >> (MOV32rr (subreg GR64:$src, x86_32bit_part_of_64bit)))>; >> >> This puts more pressure on the coalescer to coalesce away the >> copies, but seems like an overall better solution. Is this the >> sort of thing you mean? > > -- > Christopher Lamb > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20080309/bcc6839d/attachment.html From christopher.lamb at gmail.com Mon Mar 10 00:29:13 2008 From: christopher.lamb at gmail.com (Christopher Lamb) Date: Sun, 9 Mar 2008 22:29:13 -0700 Subject: [llvm-commits] [llvm] r47658 - in /llvm/trunk: lib/Target/X86/README-X86-64.txt lib/Target/X86/X86Instr64bit.td test/CodeGen/X86/x86-64-and-mask.ll In-Reply-To: <778635E2-7981-4E29-AFFD-B38D1765BDB5@apple.com> References: <200802270547.m1R5ls0N001359@zion.cs.uiuc.edu> <76820C32-34B8-420A-997C-46CB591DA46E@apple.com> <4450BAA6-789F-4688-A998-39F41ACC16DB@gmail.com> <778635E2-7981-4E29-AFFD-B38D1765BDB5@apple.com> Message-ID: <2A06214D-C548-4B27-ADA2-99CB7C8548B3@gmail.com> On Mar 9, 2008, at 10:17 PM, Chris Lattner wrote: > > On Mar 9, 2008, at 9:28 PM, Christopher Lamb wrote: > >> I've prepared a change locally that allows you to write the >> following: >> >> // r & (2^32-1) >> def : Pat<(and GR64:$src, i64immFFFFFFFF), >> (INSERT_SUBREG x86_impl_val_zero, >> (MOV32rr (EXTRACT_SUBREG GR64:$src, x86_subreg_32bit)), >> x86_subreg_32bit)>; > > Woot, very nifty! In td files, we generally use lower case for > nodes, should 'INSERT_SUBREG' -> 'insert_subreg'? insert_subreg, the SDNode has existed since the first subreg support went in. This is for selecting to an INSERT_SUBREG target instruction. -- Christopher Lamb >> On Mar 8, 2008, at 2:18 PM, Chris Lattner wrote: >> >>> One very simple and nice thing we could do is replace the >>> duplicated instruction with a Pat pattern. This would mean that >>> there is only one instruction and the magic just happens in the >>> isel. This would give us something like this: >>> >>> def : Pat<(and GR64:$src, i64immFFFFFFFF), >>> (x86_64_bit_part_of_32_bit >>> (MOV32rr (subreg GR64:$src, >>> x86_32bit_part_of_64bit)))>; >>> >>> This puts more pressure on the coalescer to coalesce away the >>> copies, but seems like an overall better solution. Is this the >>> sort of thing you mean? >> >> -- >> Christopher Lamb >> >> >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20080309/85c561c2/attachment.html From clattner at apple.com Mon Mar 10 00:37:12 2008 From: clattner at apple.com (Chris Lattner) Date: Sun, 9 Mar 2008 22:37:12 -0700 Subject: [llvm-commits] [llvm] r47658 - in /llvm/trunk: lib/Target/X86/README-X86-64.txt lib/Target/X86/X86Instr64bit.td test/CodeGen/X86/x86-64-and-mask.ll In-Reply-To: <2A06214D-C548-4B27-ADA2-99CB7C8548B3@gmail.com> References: <200802270547.m1R5ls0N001359@zion.cs.uiuc.edu> <76820C32-34B8-420A-997C-46CB591DA46E@apple.com> <4450BAA6-789F-4688-A998-39F41ACC16DB@gmail.com> <778635E2-7981-4E29-AFFD-B38D1765BDB5@apple.com> <2A06214D-C548-4B27-ADA2-99CB7C8548B3@gmail.com> Message-ID: On Mar 9, 2008, at 10:29 PM, Christopher Lamb wrote: > > On Mar 9, 2008, at 10:17 PM, Chris Lattner wrote: > >> >> On Mar 9, 2008, at 9:28 PM, Christopher Lamb wrote: >> >>> I've prepared a change locally that allows you to write the >>> following: >>> >>> // r & (2^32-1) >>> def : Pat<(and GR64:$src, i64immFFFFFFFF), >>> (INSERT_SUBREG x86_impl_val_zero, >>> (MOV32rr (EXTRACT_SUBREG GR64:$src, x86_subreg_32bit)), >>> x86_subreg_32bit)>; >> >> Woot, very nifty! In td files, we generally use lower case for >> nodes, should 'INSERT_SUBREG' -> 'insert_subreg'? > > insert_subreg, the SDNode has existed since the first subreg support > went in. This is for selecting to an INSERT_SUBREG target instruction. > Oh right, makes sense. -Chris From christopher.lamb at gmail.com Mon Mar 10 01:12:08 2008 From: christopher.lamb at gmail.com (Christopher Lamb) Date: Mon, 10 Mar 2008 06:12:08 -0000 Subject: [llvm-commits] [llvm] r48130 - in /llvm/trunk: include/llvm/CodeGen/SelectionDAGNodes.h lib/CodeGen/LowerSubregs.cpp lib/CodeGen/SelectionDAG/ScheduleDAG.cpp lib/Target/Target.td lib/Target/X86/X86ISelDAGToDAG.cpp lib/Target/X86/X86Instr64bit.td lib/Target/X86/X86InstrInfo.cpp lib/Target/X86/X86InstrInfo.h lib/Target/X86/X86InstrInfo.td lib/Target/X86/X86RegisterInfo.h lib/Target/X86/X86RegisterInfo.td Message-ID: <200803100612.m2A6C8Ys008166@zion.cs.uiuc.edu> Author: clamb Date: Mon Mar 10 01:12:08 2008 New Revision: 48130 URL: http://llvm.org/viewvc/llvm-project?rev=48130&view=rev Log: Allow insert_subreg into implicit, target-specific values. Change insert/extract subreg instructions to be able to be used in TableGen patterns. Use the above features to reimplement an x86-64 pseudo instruction as a pattern. Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h llvm/trunk/lib/CodeGen/LowerSubregs.cpp llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp llvm/trunk/lib/Target/Target.td llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp llvm/trunk/lib/Target/X86/X86Instr64bit.td llvm/trunk/lib/Target/X86/X86InstrInfo.cpp llvm/trunk/lib/Target/X86/X86InstrInfo.h llvm/trunk/lib/Target/X86/X86InstrInfo.td llvm/trunk/lib/Target/X86/X86RegisterInfo.h llvm/trunk/lib/Target/X86/X86RegisterInfo.td Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h?rev=48130&r1=48129&r2=48130&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h (original) +++ llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h Mon Mar 10 01:12:08 2008 @@ -322,9 +322,12 @@ // This node takes a superreg and a constant sub-register index as operands. EXTRACT_SUBREG, - // INSERT_SUBREG - This node is used to insert a sub-register value. + // INSERT_SUBREG - This node is used to insert a sub-register value into + // either explicitly into a superreg, or implicitly into a superreg value. // This node takes a superreg, a subreg value, and a constant sub-register - // index as operands. + // index as operands. The superreg may be either a superregister operand or a + // target constant indicating that the insert is being done into a target + // specific implicit value. INSERT_SUBREG, // MULHU/MULHS - Multiply high - Multiply two integers of type iN, producing Modified: llvm/trunk/lib/CodeGen/LowerSubregs.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LowerSubregs.cpp?rev=48130&r1=48129&r2=48130&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LowerSubregs.cpp (original) +++ llvm/trunk/lib/CodeGen/LowerSubregs.cpp Mon Mar 10 01:12:08 2008 @@ -105,32 +105,21 @@ MachineFunction &MF = *MBB->getParent(); const TargetRegisterInfo &TRI = *MF.getTarget().getRegisterInfo(); const TargetInstrInfo &TII = *MF.getTarget().getInstrInfo(); - unsigned DstReg = 0; + assert((MI->getOperand(0).isRegister() && MI->getOperand(0).isDef()) && + ((MI->getOperand(1).isRegister() && MI->getOperand(1).isUse()) || + MI->getOperand(1).isImmediate()) && + (MI->getOperand(2).isRegister() && MI->getOperand(2).isUse()) && + MI->getOperand(3).isImmediate() && "Invalid insert_subreg"); + + unsigned DstReg = MI->getOperand(0).getReg(); unsigned SrcReg = 0; - unsigned InsReg = 0; - unsigned SubIdx = 0; - - // If only have 3 operands, then the source superreg is undef - // and we can supress the copy from the undef value - if (MI->getNumOperands() == 3) { - assert((MI->getOperand(0).isRegister() && MI->getOperand(0).isDef()) && - (MI->getOperand(1).isRegister() && MI->getOperand(1).isUse()) && - MI->getOperand(2).isImmediate() && "Invalid extract_subreg"); - DstReg = MI->getOperand(0).getReg(); + // Check if we're inserting into an implicit value. + if (MI->getOperand(1).isImmediate()) SrcReg = DstReg; - InsReg = MI->getOperand(1).getReg(); - SubIdx = MI->getOperand(2).getImm(); - } else if (MI->getNumOperands() == 4) { - assert((MI->getOperand(0).isRegister() && MI->getOperand(0).isDef()) && - (MI->getOperand(1).isRegister() && MI->getOperand(1).isUse()) && - (MI->getOperand(2).isRegister() && MI->getOperand(2).isUse()) && - MI->getOperand(3).isImmediate() && "Invalid extract_subreg"); - DstReg = MI->getOperand(0).getReg(); + else SrcReg = MI->getOperand(1).getReg(); - InsReg = MI->getOperand(2).getReg(); - SubIdx = MI->getOperand(3).getImm(); - } else - assert(0 && "Malformed extract_subreg"); + unsigned InsReg = MI->getOperand(2).getReg(); + unsigned SubIdx = MI->getOperand(3).getImm(); assert(SubIdx != 0 && "Invalid index for extract_subreg"); unsigned DstSubReg = TRI.getSubReg(DstReg, SubIdx); Modified: llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp?rev=48130&r1=48129&r2=48130&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp Mon Mar 10 01:12:08 2008 @@ -693,19 +693,13 @@ MI->addOperand(MachineOperand::CreateImm(SubIdx)); } else if (Opc == TargetInstrInfo::INSERT_SUBREG) { - assert((Node->getNumOperands() == 2 || Node->getNumOperands() == 3) && + assert((Node->getNumOperands() == 3) && "Malformed insert_subreg node"); - bool isUndefInput = (Node->getNumOperands() == 2); - unsigned SubReg = 0; - unsigned SubIdx = 0; - - if (isUndefInput) { - SubReg = getVR(Node->getOperand(0), VRBaseMap); - SubIdx = cast(Node->getOperand(1))->getValue(); - } else { - SubReg = getVR(Node->getOperand(1), VRBaseMap); - SubIdx = cast(Node->getOperand(2))->getValue(); - } + SDOperand N0 = Node->getOperand(0); + SDOperand N1 = Node->getOperand(1); + SDOperand N2 = Node->getOperand(2); + unsigned SubReg = getVR(N1, VRBaseMap); + unsigned SubIdx = cast(N2)->getValue(); // TODO: Add tracking info to MachineRegisterInfo of which vregs are subregs // to allow coalescing in the allocator @@ -743,9 +737,15 @@ } MI->addOperand(MachineOperand::CreateReg(VRBase, true)); - AddOperand(MI, Node->getOperand(0), 0, 0, VRBaseMap); - if (!isUndefInput) - AddOperand(MI, Node->getOperand(1), 0, 0, VRBaseMap); + + // If N0 is a constant then it indicates the insert is being done + // into a target specific constant value, not a register. + if (const ConstantSDNode *SD = dyn_cast(N0)) + MI->addOperand(MachineOperand::CreateImm(SD->getValue())); + else + AddOperand(MI, N0, 0, 0, VRBaseMap); + // Add the subregster being inserted + AddOperand(MI, N1, 0, 0, VRBaseMap); MI->addOperand(MachineOperand::CreateImm(SubIdx)); } else assert(0 && "Node is not a subreg insert or extract"); Modified: llvm/trunk/lib/Target/Target.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Target.td?rev=48130&r1=48129&r2=48130&view=diff ============================================================================== --- llvm/trunk/lib/Target/Target.td (original) +++ llvm/trunk/lib/Target/Target.td Mon Mar 10 01:12:08 2008 @@ -263,6 +263,10 @@ /// flags. But currently we have but one flag. def ptr_rc; +/// unknown definition - Mark this operand as being of unknown type, causing +/// it to be resolved by inference in the context it is used. +def unknown; + /// Operand Types - These provide the built-in operand types that may be used /// by a target. Targets can optionally provide their own operand types as /// needed, though this should not be needed for RISC targets. @@ -351,15 +355,15 @@ let hasCtrlDep = 1; } def EXTRACT_SUBREG : Instruction { - let OutOperandList = (ops variable_ops); - let InOperandList = (ops variable_ops); + let OutOperandList = (ops unknown:$dst); + let InOperandList = (ops unknown:$supersrc, i32imm:$subidx); let AsmString = ""; let Namespace = "TargetInstrInfo"; let neverHasSideEffects = 1; } def INSERT_SUBREG : Instruction { - let OutOperandList = (ops variable_ops); - let InOperandList = (ops variable_ops); + let OutOperandList = (ops unknown:$dst); + let InOperandList = (ops unknown:$supersrc, unknown:$subsrc, i32imm:$subidx); let AsmString = ""; let Namespace = "TargetInstrInfo"; let neverHasSideEffects = 1; Modified: llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp?rev=48130&r1=48129&r2=48130&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelDAGToDAG.cpp Mon Mar 10 01:12:08 2008 @@ -1491,22 +1491,27 @@ AddToISelQueue(N0); if (NVT == MVT::i64 || NVT == MVT::i32 || NVT == MVT::i16) { SDOperand SRIdx; + SDOperand ImplVal = CurDAG->getTargetConstant(X86::IMPL_VAL_UNDEF, + MVT::i32); switch(N0.getValueType()) { case MVT::i32: - SRIdx = CurDAG->getTargetConstant(3, MVT::i32); // SubRegSet 3 + SRIdx = CurDAG->getTargetConstant(X86::SUBREG_32BIT, MVT::i32); + // x86-64 zero extends 32-bit inserts int 64-bit registers + if (Subtarget->is64Bit()) + ImplVal = CurDAG->getTargetConstant(X86::IMPL_VAL_ZERO, MVT::i32); break; case MVT::i16: - SRIdx = CurDAG->getTargetConstant(2, MVT::i32); // SubRegSet 2 + SRIdx = CurDAG->getTargetConstant(X86::SUBREG_16BIT, MVT::i32); break; case MVT::i8: if (Subtarget->is64Bit()) - SRIdx = CurDAG->getTargetConstant(1, MVT::i32); // SubRegSet 1 + SRIdx = CurDAG->getTargetConstant(X86::SUBREG_8BIT, MVT::i32); break; default: assert(0 && "Unknown any_extend!"); } if (SRIdx.Val) { SDNode *ResNode = CurDAG->getTargetNode(X86::INSERT_SUBREG, - NVT, N0, SRIdx); + NVT, ImplVal, N0, SRIdx); #ifndef NDEBUG DOUT << std::string(Indent-2, ' ') << "=> "; Modified: llvm/trunk/lib/Target/X86/X86Instr64bit.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Instr64bit.td?rev=48130&r1=48129&r2=48130&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86Instr64bit.td (original) +++ llvm/trunk/lib/Target/X86/X86Instr64bit.td Mon Mar 10 01:12:08 2008 @@ -1098,12 +1098,11 @@ "mov{l}\t{$src, ${dst:subreg32}|${dst:subreg32}, $src}", [(set GR64:$dst, (zextloadi64i32 addr:$src))]>; -/// PsAND64rrFFFFFFFF - r = r & (2^32-1) -def PsAND64rrFFFFFFFF - : I<0x89, MRMDestReg, (outs GR64:$dst), (ins GR64:$src), - "mov{l}\t{${src:subreg32}, ${dst:subreg32}|${dst:subreg32}, ${src:subreg32}}", - [(set GR64:$dst, (and GR64:$src, i64immFFFFFFFF))]>; - +// r & (2^32-1) +def : Pat<(and GR64:$src, i64immFFFFFFFF), + (INSERT_SUBREG x86_impl_val_zero, + (MOV32rr (EXTRACT_SUBREG GR64:$src, x86_subreg_32bit)), + x86_subreg_32bit)>; // Alias instructions that map movr0 to xor. Use xorl instead of xorq; it's // equivalent due to implicit zero-extending, and it sometimes has a smaller Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.cpp?rev=48130&r1=48129&r2=48130&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.cpp (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.cpp Mon Mar 10 01:12:08 2008 @@ -903,16 +903,20 @@ ? X86::LEA64_32r : X86::LEA32r; unsigned leaInReg = RegInfo.createVirtualRegister(&X86::GR32RegClass); unsigned leaOutReg = RegInfo.createVirtualRegister(&X86::GR32RegClass); - - MachineInstr *Ins = - BuildMI(get(X86::INSERT_SUBREG), leaInReg).addReg(Src).addImm(2); + + // Build and insert into an implicit UNDEF value. This is OK because + // well be shifting and then extracting the lower 16-bits. + MachineInstr *Ins = + BuildMI(get(X86::INSERT_SUBREG),leaInReg).addImm(X86::IMPL_VAL_UNDEF) + .addReg(Src).addImm(X86::SUBREG_16BIT); Ins->copyKillDeadInfo(MI); NewMI = BuildMI(get(Opc), leaOutReg) .addReg(0).addImm(1 << ShAmt).addReg(leaInReg).addImm(0); MachineInstr *Ext = - BuildMI(get(X86::EXTRACT_SUBREG), Dest).addReg(leaOutReg).addImm(2); + BuildMI(get(X86::EXTRACT_SUBREG), Dest) + .addReg(leaOutReg).addImm(X86::SUBREG_16BIT); Ext->copyKillDeadInfo(MI); MFI->insert(MBBI, Ins); // Insert the insert_subreg Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.h?rev=48130&r1=48129&r2=48130&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.h (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.h Mon Mar 10 01:12:08 2008 @@ -46,6 +46,14 @@ COND_INVALID }; + // X86 specific implict values used for subregister inserts. + // This can be used to model the fact that x86-64 by default + // inserts 32-bit values into 64-bit registers implicitly containing zeros. + enum ImplicitVal { + IMPL_VAL_UNDEF = 0, + IMPL_VAL_ZERO = 1 + }; + // Turn condition code into conditional branch opcode. unsigned GetCondBranchFromCond(CondCode CC); Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.td?rev=48130&r1=48129&r2=48130&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.td (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.td Mon Mar 10 01:12:08 2008 @@ -161,6 +161,10 @@ // Branch targets have OtherVT type. def brtarget : Operand; +// These should match the enum X86::ImplicitVal +def x86_impl_val_undef : PatLeaf<(i32 0)>; +def x86_impl_val_zero : PatLeaf<(i32 1)>; + //===----------------------------------------------------------------------===// // X86 Complex Pattern Definitions. // Modified: llvm/trunk/lib/Target/X86/X86RegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86RegisterInfo.h?rev=48130&r1=48129&r2=48130&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86RegisterInfo.h (original) +++ llvm/trunk/lib/Target/X86/X86RegisterInfo.h Mon Mar 10 01:12:08 2008 @@ -32,6 +32,15 @@ }; } +namespace X86 { + /// SubregIndex - The index of various sized subregister classes. Note that + /// these indices must be kept in sync with the class indices in the + /// X86RegisterInfo.td file. + enum SubregIndex { + SUBREG_8BIT = 1, SUBREG_16BIT = 2, SUBREG_32BIT = 3 + }; +} + /// DWARFFlavour - Flavour of dwarf regnumbers /// namespace DWARFFlavour { Modified: llvm/trunk/lib/Target/X86/X86RegisterInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86RegisterInfo.td?rev=48130&r1=48129&r2=48130&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86RegisterInfo.td (original) +++ llvm/trunk/lib/Target/X86/X86RegisterInfo.td Mon Mar 10 01:12:08 2008 @@ -176,6 +176,10 @@ // sub registers for each register. // +def x86_subreg_8bit : PatLeaf<(i32 1)>; +def x86_subreg_16bit : PatLeaf<(i32 2)>; +def x86_subreg_32bit : PatLeaf<(i32 3)>; + def : SubRegSet<1, [AX, CX, DX, BX, SP, BP, SI, DI, R8W, R9W, R10W, R11W, R12W, R13W, R14W, R15W], [AL, CL, DL, BL, SPL, BPL, SIL, DIL, From christopher.lamb at gmail.com Mon Mar 10 01:19:58 2008 From: christopher.lamb at gmail.com (Christopher Lamb) Date: Sun, 9 Mar 2008 23:19:58 -0700 Subject: [llvm-commits] [llvm] r47658 - in /llvm/trunk: lib/Target/X86/README-X86-64.txt lib/Target/X86/X86Instr64bit.td test/CodeGen/X86/x86-64-and-mask.ll In-Reply-To: References: <200802270547.m1R5ls0N001359@zion.cs.uiuc.edu> <76820C32-34B8-420A-997C-46CB591DA46E@apple.com> <4450BAA6-789F-4688-A998-39F41ACC16DB@gmail.com> <778635E2-7981-4E29-AFFD-B38D1765BDB5@apple.com> <2A06214D-C548-4B27-ADA2-99CB7C8548B3@gmail.com> Message-ID: <04F7A58C-AFC9-46E7-81AE-B9641ABD725F@gmail.com> My understanding is that doing the patterns this way, rather than with the AsmPrinter hack, will improve JIT code quality on x86-64, no? -- Christopher Lamb On Mar 9, 2008, at 10:37 PM, Chris Lattner wrote: > > On Mar 9, 2008, at 10:29 PM, Christopher Lamb wrote: > >> >> On Mar 9, 2008, at 10:17 PM, Chris Lattner wrote: >> >>> >>> On Mar 9, 2008, at 9:28 PM, Christopher Lamb wrote: >>> >>>> I've prepared a change locally that allows you to write the >>>> following: >>>> >>>> // r & (2^32-1) >>>> def : Pat<(and GR64:$src, i64immFFFFFFFF), >>>> (INSERT_SUBREG x86_impl_val_zero, >>>> (MOV32rr (EXTRACT_SUBREG GR64:$src, x86_subreg_32bit)), >>>> x86_subreg_32bit)>; >>> >>> Woot, very nifty! In td files, we generally use lower case for >>> nodes, should 'INSERT_SUBREG' -> 'insert_subreg'? >> >> insert_subreg, the SDNode has existed since the first subreg >> support went in. This is for selecting to an INSERT_SUBREG target >> instruction. >> > Oh right, makes sense. > > -Chris -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20080309/4986f232/attachment.html From clattner at apple.com Mon Mar 10 01:21:26 2008 From: clattner at apple.com (Chris Lattner) Date: Sun, 9 Mar 2008 23:21:26 -0700 Subject: [llvm-commits] [llvm] r47658 - in /llvm/trunk: lib/Target/X86/README-X86-64.txt lib/Target/X86/X86Instr64bit.td test/CodeGen/X86/x86-64-and-mask.ll In-Reply-To: <04F7A58C-AFC9-46E7-81AE-B9641ABD725F@gmail.com> References: <200802270547.m1R5ls0N001359@zion.cs.uiuc.edu> <76820C32-34B8-420A-997C-46CB591DA46E@apple.com> <4450BAA6-789F-4688-A998-39F41ACC16DB@gmail.com> <778635E2-7981-4E29-AFFD-B38D1765BDB5@apple.com> <2A06214D-C548-4B27-ADA2-99CB7C8548B3@gmail.com> <04F7A58C-AFC9-46E7-81AE-B9641ABD725F@gmail.com> Message-ID: <4289DA6F-7409-4BCD-A3AD-5736E62B9827@apple.com> On Mar 9, 2008, at 11:19 PM, Christopher Lamb wrote: > My understanding is that doing the patterns this way, rather than > with the AsmPrinter hack, will improve JIT code quality on x86-64, no? I don't think it will improve the quality of the code generated, but it eliminates actual instruction definitions from the target, which means that there are fewer encodings to handle etc. The relative performance depends on how well the coalescer works for subregs vs the previous hack. -Chris > -- > Christopher Lamb > > On Mar 9, 2008, at 10:37 PM, Chris Lattner wrote: > >> >> On Mar 9, 2008, at 10:29 PM, Christopher Lamb wrote: >> >>> >>> On Mar 9, 2008, at 10:17 PM, Chris Lattner wrote: >>> >>>> >>>> On Mar 9, 2008, at 9:28 PM, Christopher Lamb wrote: >>>> >>>>> I've prepared a change locally that allows you to write the >>>>> following: >>>>> >>>>> // r & (2^32-1) >>>>> def : Pat<(and GR64:$src, i64immFFFFFFFF), >>>>> (INSERT_SUBREG x86_impl_val_zero, >>>>> (MOV32rr (EXTRACT_SUBREG GR64:$src, >>>>> x86_subreg_32bit)), >>>>> x86_subreg_32bit)>; >>>> >>>> Woot, very nifty! In td files, we generally use lower case for >>>> nodes, should 'INSERT_SUBREG' -> 'insert_subreg'? >>> >>> insert_subreg, the SDNode has existed since the first subreg >>> support went in. This is for selecting to an INSERT_SUBREG target >>> instruction. >>> >> Oh right, makes sense. >> >> -Chris > > > > From sabre at nondot.org Mon Mar 10 01:45:36 2008 From: sabre at nondot.org (Chris Lattner) Date: Mon, 10 Mar 2008 06:45:36 -0000 Subject: [llvm-commits] [llvm] r48132 - /llvm/trunk/test/lib/llvm.exp Message-ID: <200803100645.m2A6jaGC009100@zion.cs.uiuc.edu> Author: lattner Date: Mon Mar 10 01:45:35 2008 New Revision: 48132 URL: http://llvm.org/viewvc/llvm-project?rev=48132&view=rev Log: Fix PR2120 by changing the replacement order to change compile_cxx before compile_c. Patch by Joachim Durchholz! Modified: llvm/trunk/test/lib/llvm.exp Modified: llvm/trunk/test/lib/llvm.exp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lib/llvm.exp?rev=48132&r1=48131&r2=48132&view=diff ============================================================================== --- llvm/trunk/test/lib/llvm.exp (original) +++ llvm/trunk/test/lib/llvm.exp Mon Mar 10 01:45:35 2008 @@ -56,10 +56,10 @@ regsub -all {%llvmgcc} $new_line "$llvmgcc -emit-llvm" new_line #replace %llvmgxx with actual path to llvmg++ regsub -all {%llvmgxx} $new_line "$llvmgxx -emit-llvm" new_line - #replace %compile_c with C compilation command - regsub -all {%compile_c} $new_line "$compile_c" new_line #replace %compile_cxx with C++ compilation command regsub -all {%compile_cxx} $new_line "$compile_cxx" new_line + #replace %compile_c with C compilation command + regsub -all {%compile_c} $new_line "$compile_c" new_line #replace %link with C++ link command regsub -all {%link} $new_line "$link" new_line #replace %shlibext with shared library extension From sabre at nondot.org Mon Mar 10 01:49:40 2008 From: sabre at nondot.org (Chris Lattner) Date: Mon, 10 Mar 2008 06:49:40 -0000 Subject: [llvm-commits] [llvm] r48133 - /llvm/trunk/test/Makefile Message-ID: <200803100649.m2A6neWi009263@zion.cs.uiuc.edu> Author: lattner Date: Mon Mar 10 01:49:40 2008 New Revision: 48133 URL: http://llvm.org/viewvc/llvm-project?rev=48133&view=rev Log: Fix a typo Modified: llvm/trunk/test/Makefile Modified: llvm/trunk/test/Makefile URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Makefile?rev=48133&r1=48132&r2=48133&view=diff ============================================================================== --- llvm/trunk/test/Makefile (original) +++ llvm/trunk/test/Makefile Mon Mar 10 01:49:40 2008 @@ -96,7 +96,7 @@ @echo 'set gccpath "$(CC)"' >>site.tmp @echo 'set gxxpath "$(CXX)"' >>site.tmp @echo 'set compile_c "$(CC) $(CPP.Flags) $(C.Flags) $(CompileCommonOpts) -c "' >>site.tmp - @echo 'set compile_cxx "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) - c"' >> site.tmp + @echo 'set compile_cxx "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) -c"' >> site.tmp @echo 'set link "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) $(LD.Flags)"' >>site.tmp @echo 'set llvmgcc "$(LLVMGCC)"' >> site.tmp @echo 'set llvmgxx "$(LLVMGCC)"' >> site.tmp From sabre at nondot.org Mon Mar 10 01:52:10 2008 From: sabre at nondot.org (Chris Lattner) Date: Mon, 10 Mar 2008 06:52:10 -0000 Subject: [llvm-commits] [llvm] r48134 - in /llvm/trunk/test/C++Frontend: 2006-11-06-StackTrace.cpp 2006-11-30-NoCompileUnit.cpp 2006-11-30-Pubnames.cpp Message-ID: <200803100652.m2A6qAP6009346@zion.cs.uiuc.edu> Author: lattner Date: Mon Mar 10 01:52:10 2008 New Revision: 48134 URL: http://llvm.org/viewvc/llvm-project?rev=48134&view=rev Log: switch from hard coded g++/as tools to the ones detected from the build system. Patch by Joachim Durchholz for PR2121 Modified: llvm/trunk/test/C++Frontend/2006-11-06-StackTrace.cpp llvm/trunk/test/C++Frontend/2006-11-30-NoCompileUnit.cpp llvm/trunk/test/C++Frontend/2006-11-30-Pubnames.cpp Modified: llvm/trunk/test/C++Frontend/2006-11-06-StackTrace.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/C%2B%2BFrontend/2006-11-06-StackTrace.cpp?rev=48134&r1=48133&r2=48134&view=diff ============================================================================== --- llvm/trunk/test/C++Frontend/2006-11-06-StackTrace.cpp (original) +++ llvm/trunk/test/C++Frontend/2006-11-06-StackTrace.cpp Mon Mar 10 01:52:10 2008 @@ -1,7 +1,7 @@ // This is a regression test on debug info to make sure that we can get a // meaningful stack trace from a C++ program. // RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | llc --disable-fp-elim -o %t.s -f -// RUN: as %t.s -o %t.o +// RUN: %compile_c %t.s -o %t.o // RUN: %link %t.o -o %t.exe // RUN: echo {break DeepStack::deepest\nrun 17\nwhere\n} > %t.in // RUN: gdb -q -batch -n -x %t.in %t.exe | tee %t.out | \ Modified: llvm/trunk/test/C++Frontend/2006-11-30-NoCompileUnit.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/C%2B%2BFrontend/2006-11-30-NoCompileUnit.cpp?rev=48134&r1=48133&r2=48134&view=diff ============================================================================== --- llvm/trunk/test/C++Frontend/2006-11-30-NoCompileUnit.cpp (original) +++ llvm/trunk/test/C++Frontend/2006-11-30-NoCompileUnit.cpp Mon Mar 10 01:52:10 2008 @@ -2,8 +2,8 @@ // unit size issue with gdb. // RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | \ // RUN: llc --disable-fp-elim -o NoCompileUnit.s -f -// RUN: as NoCompileUnit.s -o NoCompileUnit.o -// RUN: g++ NoCompileUnit.o -o NoCompileUnit.exe +// RUN: %compile_c NoCompileUnit.s -o NoCompileUnit.o +// RUN: %compile_cxx NoCompileUnit.o -o NoCompileUnit.exe // RUN: echo {break main\nrun\np NoCompileUnit::pubname} > %t2 // RUN: gdb -q -batch -n -x %t2 NoCompileUnit.exe | \ // RUN: tee NoCompileUnit.out | not grep {"low == high"} Modified: llvm/trunk/test/C++Frontend/2006-11-30-Pubnames.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/C%2B%2BFrontend/2006-11-30-Pubnames.cpp?rev=48134&r1=48133&r2=48134&view=diff ============================================================================== --- llvm/trunk/test/C++Frontend/2006-11-30-Pubnames.cpp (original) +++ llvm/trunk/test/C++Frontend/2006-11-30-Pubnames.cpp Mon Mar 10 01:52:10 2008 @@ -2,7 +2,7 @@ // qualified global names. // RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | \ // RUN: llc --disable-fp-elim -o %t.s -f -// RUN: as %t.s -o %t.o +// RUN: %compile_c %t.s -o %t.o // RUN: %link %t.o -o %t.exe // RUN: echo {break main\nrun\np Pubnames::pubname} > %t.in // RUN: gdb -q -batch -n -x %t.in %t.exe | tee %t.out | grep {\$1 = 10} From sabre at nondot.org Mon Mar 10 01:53:15 2008 From: sabre at nondot.org (Chris Lattner) Date: Mon, 10 Mar 2008 06:53:15 -0000 Subject: [llvm-commits] [llvm] r48135 - /llvm/trunk/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx Message-ID: <200803100653.m2A6rF2Y009382@zion.cs.uiuc.edu> Author: lattner Date: Mon Mar 10 01:53:14 2008 New Revision: 48135 URL: http://llvm.org/viewvc/llvm-project?rev=48135&view=rev Log: remove an execution test. Removed: llvm/trunk/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx Removed: llvm/trunk/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx?rev=48134&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx (original) +++ llvm/trunk/test/CodeGen/CBackend/2003-06-23-PromotedExprs.llx (removed) @@ -1,17 +0,0 @@ - -; RUN: llvm-as < %s | llc -march=c > %t1.cbe.c -; RUN: gcc -B/usr/bin/ %t1.cbe.c -o %t1.cbe -; RUN: ./%t1.cbe - -define i1 @doTest(i8 %x) { - %dec.0 = add i8 %x, -1 ; [#uses=1] - %tmp.1001 = trunc i8 %dec.0 to i1 ; [#uses=1] - ret i1 %tmp.1001 -} - -define i32 @main() { - %result = call i1 @doTest( i8 1 ) ; [#uses=1] - %p = zext i1 %result to i32 ; [#uses=1] - ret i32 %p -} - From evan.cheng at apple.com Mon Mar 10 02:19:13 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Mon, 10 Mar 2008 07:19:13 -0000 Subject: [llvm-commits] [llvm] r48136 - in /llvm/trunk: lib/CodeGen/SelectionDAG/DAGCombiner.cpp test/CodeGen/X86/vec_zero-2.ll Message-ID: <200803100719.m2A7JDZa010180@zion.cs.uiuc.edu> Author: evancheng Date: Mon Mar 10 02:19:13 2008 New Revision: 48136 URL: http://llvm.org/viewvc/llvm-project?rev=48136&view=rev Log: Avoid creating BUILD_VECTOR of all zero elements of "non-normalized" type (e.g. v8i16 on x86) after legalizer. Instruction selection does not expect to see them. In all likelihood this can only be an issue in a bugpoint reduced test case. Added: llvm/trunk/test/CodeGen/X86/vec_zero-2.ll Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=48136&r1=48135&r2=48136&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Mon Mar 10 02:19:13 2008 @@ -1103,6 +1103,10 @@ // fold (sub x, x) -> 0 if (N0 == N1) + if (ISD::isBuildVectorAllZeros(N0.Val)) + // Zero vectors might be normalized to a particular vector type to ensure + // they are CSE'd. Return it as it is. + return N0; return DAG.getConstant(0, N->getValueType(0)); // fold (sub c1, c2) -> c1-c2 if (N0C && N1C) Added: llvm/trunk/test/CodeGen/X86/vec_zero-2.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/vec_zero-2.ll?rev=48136&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/vec_zero-2.ll (added) +++ llvm/trunk/test/CodeGen/X86/vec_zero-2.ll Mon Mar 10 02:19:13 2008 @@ -0,0 +1,24 @@ +; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 + +define i32 @t() { +entry: + br i1 true, label %bb4743, label %bb1656 +bb1656: ; preds = %entry + ret i32 0 +bb1664: ; preds = %entry + br i1 false, label %bb5310, label %bb4743 +bb4743: ; preds = %bb1664 + %tmp5256 = bitcast <2 x i64> zeroinitializer to <8 x i16> ; <<8 x i16>> [#uses=1] + %tmp5257 = sub <8 x i16> %tmp5256, zeroinitializer ; <<8 x i16>> [#uses=1] + %tmp5258 = bitcast <8 x i16> %tmp5257 to <2 x i64> ; <<2 x i64>> [#uses=1] + %tmp5265 = bitcast <2 x i64> %tmp5258 to <8 x i16> ; <<8 x i16>> [#uses=1] + %tmp5266 = call <8 x i16> @llvm.x86.sse2.packuswb.128( <8 x i16> %tmp5265, <8 x i16> zeroinitializer ) nounwind readnone ; <<8 x i16>> [#uses=1] + %tmp5267 = bitcast <8 x i16> %tmp5266 to <2 x i64> ; <<2 x i64>> [#uses=1] + %tmp5294 = and <2 x i64> zeroinitializer, %tmp5267 ; <<2 x i64>> [#uses=1] + br label %bb5310 +bb5310: ; preds = %bb4743, %bb1664 + %tmp5294.pn = phi <2 x i64> [ %tmp5294, %bb4743 ], [ zeroinitializer, %bb1664 ] ; <<2 x i64>> [#uses=0] + ret i32 0 +} + +declare <8 x i16> @llvm.x86.sse2.packuswb.128(<8 x i16>, <8 x i16>) nounwind readnone From tonic at nondot.org Mon Mar 10 02:21:50 2008 From: tonic at nondot.org (Tanya Lattner) Date: Mon, 10 Mar 2008 07:21:50 -0000 Subject: [llvm-commits] [llvm] r48137 - in /llvm/trunk/test: DebugInfo/ ExecutionEngine/ Linker/ Transforms/SimplifyCFG/ Transforms/SimplifyLibCalls/ Transforms/TailCallElim/ Transforms/TailDup/ Verifier/ Message-ID: <200803100721.m2A7LrYV010388@zion.cs.uiuc.edu> Author: tbrethou Date: Mon Mar 10 02:21:50 2008 New Revision: 48137 URL: http://llvm.org/viewvc/llvm-project?rev=48137&view=rev Log: Remove llvm-upgrade and update tests. Modified: llvm/trunk/test/DebugInfo/funccall.ll llvm/trunk/test/ExecutionEngine/2002-12-16-ArgTest.ll llvm/trunk/test/ExecutionEngine/2003-01-04-ArgumentBug.ll llvm/trunk/test/ExecutionEngine/2003-01-04-LoopTest.ll llvm/trunk/test/ExecutionEngine/2003-01-04-PhiTest.ll llvm/trunk/test/ExecutionEngine/2003-01-09-SARTest.ll llvm/trunk/test/ExecutionEngine/2003-01-10-FUCOM.ll llvm/trunk/test/ExecutionEngine/2003-01-15-AlignmentTest.ll llvm/trunk/test/ExecutionEngine/2003-05-06-LivenessClobber.llx llvm/trunk/test/ExecutionEngine/2003-05-07-ArgumentTest.llx llvm/trunk/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll llvm/trunk/test/ExecutionEngine/2003-06-04-bzip2-bug.ll llvm/trunk/test/ExecutionEngine/2003-06-05-PHIBug.ll llvm/trunk/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll llvm/trunk/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll llvm/trunk/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll llvm/trunk/test/ExecutionEngine/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll llvm/trunk/test/ExecutionEngine/2005-12-02-TailCallBug.ll llvm/trunk/test/ExecutionEngine/hello.ll llvm/trunk/test/ExecutionEngine/hello2.ll llvm/trunk/test/ExecutionEngine/simplesttest.ll llvm/trunk/test/ExecutionEngine/simpletest.ll llvm/trunk/test/ExecutionEngine/test-arith.ll llvm/trunk/test/ExecutionEngine/test-branch.ll llvm/trunk/test/ExecutionEngine/test-call.ll llvm/trunk/test/ExecutionEngine/test-cast.ll llvm/trunk/test/ExecutionEngine/test-constantexpr.ll llvm/trunk/test/ExecutionEngine/test-fp.ll llvm/trunk/test/ExecutionEngine/test-loadstore.ll llvm/trunk/test/ExecutionEngine/test-logical.ll llvm/trunk/test/ExecutionEngine/test-loop.ll llvm/trunk/test/ExecutionEngine/test-malloc.ll llvm/trunk/test/ExecutionEngine/test-phi.ll llvm/trunk/test/ExecutionEngine/test-ret.ll llvm/trunk/test/ExecutionEngine/test-setcond-fp.ll llvm/trunk/test/ExecutionEngine/test-setcond-int.ll llvm/trunk/test/ExecutionEngine/test-shift.ll llvm/trunk/test/Linker/2003-11-18-TypeResolution.ll llvm/trunk/test/Linker/2004-02-17-WeakStrongLinkage.ll llvm/trunk/test/Linker/2004-05-07-TypeResolution1.ll llvm/trunk/test/Linker/2004-05-07-TypeResolution2.ll llvm/trunk/test/Linker/2005-02-12-ConstantGlobals.ll llvm/trunk/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll llvm/trunk/test/Linker/2006-01-19-ConstantPacked.ll llvm/trunk/test/Linker/AppendingLinkage.ll llvm/trunk/test/Linker/AppendingLinkage2.ll llvm/trunk/test/Linker/ConstantGlobals1.ll llvm/trunk/test/Linker/ConstantGlobals2.ll llvm/trunk/test/Linker/ConstantGlobals3.ll llvm/trunk/test/Linker/LinkOnce.ll llvm/trunk/test/Linker/testlink1.ll llvm/trunk/test/Linker/testlink2.ll llvm/trunk/test/Linker/weakextern.ll llvm/trunk/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll llvm/trunk/test/Transforms/SimplifyCFG/2002-05-21-PHIElimination.ll llvm/trunk/test/Transforms/SimplifyCFG/2002-06-24-PHINode.ll llvm/trunk/test/Transforms/SimplifyCFG/2002-09-24-PHIAssertion.ll llvm/trunk/test/Transforms/SimplifyCFG/2003-03-07-DominateProblem.ll llvm/trunk/test/Transforms/SimplifyCFG/2003-08-05-InvokeCrash.ll llvm/trunk/test/Transforms/SimplifyCFG/2003-08-05-MishandleInvoke.ll llvm/trunk/test/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll llvm/trunk/test/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll llvm/trunk/test/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll llvm/trunk/test/Transforms/SimplifyCFG/2004-12-10-SimplifyCFGCrash.ll llvm/trunk/test/Transforms/SimplifyCFG/2005-06-16-PHICrash.ll llvm/trunk/test/Transforms/SimplifyCFG/2005-08-01-PHIUpdateFail.ll llvm/trunk/test/Transforms/SimplifyCFG/2005-08-03-PHIFactorCrash.ll llvm/trunk/test/Transforms/SimplifyCFG/2005-10-02-InvokeSimplify.ll llvm/trunk/test/Transforms/SimplifyCFG/2005-12-03-IncorrectPHIFold.ll llvm/trunk/test/Transforms/SimplifyCFG/2006-02-17-InfiniteUnroll.ll llvm/trunk/test/Transforms/SimplifyCFG/2006-06-12-InfLoop.ll llvm/trunk/test/Transforms/SimplifyCFG/2006-08-03-Crash.ll llvm/trunk/test/Transforms/SimplifyCFG/2006-10-19-UncondDiv.ll llvm/trunk/test/Transforms/SimplifyCFG/2006-10-29-InvokeCrash.ll llvm/trunk/test/Transforms/SimplifyCFG/2006-12-08-Ptr-ICmp-Branch.ll llvm/trunk/test/Transforms/SimplifyLibCalls/2005-05-20-sprintf-crash.ll llvm/trunk/test/Transforms/SimplifyLibCalls/ExitInMain.ll llvm/trunk/test/Transforms/SimplifyLibCalls/FFS.ll llvm/trunk/test/Transforms/SimplifyLibCalls/FPrintF.ll llvm/trunk/test/Transforms/SimplifyLibCalls/IsDigit.ll llvm/trunk/test/Transforms/SimplifyLibCalls/MemCpy.ll llvm/trunk/test/Transforms/SimplifyLibCalls/MemMove.ll llvm/trunk/test/Transforms/SimplifyLibCalls/MemSet.ll llvm/trunk/test/Transforms/SimplifyLibCalls/Pow.ll llvm/trunk/test/Transforms/SimplifyLibCalls/Puts.ll llvm/trunk/test/Transforms/SimplifyLibCalls/SPrintF.ll llvm/trunk/test/Transforms/SimplifyLibCalls/StrCat.ll llvm/trunk/test/Transforms/SimplifyLibCalls/StrChr.ll llvm/trunk/test/Transforms/SimplifyLibCalls/StrCmp.ll llvm/trunk/test/Transforms/SimplifyLibCalls/StrCpy.ll llvm/trunk/test/Transforms/SimplifyLibCalls/StrLen.ll llvm/trunk/test/Transforms/SimplifyLibCalls/StrNCmp.ll llvm/trunk/test/Transforms/SimplifyLibCalls/ToAscii.ll llvm/trunk/test/Transforms/SimplifyLibCalls/floor.ll llvm/trunk/test/Transforms/SimplifyLibCalls/memcmp.ll llvm/trunk/test/Transforms/TailCallElim/accum_recursion.ll llvm/trunk/test/Transforms/TailCallElim/accum_recursion_constant_arg.ll llvm/trunk/test/Transforms/TailCallElim/ackermann.ll llvm/trunk/test/Transforms/TailCallElim/dont-tce-tail-marked-call.ll llvm/trunk/test/Transforms/TailCallElim/intervening-inst.ll llvm/trunk/test/Transforms/TailCallElim/move_alloca_for_tail_call.ll llvm/trunk/test/Transforms/TailCallElim/return_constant.ll llvm/trunk/test/Transforms/TailCallElim/trivial_codegen_tailcall.ll llvm/trunk/test/Transforms/TailDup/2003-06-24-Simpleloop.ll llvm/trunk/test/Transforms/TailDup/2003-07-22-InfiniteLoop.ll llvm/trunk/test/Transforms/TailDup/2003-08-23-InvalidatedPointers.ll llvm/trunk/test/Transforms/TailDup/2003-08-31-UnreachableBlocks.ll llvm/trunk/test/Transforms/TailDup/2004-04-01-DemoteRegToStack.llx llvm/trunk/test/Transforms/TailDup/MergeTest.ll llvm/trunk/test/Transforms/TailDup/PHIUpdateTest.ll llvm/trunk/test/Transforms/TailDup/basictest.ll llvm/trunk/test/Transforms/TailDup/basictest2.ll llvm/trunk/test/Transforms/TailDup/if-tail-dup.ll llvm/trunk/test/Verifier/invoke-1.ll llvm/trunk/test/Verifier/invoke-2.ll Modified: llvm/trunk/test/DebugInfo/funccall.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/funccall.ll?rev=48137&r1=48136&r2=48137&view=diff ============================================================================== --- llvm/trunk/test/DebugInfo/funccall.ll (original) +++ llvm/trunk/test/DebugInfo/funccall.ll Mon Mar 10 02:21:50 2008 @@ -1,166 +1,147 @@ -;; RUN: llvm-upgrade < %s | llvm-as | llc +;; RUN: llvm-as < %s | llc + %llvm.dbg.anchor.type = type { i32, i32 } + %llvm.dbg.basictype.type = type { i32, { }*, i8*, { }*, i32, i64, i64, i64, i32, i32 } + %llvm.dbg.compile_unit.type = type { i32, { }*, i32, i8*, i8*, i8* } + %llvm.dbg.global_variable.type = type { i32, { }*, { }*, i8*, i8*, i8*, { }*, i32, { }*, i1, i1, { }* } + %llvm.dbg.subprogram.type = type { i32, { }*, { }*, i8*, i8*, i8*, { }*, i32, { }*, i1, i1 } + %llvm.dbg.variable.type = type { i32, { }*, i8*, { }*, i32, { }* } + at llvm.dbg.subprograms = linkonce constant %llvm.dbg.anchor.type { i32 393216, i32 46 }, section "llvm.metadata" ; <%llvm.dbg.anchor.type*> [#uses=1] + at llvm.dbg.compile_units = linkonce constant %llvm.dbg.anchor.type { i32 393216, i32 17 }, section "llvm.metadata" ; <%llvm.dbg.anchor.type*> [#uses=1] + at llvm.dbg.global_variables = linkonce constant %llvm.dbg.anchor.type { i32 393216, i32 52 }, section "llvm.metadata" ; <%llvm.dbg.anchor.type*> [#uses=1] + at llvm.dbg.subprogram = internal constant %llvm.dbg.subprogram.type { + i32 393262, + { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.subprograms to { }*), + { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), + i8* getelementptr ([4 x i8]* @str, i32 0, i32 0), + i8* getelementptr ([4 x i8]* @str, i32 0, i32 0), + i8* null, + { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), + i32 4, + { }* null, + i1 false, + i1 true }, section "llvm.metadata" ; <%llvm.dbg.subprogram.type*> [#uses=1] + at str = internal constant [4 x i8] c"foo\00", section "llvm.metadata" ; <[4 x i8]*> [#uses=1] + at llvm.dbg.compile_unit = internal constant %llvm.dbg.compile_unit.type { + i32 393233, + { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.compile_units to { }*), + i32 1, + i8* getelementptr ([11 x i8]* @str1, i32 0, i32 0), + i8* getelementptr ([50 x i8]* @str2, i32 0, i32 0), + i8* getelementptr ([45 x i8]* @str3, i32 0, i32 0) }, section "llvm.metadata" ; <%llvm.dbg.compile_unit.type*> [#uses=1] + at str1 = internal constant [11 x i8] c"funccall.c\00", section "llvm.metadata" ; <[11 x i8]*> [#uses=1] + at str2 = internal constant [50 x i8] c"/Volumes/Big2/llvm/llvm/test/Regression/Debugger/\00", section "llvm.metadata" ; <[50 x i8]*> [#uses=1] + at str3 = internal constant [45 x i8] c"4.0.1 LLVM (Apple Computer, Inc. build 5421)\00", section "llvm.metadata" ; <[45 x i8]*> [#uses=1] + at llvm.dbg.variable = internal constant %llvm.dbg.variable.type { + i32 393472, + { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram to { }*), + i8* getelementptr ([2 x i8]* @str4, i32 0, i32 0), + { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), + i32 5, + { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*) }, section "llvm.metadata" ; <%llvm.dbg.variable.type*> [#uses=1] + at str4 = internal constant [2 x i8] c"t\00", section "llvm.metadata" ; <[2 x i8]*> [#uses=1] + at llvm.dbg.basictype = internal constant %llvm.dbg.basictype.type { + i32 393252, + { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), + i8* getelementptr ([4 x i8]* @str15, i32 0, i32 0), + { }* null, + i32 0, + i64 32, + i64 32, + i64 0, + i32 0, + i32 5 }, section "llvm.metadata" ; <%llvm.dbg.basictype.type*> [#uses=1] + at str15 = internal constant [4 x i8] c"int\00", section "llvm.metadata" ; <[4 x i8]*> [#uses=1] + at llvm.dbg.subprogram2 = internal constant %llvm.dbg.subprogram.type { + i32 393262, + { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.subprograms to { }*), + { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), + i8* getelementptr ([5 x i8]* @str6, i32 0, i32 0), + i8* getelementptr ([5 x i8]* @str6, i32 0, i32 0), + i8* null, + { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), + i32 8, + { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), + i1 false, + i1 true }, section "llvm.metadata" ; <%llvm.dbg.subprogram.type*> [#uses=1] + at str6 = internal constant [5 x i8] c"main\00", section "llvm.metadata" ; <[5 x i8]*> [#uses=1] + at llvm.dbg.variable3 = internal constant %llvm.dbg.variable.type { + i32 393474, + { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram2 to { }*), + i8* getelementptr ([7 x i8]* @str7, i32 0, i32 0), + { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), + i32 8, + { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*) }, section "llvm.metadata" ; <%llvm.dbg.variable.type*> [#uses=1] + at str7 = internal constant [7 x i8] c"retval\00", section "llvm.metadata" ; <[7 x i8]*> [#uses=1] + at llvm.dbg.global_variable = internal constant %llvm.dbg.global_variable.type { + i32 393268, + { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.global_variables to { }*), + { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), + i8* getelementptr ([2 x i8]* @str4, i32 0, i32 0), + i8* getelementptr ([2 x i8]* @str4, i32 0, i32 0), + i8* null, + { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), + i32 2, + { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), + i1 true, + i1 true, + { }* bitcast (i32* @q to { }*) }, section "llvm.metadata" ; <%llvm.dbg.global_variable.type*> [#uses=0] + at str4.upgrd.1 = internal constant [2 x i8] c"q\00", section "llvm.metadata" ; <[2 x i8]*> [#uses=0] + at q = internal global i32 0 ; [#uses=7] + +declare void @llvm.dbg.func.start({ }*) + +declare void @llvm.dbg.stoppoint(i32, i32, { }*) -;; Debugger type declarations -%llvm.dbg.anchor.type = type { uint, uint } -%llvm.dbg.basictype.type = type { uint, { }*, sbyte*, { }*, uint, ulong, ulong, ulong, uint, uint } -%llvm.dbg.compile_unit.type = type { uint, { }*, uint, sbyte*, sbyte*, sbyte* } -%llvm.dbg.global_variable.type = type { uint, { }*, { }*, sbyte*, sbyte*, sbyte*, { }*, uint, { }*, bool, bool, { }* } -%llvm.dbg.subprogram.type = type { uint, { }*, { }*, sbyte*, sbyte*, sbyte*, { }*, uint, { }*, bool, bool } -%llvm.dbg.variable.type = type { uint, { }*, sbyte*, { }*, uint, { }* } - -;; Debugger intrinsic declarations... -declare void %llvm.dbg.func.start({ }*) -declare void %llvm.dbg.stoppoint(uint, uint, { }*) -declare void %llvm.dbg.declare({ }*, { }*) -declare void %llvm.dbg.region.start({ }*) -declare void %llvm.dbg.region.end({ }*) - -;; Debugger anchors -%llvm.dbg.subprograms = linkonce constant %llvm.dbg.anchor.type { - uint 393216, ;; DW_TAG_anchor | version(6) - uint 46 }, section "llvm.metadata" ;; DW_TAG_subprogram -%llvm.dbg.compile_units = linkonce constant %llvm.dbg.anchor.type { - uint 393216, ;; DW_TAG_anchor | version(6) - uint 17 }, section "llvm.metadata" ;; DW_TAG_compile_unit -%llvm.dbg.global_variables = linkonce constant %llvm.dbg.anchor.type { - uint 393216, ;; DW_TAG_anchor | version(6) - uint 52 }, section "llvm.metadata" ;; DW_TAG_variable - -;; Debug info -%llvm.dbg.subprogram = internal constant %llvm.dbg.subprogram.type { - uint 393262, ;; DW_TAG_subprogram | version(6) - { }* bitcast (%llvm.dbg.anchor.type* %llvm.dbg.subprograms to { }*), ;; Anchor - { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*),;; Context - sbyte* getelementptr ([4 x sbyte]* %str, int 0, int 0), ;; Name - sbyte* getelementptr ([4 x sbyte]* %str, int 0, int 0), ;; Fully quanlified name - sbyte* null, ;; Linkage name - { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*),;; Compile unit - uint 4, ;; Line number - { }* null, ;; Type descriptor - bool false, ;; Static? - bool true }, section "llvm.metadata" ;; External? -%str = internal constant [4 x sbyte] c"foo\00", section "llvm.metadata" - -%llvm.dbg.compile_unit = internal constant %llvm.dbg.compile_unit.type { - uint 393233, ;; DW_TAG_compile_unit | version(6) - { }* bitcast (%llvm.dbg.anchor.type* %llvm.dbg.compile_units to { }*), ;; Anchor - uint 1, ;; Language - sbyte* getelementptr ([11 x sbyte]* %str, int 0, int 0), ;; Source file - sbyte* getelementptr ([50 x sbyte]* %str, int 0, int 0), ;; Source file directory - sbyte* getelementptr ([45 x sbyte]* %str, int 0, int 0) }, section "llvm.metadata" ;; Produceer -%str = internal constant [11 x sbyte] c"funccall.c\00", section "llvm.metadata" -%str = internal constant [50 x sbyte] c"/Volumes/Big2/llvm/llvm/test/Regression/Debugger/\00", section "llvm.metadata" -%str = internal constant [45 x sbyte] c"4.0.1 LLVM (Apple Computer, Inc. build 5421)\00", section "llvm.metadata" - -%llvm.dbg.variable = internal constant %llvm.dbg.variable.type { - uint 393472, ;; DW_TAG_auto_variable | version(6) - { }* bitcast (%llvm.dbg.subprogram.type* %llvm.dbg.subprogram to { }*), ;; Context - sbyte* getelementptr ([2 x sbyte]* %str, int 0, int 0), ;; Name - { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*),;; Compile unit - uint 5, ;; Line number - { }* bitcast (%llvm.dbg.basictype.type* %llvm.dbg.basictype to { }*) }, section "llvm.metadata" ;; Type -%str = internal constant [2 x sbyte] c"t\00", section "llvm.metadata" - -%llvm.dbg.basictype = internal constant %llvm.dbg.basictype.type { - uint 393252, ;; DW_TAG_base_type | version(6) - { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*),;; Context - sbyte* getelementptr ([4 x sbyte]* %str1, int 0, int 0), ;; Name - { }* null, ;; Compile Unit - uint 0, ;; Line number - ulong 32, ;; Size in bits - ulong 32, ;; Align in bits - ulong 0, ;; Offset in bits - uint 0, ;; Flags - uint 5 }, section "llvm.metadata" ;; Basic type encoding -%str1 = internal constant [4 x sbyte] c"int\00", section "llvm.metadata" - -%llvm.dbg.subprogram2 = internal constant %llvm.dbg.subprogram.type { - uint 393262, ;; DW_TAG_subprogram | version(6) - { }* bitcast (%llvm.dbg.anchor.type* %llvm.dbg.subprograms to { }*), ;; Anchor - { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*),;; Context - sbyte* getelementptr ([5 x sbyte]* %str, int 0, int 0), ;; Name - sbyte* getelementptr ([5 x sbyte]* %str, int 0, int 0), ;; Fully quanlified name - sbyte* null, ;; Linkage name - { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*),;; Compile unit - uint 8, ;; Line number - { }* bitcast (%llvm.dbg.basictype.type* %llvm.dbg.basictype to { }*), ;; Type descriptor - bool false, ;; Static? - bool true }, section "llvm.metadata" ;; External? -%str = internal constant [5 x sbyte] c"main\00", section "llvm.metadata" - -%llvm.dbg.variable3 = internal constant %llvm.dbg.variable.type { - uint 393474, ;; DW_TAG_return_variable | version(6) - { }* bitcast (%llvm.dbg.subprogram.type* %llvm.dbg.subprogram2 to { }*), ;; Context - sbyte* getelementptr ([7 x sbyte]* %str, int 0, int 0), ;; Name - { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*),;; Compile unit - uint 8, ;; Line number - { }* bitcast (%llvm.dbg.basictype.type* %llvm.dbg.basictype to { }*) }, section "llvm.metadata" ;; Type -%str = internal constant [7 x sbyte] c"retval\00", section "llvm.metadata" - -%llvm.dbg.global_variable = internal constant %llvm.dbg.global_variable.type { - uint 393268, ;; DW_TAG_variable | version(6) - { }* bitcast (%llvm.dbg.anchor.type* %llvm.dbg.global_variables to { }*), ;; Anchor - { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*),;; Context - sbyte* getelementptr ([2 x sbyte]* %str4, int 0, int 0), ;; Name - sbyte* getelementptr ([2 x sbyte]* %str4, int 0, int 0), ;; Fully qualified name - sbyte* null, ;; Linkage name - { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*),;; Compile unit - uint 2, ;; Line number - { }* bitcast (%llvm.dbg.basictype.type* %llvm.dbg.basictype to { }*), ;; Type - bool true, ;; Static? - bool true, ;; External? - { }* bitcast (int* %q to { }*) }, section "llvm.metadata" ;; Variable -%str4 = internal constant [2 x sbyte] c"q\00", section "llvm.metadata" +declare void @llvm.dbg.declare({ }*, { }*) -;; Global -%q = internal global int 0 +declare void @llvm.dbg.region.start({ }*) -implementation +declare void @llvm.dbg.region.end({ }*) -void %foo() { +define void @foo() { entry: - %t = alloca int, align 4 - "alloca point" = bitcast int 0 to int - call void %llvm.dbg.func.start( { }* bitcast (%llvm.dbg.subprogram.type* %llvm.dbg.subprogram to { }*) ) - call void %llvm.dbg.stoppoint( uint 4, uint 0, { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*) ) - %t = bitcast int* %t to { }* - call void %llvm.dbg.declare( { }* %t, { }* bitcast (%llvm.dbg.variable.type* %llvm.dbg.variable to { }*) ) - call void %llvm.dbg.stoppoint( uint 5, uint 0, { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*) ) - %tmp = load int* %q - store int %tmp, int* %t - call void %llvm.dbg.stoppoint( uint 6, uint 0, { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*) ) - %tmp1 = load int* %t - %tmp2 = add int %tmp1, 1 - store int %tmp2, int* %q - call void %llvm.dbg.stoppoint( uint 7, uint 0, { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*) ) - call void %llvm.dbg.region.end( { }* bitcast (%llvm.dbg.subprogram.type* %llvm.dbg.subprogram to { }*) ) + %t = alloca i32, align 4 ; [#uses=3] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + call void @llvm.dbg.func.start( { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram to { }*) ) + call void @llvm.dbg.stoppoint( i32 4, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*) ) + %t.upgrd.2 = bitcast i32* %t to { }* ; <{ }*> [#uses=1] + call void @llvm.dbg.declare( { }* %t.upgrd.2, { }* bitcast (%llvm.dbg.variable.type* @llvm.dbg.variable to { }*) ) + call void @llvm.dbg.stoppoint( i32 5, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*) ) + %tmp = load i32* @q ; [#uses=1] + store i32 %tmp, i32* %t + call void @llvm.dbg.stoppoint( i32 6, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*) ) + %tmp1 = load i32* %t ; [#uses=1] + %tmp2 = add i32 %tmp1, 1 ; [#uses=1] + store i32 %tmp2, i32* @q + call void @llvm.dbg.stoppoint( i32 7, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*) ) + call void @llvm.dbg.region.end( { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram to { }*) ) ret void } -int %main() { +define i32 @main() { entry: - %retval = alloca int, align 4 - %tmp = alloca int, align 4 - "alloca point" = bitcast int 0 to int - call void %llvm.dbg.func.start( { }* bitcast (%llvm.dbg.subprogram.type* %llvm.dbg.subprogram2 to { }*) ) - call void %llvm.dbg.stoppoint( uint 8, uint 0, { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*) ) - %retval = bitcast int* %retval to { }* - call void %llvm.dbg.declare( { }* %retval, { }* bitcast (%llvm.dbg.variable.type* %llvm.dbg.variable3 to { }*) ) - call void %llvm.dbg.stoppoint( uint 9, uint 0, { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*) ) - store int 0, int* %q - call void %llvm.dbg.stoppoint( uint 10, uint 0, { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*) ) - call void (...)* bitcast (void ()* %foo to void (...)*)( ) - call void %llvm.dbg.stoppoint( uint 11, uint 0, { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*) ) - %tmp = load int* %q - %tmp1 = sub int %tmp, 1 - store int %tmp1, int* %q - call void %llvm.dbg.stoppoint( uint 13, uint 0, { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*) ) - %tmp2 = load int* %q - store int %tmp2, int* %tmp - %tmp3 = load int* %tmp - store int %tmp3, int* %retval - %retval = load int* %retval - call void %llvm.dbg.stoppoint( uint 14, uint 0, { }* bitcast (%llvm.dbg.compile_unit.type* %llvm.dbg.compile_unit to { }*) ) - call void %llvm.dbg.region.end( { }* bitcast (%llvm.dbg.subprogram.type* %llvm.dbg.subprogram2 to { }*) ) - ret int %retval + %retval = alloca i32, align 4 ; [#uses=3] + %tmp = alloca i32, align 4 ; [#uses=2] + %"alloca point" = bitcast i32 0 to i32 ; [#uses=0] + call void @llvm.dbg.func.start( { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram2 to { }*) ) + call void @llvm.dbg.stoppoint( i32 8, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*) ) + %retval.upgrd.3 = bitcast i32* %retval to { }* ; <{ }*> [#uses=1] + call void @llvm.dbg.declare( { }* %retval.upgrd.3, { }* bitcast (%llvm.dbg.variable.type* @llvm.dbg.variable3 to { }*) ) + call void @llvm.dbg.stoppoint( i32 9, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*) ) + store i32 0, i32* @q + call void @llvm.dbg.stoppoint( i32 10, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*) ) + call void (...)* bitcast (void ()* @foo to void (...)*)( ) + call void @llvm.dbg.stoppoint( i32 11, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*) ) + %tmp.upgrd.4 = load i32* @q ; [#uses=1] + %tmp1 = sub i32 %tmp.upgrd.4, 1 ; [#uses=1] + store i32 %tmp1, i32* @q + call void @llvm.dbg.stoppoint( i32 13, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*) ) + %tmp2 = load i32* @q ; [#uses=1] + store i32 %tmp2, i32* %tmp + %tmp3 = load i32* %tmp ; [#uses=1] + store i32 %tmp3, i32* %retval + %retval.upgrd.5 = load i32* %retval ; [#uses=1] + call void @llvm.dbg.stoppoint( i32 14, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*) ) + call void @llvm.dbg.region.end( { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram2 to { }*) ) + ret i32 %retval.upgrd.5 } Modified: llvm/trunk/test/ExecutionEngine/2002-12-16-ArgTest.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2002-12-16-ArgTest.ll?rev=48137&r1=48136&r2=48137&view=diff ============================================================================== --- llvm/trunk/test/ExecutionEngine/2002-12-16-ArgTest.ll (original) +++ llvm/trunk/test/ExecutionEngine/2002-12-16-ArgTest.ll Mon Mar 10 02:21:50 2008 @@ -1,47 +1,38 @@ -; RUN: llvm-upgrade %s | llvm-as -f -o %t.bc +; RUN: llvm-as < %s -f -o %t.bc ; RUN: lli %t.bc > /dev/null -%.LC0 = internal global [10 x sbyte] c"argc: %d\0A\00" + at .LC0 = internal global [10 x i8] c"argc: %d\0A\00" ; <[10 x i8]*> [#uses=1] -implementation ; Functions: +declare i32 @puts(i8*) -declare int %puts(sbyte*) - -void %getoptions(int* %argc) { -bb0: ; No predecessors! +define void @getoptions(i32* %argc) { +bb0: ret void } -declare int %printf(sbyte*, ...) - -int %main(int %argc, sbyte** %argv) { -bb0: ; No predecessors! - call int (sbyte*, ...)* %printf( sbyte* getelementptr ([10 x sbyte]* %.LC0, long 0, long 0), int %argc) - %cast224 = cast sbyte** %argv to sbyte* ; [#uses=1] - %local = alloca sbyte* ; [#uses=3] - store sbyte* %cast224, sbyte** %local - %cond226 = setle int %argc, 0 ; [#uses=1] - br bool %cond226, label %bb3, label %bb2 +declare i32 @printf(i8*, ...) +define i32 @main(i32 %argc, i8** %argv) { +bb0: + call i32 (i8*, ...)* @printf( i8* getelementptr ([10 x i8]* @.LC0, i64 0, i64 0), i32 %argc ) ; :0 [#uses=0] + %cast224 = bitcast i8** %argv to i8* ; [#uses=1] + %local = alloca i8* ; [#uses=3] + store i8* %cast224, i8** %local + %cond226 = icmp sle i32 %argc, 0 ; [#uses=1] + br i1 %cond226, label %bb3, label %bb2 bb2: ; preds = %bb2, %bb0 - %cann-indvar = phi int [ 0, %bb0 ], [ %add1-indvar, %bb2 ] ; [#uses=2] - %add1-indvar = add int %cann-indvar, 1 ; [#uses=2] - %cann-indvar-idxcast = cast int %cann-indvar to long ; [#uses=1] - ;%reg115 = load sbyte** %local ; [#uses=1] - ;%cann-indvar-idxcast-scale = mul long %cann-indvar-idxcast, 8 ; [#uses=1] - ;%reg232 = getelementptr sbyte* %reg115, long %cann-indvar-idxcast-scale ; [#uses=1] - ;%cast235 = cast sbyte* %reg232 to sbyte** ; [#uses=1] - %CT = cast sbyte** %local to sbyte*** - %reg115 = load sbyte*** %CT - %cast235 = getelementptr sbyte** %reg115, long %cann-indvar-idxcast - - %reg117 = load sbyte** %cast235 ; [#uses=1] - %reg236 = call int %puts( sbyte* %reg117 ) ; [#uses=0] - %cond239 = setlt int %add1-indvar, %argc ; [#uses=1] - br bool %cond239, label %bb2, label %bb3 - + %cann-indvar = phi i32 [ 0, %bb0 ], [ %add1-indvar, %bb2 ] ; [#uses=2] + %add1-indvar = add i32 %cann-indvar, 1 ; [#uses=2] + %cann-indvar-idxcast = sext i32 %cann-indvar to i64 ; [#uses=1] + %CT = bitcast i8** %local to i8*** ; [#uses=1] + %reg115 = load i8*** %CT ; [#uses=1] + %cast235 = getelementptr i8** %reg115, i64 %cann-indvar-idxcast ; [#uses=1] + %reg117 = load i8** %cast235 ; [#uses=1] + %reg236 = call i32 @puts( i8* %reg117 ) ; [#uses=0] + %cond239 = icmp slt i32 %add1-indvar, %argc ; [#uses=1] + br i1 %cond239, label %bb2, label %bb3 bb3: ; preds = %bb2, %bb0 - %cast243 = cast sbyte** %local to int* ; [#uses=1] - call void %getoptions( int* %cast243 ) - ret int 0 + %cast243 = bitcast i8** %local to i32* ; [#uses=1] + call void @getoptions( i32* %cast243 ) + ret i32 0 } Modified: llvm/trunk/test/ExecutionEngine/2003-01-04-ArgumentBug.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-01-04-ArgumentBug.ll?rev=48137&r1=48136&r2=48137&view=diff ============================================================================== --- llvm/trunk/test/ExecutionEngine/2003-01-04-ArgumentBug.ll (original) +++ llvm/trunk/test/ExecutionEngine/2003-01-04-ArgumentBug.ll Mon Mar 10 02:21:50 2008 @@ -1,16 +1,14 @@ -; RUN: llvm-upgrade %s | llvm-as -f -o %t.bc +; RUN: llvm-as < %s -f -o %t.bc ; RUN: lli %t.bc > /dev/null - -implementation ; Functions: - -int %foo(int %X, int %Y, double %A) { - %cond212 = setne double %A, 1.000000e+00 ; [#uses=1] - %cast110 = cast bool %cond212 to int ; [#uses=1] - ret int %cast110 +define i32 @foo(i32 %X, i32 %Y, double %A) { + %cond212 = fcmp une double %A, 1.000000e+00 ; [#uses=1] + %cast110 = zext i1 %cond212 to i32 ; [#uses=1] + ret i32 %cast110 } -int %main() { - %reg212 = call int %foo( int 0, int 1, double 1.000000e+00 ) ; [#uses=1] - ret int %reg212 +define i32 @main() { + %reg212 = call i32 @foo( i32 0, i32 1, double 1.000000e+00 ) ; [#uses=1] + ret i32 %reg212 } + Modified: llvm/trunk/test/ExecutionEngine/2003-01-04-LoopTest.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-01-04-LoopTest.ll?rev=48137&r1=48136&r2=48137&view=diff ============================================================================== --- llvm/trunk/test/ExecutionEngine/2003-01-04-LoopTest.ll (original) +++ llvm/trunk/test/ExecutionEngine/2003-01-04-LoopTest.ll Mon Mar 10 02:21:50 2008 @@ -1,25 +1,21 @@ -; RUN: llvm-upgrade < %s | llvm-as -o %t.bc -f +; RUN: llvm-as < %s -o %t.bc -f ; RUN: lli %t.bc > /dev/null -implementation - -int %main() { - call int %mylog(int 4) - ret int 0 +define i32 @main() { + call i32 @mylog( i32 4 ) ; :1 [#uses=0] + ret i32 0 } -internal int %mylog(int %num) { -bb0: ; No predecessors! +define internal i32 @mylog(i32 %num) { +bb0: br label %bb2 - -bb2: - %reg112 = phi int [ 10, %bb2 ], [ 1, %bb0 ] - %cann-indvar = phi int [ %cann-indvar, %bb2 ], [0, %bb0] - %reg114 = add int %reg112, 1 - %cond222 = setlt int %reg114, %num - br bool %cond222, label %bb2, label %bb3 - -bb3: ; preds = %bb2, %bb0 - ret int %reg114 +bb2: ; preds = %bb2, %bb0 + %reg112 = phi i32 [ 10, %bb2 ], [ 1, %bb0 ] ; [#uses=1] + %cann-indvar = phi i32 [ %cann-indvar, %bb2 ], [ 0, %bb0 ] ; [#uses=1] + %reg114 = add i32 %reg112, 1 ; [#uses=2] + %cond222 = icmp slt i32 %reg114, %num ; [#uses=1] + br i1 %cond222, label %bb2, label %bb3 +bb3: ; preds = %bb2 + ret i32 %reg114 } Modified: llvm/trunk/test/ExecutionEngine/2003-01-04-PhiTest.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-01-04-PhiTest.ll?rev=48137&r1=48136&r2=48137&view=diff ============================================================================== --- llvm/trunk/test/ExecutionEngine/2003-01-04-PhiTest.ll (original) +++ llvm/trunk/test/ExecutionEngine/2003-01-04-PhiTest.ll Mon Mar 10 02:21:50 2008 @@ -1,11 +1,13 @@ -; RUN: llvm-upgrade < %s | llvm-as -f -o %t.bc +; RUN: llvm-as < %s -f -o %t.bc ; RUN: lli %t.bc > /dev/null -int %main() { +define i32 @main() { +;