[llvm-commits] [SignlessTypes] CVS: llvm/lib/AsmParser/Lexer.cpp.cvs Lexer.l Lexer.l.cvs ParserInternals.h llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y llvmAsmParser.y.cvs

Reid Spencer reid at x10sys.com
Thu Oct 19 21:27:46 PDT 2006



Changes in directory llvm/lib/AsmParser:

Lexer.cpp.cvs updated: 1.10.2.3 -> 1.10.2.4
Lexer.l updated: 1.78.2.2 -> 1.78.2.3
Lexer.l.cvs updated: 1.8.2.2 -> 1.8.2.3
ParserInternals.h updated: 1.45.2.2 -> 1.45.2.3
llvmAsmParser.cpp.cvs updated: 1.18.2.3 -> 1.18.2.4
llvmAsmParser.h.cvs updated: 1.13.2.3 -> 1.13.2.4
llvmAsmParser.y updated: 1.266.2.3 -> 1.266.2.4
llvmAsmParser.y.cvs updated: 1.18.2.3 -> 1.18.2.4
---
Log message:

Initial patch for DIV -> SDIV/UDIV


---
Diffs of the changes:  (+1857 -1729)

 Lexer.cpp.cvs         | 1172 ++++++++++++++-------------
 Lexer.l               |   16 
 Lexer.l.cvs           |   16 
 ParserInternals.h     |   16 
 llvmAsmParser.cpp.cvs | 2124 +++++++++++++++++++++++++-------------------------
 llvmAsmParser.h.cvs   |  128 +--
 llvmAsmParser.y       |   57 -
 llvmAsmParser.y.cvs   |   57 -
 8 files changed, 1857 insertions(+), 1729 deletions(-)


Index: llvm/lib/AsmParser/Lexer.cpp.cvs
diff -u llvm/lib/AsmParser/Lexer.cpp.cvs:1.10.2.3 llvm/lib/AsmParser/Lexer.cpp.cvs:1.10.2.4
--- llvm/lib/AsmParser/Lexer.cpp.cvs:1.10.2.3	Thu Oct 19 19:34:43 2006
+++ llvm/lib/AsmParser/Lexer.cpp.cvs	Thu Oct 19 23:27:17 2006
@@ -20,7 +20,7 @@
 /* A lexical scanner generated by flex*/
 
 /* Scanner skeleton version:
- * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.10.2.3 2006/10/20 00:34:43 reid Exp $
+ * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.10.2.4 2006/10/20 04:27:17 reid Exp $
  */
 
 #define FLEX_SCANNER
@@ -317,35 +317,35 @@
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 114
-#define YY_END_OF_BUFFER 115
-static yyconst short int yy_acclist[192] =
+#define YY_NUM_RULES 116
+#define YY_END_OF_BUFFER 117
+static yyconst short int yy_acclist[194] =
     {   0,
-      115,  113,  114,  112,  113,  114,  112,  114,  113,  114,
-      113,  114,  113,  114,  113,  114,  113,  114,  113,  114,
-      105,  113,  114,  105,  113,  114,    1,  113,  114,  113,
-      114,  113,  114,  113,  114,  113,  114,  113,  114,  113,
-      114,  113,  114,  113,  114,  113,  114,  113,  114,  113,
-      114,  113,  114,  113,  114,  113,  114,  113,  114,  113,
-      114,  113,  114,  113,  114,  113,  114,  113,  114,  113,
-      114,  104,  102,  101,  101,  108,  106,  110,  105,    1,
-       87,   41,   69,   23,  104,  101,  101,  109,  110,   20,
-      110,  111,   63,   68,   39,   34,   42,   66,    3,   54,
-
-       65,   25,   77,   67,   86,   81,   82,   64,   70,  103,
-      110,  110,   49,   78,   79,   32,   94,   95,   56,   22,
-      107,   26,    4,   61,   55,   48,   11,  110,   36,    2,
-        5,   58,   60,   50,   72,   76,   74,   75,   73,   71,
-       52,   96,   51,   57,   21,   84,   93,   45,   59,   30,
-       24,   44,    7,   89,   33,   92,   38,   62,   80,   88,
-       27,   28,   90,   53,   85,   83,   43,    6,   29,   37,
-        8,   17,    9,   10,   35,   12,   14,   13,   40,   15,
-       31,   91,   97,   99,  100,   16,   46,   98,   18,   47,
-       19
+      117,  115,  116,  114,  115,  116,  114,  116,  115,  116,
+      115,  116,  115,  116,  115,  116,  115,  116,  115,  116,
+      107,  115,  116,  107,  115,  116,    1,  115,  116,  115,
+      116,  115,  116,  115,  116,  115,  116,  115,  116,  115,
+      116,  115,  116,  115,  116,  115,  116,  115,  116,  115,
+      116,  115,  116,  115,  116,  115,  116,  115,  116,  115,
+      116,  115,  116,  115,  116,  115,  116,  115,  116,  115,
+      116,  106,  104,  103,  103,  110,  108,  112,  107,    1,
+       89,   41,   71,   23,  106,  103,  103,  111,  112,   20,
+      112,  113,   63,   70,   39,   34,   42,   66,    3,   54,
+
+       65,   25,   79,   69,   88,   83,   84,   64,   72,  105,
+      112,  112,   49,   80,   81,   32,   96,   97,   56,   22,
+      109,   68,   26,    4,   61,   67,   55,   48,   11,  112,
+       36,    2,    5,   58,   60,   50,   74,   78,   76,   77,
+       75,   73,   52,   98,   51,   57,   21,   86,   95,   45,
+       59,   30,   24,   44,    7,   91,   33,   94,   38,   62,
+       82,   90,   27,   28,   92,   53,   87,   85,   43,    6,
+       29,   37,    8,   17,    9,   10,   35,   12,   14,   13,
+       40,   15,   31,   93,   99,  101,  102,   16,   46,  100,
+       18,   47,   19
 
     } ;
 
-static yyconst short int yy_accept[505] =
+static yyconst short int yy_accept[511] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -358,51 +358,51 @@
        83,   83,   83,   83,   83,   83,   83,   84,   84,   84,
        84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
 
-       85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
-       85,   85,   85,   85,   86,   87,   89,   90,   91,   92,
-       92,   93,   94,   94,   94,   95,   95,   96,   96,   97,
-       97,   97,   97,   98,   98,   98,   98,   98,   98,   98,
-       99,   99,   99,  100,  100,  100,  100,  100,  100,  100,
-      100,  100,  100,  100,  101,  101,  101,  101,  101,  101,
-      101,  101,  101,  102,  103,  103,  103,  104,  104,  105,
-      106,  106,  106,  106,  106,  106,  107,  107,  108,  108,
-      108,  108,  109,  109,  109,  109,  109,  109,  109,  109,
+       84,   85,   85,   85,   85,   85,   85,   85,   85,   85,
+       85,   85,   85,   85,   85,   85,   86,   87,   89,   90,
+       91,   92,   92,   93,   94,   94,   94,   95,   95,   96,
+       96,   97,   97,   97,   97,   98,   98,   98,   98,   98,
+       98,   98,   99,   99,   99,  100,  100,  100,  100,  100,
+      100,  100,  100,  100,  100,  100,  101,  101,  101,  101,
+      101,  101,  101,  101,  101,  102,  103,  103,  103,  104,
+      104,  105,  106,  106,  106,  106,  106,  106,  106,  107,
+      107,  108,  108,  108,  108,  109,  109,  109,  109,  109,
       109,  109,  109,  109,  109,  109,  109,  109,  109,  109,
 
-      109,  109,  109,  109,  110,  110,  111,  112,  112,  112,
-      112,  113,  113,  113,  113,  113,  114,  115,  116,  116,
-      116,  116,  117,  117,  117,  117,  117,  117,  117,  117,
-      117,  117,  117,  117,  117,  118,  118,  118,  118,  118,
-      118,  118,  118,  118,  118,  119,  120,  120,  120,  121,
-      121,  121,  122,  122,  122,  122,  122,  122,  122,  122,
-      122,  122,  122,  122,  122,  123,  123,  123,  124,  125,
-      125,  126,  126,  126,  126,  126,  126,  126,  126,  126,
-      126,  127,  127,  128,  128,  128,  129,  130,  130,  130,
-      131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
-
-      131,  131,  131,  132,  132,  133,  133,  133,  133,  133,
-      133,  133,  134,  134,  134,  134,  134,  134,  134,  135,
-      135,  135,  136,  137,  138,  139,  140,  141,  142,  142,
-      142,  143,  143,  143,  143,  144,  145,  146,  146,  146,
-      146,  146,  146,  147,  147,  147,  147,  147,  147,  148,
-      148,  149,  149,  149,  149,  149,  149,  149,  150,  151,
-      152,  152,  152,  153,  153,  154,  154,  154,  154,  155,
-      155,  156,  157,  158,  159,  159,  159,  160,  160,  160,
-      161,  162,  163,  163,  163,  164,  165,  166,  167,  167,
-      167,  167,  167,  167,  167,  168,  169,  170,  170,  170,
-
-      170,  170,  170,  170,  170,  170,  170,  170,  170,  171,
-      171,  171,  171,  171,  171,  171,  171,  171,  171,  172,
-      172,  172,  172,  173,  173,  173,  173,  173,  174,  175,
-      175,  175,  175,  175,  175,  176,  176,  176,  176,  177,
-      178,  179,  179,  179,  179,  179,  179,  179,  179,  179,
-      179,  179,  179,  179,  179,  179,  179,  179,  179,  179,
-      179,  179,  180,  180,  180,  180,  180,  180,  181,  181,
-      181,  181,  181,  182,  182,  182,  183,  183,  183,  183,
-      183,  183,  183,  183,  183,  183,  183,  183,  183,  183,
-      184,  184,  185,  186,  187,  187,  188,  188,  189,  190,
+      109,  109,  109,  109,  109,  109,  109,  109,  110,  110,
+      111,  112,  112,  112,  112,  113,  113,  113,  113,  113,
+      114,  115,  116,  116,  116,  116,  117,  117,  117,  117,
+      117,  117,  117,  117,  117,  117,  117,  117,  117,  118,
+      118,  118,  118,  118,  118,  118,  118,  118,  118,  119,
+      120,  120,  120,  121,  121,  121,  122,  122,  123,  123,
+      123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
+      124,  124,  124,  125,  126,  126,  127,  128,  128,  128,
+      128,  128,  128,  128,  128,  128,  128,  129,  129,  130,
+      130,  130,  131,  132,  132,  132,  133,  133,  133,  133,
+
+      133,  133,  133,  133,  133,  133,  133,  133,  133,  134,
+      134,  135,  135,  135,  135,  135,  135,  135,  136,  136,
+      136,  136,  136,  136,  136,  137,  137,  137,  138,  139,
+      140,  141,  142,  143,  144,  144,  144,  145,  145,  145,
+      145,  146,  147,  148,  148,  148,  148,  148,  148,  149,
+      149,  149,  149,  149,  149,  150,  150,  151,  151,  151,
+      151,  151,  151,  151,  152,  153,  154,  154,  154,  155,
+      155,  156,  156,  156,  156,  157,  157,  158,  159,  160,
+      161,  161,  161,  162,  162,  162,  163,  164,  165,  165,
+      165,  166,  167,  168,  169,  169,  169,  169,  169,  169,
+
+      169,  170,  171,  172,  172,  172,  172,  172,  172,  172,
+      172,  172,  172,  172,  172,  173,  173,  173,  173,  173,
+      173,  173,  173,  173,  173,  174,  174,  174,  174,  175,
+      175,  175,  175,  175,  176,  177,  177,  177,  177,  177,
+      177,  178,  178,  178,  178,  179,  180,  181,  181,  181,
+      181,  181,  181,  181,  181,  181,  181,  181,  181,  181,
+      181,  181,  181,  181,  181,  181,  181,  181,  182,  182,
+      182,  182,  182,  182,  183,  183,  183,  183,  183,  184,
+      184,  184,  185,  185,  185,  185,  185,  185,  185,  185,
+      185,  185,  185,  185,  185,  185,  186,  186,  187,  188,
 
-      191,  191,  192,  192
+      189,  189,  190,  190,  191,  192,  193,  193,  194,  194
     } ;
 
 static yyconst int yy_ec[256] =
@@ -446,256 +446,260 @@
         3,    3,    3
     } ;
 
-static yyconst short int yy_base[509] =
+static yyconst short int yy_base[515] =
     {   0,
-        0,    0, 1096, 1097, 1097, 1097, 1091, 1080,   36,   40,
+        0,    0, 1108, 1109, 1109, 1109, 1103, 1092,   36,   40,
        44,   50,   56,   62,    0,   63,   66,   81,   89,   47,
        90,   91,   76,   96,  108,   49,   97,  110,   68,  137,
-      120,  168,  112,  115,  135,  127, 1089, 1097, 1078, 1097,
-        0,  158,  173,  180,  196,   70,  201,  216,  221,    0,
-      121,  152,  123,  139,  166,  140,  162,  184, 1077,  222,
-      180,   31,  186,  119,  232,  208,  144,  225,  234,  236,
-      235,  188,  238,  240,  246,  241,  245,  203,  248,  256,
-      254,  258,  262,  252,  272,  274, 1076,  276,  278,  280,
-      255,  253,  283,  284,  285,  286,  288,  297,  300, 1075,
-
-      301,  292,  295,  307,  309,  318,  316,  315,  322,  312,
-      147,  329,  330, 1074,    0,  344,  349, 1073,  363,  380,
-        0, 1072,  338,  336, 1071,  355, 1070,  356, 1069,  353,
-      367,  334, 1068,  375,  365,  381,  384,  370,  371, 1067,
-      388,  392,  391,  393,  394,  395,  396,  400,  399,  407,
-      406,  409,  411,  413,  410,  414,  418,  421,  425,  426,
-      427,  429, 1066, 1065,  430,  431, 1064,  435, 1063, 1062,
-      458,  436,  439,  434,  469, 1061,  449, 1060,  438,  441,
-      458, 1059,  471,  472,  474,  473,  481,  482,  475,  476,
-      483,  488,  489,  493,  495,  496,  504,  501,  503,  505,
-
-      510,  507,  516, 1058,  511, 1097,  527,  541,  545,  549,
-      554,  555,  440,  556,  557, 1057, 1056, 1055,  558,  559,
-      560, 1054,  527,  518,  561,  189,  562,  528,  566,  563,
-      564,  567,  568,  570, 1053,  571,  587,  580,  578,  579,
-      581,  590,  591,  596, 1052, 1051,  594,  598, 1050,  597,
-      601,    0,  606,  603,  607,  602,  608,  610,  618,  620,
-      625,  623,  628,  629, 1049,  630,  626, 1048, 1047,  638,
-     1046,  634,  640,  642,  644,  646,  648,  651,  653,  652,
-     1045,  654, 1044,  656,  657,  662, 1043,  662,  665, 1042,
-      668,  671,  674,  680,  682,  683,  684,  685,  687,  686,
-
-      689,  690, 1041,  691, 1040,  696,  692,  695,  693,  700,
-      699, 1039,  710,  712,  713,  714,  715,  719, 1038,  718,
-      722, 1037, 1036, 1035, 1034, 1033, 1032, 1031,  725,  729,
-     1030,  726,  730,  732, 1029, 1028, 1027,  731,  735,  743,
-      733,  737, 1026,  734,  746,  744,  747,  750, 1025,  752,
-     1024,  755,  761,  760,  758,  763,  764, 1023, 1022, 1021,
-      771,  762, 1020,  773, 1019,  774,  777,  779, 1018,  787,
-     1017, 1016, 1015, 1014,  778,  788, 1013,  791,  792, 1012,
-     1011, 1010,  790,  795, 1009, 1008, 1007, 1006,  793,  796,
-      798,  797,  804,  801, 1005, 1004, 1003,  809,  811,  812,
-
-      813,  814,  816,  817,  820,  822,  827,  819, 1002,  815,
-      833,  826,  839,  843,  845,  846,  847,  848,  999,  849,
-      850,  851,  990,  854,  857,  855,  856,  989,  987,  858,
-      866,  876,  862,  861,  986,  879,  880,  881,  984,  983,
-      982,  882,  884,  888,  890,  889,  863,  891,  896,  897,
-      899,  901,  900,  902,  903,  904,  908,  909,  912,  913,
-      916,  980,  918,  924,  923,  925,  926,  977,  928,  929,
-      930,  931,  975,  935,  936,  973,  934,  944,  942,  946,
-      950,  954,  956,  957,  958,  960,  961,  959,  962,  864,
-      964,  829,  766,  604,  969,  519,  965,  517,  477,  446,
+      120,  168,  112,  115,  135,  127, 1101, 1109, 1090, 1109,
+        0,  158,  173,  196,  201,   70,  206,  221,  226,    0,
+      121,  152,  123,  139,  159,  140,  162,  166, 1089,  227,
+      179,   31,  187,  119,  237,  182,  230,  188,  238,  240,
+      239,  241,  180,  243,  250,  248,  251,  252,  255,  260,
+      264,  262,  269,  257,  271,  282, 1088,  275,  281,  283,
+      285,  289,  290,  293,  304,  297,  291,  292,  301,  302,
+
+     1087,  307,  310,  296,  313,  318,  321,  330,  332,  336,
+      333,  337,  213,  334,  345, 1086,    0,  361,  365, 1085,
+      379,  396,    0, 1084,  354,  349, 1083,  371, 1082,  370,
+     1081,  369,  372,  327, 1080,  373,  385,  391,  347,  386,
+      397, 1079,  402,  398,  403,  399,  405,  406,  409,  413,
+      410,  420,  417,  421,  422,  424,  425,  430,  427,  434,
+      437,  435,  438,  440, 1078, 1077,  444,  442, 1076,  448,
+     1075, 1074,  470,  447,  449,  458,  451,  482, 1073,  450,
+     1072,  484,  452,  483, 1071,  463,  485,  487,  488,  492,
+      496,  489,  490,  495,  502,  508,  503,  513,  510,  506,
+
+      509,  511,  516,  521,  526,  527,  210, 1070,  528, 1109,
+      539,  556,  560,  564,  569,  530,  533,  534,  570, 1069,
+     1068, 1067,  571,  572,  573, 1066,  539,  575,  574,  295,
+      576,  577,  579,  581,  580,  583,  586,  584, 1065,  589,
+      594,  597,  590,  600,  603,  605,  608,  609, 1064, 1063,
+      610,  612, 1062,  613,  615,    0,  614, 1061,  616,  618,
+      619,  622,  632,  633,  630,  634,  640,  643,  647, 1060,
+      648,  635, 1059, 1058,  651, 1057, 1056,  656,  636,  658,
+      659,  661,  662,  663,  665,  666, 1055,  668, 1054,  670,
+      669,  676, 1053,  681,  677, 1052,  687,  690,  689,  679,
+
+      697,  688,  698,  699,  701,  702,  704,  705, 1051,  706,
+     1050,  710,  709,  711,  714,  715,  720, 1049,  716,  722,
+      723,  726,  734,  736, 1048,  728,  738, 1047, 1046, 1045,
+     1044, 1043, 1042, 1041,  739,  740, 1040,  741,  742,  747,
+     1039, 1038, 1037,  744,  748,  749,  751,  752, 1036,  758,
+      759,  764,  760,  762, 1035,  771, 1034,  768,  766,  777,
+      770,  775,  776, 1033, 1032, 1031,  791,  778, 1030,  782,
+     1029,  780,  788,  799, 1028,  800, 1027, 1026, 1025, 1024,
+      787,  802, 1023,  803,  805, 1022, 1021, 1020,  809,  806,
+     1019, 1018, 1017, 1016,  810,  811,  813,  814,  817,  816,
+
+     1015, 1014, 1013,  820,  823,  824,  828,  826,  829,  830,
+      831,  836,  840,  832, 1010,  837,  848,  853,  855,  852,
+      842,  856,  845,  859, 1000,  864,  866,  867,  999,  869,
+      871,  872,  873,  998,  996,  877,  874,  878,  879,  875,
+      995,  886,  891,  892,  994,  989,  988,  897,  898,  880,
+      899,  900,  901,  906,  908,  909,  910,  912,  911,  914,
+      915,  918,  920,  921,  923,  924,  927,  987,  928,  936,
+      937,  938,  940,  982,  942,  935,  941,  943,  790,  946,
+      947,  545,  948,  959,  949,  961,  965,  967,  968,  969,
+      971,  970,  973,  972,  974,  543,  975,  456,  455,  454,
 
-      970,  333, 1097, 1005, 1007,   83, 1011,   80
+      976,  253,  984,  178,  177,  147,  981,  144, 1109, 1016,
+     1018,   83, 1022,   80
     } ;
 
-static yyconst short int yy_def[509] =
+static yyconst short int yy_def[515] =
     {   0,
-      503,    1,  503,  503,  503,  503,  504,  505,  506,  503,
-      505,  505,  505,  505,  507,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  504,  503,  505,  503,
-      508,  508,  503,  503,  505,  505,  505,  505,  505,  507,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  503,  508,  508,  503,  505,  505,  505,
-       49,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-       49,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-
-      505,  505,  505,  505,  505,  503,  503,  503,  503,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  171,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  503,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      509,    1,  509,  509,  509,  509,  510,  511,  512,  509,
+      511,  511,  511,  511,  513,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  510,  509,  511,  509,
+      514,  514,  509,  509,  511,  511,  511,  511,  511,  513,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  509,  514,  514,  509,  511,
+      511,  511,   49,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,   49,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  509,
+      509,  509,  509,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  173,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  509,  511,  511,  511,  511,  511,  511,  511,  511,
+
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
+      511,  511,  511,  511,  511,  511,  511,  511,  511,  511,
 
-      505,  505,    0,  503,  503,  503,  503,  503
+      511,  511,  511,  511,  511,  511,  511,  511,    0,  509,
+      509,  509,  509,  509
     } ;
 
-static yyconst short int yy_nxt[1141] =
+static yyconst short int yy_nxt[1153] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,    8,    8,    8,   16,   17,
        18,   19,   20,   21,   22,    8,   23,    8,   24,   25,
        26,   27,   28,    8,   29,   30,   31,   32,   33,   34,
        35,    8,   36,   42,   40,   43,   43,   43,   43,   44,
-       44,   44,   44,   45,   45,   45,   45,   40,   46,  134,
-       40,  135,   40,   40,   47,   48,   48,   48,   48,   40,
-       47,   48,   48,   48,   48,   40,   40,   69,  118,   40,
-       84,   40,  115,   40,   51,   41,   85,   70,   56,   40,
+       44,   44,   44,   45,   45,   45,   45,   40,   46,  136,
+       40,  137,   40,   40,   47,   48,   48,   48,   48,   40,
+       47,   48,   48,   48,   48,   40,   40,   69,  120,   40,
+       84,   40,  117,   40,   51,   41,   85,   70,   56,   40,
        90,   52,   57,   53,   40,   54,   49,   58,   55,   60,
 
        59,   61,   40,   40,   40,   76,   77,   64,   71,   40,
        40,   65,   62,   74,   78,   66,   63,   67,   72,   75,
        68,   40,   79,   40,   73,   40,   81,   80,   40,   86,
-      108,   87,   40,   40,   40,   88,   40,  110,   99,   82,
-       40,   89,  122,  109,  125,   83,   91,  111,   40,  113,
-       40,  100,   40,   40,  101,  137,   92,   40,  203,   93,
-       40,  102,   94,   95,  128,   40,  112,  116,  116,  116,
-      116,  126,  141,   96,   97,   40,   98,   91,  123,   40,
-      124,   40,   43,   43,   43,   43,  129,  103,  117,   44,
-       44,   44,   44,   40,  104,  127,  105,   40,  106,   40,
-
-      133,   40,   40,  107,   47,   45,   45,   45,   45,   40,
-      119,  119,  119,  119,   40,  130,   40,  120,  297,  148,
-      136,   40,  156,  120,   47,   48,   48,   48,   48,   40,
-      121,  121,  121,  121,   40,   40,  121,  121,   40,  121,
-      121,  121,  121,  121,  121,   40,  140,   40,   40,   40,
-      131,   40,  138,   40,   40,  143,  144,  132,   40,   40,
-      149,   40,  142,  146,  139,   40,   40,   40,   40,   40,
-      147,   40,  145,  152,  159,   40,  150,  151,  157,  162,
-      153,  154,  161,  155,  158,   40,  160,   40,  164,   40,
-      163,   40,  166,   40,  172,  171,   40,   40,   40,   40,
-
-      165,   40,  167,  173,  168,   40,  180,  182,   40,  169,
-       40,  174,  176,   40,   40,  177,  170,  181,  178,  175,
-       40,  179,   40,  183,  188,   40,  184,  186,   40,   40,
-      202,   40,  197,  198,  185,   40,  189,  190,  187,  192,
-      191,  196,   40,   40,  193,  199,   40,   40,  200,   40,
-      201,   40,  194,  116,  116,  116,  116,  195,  207,  207,
-      207,  207,  212,  204,  205,  208,   40,  213,   40,   40,
-      218,  208,  119,  119,  119,  119,   40,  214,   40,  120,
-       40,  216,  215,   40,   40,  120,  209,  210,   40,  211,
-      211,  211,  211,   40,   40,  217,  219,   40,  223,  224,
-
-      220,   40,  222,  221,   40,   40,   40,   40,   40,   40,
-      225,  227,   40,   40,  226,  229,  230,  228,  234,   40,
-       40,  235,   40,   40,   40,  237,   40,   40,  231,  236,
-      232,   40,  233,  239,   40,  240,  242,  238,   40,   40,
-       40,  241,   40,   40,   40,  243,  245,   40,   40,   40,
-      246,   40,   40,   40,   40,  247,  255,  244,  249,   40,
-      288,  261,   40,  262,  250,  251,  248,  252,  252,  252,
-      252,   40,  253,  252,  252,  254,  252,  252,  252,  252,
-      252,  252,   40,  260,   40,   40,   40,   40,   40,   40,
-       40,  256,  263,  257,   40,   40,   40,  258,  266,  259,
-
-      265,   40,   40,  268,  269,  267,   40,  264,   40,   40,
-      273,  270,  271,  272,   40,  275,   40,   40,   40,  274,
-       40,  276,  278,   40,   40,  280,  281,  277,  282,   40,
-       40,   40,   40,  284,  283,  279,  207,  207,  207,  207,
-       40,   40,  285,  208,  295,  294,  299,  209,  209,  208,
-      286,  286,  286,  286,  286,  286,  286,  286,  211,  211,
-      211,  211,   40,  211,  211,  211,  211,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,  291,   40,
-       40,   40,  302,   40,   40,  287,  289,  290,  304,  303,
-      298,   40,   40,   40,   40,  292,  293,  301,  300,  306,
-
-       40,  296,  308,   40,   40,  307,  305,   40,  311,   40,
-       40,   40,  309,  310,   40,   40,   40,   40,  312,   40,
-       40,   40,  313,   40,  314,  315,  316,  321,  319,  320,
-      323,   40,  325,   40,  317,  322,   40,  318,   40,   40,
-      327,   40,   40,   40,  324,  330,  326,   40,  329,  332,
-      331,   40,  333,   40,  334,   40,  328,   40,  336,   40,
-      335,   40,  339,  337,   40,   40,   40,   40,  338,   40,
-       40,  286,  286,  286,  286,   40,  340,  343,   40,  346,
-      349,   40,  341,  348,   40,  342,  350,   40,  351,  352,
-      345,  347,  344,   40,  353,   40,   40,   40,   40,   40,
-
-       40,  355,   40,   40,   40,   40,   40,  358,   40,   40,
-      362,  363,   40,   40,  354,  356,  357,  359,  364,  361,
-      365,  369,  360,   40,  366,   40,   40,   40,   40,  367,
-      368,   40,   40,  372,  371,   40,  373,  374,   40,   40,
-      370,  375,   40,   40,   40,   40,   40,   40,   40,  376,
-       40,  380,  379,  378,  382,  384,   40,   40,  377,   40,
-       40,  387,  390,   40,  385,   40,  381,  383,   40,  386,
-      388,   40,  389,   40,   40,   40,   40,   40,  393,   40,
-      392,  395,  396,  391,   40,  394,   40,   40,  400,  401,
-       40,   40,   40,  397,  398,  399,  404,  406,  402,  405,
-
-       40,   40,  403,   40,   40,   40,   40,  407,   40,   40,
-       40,   40,  408,  410,   40,  411,  412,   40,  409,  416,
-      413,  414,   40,  417,   40,   40,   40,   40,   40,   40,
-       40,  415,   40,   40,  418,   40,  424,  419,  425,   40,
-       40,  423,   40,  420,  433,  421,   40,  426,  427,  429,
-      428,  422,   40,  431,  430,  432,   40,  434,   40,   40,
-       40,   40,   40,   40,   40,  435,  437,   40,   40,   40,
-       40,   40,  439,  442,   40,   40,   40,   40,  446,   40,
-      451,  436,  443,  438,  447,  440,  441,  444,  448,   40,
-      450,  445,   40,   40,   40,   40,  449,   40,  453,  452,
-
-      455,   40,   40,   40,   40,  460,  456,  454,  458,   40,
-       40,  461,   40,   40,   40,   40,   40,   40,  459,  465,
-      467,   40,   40,  463,  457,   40,   40,  464,  466,   40,
-      468,   40,  462,  469,  472,  473,   40,   40,   40,   40,
-      470,   40,   40,   40,   40,  471,  476,   40,   40,   40,
-      480,  477,  474,  478,  479,   40,  482,   40,  485,   40,
-      475,  483,  486,   40,  487,  481,  484,   40,  488,   40,
-       40,   40,   40,   40,   40,   40,  489,   40,   40,  494,
-      495,  496,   40,   40,  490,  491,   40,  501,   40,  500,
-       40,  493,  492,   40,  499,   40,   40,   40,  498,   40,
+      110,   87,   40,   40,   40,   88,   40,  112,  100,   82,
+       40,   89,  124,  111,  127,   83,   91,  113,   40,  115,
+       40,  101,   40,   40,  102,  139,   92,   40,   93,   94,
+       40,  103,   95,   96,  130,   40,  114,  118,  118,  118,
+      118,  128,   40,   97,   98,   40,   99,   91,  125,   40,
+      126,   40,   43,   43,   43,   43,  131,  104,  129,  105,
+       40,   40,   40,   40,  106,   40,  107,  132,  108,  135,
+
+       40,   40,  151,  109,  119,   44,   44,   44,   44,   47,
+       45,   45,   45,   45,   40,  121,  121,  121,  121,   40,
+      142,  138,  122,   40,  207,  144,   40,  290,  122,   47,
+       48,   48,   48,   48,   40,  123,  123,  123,  123,   40,
+       40,  123,  123,   40,  123,  123,  123,  123,  123,  123,
+       40,   40,   40,   40,   40,  133,   40,  140,  143,  145,
+      146,   40,  134,   40,   40,   40,   40,  148,   40,  141,
+       40,  158,  150,   40,  149,   40,  147,   40,  161,  152,
+      154,  153,   40,  164,   40,  159,  155,  156,   40,  157,
+      162,  160,  163,  166,   40,   40,   40,  165,   40,  167,
+
+      168,  169,   40,   40,   40,   40,   40,  170,   40,   40,
+       40,  185,  171,  176,   40,   40,  175,   40,  183,  172,
+       40,  177,  184,   40,  303,  173,   40,  186,  187,  178,
+      174,   40,  179,  189,   40,  180,  188,  192,  181,  193,
+       40,  182,  191,   40,  190,   40,   40,   40,  194,   40,
+       40,  196,  195,  201,  202,  206,  197,  200,   40,  204,
+       40,  205,   40,  222,  198,  226,  203,   40,  208,  199,
+      118,  118,  118,  118,  211,  211,  211,  211,  216,  209,
+      217,  212,   40,   40,   40,   40,   40,  212,  121,  121,
+      121,  121,   40,  218,  223,  122,  219,  220,   40,   40,
+
+      221,  122,  213,  214,   40,  215,  215,  215,  215,   40,
+       40,   40,   40,  225,  227,   40,   40,  231,   40,   40,
+      224,  233,   40,   40,  229,  228,   40,  234,  230,  232,
+       40,  238,  239,   40,   40,   40,  241,   40,   40,  235,
+       40,  236,  240,   40,  243,  237,  244,   40,   40,  242,
+       40,   40,  246,   40,  247,   40,  245,   40,  249,  250,
+       40,   40,   40,   40,   40,   40,  251,   40,   40,   40,
+      248,   40,  253,  260,  267,  254,   40,  252,  255,  256,
+      256,  256,  256,  257,  265,  256,  256,  258,  256,  256,
+      256,  256,  256,  256,  259,   40,   40,   40,   40,  269,
+
+       40,   40,   40,   40,  261,   40,  262,  266,   40,   40,
+      263,  271,  264,  270,  273,   40,   40,  268,  274,   40,
+      272,   40,   40,   40,   40,  275,   40,  284,  276,   40,
+      279,  277,  278,  280,   40,  281,  282,  283,  286,   40,
+       40,   40,  287,   40,  288,  285,   40,   40,  211,  211,
+      211,  211,   40,  294,  289,  212,   40,  300,   40,  291,
+      293,  212,  213,  213,  295,  292,  292,  292,  292,  292,
+      292,  292,  292,  215,  215,  215,  215,   40,  215,  215,
+      215,  215,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,  297,   40,   40,   40,  305,   40,   40,  308,   40,
+
+      296,  301,   40,   40,  304,  309,  310,   40,  298,  299,
+       40,  306,  313,   40,  302,  307,   40,  312,   40,  314,
+      311,   40,   40,   40,  315,   40,   40,   40,   40,   40,
+      317,   40,   40,  318,  316,   40,  325,  320,  327,  319,
+      322,  321,  326,   40,  329,   40,   40,   40,   40,   40,
+      323,  324,  328,   40,  331,  333,   40,  335,  330,  343,
+       40,   40,  336,  340,   40,  337,  334,  338,  332,   40,
+      339,   40,   40,  341,   40,   40,   40,  345,   40,   40,
+      342,   40,   40,   40,  344,  292,  292,  292,  292,  349,
+       40,  346,   40,  352,   40,  354,  347,  348,  356,  355,
+
+       40,   40,   40,   40,  351,  353,  350,  357,  358,  359,
+       40,   40,   40,  360,   40,   40,  361,   40,   40,   40,
+      362,  364,   40,   40,   40,  368,  369,   40,   40,   40,
+      363,  365,  370,   40,  367,   40,   40,  371,  366,   40,
+      372,   40,  375,  378,  377,  374,  376,   40,  379,   40,
+      373,   40,   40,   40,   40,   40,  380,   40,  381,  382,
+       40,   40,   40,  385,   40,   40,  386,  384,  390,  388,
+      391,   40,   40,   40,  383,   40,  393,   40,  387,   40,
+      389,   40,  396,   40,   40,  395,  401,  392,   40,   40,
+       40,   40,  398,   40,  394,   40,  397,  399,  400,  402,
+
+       40,   40,  410,   40,   40,  403,  404,  405,  406,  407,
+      411,  409,   40,   40,  408,   40,   40,  412,   40,   40,
+      413,  414,   40,   40,   40,  416,   40,   40,  417,   40,
+       40,  419,  415,   40,  422,  418,   40,   40,  420,   40,
+      423,   40,   40,   40,   40,   40,  421,  424,  430,   40,
+       40,  431,  425,   40,  426,   40,  429,  427,   40,  433,
+      432,   40,  435,  428,  434,   40,   40,  436,   40,   40,
+      438,  439,   40,  440,  441,  437,  443,   40,  442,   40,
+       40,  444,   40,  445,   40,   40,   40,   40,   40,  448,
+       40,   40,   40,   40,  457,  452,  454,  449,  455,   40,
+
+      446,  450,  447,  453,   40,   40,  458,  456,  451,  459,
+       40,   40,   40,   40,   40,  461,  463,  464,  460,   40,
+      462,   40,   40,   40,   40,   40,  467,   40,   40,  465,
+      471,   40,  473,   40,   40,  469,   40,   40,  470,  472,
+       40,   40,  474,  466,  468,  478,  479,  475,   40,   40,
+       40,   40,  476,   40,   40,   40,   40,  477,  482,   40,
+       40,   40,   40,  480,  486,  483,  484,  488,  485,  491,
+      481,  487,   40,  489,   40,  494,  492,  490,   40,  493,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+      501,  495,  500,  502,   40,   40,  506,   40,  497,  496,
 
-       40,  497,   40,   40,  502,   37,   37,   37,   37,   39,
-       39,   50,   40,   50,   50,   40,   40,   40,   40,   40,
+       40,   40,   40,  499,  498,  505,  507,   40,   40,   40,
+      504,   40,   40,   40,  503,  508,   37,   37,   37,   37,
+       39,   39,   50,   40,   50,   50,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,  206,   40,   40,
-       40,   40,  114,   40,   38,  503,    3,  503,  503,  503,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,  210,
 
-      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-      503,  503,  503,  503,  503,  503,  503,  503,  503,  503
+       40,   40,   40,   40,  116,   40,   38,  509,    3,  509,
+      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
+      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
+      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
+      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
+      509,  509
     } ;
 
-static yyconst short int yy_chk[1141] =
+static yyconst short int yy_chk[1153] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -705,7 +709,7 @@
        10,   10,   10,   11,   11,   11,   11,   11,   12,   62,
        20,   62,   26,   12,   13,   13,   13,   13,   13,   13,
        14,   14,   14,   14,   14,   14,   16,   20,   46,   17,
-       26,   29,  508,   46,   16,  506,   26,   20,   17,   23,
+       26,   29,  514,   46,   16,  512,   26,   20,   17,   23,
        29,   16,   17,   16,   18,   16,   13,   17,   16,   18,
 
        17,   18,   19,   21,   22,   23,   23,   19,   21,   24,
@@ -713,115 +717,117 @@
        19,   25,   24,   28,   21,   33,   25,   24,   34,   27,
        33,   27,   64,   31,   51,   28,   53,   34,   31,   25,
        36,   28,   51,   33,   53,   25,   30,   35,   35,   36,
-       30,   31,   54,   56,   31,   64,   30,   67,  111,   30,
-      111,   31,   30,   30,   56,   52,   35,   42,   42,   42,
-       42,   54,   67,   30,   30,   57,   30,   32,   52,   55,
-       52,   32,   43,   43,   43,   43,   57,   32,   44,   44,
-       44,   44,   44,   61,   32,   55,   32,   58,   32,   63,
-
-       61,   72,  226,   32,   45,   45,   45,   45,   45,   45,
-       47,   47,   47,   47,   47,   58,   78,   47,  226,   72,
-       63,   66,   78,   47,   48,   48,   48,   48,   48,   48,
-       49,   49,   49,   49,   49,   60,   49,   49,   68,   49,
-       49,   49,   49,   49,   49,   65,   66,   69,   71,   70,
-       60,   73,   65,   74,   76,   69,   70,   60,   77,   75,
-       73,   79,   68,   71,   65,   84,   92,   81,   91,   80,
-       71,   82,   70,   76,   80,   83,   74,   75,   79,   82,
-       77,   77,   81,   77,   79,   85,   80,   86,   84,   88,
-       83,   89,   86,   90,   92,   91,   93,   94,   95,   96,
-
-       85,   97,   88,   93,   89,  102,   95,   97,  103,   90,
-       98,   93,   94,   99,  101,   94,   90,   96,   94,   93,
-      104,   94,  105,   98,  102,  110,   99,  101,  108,  107,
-      110,  106,  108,  108,   99,  109,  103,  104,  101,  106,
-      105,  107,  112,  113,  106,  108,  502,  132,  109,  124,
-      109,  123,  106,  116,  116,  116,  116,  106,  117,  117,
-      117,  117,  123,  112,  113,  117,  130,  124,  126,  128,
-      132,  117,  119,  119,  119,  119,  119,  126,  135,  119,
-      131,  130,  128,  138,  139,  119,  120,  120,  134,  120,
-      120,  120,  120,  120,  136,  131,  134,  137,  138,  139,
-
-      135,  141,  137,  136,  143,  142,  144,  145,  146,  147,
-      141,  142,  149,  148,  141,  144,  145,  143,  148,  151,
-      150,  149,  152,  155,  153,  151,  154,  156,  145,  150,
-      146,  157,  147,  153,  158,  154,  156,  152,  159,  160,
-      161,  155,  162,  165,  166,  157,  159,  174,  168,  172,
-      160,  179,  173,  213,  180,  161,  174,  158,  165,  500,
-      213,  179,  177,  180,  166,  168,  162,  171,  171,  171,
-      171,  181,  172,  171,  171,  173,  171,  171,  171,  171,
-      171,  171,  175,  177,  183,  184,  186,  185,  189,  190,
-      499,  175,  181,  175,  187,  188,  191,  175,  185,  175,
-
-      184,  192,  193,  187,  188,  186,  194,  183,  195,  196,
-      192,  189,  190,  191,  198,  194,  199,  197,  200,  193,
-      202,  195,  197,  201,  205,  199,  200,  196,  201,  203,
-      498,  224,  496,  203,  202,  198,  207,  207,  207,  207,
-      223,  228,  205,  207,  224,  223,  228,  208,  208,  207,
-      208,  208,  208,  208,  209,  209,  209,  209,  210,  210,
-      210,  210,  210,  211,  211,  211,  211,  211,  212,  214,
-      215,  219,  220,  221,  225,  227,  230,  231,  219,  229,
-      232,  233,  231,  234,  236,  212,  214,  215,  233,  232,
-      227,  239,  240,  238,  241,  220,  221,  230,  229,  236,
-
-      237,  225,  238,  242,  243,  237,  234,  247,  241,  244,
-      250,  248,  239,  240,  251,  256,  254,  494,  242,  253,
-      255,  257,  243,  258,  244,  247,  248,  255,  253,  254,
-      257,  259,  258,  260,  250,  256,  262,  251,  261,  267,
-      259,  263,  264,  266,  257,  262,  258,  272,  261,  264,
-      263,  270,  266,  273,  267,  274,  260,  275,  272,  276,
-      270,  277,  275,  273,  278,  280,  279,  282,  274,  284,
-      285,  286,  286,  286,  286,  288,  276,  279,  289,  284,
-      288,  291,  277,  285,  292,  278,  289,  293,  291,  292,
-      282,  284,  280,  294,  293,  295,  296,  297,  298,  300,
-
-      299,  295,  301,  302,  304,  307,  309,  298,  308,  306,
-      302,  304,  311,  310,  294,  296,  297,  299,  306,  301,
-      307,  311,  300,  313,  308,  314,  315,  316,  317,  309,
-      310,  320,  318,  315,  314,  321,  316,  317,  329,  332,
-      313,  318,  330,  333,  338,  334,  341,  344,  339,  320,
-      342,  332,  330,  329,  334,  339,  340,  346,  321,  345,
-      347,  342,  346,  348,  340,  350,  333,  338,  352,  341,
-      344,  355,  345,  354,  353,  362,  356,  357,  350,  493,
-      348,  353,  354,  347,  361,  352,  364,  366,  361,  361,
-      367,  375,  368,  355,  356,  357,  366,  368,  362,  367,
-
-      370,  376,  364,  383,  378,  379,  389,  370,  384,  390,
-      392,  391,  375,  378,  394,  379,  383,  393,  376,  391,
-      384,  389,  398,  392,  399,  400,  401,  402,  410,  403,
-      404,  390,  408,  405,  393,  406,  402,  394,  403,  412,
-      407,  401,  492,  398,  412,  399,  411,  404,  405,  407,
-      406,  400,  413,  410,  408,  411,  414,  413,  415,  416,
-      417,  418,  420,  421,  422,  414,  416,  424,  426,  427,
-      425,  430,  418,  422,  434,  433,  447,  490,  427,  431,
-      434,  415,  424,  417,  430,  420,  421,  425,  431,  432,
-      433,  426,  436,  437,  438,  442,  432,  443,  437,  436,
-
-      442,  444,  446,  445,  448,  447,  443,  438,  445,  449,
-      450,  448,  451,  453,  452,  454,  455,  456,  446,  452,
-      454,  457,  458,  450,  444,  459,  460,  451,  453,  461,
-      455,  463,  449,  456,  459,  460,  465,  464,  466,  467,
-      457,  469,  470,  471,  472,  458,  464,  477,  474,  475,
-      469,  465,  461,  466,  467,  479,  471,  478,  475,  480,
-      463,  472,  477,  481,  478,  470,  474,  482,  479,  483,
-      484,  485,  488,  486,  487,  489,  480,  491,  497,  485,
-      486,  487,  495,  501,  481,  482,  476,  497,  473,  495,
-      468,  484,  483,  462,  491,  441,  440,  439,  489,  435,
-
-      429,  488,  428,  423,  501,  504,  504,  504,  504,  505,
-      505,  507,  419,  507,  507,  409,  397,  396,  395,  388,
-      387,  386,  385,  382,  381,  380,  377,  374,  373,  372,
-      371,  369,  365,  363,  360,  359,  358,  351,  349,  343,
-      337,  336,  335,  331,  328,  327,  326,  325,  324,  323,
-      322,  319,  312,  305,  303,  290,  287,  283,  281,  271,
-      269,  268,  265,  249,  246,  245,  235,  222,  218,  217,
-      216,  204,  182,  178,  176,  170,  169,  167,  164,  163,
-      140,  133,  129,  127,  125,  122,  118,  114,  100,   87,
-       59,   39,   37,    8,    7,    3,  503,  503,  503,  503,
-
-      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
-      503,  503,  503,  503,  503,  503,  503,  503,  503,  503
+       30,   31,   54,   56,   31,   64,   30,  508,   30,   30,
+      506,   31,   30,   30,   56,   52,   35,   42,   42,   42,
+       42,   54,   55,   30,   30,   57,   30,   32,   52,   58,
+       52,   32,   43,   43,   43,   43,   57,   32,   55,   32,
+      505,  504,   61,   73,   32,   66,   32,   58,   32,   61,
+
+       63,   68,   73,   32,   44,   44,   44,   44,   44,   45,
+       45,   45,   45,   45,   45,   47,   47,   47,   47,   47,
+       66,   63,   47,  207,  113,   68,  113,  207,   47,   48,
+       48,   48,   48,   48,   48,   49,   49,   49,   49,   49,
+       60,   49,   49,   67,   49,   49,   49,   49,   49,   49,
+       65,   69,   71,   70,   72,   60,   74,   65,   67,   69,
+       70,   76,   60,   75,   77,   78,  502,   71,   79,   65,
+       84,   78,   72,   80,   71,   82,   70,   81,   80,   74,
+       76,   75,   83,   82,   85,   79,   77,   77,   88,   77,
+       80,   79,   81,   84,   89,   86,   90,   83,   91,   85,
+
+       86,   88,   92,   93,   97,   98,   94,   89,  230,  104,
+       96,   98,   90,   94,   99,  100,   93,   95,   96,   90,
+      102,   94,   97,  103,  230,   91,  105,   99,  100,   94,
+       92,  106,   95,  102,  107,   95,  100,  104,   95,  105,
+      134,   95,  103,  108,  102,  109,  111,  114,  106,  110,
+      112,  108,  107,  110,  110,  112,  108,  109,  115,  111,
+      139,  111,  126,  134,  108,  139,  110,  125,  114,  108,
+      118,  118,  118,  118,  119,  119,  119,  119,  125,  115,
+      126,  119,  132,  130,  128,  133,  136,  119,  121,  121,
+      121,  121,  121,  128,  136,  121,  130,  132,  137,  140,
+
+      133,  121,  122,  122,  138,  122,  122,  122,  122,  122,
+      141,  144,  146,  138,  140,  143,  145,  144,  147,  148,
+      137,  146,  149,  151,  143,  141,  150,  147,  143,  145,
+      153,  150,  151,  152,  154,  155,  153,  156,  157,  147,
+      159,  148,  152,  158,  155,  149,  156,  160,  162,  154,
+      161,  163,  158,  164,  159,  168,  157,  167,  161,  162,
+      174,  170,  175,  180,  177,  183,  163,  500,  499,  498,
+      160,  176,  167,  177,  183,  168,  186,  164,  170,  173,
+      173,  173,  173,  174,  180,  173,  173,  175,  173,  173,
+      173,  173,  173,  173,  176,  178,  184,  182,  187,  186,
+
+      188,  189,  192,  193,  178,  190,  178,  182,  194,  191,
+      178,  188,  178,  187,  190,  195,  197,  184,  191,  200,
+      189,  196,  201,  199,  202,  192,  198,  201,  193,  203,
+      196,  194,  195,  197,  204,  198,  199,  200,  203,  205,
+      206,  209,  204,  216,  205,  202,  217,  218,  211,  211,
+      211,  211,  227,  217,  206,  211,  496,  227,  482,  209,
+      216,  211,  212,  212,  218,  212,  212,  212,  212,  213,
+      213,  213,  213,  214,  214,  214,  214,  214,  215,  215,
+      215,  215,  215,  219,  223,  224,  225,  229,  228,  231,
+      232,  223,  233,  235,  234,  232,  236,  238,  235,  237,
+
+      219,  228,  240,  243,  231,  236,  237,  241,  224,  225,
+      242,  233,  241,  244,  229,  234,  245,  240,  246,  242,
+      238,  247,  248,  251,  243,  252,  254,  257,  255,  259,
+      245,  260,  261,  246,  244,  262,  257,  248,  260,  247,
+      252,  251,  259,  265,  262,  263,  264,  266,  272,  279,
+      254,  255,  261,  267,  263,  264,  268,  266,  262,  279,
+      269,  271,  267,  272,  275,  268,  265,  269,  263,  278,
+      271,  280,  281,  275,  282,  283,  284,  281,  285,  286,
+      278,  288,  291,  290,  280,  292,  292,  292,  292,  285,
+      295,  282,  300,  290,  294,  291,  283,  284,  295,  294,
+
+      297,  302,  299,  298,  288,  290,  286,  297,  298,  299,
+      301,  303,  304,  300,  305,  306,  301,  307,  308,  310,
+      302,  304,  313,  312,  314,  308,  310,  315,  316,  319,
+      303,  305,  312,  317,  307,  320,  321,  313,  306,  322,
+      314,  326,  317,  321,  320,  316,  319,  323,  322,  324,
+      315,  327,  335,  336,  338,  339,  323,  344,  324,  326,
+      340,  345,  346,  336,  347,  348,  338,  335,  345,  340,
+      346,  350,  351,  353,  327,  354,  348,  352,  339,  359,
+      344,  358,  352,  361,  356,  351,  359,  347,  362,  363,
+      360,  368,  354,  372,  350,  370,  353,  356,  358,  360,
+
+      381,  373,  372,  479,  367,  361,  362,  363,  367,  367,
+      373,  370,  374,  376,  368,  382,  384,  374,  385,  390,
+      376,  381,  389,  395,  396,  384,  397,  398,  385,  400,
+      399,  390,  382,  404,  397,  389,  405,  406,  395,  408,
+      398,  407,  409,  410,  411,  414,  396,  399,  408,  412,
+      416,  409,  400,  413,  404,  421,  407,  405,  423,  411,
+      410,  417,  413,  406,  412,  420,  418,  414,  419,  422,
+      417,  418,  424,  419,  420,  416,  422,  426,  421,  427,
+      428,  423,  430,  424,  431,  432,  433,  437,  440,  428,
+      436,  438,  439,  450,  440,  433,  437,  430,  438,  442,
+
+      426,  431,  427,  436,  443,  444,  442,  439,  432,  443,
+      448,  449,  451,  452,  453,  448,  450,  451,  444,  454,
+      449,  455,  456,  457,  459,  458,  454,  460,  461,  452,
+      458,  462,  460,  463,  464,  456,  465,  466,  457,  459,
+      467,  469,  461,  453,  455,  465,  466,  462,  476,  470,
+      471,  472,  463,  473,  477,  475,  478,  464,  470,  480,
+      481,  483,  485,  467,  475,  471,  472,  477,  473,  481,
+      469,  476,  484,  478,  486,  485,  483,  480,  487,  484,
+      488,  489,  490,  492,  491,  494,  493,  495,  497,  501,
+      492,  486,  491,  493,  507,  474,  501,  503,  488,  487,
+
+      468,  447,  446,  490,  489,  497,  503,  445,  441,  435,
+      495,  434,  429,  425,  494,  507,  510,  510,  510,  510,
+      511,  511,  513,  415,  513,  513,  403,  402,  401,  394,
+      393,  392,  391,  388,  387,  386,  383,  380,  379,  378,
+      377,  375,  371,  369,  366,  365,  364,  357,  355,  349,
+      343,  342,  341,  337,  334,  333,  332,  331,  330,  329,
+      328,  325,  318,  311,  309,  296,  293,  289,  287,  277,
+      276,  274,  273,  270,  258,  253,  250,  249,  239,  226,
+      222,  221,  220,  208,  185,  181,  179,  172,  171,  169,
+      166,  165,  142,  135,  131,  129,  127,  124,  120,  116,
+
+      101,   87,   59,   39,   37,    8,    7,    3,  509,  509,
+      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
+      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
+      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
+      509,  509,  509,  509,  509,  509,  509,  509,  509,  509,
+      509,  509
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -838,7 +844,7 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 1 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 #define INITIAL 0
 /*===-- Lexer.l - Scanner for llvm assembly files --------------*- C++ -*--===//
 //
@@ -853,7 +859,7 @@
 //
 //===----------------------------------------------------------------------===*/
 #define YY_NEVER_INTERACTIVE 1
-#line 28 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 28 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -868,8 +874,18 @@
   yy_scan_string (str);
 }
 
+// Construct a token value for a non-obsolete token
 #define RET_TOK(type, Enum, sym) \
-  llvmAsmlval.type = Instruction::Enum; return sym
+  llvmAsmlval.type.opcode = Instruction::Enum; \
+  llvmAsmlval.type.obsolete = false; \
+  return sym
+
+// Construct a token value for an obsolete token
+#define RET_TOK_OBSOLETE(type, Enum, sym) \
+  llvmAsmlval.type.opcode = Instruction::Enum; \
+  llvmAsmlval.type.obsolete = true; \
+  return sym
+
 
 namespace llvm {
 
@@ -979,7 +995,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 983 "Lexer.cpp"
+#line 999 "Lexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1130,10 +1146,10 @@
 	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
-#line 179 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 189 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 
 
-#line 1137 "Lexer.cpp"
+#line 1153 "Lexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1181,14 +1197,14 @@
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 504 )
+				if ( yy_current_state >= 510 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			*yy_state_ptr++ = yy_current_state;
 			++yy_cp;
 			}
-		while ( yy_current_state != 503 );
+		while ( yy_current_state != 509 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1226,516 +1242,526 @@
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 181 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 191 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 183 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 193 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 184 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 194 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 185 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 195 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 186 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 196 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 187 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 197 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 188 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 198 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 189 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 199 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 190 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 200 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 191 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 201 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 192 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 202 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return WEAK; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 193 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 203 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 194 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 204 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 195 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 205 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 196 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 206 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return EXTERN_WEAK; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 197 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 207 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }    /* Deprecated, turn into external */
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 198 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 208 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 199 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 209 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return IMPLEMENTATION; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 200 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 210 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return ZEROINITIALIZER; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 201 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 211 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return DOTDOTDOT; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 202 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 212 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return UNDEF; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 203 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 213 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return NULL_TOK; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 204 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 214 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return TO; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 205 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 215 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 206 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 216 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return NOT; }  /* Deprecated, turned into XOR */
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 207 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 217 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return TAIL; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 208 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 218 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return TARGET; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 209 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 219 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return TRIPLE; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 210 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 220 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return DEPLIBS; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 211 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 221 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return ENDIAN; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 212 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 222 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return POINTERSIZE; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 213 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 223 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return DATA; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 214 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 224 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return LITTLE; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 215 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 225 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return BIG; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 216 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 226 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return VOLATILE; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 217 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 227 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return ALIGN;  }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 218 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 228 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return SECTION; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 219 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 229 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return MODULE; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 220 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 230 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return ASM_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 221 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 231 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return SIDEEFFECT; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 223 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 233 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return CC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 224 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 234 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return CCC_TOK; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 225 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 235 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return CSRETCC_TOK; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 226 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 236 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return FASTCC_TOK; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 227 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 237 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return COLDCC_TOK; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 228 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 238 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 229 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 239 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 231 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 241 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::VoidTy  ; return VOID;   }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 232 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 242 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::BoolTy  ; return BOOL;   }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 233 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 243 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::SByteTy ; return SBYTE;  }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 234 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 244 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::UByteTy ; return UBYTE;  }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 235 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 245 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::ShortTy ; return SHORT;  }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 236 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 246 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::UShortTy; return USHORT; }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 237 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 247 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::IntTy   ; return INT;    }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 238 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 248 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::UIntTy  ; return UINT;   }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 239 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 249 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::LongTy  ; return LONG;   }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 240 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 250 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::ULongTy ; return ULONG;  }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 241 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 251 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::FloatTy ; return FLOAT;  }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 242 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 252 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::DoubleTy; return DOUBLE; }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 243 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 253 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::LabelTy ; return LABEL;  }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 244 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 254 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return TYPE;   }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 245 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 255 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return OPAQUE; }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 247 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 257 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Add, ADD); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 248 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 258 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 249 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 259 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 250 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Div, DIV); }
+#line 260 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK_OBSOLETE(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 251 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Rem, REM); }
+#line 261 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 252 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, And, AND); }
+#line 262 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 253 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Or , OR ); }
+#line 263 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Rem, REM); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 254 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Xor, XOR); }
+#line 264 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 255 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetNE, SETNE); }
+#line 265 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 256 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetEQ, SETEQ); }
+#line 266 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 257 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetLT, SETLT); }
+#line 267 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetNE, SETNE); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 258 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetGT, SETGT); }
+#line 268 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetEQ, SETEQ); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 259 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetLE, SETLE); }
+#line 269 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetLT, SETLT); }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 260 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetGE, SETGE); }
+#line 270 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetGT, SETGT); }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 262 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
+#line 271 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetLE, SETLE); }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 263 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Call, CALL); }
+#line 272 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetGE, SETGE); }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 264 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Cast, CAST); }
+#line 274 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 265 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Select, SELECT); }
+#line 275 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 266 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Shl, SHL); }
+#line 276 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Cast, CAST); }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 267 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Shr, SHR); }
+#line 277 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 268 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return VANEXT_old; }
+#line 278 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Shl, SHL); }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 269 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ return VAARG_old; }
+#line 279 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Shr, SHR); }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 270 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, VAArg , VAARG); }
+#line 280 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ return VANEXT_old; }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 271 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Ret, RET); }
+#line 281 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ return VAARG_old; }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 272 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Br, BR); }
+#line 282 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 273 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Switch, SWITCH); }
+#line 283 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 274 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Invoke, INVOKE); }
+#line 284 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 275 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unwind, UNWIND); }
+#line 285 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 276 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
+#line 286 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 278 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Malloc, MALLOC); }
+#line 287 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 279 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
+#line 288 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 280 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Free, FREE); }
+#line 290 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 281 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Load, LOAD); }
+#line 291 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 282 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Store, STORE); }
+#line 292 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 283 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
+#line 293 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 285 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
+#line 294 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 286 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
+#line 295 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 287 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+#line 297 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 290 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 298 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
+	YY_BREAK
+case 102:
+YY_RULE_SETUP
+#line 299 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+	YY_BREAK
+case 103:
+YY_RULE_SETUP
+#line 302 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 {
                   UnEscapeLexed(yytext+1);
                   llvmAsmlval.StrVal = strdup(yytext+1);             // Skip %
                   return VAR_ID;
                 }
 	YY_BREAK
-case 102:
+case 104:
 YY_RULE_SETUP
-#line 295 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 307 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-1] = 0;  // nuke colon
                   UnEscapeLexed(yytext);
@@ -1743,9 +1769,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 103:
+case 105:
 YY_RULE_SETUP
-#line 301 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 313 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-2] = 0;  // nuke colon, end quote
                   UnEscapeLexed(yytext+1);
@@ -1753,9 +1779,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 104:
+case 106:
 YY_RULE_SETUP
-#line 308 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 320 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { // Note that we cannot unescape a string constant here!  The
                    // string constant might contain a \00 which would not be
                    // understood by the string stuff.  It is valid to make a
@@ -1766,14 +1792,14 @@
                    return STRINGCONSTANT;
                  }
 	YY_BREAK
-case 105:
+case 107:
 YY_RULE_SETUP
-#line 319 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 331 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { llvmAsmlval.UInt64Val = atoull(yytext); return EUINT64VAL; }
 	YY_BREAK
-case 106:
+case 108:
 YY_RULE_SETUP
-#line 320 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 332 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   // +1:  we have bigger negative range
@@ -1783,17 +1809,17 @@
                   return ESINT64VAL;
                 }
 	YY_BREAK
-case 107:
+case 109:
 YY_RULE_SETUP
-#line 328 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 340 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 {
                    llvmAsmlval.UInt64Val = HexIntToVal(yytext+3);
                    return yytext[0] == 's' ? ESINT64VAL : EUINT64VAL;
                  }
 	YY_BREAK
-case 108:
+case 110:
 YY_RULE_SETUP
-#line 333 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 345 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -1802,9 +1828,9 @@
                   return UINTVAL;
                 }
 	YY_BREAK
-case 109:
+case 111:
 YY_RULE_SETUP
-#line 340 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 352 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+2);
                   // +1:  we have bigger negative range
@@ -1814,18 +1840,18 @@
                   return SINTVAL;
                 }
 	YY_BREAK
-case 110:
+case 112:
 YY_RULE_SETUP
-#line 349 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 361 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
 	YY_BREAK
-case 111:
+case 113:
 YY_RULE_SETUP
-#line 350 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 362 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 352 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 364 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -1834,22 +1860,22 @@
                   return EOF;
                 }
 	YY_BREAK
-case 112:
+case 114:
 YY_RULE_SETUP
-#line 360 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 372 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 113:
+case 115:
 YY_RULE_SETUP
-#line 361 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 373 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 { return yytext[0]; }
 	YY_BREAK
-case 114:
+case 116:
 YY_RULE_SETUP
-#line 363 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 375 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1853 "Lexer.cpp"
+#line 1879 "Lexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2136,7 +2162,7 @@
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 504 )
+			if ( yy_current_state >= 510 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2166,11 +2192,11 @@
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 504 )
+		if ( yy_current_state >= 510 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 503);
+	yy_is_jam = (yy_current_state == 509);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2727,5 +2753,5 @@
 	return 0;
 	}
 #endif
-#line 363 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+#line 375 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
 


Index: llvm/lib/AsmParser/Lexer.l
diff -u llvm/lib/AsmParser/Lexer.l:1.78.2.2 llvm/lib/AsmParser/Lexer.l:1.78.2.3
--- llvm/lib/AsmParser/Lexer.l:1.78.2.2	Thu Oct 19 19:34:43 2006
+++ llvm/lib/AsmParser/Lexer.l	Thu Oct 19 23:27:17 2006
@@ -39,8 +39,18 @@
   yy_scan_string (str);
 }
 
+// Construct a token value for a non-obsolete token
 #define RET_TOK(type, Enum, sym) \
-  llvmAsmlval.type = Instruction::Enum; return sym
+  llvmAsmlval.type.opcode = Instruction::Enum; \
+  llvmAsmlval.type.obsolete = false; \
+  return sym
+
+// Construct a token value for an obsolete token
+#define RET_TOK_OBSOLETE(type, Enum, sym) \
+  llvmAsmlval.type.opcode = Instruction::Enum; \
+  llvmAsmlval.type.obsolete = true; \
+  return sym
+
 
 namespace llvm {
 
@@ -247,7 +257,9 @@
 add             { RET_TOK(BinaryOpVal, Add, ADD); }
 sub             { RET_TOK(BinaryOpVal, Sub, SUB); }
 mul             { RET_TOK(BinaryOpVal, Mul, MUL); }
-div             { RET_TOK(BinaryOpVal, Div, DIV); }
+div             { RET_TOK_OBSOLETE(BinaryOpVal, UDiv, UDIV); }
+udiv            { RET_TOK(BinaryOpVal, UDiv, UDIV); }
+sdiv            { RET_TOK(BinaryOpVal, UDiv, UDIV); }
 rem             { RET_TOK(BinaryOpVal, Rem, REM); }
 and             { RET_TOK(BinaryOpVal, And, AND); }
 or              { RET_TOK(BinaryOpVal, Or , OR ); }


Index: llvm/lib/AsmParser/Lexer.l.cvs
diff -u llvm/lib/AsmParser/Lexer.l.cvs:1.8.2.2 llvm/lib/AsmParser/Lexer.l.cvs:1.8.2.3
--- llvm/lib/AsmParser/Lexer.l.cvs:1.8.2.2	Thu Oct 19 19:34:43 2006
+++ llvm/lib/AsmParser/Lexer.l.cvs	Thu Oct 19 23:27:17 2006
@@ -39,8 +39,18 @@
   yy_scan_string (str);
 }
 
+// Construct a token value for a non-obsolete token
 #define RET_TOK(type, Enum, sym) \
-  llvmAsmlval.type = Instruction::Enum; return sym
+  llvmAsmlval.type.opcode = Instruction::Enum; \
+  llvmAsmlval.type.obsolete = false; \
+  return sym
+
+// Construct a token value for an obsolete token
+#define RET_TOK_OBSOLETE(type, Enum, sym) \
+  llvmAsmlval.type.opcode = Instruction::Enum; \
+  llvmAsmlval.type.obsolete = true; \
+  return sym
+
 
 namespace llvm {
 
@@ -247,7 +257,9 @@
 add             { RET_TOK(BinaryOpVal, Add, ADD); }
 sub             { RET_TOK(BinaryOpVal, Sub, SUB); }
 mul             { RET_TOK(BinaryOpVal, Mul, MUL); }
-div             { RET_TOK(BinaryOpVal, Div, DIV); }
+div             { RET_TOK_OBSOLETE(BinaryOpVal, UDiv, UDIV); }
+udiv            { RET_TOK(BinaryOpVal, UDiv, UDIV); }
+sdiv            { RET_TOK(BinaryOpVal, UDiv, UDIV); }
 rem             { RET_TOK(BinaryOpVal, Rem, REM); }
 and             { RET_TOK(BinaryOpVal, And, AND); }
 or              { RET_TOK(BinaryOpVal, Or , OR ); }


Index: llvm/lib/AsmParser/ParserInternals.h
diff -u llvm/lib/AsmParser/ParserInternals.h:1.45.2.2 llvm/lib/AsmParser/ParserInternals.h:1.45.2.3
--- llvm/lib/AsmParser/ParserInternals.h:1.45.2.2	Thu Oct 19 19:34:43 2006
+++ llvm/lib/AsmParser/ParserInternals.h	Thu Oct 19 23:27:17 2006
@@ -201,4 +201,20 @@
 
 } // End llvm namespace
 
+// This structure is used to keep track of obsolete opcodes. The lexer will
+// retain the ability to parse obsolete opcode mnemonics. In this case it will
+// set "obsolete" to true and the opcode will be the replacement opcode. For
+// example if "rem" is encountered then opcode will be set to "urem" and the
+// "obsolete" flag will be true. If the opcode is not obsolete then "obsolete"
+// will be false. 
+template <class Enum> 
+struct OpcodeInfo {
+  Enum opcode;
+  bool obsolete;
+};
+typedef OpcodeInfo<llvm::Instruction::BinaryOps>  BinaryOpInfo;
+typedef OpcodeInfo<llvm::Instruction::TermOps>    TermOpInfo;
+typedef OpcodeInfo<llvm::Instruction::MemoryOps>  MemOpInfo;
+typedef OpcodeInfo<llvm::Instruction::OtherOps>   OtherOpInfo;
+
 #endif


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.18.2.3 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.18.2.4
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.18.2.3	Thu Oct 19 19:34:43 2006
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Thu Oct 19 23:27:17 2006
@@ -142,34 +142,35 @@
      ADD = 333,
      SUB = 334,
      MUL = 335,
-     DIV = 336,
-     REM = 337,
-     AND = 338,
-     OR = 339,
-     XOR = 340,
-     SETLE = 341,
-     SETGE = 342,
-     SETLT = 343,
-     SETGT = 344,
-     SETEQ = 345,
-     SETNE = 346,
-     MALLOC = 347,
-     ALLOCA = 348,
-     FREE = 349,
-     LOAD = 350,
-     STORE = 351,
-     GETELEMENTPTR = 352,
-     PHI_TOK = 353,
-     CAST = 354,
-     SELECT = 355,
-     SHL = 356,
-     SHR = 357,
-     VAARG = 358,
-     EXTRACTELEMENT = 359,
-     INSERTELEMENT = 360,
-     SHUFFLEVECTOR = 361,
-     VAARG_old = 362,
-     VANEXT_old = 363
+     UDIV = 336,
+     SDIV = 337,
+     REM = 338,
+     AND = 339,
+     OR = 340,
+     XOR = 341,
+     SETLE = 342,
+     SETGE = 343,
+     SETLT = 344,
+     SETGT = 345,
+     SETEQ = 346,
+     SETNE = 347,
+     MALLOC = 348,
+     ALLOCA = 349,
+     FREE = 350,
+     LOAD = 351,
+     STORE = 352,
+     GETELEMENTPTR = 353,
+     PHI_TOK = 354,
+     CAST = 355,
+     SELECT = 356,
+     SHL = 357,
+     SHR = 358,
+     VAARG = 359,
+     EXTRACTELEMENT = 360,
+     INSERTELEMENT = 361,
+     SHUFFLEVECTOR = 362,
+     VAARG_old = 363,
+     VANEXT_old = 364
    };
 #endif
 /* Tokens.  */
@@ -251,40 +252,41 @@
 #define ADD 333
 #define SUB 334
 #define MUL 335
-#define DIV 336
-#define REM 337
-#define AND 338
-#define OR 339
-#define XOR 340
-#define SETLE 341
-#define SETGE 342
-#define SETLT 343
-#define SETGT 344
-#define SETEQ 345
-#define SETNE 346
-#define MALLOC 347
-#define ALLOCA 348
-#define FREE 349
-#define LOAD 350
-#define STORE 351
-#define GETELEMENTPTR 352
-#define PHI_TOK 353
-#define CAST 354
-#define SELECT 355
-#define SHL 356
-#define SHR 357
-#define VAARG 358
-#define EXTRACTELEMENT 359
-#define INSERTELEMENT 360
-#define SHUFFLEVECTOR 361
-#define VAARG_old 362
-#define VANEXT_old 363
+#define UDIV 336
+#define SDIV 337
+#define REM 338
+#define AND 339
+#define OR 340
+#define XOR 341
+#define SETLE 342
+#define SETGE 343
+#define SETLT 344
+#define SETGT 345
+#define SETEQ 346
+#define SETNE 347
+#define MALLOC 348
+#define ALLOCA 349
+#define FREE 350
+#define LOAD 351
+#define STORE 352
+#define GETELEMENTPTR 353
+#define PHI_TOK 354
+#define CAST 355
+#define SELECT 356
+#define SHL 357
+#define SHR 358
+#define VAARG 359
+#define EXTRACTELEMENT 360
+#define INSERTELEMENT 361
+#define SHUFFLEVECTOR 362
+#define VAARG_old 363
+#define VANEXT_old 364
 
 
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1087,6 +1089,23 @@
   return Ty;
 }
 
+// This function is
+template <class EnumKind>
+static void sanitizeOpCode(OpcodeInfo<EnumKind> &OI, const PATypeHolder& Ty) {
+  if (OI.obsolete) {
+    switch (OI.opcode) {
+      default:
+        GenerateError("Invalid Obsolete OpCode");
+        break;
+      case Instruction::UDiv:
+        if (Ty->isSigned())
+          OI.opcode = Instruction::SDiv;
+        break;
+    }
+    OI.obsolete = false;
+  }
+}
+
 
 // common code from the two 'RunVMAsmParser' functions
 static Module* RunParser(Module * M) {
@@ -1264,7 +1283,7 @@
 #endif
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 974 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 991 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
 typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -1298,14 +1317,14 @@
   char                             *StrVal;   // This memory is strdup'd!
   llvm::ValID                             ValIDVal; // strdup'd memory maybe!
 
-  llvm::Instruction::BinaryOps            BinaryOpVal;
-  llvm::Instruction::TermOps              TermOpVal;
-  llvm::Instruction::MemoryOps            MemOpVal;
-  llvm::Instruction::OtherOps             OtherOpVal;
-  llvm::Module::Endianness                Endianness;
+  BinaryOpInfo  BinaryOpVal;
+  TermOpInfo    TermOpVal;
+  MemOpInfo     MemOpVal;
+  OtherOpInfo   OtherOpVal;
+  llvm::Module::Endianness                  Endianness;
 } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 1309 "llvmAsmParser.tab.c"
+#line 1328 "llvmAsmParser.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -1317,7 +1336,7 @@
 
 
 /* Line 219 of yacc.c.  */
-#line 1321 "llvmAsmParser.tab.c"
+#line 1340 "llvmAsmParser.tab.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -1468,20 +1487,20 @@
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  4
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1339
+#define YYLAST   1301
 
 /* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  123
+#define YYNTOKENS  124
 /* YYNNTS -- Number of nonterminals. */
 #define YYNNTS  75
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  252
+#define YYNRULES  253
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  517
+#define YYNSTATES  518
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   363
+#define YYMAXUTOK   364
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -1493,15 +1512,15 @@
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     112,   113,   121,     2,   110,     2,     2,     2,     2,     2,
+     113,   114,   122,     2,   111,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     117,   109,   118,     2,     2,     2,     2,     2,     2,     2,
+     118,   110,   119,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   114,   111,   116,     2,     2,     2,     2,     2,   122,
+       2,   115,   112,   117,     2,     2,     2,     2,     2,   123,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     115,     2,     2,   119,     2,   120,     2,     2,     2,     2,
+     116,     2,     2,   120,     2,   121,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1525,7 +1544,7 @@
       75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108
+     105,   106,   107,   108,   109
 };
 
 #if YYDEBUG
@@ -1536,147 +1555,148 @@
        0,     0,     3,     5,     7,     9,    11,    13,    15,    17,
       19,    21,    23,    25,    27,    29,    31,    33,    35,    37,
       39,    41,    43,    45,    47,    49,    51,    53,    55,    57,
-      59,    61,    63,    65,    67,    70,    71,    73,    75,    77,
-      79,    81,    83,    85,    86,    87,    89,    91,    93,    95,
-      97,    99,   102,   103,   106,   107,   111,   114,   115,   117,
-     118,   122,   124,   127,   129,   131,   133,   135,   137,   139,
+      59,    61,    63,    65,    67,    69,    72,    73,    75,    77,
+      79,    81,    83,    85,    87,    88,    89,    91,    93,    95,
+      97,    99,   101,   104,   105,   108,   109,   113,   116,   117,
+     119,   120,   124,   126,   129,   131,   133,   135,   137,   139,
      141,   143,   145,   147,   149,   151,   153,   155,   157,   159,
-     161,   163,   165,   167,   169,   172,   177,   183,   189,   193,
-     196,   199,   201,   205,   207,   211,   213,   214,   219,   223,
-     227,   232,   237,   241,   244,   247,   250,   253,   256,   259,
-     262,   265,   268,   271,   278,   284,   293,   300,   307,   314,
-     321,   328,   337,   346,   350,   352,   354,   356,   358,   361,
-     364,   369,   372,   374,   379,   382,   387,   388,   396,   397,
-     405,   406,   414,   415,   423,   427,   432,   433,   435,   437,
-     439,   443,   447,   451,   455,   459,   463,   465,   466,   468,
-     470,   472,   473,   476,   480,   482,   484,   488,   490,   491,
-     500,   502,   504,   508,   510,   512,   515,   516,   518,   520,
-     521,   526,   527,   529,   531,   533,   535,   537,   539,   541,
-     543,   545,   549,   551,   557,   559,   561,   563,   565,   568,
-     571,   574,   578,   581,   582,   584,   587,   590,   594,   604,
-     614,   623,   637,   639,   641,   648,   654,   657,   664,   672,
-     674,   678,   680,   681,   684,   686,   692,   698,   704,   707,
-     712,   717,   724,   729,   734,   739,   744,   751,   758,   761,
-     769,   771,   774,   775,   777,   778,   782,   789,   793,   800,
-     803,   808,   815
+     161,   163,   165,   167,   169,   171,   174,   179,   185,   191,
+     195,   198,   201,   203,   207,   209,   213,   215,   216,   221,
+     225,   229,   234,   239,   243,   246,   249,   252,   255,   258,
+     261,   264,   267,   270,   273,   280,   286,   295,   302,   309,
+     316,   323,   330,   339,   348,   352,   354,   356,   358,   360,
+     363,   366,   371,   374,   376,   381,   384,   389,   390,   398,
+     399,   407,   408,   416,   417,   425,   429,   434,   435,   437,
+     439,   441,   445,   449,   453,   457,   461,   465,   467,   468,
+     470,   472,   474,   475,   478,   482,   484,   486,   490,   492,
+     493,   502,   504,   506,   510,   512,   514,   517,   518,   520,
+     522,   523,   528,   529,   531,   533,   535,   537,   539,   541,
+     543,   545,   547,   551,   553,   559,   561,   563,   565,   567,
+     570,   573,   576,   580,   583,   584,   586,   589,   592,   596,
+     606,   616,   625,   639,   641,   643,   650,   656,   659,   666,
+     674,   676,   680,   682,   683,   686,   688,   694,   700,   706,
+     709,   714,   719,   726,   731,   736,   741,   746,   753,   760,
+     763,   771,   773,   776,   777,   779,   780,   784,   791,   795,
+     802,   805,   810,   817
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 static const short int yyrhs[] =
 {
-     154,     0,    -1,     5,    -1,     6,    -1,     3,    -1,     4,
+     155,     0,    -1,     5,    -1,     6,    -1,     3,    -1,     4,
       -1,    78,    -1,    79,    -1,    80,    -1,    81,    -1,    82,
       -1,    83,    -1,    84,    -1,    85,    -1,    86,    -1,    87,
-      -1,    88,    -1,    89,    -1,    90,    -1,    91,    -1,   101,
-      -1,   102,    -1,    16,    -1,    14,    -1,    12,    -1,    10,
-      -1,    17,    -1,    15,    -1,    13,    -1,    11,    -1,   130,
-      -1,   131,    -1,    18,    -1,    19,    -1,   166,   109,    -1,
-      -1,    41,    -1,    42,    -1,    43,    -1,    44,    -1,    45,
-      -1,    46,    -1,    47,    -1,    -1,    -1,    65,    -1,    66,
-      -1,    67,    -1,    68,    -1,    69,    -1,    70,    -1,    64,
-       4,    -1,    -1,    57,     4,    -1,    -1,   110,    57,     4,
-      -1,    34,    24,    -1,    -1,   139,    -1,    -1,   110,   142,
-     141,    -1,   139,    -1,    57,     4,    -1,   145,    -1,     8,
-      -1,   147,    -1,     8,    -1,   147,    -1,     9,    -1,    10,
-      -1,    11,    -1,    12,    -1,    13,    -1,    14,    -1,    15,
-      -1,    16,    -1,    17,    -1,    18,    -1,    19,    -1,    20,
-      -1,    21,    -1,    48,    -1,   146,    -1,   181,    -1,   111,
-       4,    -1,   144,   112,   149,   113,    -1,   114,     4,   115,
-     147,   116,    -1,   117,     4,   115,   147,   118,    -1,   119,
-     148,   120,    -1,   119,   120,    -1,   147,   121,    -1,   147,
-      -1,   148,   110,   147,    -1,   148,    -1,   148,   110,    37,
-      -1,    37,    -1,    -1,   145,   114,   152,   116,    -1,   145,
-     114,   116,    -1,   145,   122,    24,    -1,   145,   117,   152,
-     118,    -1,   145,   119,   152,   120,    -1,   145,   119,   120,
-      -1,   145,    38,    -1,   145,    39,    -1,   145,   181,    -1,
-     145,   151,    -1,   145,    26,    -1,   130,   125,    -1,   131,
-       4,    -1,     9,    27,    -1,     9,    28,    -1,   133,     7,
-      -1,    99,   112,   150,    36,   145,   113,    -1,    97,   112,
-     150,   195,   113,    -1,   100,   112,   150,   110,   150,   110,
-     150,   113,    -1,   126,   112,   150,   110,   150,   113,    -1,
-     127,   112,   150,   110,   150,   113,    -1,   128,   112,   150,
-     110,   150,   113,    -1,   129,   112,   150,   110,   150,   113,
-      -1,   104,   112,   150,   110,   150,   113,    -1,   105,   112,
-     150,   110,   150,   110,   150,   113,    -1,   106,   112,   150,
-     110,   150,   110,   150,   113,    -1,   152,   110,   150,    -1,
-     150,    -1,    32,    -1,    33,    -1,   155,    -1,   155,   175,
-      -1,   155,   177,    -1,   155,    62,    61,   161,    -1,   155,
-      25,    -1,   156,    -1,   156,   134,    20,   143,    -1,   156,
-     177,    -1,   156,    62,    61,   161,    -1,    -1,   156,   134,
-     135,   153,   150,   157,   141,    -1,    -1,   156,   134,    50,
-     153,   145,   158,   141,    -1,    -1,   156,   134,    45,   153,
-     145,   159,   141,    -1,    -1,   156,   134,    47,   153,   145,
-     160,   141,    -1,   156,    51,   163,    -1,   156,    58,   109,
-     164,    -1,    -1,    24,    -1,    56,    -1,    55,    -1,    53,
-     109,   162,    -1,    54,   109,     4,    -1,    52,   109,    24,
-      -1,    71,   109,    24,    -1,   114,   165,   116,    -1,   165,
-     110,    24,    -1,    24,    -1,    -1,    22,    -1,    24,    -1,
-     166,    -1,    -1,   145,   167,    -1,   169,   110,   168,    -1,
-     168,    -1,   169,    -1,   169,   110,    37,    -1,    37,    -1,
-      -1,   136,   143,   166,   112,   170,   113,   140,   137,    -1,
-      29,    -1,   119,    -1,   135,   171,   172,    -1,    30,    -1,
-     120,    -1,   184,   174,    -1,    -1,    45,    -1,    47,    -1,
-      -1,    31,   178,   176,   171,    -1,    -1,    63,    -1,     3,
-      -1,     4,    -1,     7,    -1,    27,    -1,    28,    -1,    38,
-      -1,    39,    -1,    26,    -1,   117,   152,   118,    -1,   151,
-      -1,    61,   179,    24,   110,    24,    -1,   124,    -1,   166,
-      -1,   181,    -1,   180,    -1,   145,   182,    -1,   184,   185,
-      -1,   173,   185,    -1,   186,   134,   187,    -1,   186,   189,
-      -1,    -1,    23,    -1,    72,   183,    -1,    72,     8,    -1,
-      73,    21,   182,    -1,    73,     9,   182,   110,    21,   182,
-     110,    21,   182,    -1,    74,   132,   182,   110,    21,   182,
-     114,   188,   116,    -1,    74,   132,   182,   110,    21,   182,
-     114,   116,    -1,    75,   136,   143,   182,   112,   192,   113,
-      36,    21,   182,    76,    21,   182,    -1,    76,    -1,    77,
-      -1,   188,   132,   180,   110,    21,   182,    -1,   132,   180,
-     110,    21,   182,    -1,   134,   194,    -1,   145,   114,   182,
-     110,   182,   116,    -1,   190,   110,   114,   182,   110,   182,
-     116,    -1,   183,    -1,   191,   110,   183,    -1,   191,    -1,
-      -1,    60,    59,    -1,    59,    -1,   126,   145,   182,   110,
-     182,    -1,   127,   145,   182,   110,   182,    -1,   128,   145,
-     182,   110,   182,    -1,    49,   183,    -1,   129,   183,   110,
-     183,    -1,    99,   183,    36,   145,    -1,   100,   183,   110,
-     183,   110,   183,    -1,   103,   183,   110,   145,    -1,   107,
-     183,   110,   145,    -1,   108,   183,   110,   145,    -1,   104,
-     183,   110,   183,    -1,   105,   183,   110,   183,   110,   183,
-      -1,   106,   183,   110,   183,   110,   183,    -1,    98,   190,
-      -1,   193,   136,   143,   182,   112,   192,   113,    -1,   197,
-      -1,   110,   191,    -1,    -1,    35,    -1,    -1,    92,   145,
-     138,    -1,    92,   145,   110,    15,   182,   138,    -1,    93,
-     145,   138,    -1,    93,   145,   110,    15,   182,   138,    -1,
-      94,   183,    -1,   196,    95,   145,   182,    -1,   196,    96,
-     183,   110,   145,   182,    -1,    97,   145,   182,   195,    -1
+      -1,    88,    -1,    89,    -1,    90,    -1,    91,    -1,    92,
+      -1,   102,    -1,   103,    -1,    16,    -1,    14,    -1,    12,
+      -1,    10,    -1,    17,    -1,    15,    -1,    13,    -1,    11,
+      -1,   131,    -1,   132,    -1,    18,    -1,    19,    -1,   167,
+     110,    -1,    -1,    41,    -1,    42,    -1,    43,    -1,    44,
+      -1,    45,    -1,    46,    -1,    47,    -1,    -1,    -1,    65,
+      -1,    66,    -1,    67,    -1,    68,    -1,    69,    -1,    70,
+      -1,    64,     4,    -1,    -1,    57,     4,    -1,    -1,   111,
+      57,     4,    -1,    34,    24,    -1,    -1,   140,    -1,    -1,
+     111,   143,   142,    -1,   140,    -1,    57,     4,    -1,   146,
+      -1,     8,    -1,   148,    -1,     8,    -1,   148,    -1,     9,
+      -1,    10,    -1,    11,    -1,    12,    -1,    13,    -1,    14,
+      -1,    15,    -1,    16,    -1,    17,    -1,    18,    -1,    19,
+      -1,    20,    -1,    21,    -1,    48,    -1,   147,    -1,   182,
+      -1,   112,     4,    -1,   145,   113,   150,   114,    -1,   115,
+       4,   116,   148,   117,    -1,   118,     4,   116,   148,   119,
+      -1,   120,   149,   121,    -1,   120,   121,    -1,   148,   122,
+      -1,   148,    -1,   149,   111,   148,    -1,   149,    -1,   149,
+     111,    37,    -1,    37,    -1,    -1,   146,   115,   153,   117,
+      -1,   146,   115,   117,    -1,   146,   123,    24,    -1,   146,
+     118,   153,   119,    -1,   146,   120,   153,   121,    -1,   146,
+     120,   121,    -1,   146,    38,    -1,   146,    39,    -1,   146,
+     182,    -1,   146,   152,    -1,   146,    26,    -1,   131,   126,
+      -1,   132,     4,    -1,     9,    27,    -1,     9,    28,    -1,
+     134,     7,    -1,   100,   113,   151,    36,   146,   114,    -1,
+      98,   113,   151,   196,   114,    -1,   101,   113,   151,   111,
+     151,   111,   151,   114,    -1,   127,   113,   151,   111,   151,
+     114,    -1,   128,   113,   151,   111,   151,   114,    -1,   129,
+     113,   151,   111,   151,   114,    -1,   130,   113,   151,   111,
+     151,   114,    -1,   105,   113,   151,   111,   151,   114,    -1,
+     106,   113,   151,   111,   151,   111,   151,   114,    -1,   107,
+     113,   151,   111,   151,   111,   151,   114,    -1,   153,   111,
+     151,    -1,   151,    -1,    32,    -1,    33,    -1,   156,    -1,
+     156,   176,    -1,   156,   178,    -1,   156,    62,    61,   162,
+      -1,   156,    25,    -1,   157,    -1,   157,   135,    20,   144,
+      -1,   157,   178,    -1,   157,    62,    61,   162,    -1,    -1,
+     157,   135,   136,   154,   151,   158,   142,    -1,    -1,   157,
+     135,    50,   154,   146,   159,   142,    -1,    -1,   157,   135,
+      45,   154,   146,   160,   142,    -1,    -1,   157,   135,    47,
+     154,   146,   161,   142,    -1,   157,    51,   164,    -1,   157,
+      58,   110,   165,    -1,    -1,    24,    -1,    56,    -1,    55,
+      -1,    53,   110,   163,    -1,    54,   110,     4,    -1,    52,
+     110,    24,    -1,    71,   110,    24,    -1,   115,   166,   117,
+      -1,   166,   111,    24,    -1,    24,    -1,    -1,    22,    -1,
+      24,    -1,   167,    -1,    -1,   146,   168,    -1,   170,   111,
+     169,    -1,   169,    -1,   170,    -1,   170,   111,    37,    -1,
+      37,    -1,    -1,   137,   144,   167,   113,   171,   114,   141,
+     138,    -1,    29,    -1,   120,    -1,   136,   172,   173,    -1,
+      30,    -1,   121,    -1,   185,   175,    -1,    -1,    45,    -1,
+      47,    -1,    -1,    31,   179,   177,   172,    -1,    -1,    63,
+      -1,     3,    -1,     4,    -1,     7,    -1,    27,    -1,    28,
+      -1,    38,    -1,    39,    -1,    26,    -1,   118,   153,   119,
+      -1,   152,    -1,    61,   180,    24,   111,    24,    -1,   125,
+      -1,   167,    -1,   182,    -1,   181,    -1,   146,   183,    -1,
+     185,   186,    -1,   174,   186,    -1,   187,   135,   188,    -1,
+     187,   190,    -1,    -1,    23,    -1,    72,   184,    -1,    72,
+       8,    -1,    73,    21,   183,    -1,    73,     9,   183,   111,
+      21,   183,   111,    21,   183,    -1,    74,   133,   183,   111,
+      21,   183,   115,   189,   117,    -1,    74,   133,   183,   111,
+      21,   183,   115,   117,    -1,    75,   137,   144,   183,   113,
+     193,   114,    36,    21,   183,    76,    21,   183,    -1,    76,
+      -1,    77,    -1,   189,   133,   181,   111,    21,   183,    -1,
+     133,   181,   111,    21,   183,    -1,   135,   195,    -1,   146,
+     115,   183,   111,   183,   117,    -1,   191,   111,   115,   183,
+     111,   183,   117,    -1,   184,    -1,   192,   111,   184,    -1,
+     192,    -1,    -1,    60,    59,    -1,    59,    -1,   127,   146,
+     183,   111,   183,    -1,   128,   146,   183,   111,   183,    -1,
+     129,   146,   183,   111,   183,    -1,    49,   184,    -1,   130,
+     184,   111,   184,    -1,   100,   184,    36,   146,    -1,   101,
+     184,   111,   184,   111,   184,    -1,   104,   184,   111,   146,
+      -1,   108,   184,   111,   146,    -1,   109,   184,   111,   146,
+      -1,   105,   184,   111,   184,    -1,   106,   184,   111,   184,
+     111,   184,    -1,   107,   184,   111,   184,   111,   184,    -1,
+      99,   191,    -1,   194,   137,   144,   183,   113,   193,   114,
+      -1,   198,    -1,   111,   192,    -1,    -1,    35,    -1,    -1,
+      93,   146,   139,    -1,    93,   146,   111,    15,   183,   139,
+      -1,    94,   146,   139,    -1,    94,   146,   111,    15,   183,
+     139,    -1,    95,   184,    -1,   197,    96,   146,   183,    -1,
+     197,    97,   184,   111,   146,   183,    -1,    98,   146,   183,
+     196,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,  1097,  1097,  1098,  1106,  1107,  1117,  1117,  1117,  1117,
-    1117,  1118,  1118,  1118,  1119,  1119,  1119,  1119,  1119,  1119,
-    1121,  1121,  1125,  1125,  1125,  1125,  1126,  1126,  1126,  1126,
-    1127,  1127,  1128,  1128,  1131,  1135,  1140,  1141,  1142,  1143,
-    1144,  1145,  1146,  1147,  1149,  1150,  1151,  1152,  1153,  1154,
-    1155,  1156,  1165,  1166,  1172,  1173,  1181,  1189,  1190,  1195,
-    1196,  1197,  1202,  1216,  1216,  1217,  1217,  1219,  1229,  1229,
-    1229,  1229,  1229,  1229,  1229,  1230,  1230,  1230,  1230,  1230,
-    1230,  1231,  1235,  1239,  1247,  1255,  1268,  1273,  1285,  1295,
-    1299,  1310,  1315,  1321,  1322,  1326,  1330,  1341,  1367,  1381,
-    1411,  1437,  1458,  1471,  1481,  1486,  1547,  1554,  1563,  1569,
-    1575,  1579,  1583,  1591,  1602,  1634,  1642,  1664,  1675,  1681,
-    1689,  1695,  1701,  1710,  1714,  1722,  1722,  1732,  1740,  1745,
-    1749,  1753,  1757,  1772,  1794,  1797,  1800,  1800,  1808,  1808,
-    1816,  1816,  1824,  1824,  1833,  1836,  1839,  1843,  1856,  1857,
-    1859,  1863,  1872,  1877,  1883,  1885,  1890,  1895,  1904,  1904,
-    1905,  1905,  1907,  1914,  1920,  1927,  1931,  1937,  1942,  1947,
-    2042,  2042,  2044,  2052,  2052,  2054,  2059,  2060,  2061,  2063,
-    2063,  2073,  2077,  2082,  2086,  2090,  2094,  2098,  2102,  2106,
-    2110,  2114,  2139,  2143,  2157,  2161,  2167,  2167,  2173,  2178,
-    2182,  2191,  2202,  2207,  2219,  2232,  2236,  2240,  2245,  2254,
-    2273,  2282,  2338,  2342,  2349,  2360,  2373,  2382,  2391,  2401,
-    2405,  2412,  2412,  2414,  2418,  2423,  2439,  2454,  2468,  2481,
-    2489,  2497,  2505,  2511,  2531,  2554,  2560,  2566,  2572,  2587,
-    2646,  2653,  2656,  2661,  2665,  2672,  2677,  2683,  2688,  2694,
-    2702,  2714,  2729
+       0,  1114,  1114,  1115,  1123,  1124,  1134,  1134,  1134,  1134,
+    1134,  1134,  1135,  1135,  1135,  1136,  1136,  1136,  1136,  1136,
+    1136,  1138,  1138,  1142,  1142,  1142,  1142,  1143,  1143,  1143,
+    1143,  1144,  1144,  1145,  1145,  1148,  1152,  1157,  1158,  1159,
+    1160,  1161,  1162,  1163,  1164,  1166,  1167,  1168,  1169,  1170,
+    1171,  1172,  1173,  1182,  1183,  1189,  1190,  1198,  1206,  1207,
+    1212,  1213,  1214,  1219,  1233,  1233,  1234,  1234,  1236,  1246,
+    1246,  1246,  1246,  1246,  1246,  1246,  1247,  1247,  1247,  1247,
+    1247,  1247,  1248,  1252,  1256,  1264,  1272,  1285,  1290,  1302,
+    1312,  1316,  1327,  1332,  1338,  1339,  1343,  1347,  1358,  1384,
+    1398,  1428,  1454,  1475,  1488,  1498,  1503,  1564,  1571,  1580,
+    1586,  1592,  1596,  1600,  1608,  1619,  1651,  1659,  1683,  1694,
+    1700,  1708,  1714,  1720,  1729,  1733,  1741,  1741,  1751,  1759,
+    1764,  1768,  1772,  1776,  1791,  1813,  1816,  1819,  1819,  1827,
+    1827,  1835,  1835,  1843,  1843,  1852,  1855,  1858,  1862,  1875,
+    1876,  1878,  1882,  1891,  1896,  1902,  1904,  1909,  1914,  1923,
+    1923,  1924,  1924,  1926,  1933,  1939,  1946,  1950,  1956,  1961,
+    1966,  2061,  2061,  2063,  2071,  2071,  2073,  2078,  2079,  2080,
+    2082,  2082,  2092,  2096,  2101,  2105,  2109,  2113,  2117,  2121,
+    2125,  2129,  2133,  2158,  2162,  2176,  2180,  2186,  2186,  2192,
+    2197,  2201,  2210,  2221,  2226,  2238,  2251,  2255,  2259,  2264,
+    2273,  2292,  2301,  2357,  2361,  2368,  2379,  2392,  2401,  2410,
+    2420,  2424,  2431,  2431,  2433,  2437,  2442,  2460,  2475,  2489,
+    2502,  2510,  2518,  2526,  2532,  2552,  2575,  2581,  2587,  2593,
+    2608,  2667,  2674,  2677,  2682,  2686,  2693,  2698,  2704,  2709,
+    2715,  2723,  2735,  2750
 };
 #endif
 
@@ -1698,8 +1718,8 @@
   "SIDEEFFECT", "CC_TOK", "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK",
   "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATA", "RET",
   "BR", "SWITCH", "INVOKE", "UNWIND", "UNREACHABLE", "ADD", "SUB", "MUL",
-  "DIV", "REM", "AND", "OR", "XOR", "SETLE", "SETGE", "SETLT", "SETGT",
-  "SETEQ", "SETNE", "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE",
+  "UDIV", "SDIV", "REM", "AND", "OR", "XOR", "SETLE", "SETGE", "SETLT",
+  "SETGT", "SETEQ", "SETNE", "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE",
   "GETELEMENTPTR", "PHI_TOK", "CAST", "SELECT", "SHL", "SHR", "VAARG",
   "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR", "VAARG_old",
   "VANEXT_old", "'='", "','", "'\\\\'", "'('", "')'", "'['", "'x'", "']'",
@@ -1737,41 +1757,41 @@
      325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
      335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
      345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,   359,   360,   361,   362,   363,    61,
-      44,    92,    40,    41,    91,   120,    93,    60,    62,   123,
-     125,    42,    99
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+      61,    44,    92,    40,    41,    91,   120,    93,    60,    62,
+     123,   125,    42,    99
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const unsigned char yyr1[] =
 {
-       0,   123,   124,   124,   125,   125,   126,   126,   126,   126,
-     126,   127,   127,   127,   128,   128,   128,   128,   128,   128,
-     129,   129,   130,   130,   130,   130,   131,   131,   131,   131,
-     132,   132,   133,   133,   134,   134,   135,   135,   135,   135,
-     135,   135,   135,   135,   136,   136,   136,   136,   136,   136,
-     136,   136,   137,   137,   138,   138,   139,   140,   140,   141,
-     141,   142,   142,   143,   143,   144,   144,   145,   146,   146,
-     146,   146,   146,   146,   146,   146,   146,   146,   146,   146,
-     146,   147,   147,   147,   147,   147,   147,   147,   147,   147,
-     147,   148,   148,   149,   149,   149,   149,   150,   150,   150,
-     150,   150,   150,   150,   150,   150,   150,   150,   150,   150,
-     150,   150,   150,   151,   151,   151,   151,   151,   151,   151,
-     151,   151,   151,   152,   152,   153,   153,   154,   155,   155,
-     155,   155,   155,   156,   156,   156,   157,   156,   158,   156,
-     159,   156,   160,   156,   156,   156,   156,   161,   162,   162,
-     163,   163,   163,   163,   164,   165,   165,   165,   166,   166,
-     167,   167,   168,   169,   169,   170,   170,   170,   170,   171,
-     172,   172,   173,   174,   174,   175,   176,   176,   176,   178,
-     177,   179,   179,   180,   180,   180,   180,   180,   180,   180,
-     180,   180,   180,   180,   181,   181,   182,   182,   183,   184,
-     184,   185,   186,   186,   186,   187,   187,   187,   187,   187,
-     187,   187,   187,   187,   188,   188,   189,   190,   190,   191,
-     191,   192,   192,   193,   193,   194,   194,   194,   194,   194,
-     194,   194,   194,   194,   194,   194,   194,   194,   194,   194,
-     194,   195,   195,   196,   196,   197,   197,   197,   197,   197,
-     197,   197,   197
+       0,   124,   125,   125,   126,   126,   127,   127,   127,   127,
+     127,   127,   128,   128,   128,   129,   129,   129,   129,   129,
+     129,   130,   130,   131,   131,   131,   131,   132,   132,   132,
+     132,   133,   133,   134,   134,   135,   135,   136,   136,   136,
+     136,   136,   136,   136,   136,   137,   137,   137,   137,   137,
+     137,   137,   137,   138,   138,   139,   139,   140,   141,   141,
+     142,   142,   143,   143,   144,   144,   145,   145,   146,   147,
+     147,   147,   147,   147,   147,   147,   147,   147,   147,   147,
+     147,   147,   148,   148,   148,   148,   148,   148,   148,   148,
+     148,   148,   149,   149,   150,   150,   150,   150,   151,   151,
+     151,   151,   151,   151,   151,   151,   151,   151,   151,   151,
+     151,   151,   151,   151,   152,   152,   152,   152,   152,   152,
+     152,   152,   152,   152,   153,   153,   154,   154,   155,   156,
+     156,   156,   156,   156,   157,   157,   157,   158,   157,   159,
+     157,   160,   157,   161,   157,   157,   157,   157,   162,   163,
+     163,   164,   164,   164,   164,   165,   166,   166,   166,   167,
+     167,   168,   168,   169,   170,   170,   171,   171,   171,   171,
+     172,   173,   173,   174,   175,   175,   176,   177,   177,   177,
+     179,   178,   180,   180,   181,   181,   181,   181,   181,   181,
+     181,   181,   181,   181,   181,   182,   182,   183,   183,   184,
+     185,   185,   186,   187,   187,   187,   188,   188,   188,   188,
+     188,   188,   188,   188,   188,   189,   189,   190,   191,   191,
+     192,   192,   193,   193,   194,   194,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   196,   196,   197,   197,   198,   198,   198,   198,
+     198,   198,   198,   198
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -1780,29 +1800,29 @@
        0,     2,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     0,     0,     1,     1,     1,     1,     1,
-       1,     2,     0,     2,     0,     3,     2,     0,     1,     0,
-       3,     1,     2,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     2,     0,     1,     1,     1,
+       1,     1,     1,     1,     0,     0,     1,     1,     1,     1,
+       1,     1,     2,     0,     2,     0,     3,     2,     0,     1,
+       0,     3,     1,     2,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     4,     5,     5,     3,     2,
-       2,     1,     3,     1,     3,     1,     0,     4,     3,     3,
-       4,     4,     3,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     6,     5,     8,     6,     6,     6,     6,
-       6,     8,     8,     3,     1,     1,     1,     1,     2,     2,
-       4,     2,     1,     4,     2,     4,     0,     7,     0,     7,
-       0,     7,     0,     7,     3,     4,     0,     1,     1,     1,
-       3,     3,     3,     3,     3,     3,     1,     0,     1,     1,
-       1,     0,     2,     3,     1,     1,     3,     1,     0,     8,
-       1,     1,     3,     1,     1,     2,     0,     1,     1,     0,
-       4,     0,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     3,     1,     5,     1,     1,     1,     1,     2,     2,
-       2,     3,     2,     0,     1,     2,     2,     3,     9,     9,
-       8,    13,     1,     1,     6,     5,     2,     6,     7,     1,
-       3,     1,     0,     2,     1,     5,     5,     5,     2,     4,
-       4,     6,     4,     4,     4,     4,     6,     6,     2,     7,
-       1,     2,     0,     1,     0,     3,     6,     3,     6,     2,
-       4,     6,     4
+       1,     1,     1,     1,     1,     2,     4,     5,     5,     3,
+       2,     2,     1,     3,     1,     3,     1,     0,     4,     3,
+       3,     4,     4,     3,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     6,     5,     8,     6,     6,     6,
+       6,     6,     8,     8,     3,     1,     1,     1,     1,     2,
+       2,     4,     2,     1,     4,     2,     4,     0,     7,     0,
+       7,     0,     7,     0,     7,     3,     4,     0,     1,     1,
+       1,     3,     3,     3,     3,     3,     3,     1,     0,     1,
+       1,     1,     0,     2,     3,     1,     1,     3,     1,     0,
+       8,     1,     1,     3,     1,     1,     2,     0,     1,     1,
+       0,     4,     0,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     3,     1,     5,     1,     1,     1,     1,     2,
+       2,     2,     3,     2,     0,     1,     2,     2,     3,     9,
+       9,     8,    13,     1,     1,     6,     5,     2,     6,     7,
+       1,     3,     1,     0,     2,     1,     5,     5,     5,     2,
+       4,     4,     6,     4,     4,     4,     4,     6,     6,     2,
+       7,     1,     2,     0,     1,     0,     3,     6,     3,     6,
+       2,     4,     6,     4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -1810,482 +1830,476 @@
    means the default is an error.  */
 static const unsigned char yydefact[] =
 {
-     146,     0,    43,   132,     1,   131,   179,    36,    37,    38,
-      39,    40,    41,    42,     0,    44,   203,   128,   129,   203,
-     158,   159,     0,     0,     0,    43,     0,   134,   176,     0,
-       0,    45,    46,    47,    48,    49,    50,     0,     0,   204,
-     200,    35,   173,   174,   175,   199,     0,     0,     0,     0,
-     144,     0,     0,     0,     0,     0,     0,     0,    34,   177,
-     178,    44,   147,   130,    51,     2,     3,    64,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,     0,     0,     0,     0,   194,     0,     0,    63,
-      82,    67,   195,    83,   170,   171,   172,   244,   202,     0,
-       0,     0,     0,   157,   145,   135,   133,   125,   126,     0,
-       0,     0,     0,   180,    84,     0,     0,    66,    89,    91,
-       0,     0,    96,    90,   243,     0,   224,     0,     0,     0,
-       0,    44,   212,   213,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,     0,     0,
-       0,     0,     0,     0,     0,    20,    21,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   201,    44,   216,
-       0,   240,   152,   149,   148,   150,   151,   153,   156,     0,
-     140,   142,   138,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,     0,     0,     0,     0,   136,     0,
-       0,     0,    88,   168,    95,    93,     0,     0,   228,   223,
-     206,   205,     0,     0,    25,    29,    24,    28,    23,    27,
-      22,    26,    30,    31,     0,     0,    54,    54,   249,     0,
-       0,   238,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   154,    59,
-      59,    59,   110,   111,     4,     5,   108,   109,   112,   107,
-     103,   104,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   106,   105,    59,    65,
-      65,    92,   167,   161,   164,   165,     0,     0,    85,   183,
-     184,   185,   190,   186,   187,   188,   189,   181,     0,   192,
-     197,   196,   198,     0,   207,     0,     0,     0,   245,     0,
-     247,   242,     0,     0,     0,     0,     0,     0,     0,     0,
+     147,     0,    44,   133,     1,   132,   180,    37,    38,    39,
+      40,    41,    42,    43,     0,    45,   204,   129,   130,   204,
+     159,   160,     0,     0,     0,    44,     0,   135,   177,     0,
+       0,    46,    47,    48,    49,    50,    51,     0,     0,   205,
+     201,    36,   174,   175,   176,   200,     0,     0,     0,     0,
+     145,     0,     0,     0,     0,     0,     0,     0,    35,   178,
+     179,    45,   148,   131,    52,     2,     3,    65,    69,    70,
+      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,     0,     0,     0,     0,   195,     0,     0,    64,
+      83,    68,   196,    84,   171,   172,   173,   245,   203,     0,
+       0,     0,     0,   158,   146,   136,   134,   126,   127,     0,
+       0,     0,     0,   181,    85,     0,     0,    67,    90,    92,
+       0,     0,    97,    91,   244,     0,   225,     0,     0,     0,
+       0,    45,   213,   214,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,     0,
+       0,     0,     0,     0,     0,     0,    21,    22,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   202,    45,
+     217,     0,   241,   153,   150,   149,   151,   152,   154,   157,
+       0,   141,   143,   139,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,     0,     0,     0,     0,   137,
+       0,     0,     0,    89,   169,    96,    94,     0,     0,   229,
+     224,   207,   206,     0,     0,    26,    30,    25,    29,    24,
+      28,    23,    27,    31,    32,     0,     0,    55,    55,   250,
+       0,     0,   239,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,   155,
-       0,   141,   143,   139,     0,     0,     0,     0,     0,     0,
-      98,   124,     0,     0,   102,     0,    99,     0,     0,     0,
-       0,   137,    86,    87,   160,   162,     0,    57,    94,   182,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   252,
-       0,     0,   230,     0,   232,   235,     0,     0,   233,   234,
-       0,     0,     0,   229,     0,   250,     0,     0,     0,    61,
-      59,   242,     0,     0,     0,     0,     0,     0,    97,   100,
-     101,     0,     0,     0,     0,   166,   163,    58,    52,     0,
-     191,     0,     0,   222,    54,    55,    54,   219,   241,     0,
-       0,     0,     0,     0,   225,   226,   227,   222,     0,    56,
-      62,    60,     0,     0,     0,     0,     0,     0,   123,     0,
-       0,     0,     0,     0,   169,     0,     0,     0,   221,     0,
-       0,   246,   248,     0,     0,     0,   231,   236,   237,     0,
-     251,   114,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    53,   193,     0,     0,     0,   220,   217,     0,   239,
-     113,     0,   120,     0,     0,   116,   117,   118,   119,     0,
-     210,     0,     0,     0,   218,     0,     0,     0,   208,     0,
-     209,     0,     0,   115,   121,   122,     0,     0,     0,     0,
-       0,     0,   215,     0,     0,   214,   211
+      60,    60,    60,   111,   112,     4,     5,   109,   110,   113,
+     108,   104,   105,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   107,   106,    60,
+      66,    66,    93,   168,   162,   165,   166,     0,     0,    86,
+     184,   185,   186,   191,   187,   188,   189,   190,   182,     0,
+     193,   198,   197,   199,     0,   208,     0,     0,     0,   246,
+       0,   248,   243,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     156,     0,   142,   144,   140,     0,     0,     0,     0,     0,
+       0,    99,   125,     0,     0,   103,     0,   100,     0,     0,
+       0,     0,   138,    87,    88,   161,   163,     0,    58,    95,
+     183,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     253,     0,     0,   231,     0,   233,   236,     0,     0,   234,
+     235,     0,     0,     0,   230,     0,   251,     0,     0,     0,
+      62,    60,   243,     0,     0,     0,     0,     0,     0,    98,
+     101,   102,     0,     0,     0,     0,   167,   164,    59,    53,
+       0,   192,     0,     0,   223,    55,    56,    55,   220,   242,
+       0,     0,     0,     0,     0,   226,   227,   228,   223,     0,
+      57,    63,    61,     0,     0,     0,     0,     0,     0,   124,
+       0,     0,     0,     0,     0,   170,     0,     0,     0,   222,
+       0,     0,   247,   249,     0,     0,     0,   232,   237,   238,
+       0,   252,   115,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    54,   194,     0,     0,     0,   221,   218,     0,
+     240,   114,     0,   121,     0,     0,   117,   118,   119,   120,
+       0,   211,     0,     0,     0,   219,     0,     0,     0,   209,
+       0,   210,     0,     0,   116,   122,   123,     0,     0,     0,
+       0,     0,     0,   216,     0,     0,   215,   212
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short int yydefgoto[] =
 {
-      -1,    86,   256,   272,   273,   274,   275,   194,   195,   224,
-     196,    25,    15,    37,   444,   308,   389,   408,   331,   390,
-      87,    88,   197,    90,    91,   120,   206,   341,   299,   342,
-     109,     1,     2,     3,   278,   251,   249,   250,    63,   175,
-      50,   104,   179,    92,   355,   284,   285,   286,    38,    96,
-      16,    44,    17,    61,    18,    28,   360,   300,    93,   302,
-     417,    19,    40,    41,   167,   492,    98,   231,   448,   449,
-     168,   169,   369,   170,   171
+      -1,    86,   257,   273,   274,   275,   276,   195,   196,   225,
+     197,    25,    15,    37,   445,   309,   390,   409,   332,   391,
+      87,    88,   198,    90,    91,   120,   207,   342,   300,   343,
+     109,     1,     2,     3,   279,   252,   250,   251,    63,   176,
+      50,   104,   180,    92,   356,   285,   286,   287,    38,    96,
+      16,    44,    17,    61,    18,    28,   361,   301,    93,   303,
+     418,    19,    40,    41,   168,   493,    98,   232,   449,   450,
+     169,   170,   370,   171,   172
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -410
+#define YYPACT_NINF -459
 static const short int yypact[] =
 {
-    -410,    17,   118,   605,  -410,  -410,  -410,  -410,  -410,  -410,
-    -410,  -410,  -410,  -410,    24,   160,    67,  -410,  -410,   -15,
-    -410,  -410,    27,    -5,    46,    -6,    10,  -410,    86,   147,
-     138,  -410,  -410,  -410,  -410,  -410,  -410,  1060,   -20,  -410,
-    -410,   110,  -410,  -410,  -410,  -410,    69,    70,    72,    73,
-    -410,    63,   147,  1060,    68,    68,    68,    68,  -410,  -410,
-    -410,   160,  -410,  -410,  -410,  -410,  -410,    64,  -410,  -410,
-    -410,  -410,  -410,  -410,  -410,  -410,  -410,  -410,  -410,  -410,
-    -410,  -410,   182,   183,   186,   572,  -410,   110,    77,  -410,
-    -410,   -28,  -410,  -410,  -410,  -410,  -410,  1231,  -410,   168,
-      83,   199,   180,   181,  -410,  -410,  -410,  -410,  -410,  1101,
-    1101,  1101,  1142,  -410,  -410,    91,    96,  -410,  -410,   -28,
-     -98,   103,   852,  -410,  -410,  1101,  -410,   157,  1183,    50,
-     185,   160,  -410,  -410,  -410,  -410,  -410,  -410,  -410,  -410,
-    -410,  -410,  -410,  -410,  -410,  -410,  -410,  -410,  1101,  1101,
-    1101,  1101,  1101,  1101,  1101,  -410,  -410,  1101,  1101,  1101,
-    1101,  1101,  1101,  1101,  1101,  1101,  1101,  -410,   160,  -410,
-      49,  -410,  -410,  -410,  -410,  -410,  -410,  -410,  -410,   -14,
-    -410,  -410,  -410,   120,   148,   213,   150,   214,   154,   215,
-     166,   217,   224,   231,   170,   218,   232,   425,  -410,  1101,
-    1101,  1101,  -410,   893,  -410,   130,   128,   638,  -410,  -410,
-      64,  -410,   638,   638,  -410,  -410,  -410,  -410,  -410,  -410,
-    -410,  -410,  -410,  -410,   638,  1060,   132,   133,  -410,   638,
-     136,   134,   216,   141,   143,   144,   146,   149,   151,   152,
-     638,   638,   638,   153,  1060,  1101,  1101,   233,  -410,   155,
-     155,   155,  -410,  -410,  -410,  -410,  -410,  -410,  -410,  -410,
-    -410,  -410,   156,   159,   161,   164,   175,   177,   934,  1142,
-     592,   234,   178,   184,   187,   188,  -410,  -410,   155,   -70,
-     -35,   -28,  -410,   110,  -410,   162,   179,   978,  -410,  -410,
-    -410,  -410,  -410,  -410,  -410,  -410,  -410,   197,  1142,  -410,
-    -410,  -410,  -410,   191,  -410,   195,   638,     3,  -410,    18,
-    -410,   196,   638,   193,  1101,  1101,  1101,  1101,  1101,  1101,
-    1101,  1101,   201,   202,   203,  1101,   638,   638,   205,  -410,
-      13,  -410,  -410,  -410,  1142,  1142,  1142,  1142,  1142,  1142,
-    -410,  -410,   -13,   -99,  -410,   -78,  -410,  1142,  1142,  1142,
-    1142,  -410,  -410,  -410,  -410,  -410,  1019,   230,  -410,  -410,
-     242,   -23,   246,   272,   208,   638,   290,   638,  1101,  -410,
-     211,   638,  -410,   212,  -410,  -410,   219,   220,  -410,  -410,
-     638,   638,   638,  -410,   229,  -410,  1101,   273,   294,  -410,
-     155,   196,   291,   226,   237,   240,   241,  1142,  -410,  -410,
-    -410,   243,   247,   248,   249,  -410,  -410,  -410,   252,   250,
-    -410,   638,   638,  1101,   251,  -410,   251,  -410,   255,   638,
-     256,  1101,  1101,  1101,  -410,  -410,  -410,  1101,   638,  -410,
-    -410,  -410,   239,  1101,  1142,  1142,  1142,  1142,  -410,  1142,
-    1142,  1142,  1142,   322,  -410,   304,   257,   228,   255,   259,
-     286,  -410,  -410,  1101,   253,   638,  -410,  -410,  -410,   260,
-    -410,  -410,   262,   267,   265,   270,   277,   278,   279,   280,
-     281,  -410,  -410,   323,    14,   320,  -410,  -410,   254,  -410,
-    -410,  1142,  -410,  1142,  1142,  -410,  -410,  -410,  -410,   638,
-    -410,   742,    52,   362,  -410,   282,   284,   287,  -410,   289,
-    -410,   742,   638,  -410,  -410,  -410,   380,   292,   327,   638,
-     383,   384,  -410,   638,   638,  -410,  -410
+    -459,     8,   119,   464,  -459,  -459,  -459,  -459,  -459,  -459,
+    -459,  -459,  -459,  -459,   -46,   162,    21,  -459,  -459,   -11,
+    -459,  -459,    23,   -25,    59,   219,    35,  -459,    -5,   109,
+     143,  -459,  -459,  -459,  -459,  -459,  -459,  1020,    12,  -459,
+    -459,   112,  -459,  -459,  -459,  -459,    80,    82,    84,    88,
+    -459,    54,   109,  1020,   121,   121,   121,   121,  -459,  -459,
+    -459,   162,  -459,  -459,  -459,  -459,  -459,    90,  -459,  -459,
+    -459,  -459,  -459,  -459,  -459,  -459,  -459,  -459,  -459,  -459,
+    -459,  -459,   196,   197,   202,   574,  -459,   112,    99,  -459,
+    -459,   -42,  -459,  -459,  -459,  -459,  -459,  1192,  -459,   192,
+     103,   213,   194,   195,  -459,  -459,  -459,  -459,  -459,  1061,
+    1061,  1061,  1102,  -459,  -459,   104,   106,  -459,  -459,   -42,
+    -100,   110,   856,  -459,  -459,  1061,  -459,   165,  1143,    69,
+     390,   162,  -459,  -459,  -459,  -459,  -459,  -459,  -459,  -459,
+    -459,  -459,  -459,  -459,  -459,  -459,  -459,  -459,  -459,  1061,
+    1061,  1061,  1061,  1061,  1061,  1061,  -459,  -459,  1061,  1061,
+    1061,  1061,  1061,  1061,  1061,  1061,  1061,  1061,  -459,   162,
+    -459,    75,  -459,  -459,  -459,  -459,  -459,  -459,  -459,  -459,
+     -72,  -459,  -459,  -459,   147,   174,   236,   176,   237,   179,
+     238,   184,   239,   244,   245,   193,   240,   246,   455,  -459,
+    1061,  1061,  1061,  -459,   897,  -459,   134,   140,   640,  -459,
+    -459,    90,  -459,   640,   640,  -459,  -459,  -459,  -459,  -459,
+    -459,  -459,  -459,  -459,  -459,   640,  1020,   144,   146,  -459,
+     640,   152,   148,   222,   157,   161,   163,   166,   177,   180,
+     182,   640,   640,   640,   183,  1020,  1061,  1061,   249,  -459,
+     186,   186,   186,  -459,  -459,  -459,  -459,  -459,  -459,  -459,
+    -459,  -459,  -459,   185,   187,   188,   189,   199,   200,    87,
+    1102,   594,   266,   201,   203,   208,   209,  -459,  -459,   186,
+     -36,    33,   -42,  -459,   112,  -459,   212,   181,   938,  -459,
+    -459,  -459,  -459,  -459,  -459,  -459,  -459,  -459,   243,  1102,
+    -459,  -459,  -459,  -459,   216,  -459,   217,   640,    -6,  -459,
+       3,  -459,   218,   640,   215,  1061,  1061,  1061,  1061,  1061,
+    1061,  1061,  1061,   220,   226,   231,  1061,   640,   640,   232,
+    -459,   -21,  -459,  -459,  -459,  1102,  1102,  1102,  1102,  1102,
+    1102,  -459,  -459,    32,   -32,  -459,   -74,  -459,  1102,  1102,
+    1102,  1102,  -459,  -459,  -459,  -459,  -459,   979,   265,  -459,
+    -459,   283,    29,   287,   289,   235,   640,   340,   640,  1061,
+    -459,   234,   640,  -459,   241,  -459,  -459,   242,   247,  -459,
+    -459,   640,   640,   640,  -459,   248,  -459,  1061,   327,   350,
+    -459,   186,   218,   321,   251,   255,   256,   257,  1102,  -459,
+    -459,  -459,   259,   260,   262,   263,  -459,  -459,  -459,   302,
+     267,  -459,   640,   640,  1061,   268,  -459,   268,  -459,   270,
+     640,   273,  1061,  1061,  1061,  -459,  -459,  -459,  1061,   640,
+    -459,  -459,  -459,   274,  1061,  1102,  1102,  1102,  1102,  -459,
+    1102,  1102,  1102,  1102,   356,  -459,   352,   281,   278,   270,
+     280,   338,  -459,  -459,  1061,   279,   640,  -459,  -459,  -459,
+     284,  -459,  -459,   294,   298,   296,   300,   301,   299,   304,
+     305,   306,  -459,  -459,   393,    14,   379,  -459,  -459,   307,
+    -459,  -459,  1102,  -459,  1102,  1102,  -459,  -459,  -459,  -459,
+     640,  -459,   745,    53,   395,  -459,   308,   309,   311,  -459,
+     310,  -459,   745,   640,  -459,  -459,  -459,   405,   316,   353,
+     640,   410,   411,  -459,   640,   640,  -459,  -459
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -410,  -410,  -410,   309,   310,   311,   312,  -129,  -128,  -398,
-    -410,   369,   386,  -118,  -410,  -223,    55,  -410,  -244,  -410,
-     -50,  -410,   -37,  -410,   -64,   293,  -410,  -102,   221,  -192,
-      53,  -410,  -410,  -410,  -410,  -410,  -410,  -410,   361,  -410,
-    -410,  -410,  -410,     2,  -410,    58,  -410,  -410,   356,  -410,
-    -410,  -410,  -410,  -410,   416,  -410,  -410,  -409,   -57,    62,
-    -105,  -410,   401,  -410,  -410,  -410,  -410,  -410,    54,    -4,
-    -410,  -410,    30,  -410,  -410
+    -459,  -459,  -459,   339,   341,   342,   343,  -129,  -128,  -458,
+    -459,   394,   412,  -117,  -459,  -224,    83,  -459,  -245,  -459,
+     -50,  -459,   -37,  -459,   -63,   320,  -459,  -102,   250,  -238,
+      27,  -459,  -459,  -459,  -459,  -459,  -459,  -459,   397,  -459,
+    -459,  -459,  -459,     2,  -459,    93,  -459,  -459,   386,  -459,
+    -459,  -459,  -459,  -459,   448,  -459,  -459,  -454,   -57,    62,
+    -105,  -459,   433,  -459,  -459,  -459,  -459,  -459,    85,    28,
+    -459,  -459,    63,  -459,  -459
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -128
+#define YYTABLE_NINF -129
 static const short int yytable[] =
 {
-      89,   222,   223,   106,   310,    26,   332,   333,    39,    94,
-     198,   397,   201,   225,    53,    42,    89,     4,   365,   399,
-     208,   119,   202,   211,   214,   215,   216,   217,   218,   219,
-     220,   221,   397,   367,   351,     7,     8,     9,    10,    54,
-      12,    55,   400,    26,    56,   228,   352,   387,   232,   233,
-     244,   123,   234,   235,   236,   237,   238,   239,   119,   212,
-     366,   243,   214,   215,   216,   217,   218,   219,   220,   221,
-     388,   213,   180,   181,   182,   366,   491,   343,   345,    46,
-      47,    48,   499,   353,   -65,    29,   123,   397,   207,   121,
-      39,   207,   507,   123,   501,   410,   247,   397,    49,    95,
-     107,   108,   248,   398,    51,    43,   361,    52,   110,   111,
-     112,   226,   227,   207,   229,   230,   207,   207,  -127,    58,
-     207,   207,   207,   207,   207,   207,   240,   241,   242,   207,
-     490,    59,    20,    60,    21,   279,   280,   281,   173,   174,
-     277,   328,    64,     5,   245,   246,   431,   252,   253,     6,
-     301,   -25,   -25,   -24,   -24,   301,   301,   -23,   -23,     7,
-       8,     9,    10,    11,    12,    13,   283,   301,   500,   -22,
-     -22,    62,   301,   254,   255,   306,   -66,   103,    99,   100,
-      14,   101,   102,   301,   301,   301,   114,   115,    89,   122,
-     116,   451,   172,   452,   326,   214,   215,   216,   217,   218,
-     219,   220,   221,   176,   177,   178,   199,    89,   327,   207,
-     373,   200,   375,   376,   377,   203,   209,   -29,   -28,   -27,
-     383,   -26,   257,   281,    30,    31,    32,    33,    34,    35,
-      36,   -32,   391,   392,   393,   394,   395,   396,   -33,   258,
-     287,   288,   307,   309,   313,   401,   402,   403,   404,   301,
-     312,   315,   314,   316,   317,   301,   318,   329,   346,   319,
-     359,   320,   321,   325,   387,   330,   409,   411,   334,   301,
-     301,   335,   356,   336,   303,   304,   337,   372,   207,   374,
-     207,   207,   207,   378,   379,   354,   305,   338,   207,   339,
-     347,   311,   357,   412,   415,   438,   348,   429,   430,   349,
-     350,   362,   322,   323,   324,   363,   368,   371,   301,   443,
-     301,   380,   381,   382,   301,   386,   456,   457,   458,   283,
-     413,   419,   421,   301,   301,   301,   471,   433,   472,   422,
-     423,   207,   463,   464,   465,   466,   434,   467,   468,   469,
-     470,   427,   474,   366,   489,   222,   223,   435,   476,   428,
-     436,   437,   461,   439,   301,   301,   493,   440,   441,   442,
-     445,   450,   301,   222,   223,   453,   455,   473,   364,   477,
-     494,   301,   475,   479,   370,   480,   207,   481,   482,   495,
-     483,   496,   497,   502,   207,   207,   207,   484,   384,   385,
-     207,   485,   486,   487,   488,   503,   462,   504,   301,   506,
-     505,   509,   510,   511,   513,   514,   163,   164,   165,   166,
-      97,    57,   407,   105,   406,   205,   207,   113,   276,    27,
-      45,   432,   418,   459,     0,     0,     0,   414,     0,   416,
-      65,    66,   301,   420,     0,     0,     0,     0,     0,     0,
-       0,     0,   424,   425,   426,   301,     0,    20,     0,    21,
-       0,   259,   301,     0,     0,     0,   301,   301,     0,     0,
-       0,     0,     0,   260,   261,     0,     0,     0,     0,     0,
-       0,     0,     0,   446,   447,     0,     0,     0,     0,     0,
-       0,   454,     0,     0,     0,     0,     0,     0,     0,     0,
-     460,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      89,   223,   224,   106,   311,    26,   333,   334,     4,   366,
+     199,   202,    39,   388,   226,    29,    89,   492,   368,    42,
+     209,   203,   119,   212,   215,   216,   217,   218,   219,   220,
+     221,   222,   344,   346,   352,   502,   389,   398,   500,   248,
+      59,    94,    60,    26,    39,   249,   229,   401,   508,   233,
+     234,   367,   245,   235,   236,   237,   238,   239,   240,   119,
+     367,   362,   244,   215,   216,   217,   218,   219,   220,   221,
+     222,   -66,   181,   182,   183,    46,    47,    48,   213,   398,
+     123,   353,   110,   111,   112,    51,   123,   400,   208,   121,
+     214,   208,    65,    66,    49,   117,   184,   185,   186,   187,
+     188,   189,   190,   191,   192,   193,   194,    79,    80,    20,
+      43,    21,   227,   228,   208,   230,   231,   208,   208,  -128,
+      52,   208,   208,   208,   208,   208,   208,   241,   242,   243,
+     208,   491,    95,    62,    20,    81,    21,   280,   281,   282,
+     398,   278,   329,   398,     5,    58,   432,    64,   411,   399,
+       6,   302,   354,   107,   108,   123,   302,   302,   174,   175,
+       7,     8,     9,    10,    11,    12,    13,   284,   302,   103,
+     501,   246,   247,   302,   253,   254,   307,   -26,   -26,   -25,
+     -25,    14,   -24,   -24,   302,   302,   302,   -23,   -23,    89,
+      99,   452,   100,   453,   101,   327,   255,   256,   102,    82,
+     114,   115,    83,   -67,   341,    84,   116,    85,    89,   328,
+     208,   374,   122,   376,   377,   378,   173,   177,   178,   179,
+     200,   384,   201,   204,   210,   282,    30,    31,    32,    33,
+      34,    35,    36,   392,   393,   394,   395,   396,   397,    53,
+     -30,   -29,   -28,   -27,   258,   288,   402,   403,   404,   405,
+     302,   -33,   -34,   259,   289,   308,   302,   310,   315,   314,
+       7,     8,     9,    10,    54,    12,    55,   313,   316,    56,
+     302,   302,   317,   330,   318,   304,   305,   319,   373,   208,
+     375,   208,   208,   208,   379,   380,   355,   306,   320,   208,
+     347,   321,   312,   322,   326,   358,   439,   331,   335,   388,
+     336,   337,   338,   323,   324,   325,   360,   410,   412,   302,
+     413,   302,   339,   340,   348,   302,   349,   457,   458,   459,
+     284,   350,   351,   357,   302,   302,   302,   363,   364,   369,
+     372,   381,   208,   464,   465,   466,   467,   382,   468,   469,
+     470,   471,   383,   387,   416,   420,   223,   224,   414,   477,
+     429,   430,   422,   423,   431,   302,   302,   434,   424,   444,
+     472,   428,   435,   302,   223,   224,   436,   437,   438,   365,
+     440,   441,   302,   442,   443,   371,   473,   208,   446,   451,
+     496,   454,   497,   498,   456,   208,   208,   208,   462,   385,
+     386,   208,   474,   475,   476,   367,   478,   463,   480,   302,
+     215,   216,   217,   218,   219,   220,   221,   222,   481,   482,
+     483,   484,   485,   486,   490,   494,   503,   208,   487,   488,
+     489,   507,   504,   505,   495,   506,   510,   511,   415,   512,
+     417,   514,   515,   302,   421,    97,   164,    57,   165,   166,
+     167,   408,   206,   425,   426,   427,   302,   113,   277,   105,
+     407,    27,    45,   302,   419,   433,   460,   302,   302,     0,
+      65,    66,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   447,   448,     0,    20,     0,    21,
+       0,   260,   455,     0,   -36,     0,    20,     0,    21,     0,
+       0,   461,     0,   261,   262,     6,   -36,   -36,     0,     0,
+       0,     0,     0,     0,     0,   -36,   -36,   -36,   -36,   -36,
+     -36,   -36,     0,     0,   -36,    22,     0,     0,   479,     0,
+       0,     0,    23,     0,     0,     0,    24,     0,     0,     0,
        0,     0,     0,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   478,     0,     0,
-       0,     0,   262,     0,   263,   264,   155,   156,     0,   265,
-     266,   267,     0,     0,     0,     0,     0,     0,     0,   268,
-       0,     0,   269,     0,   270,     0,     0,   271,     0,     0,
-       0,   498,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   508,     0,     0,     0,     0,     0,
-       0,   512,     0,     0,     0,   515,   516,    65,    66,     0,
-     117,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    20,     0,    21,    65,    66,     0,
-     117,   183,   184,   185,   186,   187,   188,   189,   190,   191,
-     192,   193,    79,    80,    20,     0,    21,     0,     0,     0,
-      81,     0,     0,     0,     0,   -35,     0,    20,     0,    21,
-       0,     0,     0,     0,     0,     0,     6,   -35,   -35,     0,
-      81,   289,   290,    65,    66,   291,   -35,   -35,   -35,   -35,
-     -35,   -35,   -35,     0,     0,   -35,    22,     0,     0,     0,
-      20,     0,    21,    23,   292,   293,   294,    24,     0,     0,
-       0,     0,     0,     0,     0,     0,   295,   296,     0,     0,
-       0,     0,     0,    82,     0,     0,    83,     0,     0,    84,
-       0,    85,   118,     0,     0,     0,     0,     0,     0,   297,
-       0,     0,     0,    82,     0,     0,    83,     0,     0,    84,
-       0,    85,   344,     0,     0,     0,   134,   135,   136,   137,
-     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
-       0,     0,     0,     0,     0,   262,     0,   263,   264,   155,
-     156,     0,   265,   266,   267,   289,   290,     0,     0,   291,
-       0,     0,     0,     0,     0,   298,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   292,   293,
-     294,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     295,   296,     0,     0,     0,     0,     0,     0,     0,     0,
+     141,   142,   143,   144,   145,   146,   147,   148,     0,     0,
+       0,     0,   499,   263,     0,   264,   265,   156,   157,     0,
+     266,   267,   268,     0,     0,   509,     0,     0,     0,     0,
+     269,     0,   513,   270,     0,   271,   516,   517,   272,    65,
+      66,     0,   117,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    20,     0,    21,    65,
+      66,     0,   117,   184,   185,   186,   187,   188,   189,   190,
+     191,   192,   193,   194,    79,    80,    20,     0,    21,     0,
+       0,     0,    81,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   297,     0,     0,     0,     0,     0,     0,
+       0,     0,    81,   290,   291,    65,    66,   292,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
-     144,   145,   146,   147,     0,     0,     0,     0,     0,   262,
-       0,   263,   264,   155,   156,     0,   265,   266,   267,     0,
-       0,     0,     0,     0,     0,     0,     0,    65,    66,   298,
-     117,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    20,     0,    21,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   204,
-       0,     0,     0,     0,     0,     0,     0,     0,    65,    66,
-      81,   117,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    20,     0,    21,     0,     0,
+       0,     0,    20,     0,    21,     0,   293,   294,   295,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   296,   297,
+       0,     0,     0,     0,     0,     0,    82,     0,     0,    83,
+       0,     0,    84,     0,    85,   118,     0,     0,     0,     0,
+       0,   298,     0,     0,     0,     0,    82,     0,     0,    83,
+       0,     0,    84,     0,    85,   345,     0,     0,   134,   135,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   148,     0,     0,     0,     0,     0,   263,     0,
+     264,   265,   156,   157,     0,   266,   267,   268,   290,   291,
+       0,     0,   292,     0,     0,     0,     0,     0,   299,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     282,     0,     0,     0,     0,     0,     0,     0,     0,    65,
-      66,    81,   117,   183,   184,   185,   186,   187,   188,   189,
-     190,   191,   192,   193,    79,    80,    20,     0,    21,     0,
-       0,     0,     0,    82,     0,     0,    83,     0,     0,    84,
-       0,    85,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    81,    65,    66,     0,   117,    68,    69,    70,
+       0,   293,   294,   295,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   296,   297,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   298,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   134,   135,   136,   137,   138,   139,   140,
+     141,   142,   143,   144,   145,   146,   147,   148,     0,     0,
+       0,     0,     0,   263,     0,   264,   265,   156,   157,     0,
+     266,   267,   268,     0,     0,     0,     0,     0,     0,     0,
+       0,    65,    66,   299,   117,    68,    69,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    20,     0,
+      21,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   205,     0,     0,     0,     0,     0,     0,
+       0,     0,    65,    66,    81,   117,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    20,
+       0,    21,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   283,     0,     0,     0,     0,     0,
+       0,     0,     0,    65,    66,    81,   117,    68,    69,    70,
       71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      20,     0,    21,     0,    82,     0,     0,    83,     0,     0,
-      84,     0,    85,     0,     0,   358,     0,     0,     0,     0,
+      20,     0,    21,     0,     0,     0,     0,     0,    82,     0,
+       0,    83,     0,     0,    84,   359,    85,     0,     0,     0,
        0,     0,     0,     0,    65,    66,    81,   117,    68,    69,
       70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    20,     0,    21,     0,    82,     0,     0,    83,     0,
-     340,    84,     0,    85,     0,     0,   405,     0,     0,     0,
+      80,    20,     0,    21,     0,     0,     0,     0,     0,    82,
+       0,     0,    83,     0,     0,    84,   406,    85,     0,     0,
        0,     0,     0,     0,     0,    65,    66,    81,    67,    68,
       69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    20,     0,    21,     0,     0,     0,     0,    82,
-       0,     0,    83,     0,     0,    84,     0,    85,     0,     0,
+      79,    80,    20,     0,    21,     0,     0,     0,     0,     0,
+      82,     0,     0,    83,     0,     0,    84,     0,    85,     0,
        0,     0,     0,     0,     0,     0,    65,    66,    81,   117,
       68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
       78,    79,    80,    20,     0,    21,     0,     0,     0,     0,
-      82,     0,     0,    83,     0,     0,    84,     0,    85,     0,
-       0,     0,     0,     0,     0,     0,     0,    65,    66,    81,
-     117,   183,   184,   185,   186,   187,   188,   189,   190,   191,
-     192,   193,    79,    80,    20,     0,    21,     0,     0,     0,
        0,    82,     0,     0,    83,     0,     0,    84,     0,    85,
-       0,     0,     0,     0,     0,     0,     0,     0,    65,    66,
-      81,   210,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    20,     0,    21,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    65,    66,    81,
+     117,   184,   185,   186,   187,   188,   189,   190,   191,   192,
+     193,   194,    79,    80,    20,     0,    21,     0,     0,     0,
        0,     0,    82,     0,     0,    83,     0,     0,    84,     0,
-      85,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      85,     0,     0,     0,     0,     0,     0,     0,    65,    66,
+      81,   211,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    20,     0,    21,     0,     0,
+       0,     0,     0,    82,     0,     0,    83,     0,     0,    84,
+       0,    85,     0,     0,     0,     0,     0,     0,     0,     0,
        0,    81,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    82,     0,     0,    83,     0,     0,    84,
-       0,    85,     0,     0,     0,     0,   124,     0,     0,     0,
+       0,     0,     0,     0,    82,     0,     0,    83,     0,     0,
+      84,     0,    85,     0,     0,     0,     0,   124,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     125,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     126,   127,     0,     0,    82,     0,     0,    83,     0,     0,
-      84,     0,    85,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,     0,     0,   151,   152,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162
+       0,   125,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   126,   127,     0,     0,    82,     0,     0,    83,     0,
+       0,    84,     0,    85,   128,   129,   130,   131,   132,   133,
+     134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   149,   150,   151,     0,     0,
+     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
+     162,   163
 };
 
 static const short int yycheck[] =
 {
-      37,   130,   130,    53,   227,     3,   250,   251,    23,    29,
-     112,   110,   110,   131,    20,    30,    53,     0,    15,   118,
-     125,    85,   120,   128,    10,    11,    12,    13,    14,    15,
-      16,    17,   110,    15,   278,    41,    42,    43,    44,    45,
-      46,    47,   120,    41,    50,   150,   116,    34,   153,   154,
-     168,   121,   157,   158,   159,   160,   161,   162,   122,     9,
-      57,   166,    10,    11,    12,    13,    14,    15,    16,    17,
-      57,    21,   109,   110,   111,    57,   474,   269,   270,    52,
-      53,    54,   491,   118,   112,    61,   121,   110,   125,    87,
-      23,   128,   501,   121,   492,   118,   110,   110,    71,   119,
-      32,    33,   116,   116,   109,   120,   298,    61,    55,    56,
-      57,   148,   149,   150,   151,   152,   153,   154,     0,   109,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     116,    45,    22,    47,    24,   199,   200,   201,    55,    56,
-     197,   246,     4,    25,    95,    96,   390,    27,    28,    31,
-     207,     3,     4,     3,     4,   212,   213,     3,     4,    41,
-      42,    43,    44,    45,    46,    47,   203,   224,   116,     3,
-       4,    24,   229,     3,     4,   225,   112,   114,   109,   109,
-      62,   109,   109,   240,   241,   242,     4,     4,   225,   112,
-       4,   414,    24,   416,   244,    10,    11,    12,    13,    14,
-      15,    16,    17,     4,    24,    24,   115,   244,   245,   246,
-     315,   115,   317,   318,   319,   112,    59,     4,     4,     4,
-     325,     4,     4,   287,    64,    65,    66,    67,    68,    69,
-      70,     7,   334,   335,   336,   337,   338,   339,     7,     7,
-     110,   113,   110,   110,   110,   347,   348,   349,   350,   306,
-     114,   110,    36,   110,   110,   312,   110,    24,    24,   110,
-      63,   110,   110,   110,    34,   110,    24,    21,   112,   326,
-     327,   112,   110,   112,   212,   213,   112,   314,   315,   316,
-     317,   318,   319,   320,   321,   283,   224,   112,   325,   112,
-     112,   229,   113,    21,     4,   397,   112,    24,     4,   112,
-     112,   110,   240,   241,   242,   110,   110,   114,   365,    57,
-     367,   110,   110,   110,   371,   110,   421,   422,   423,   356,
-     112,   110,   110,   380,   381,   382,     4,    36,    24,   110,
-     110,   368,   434,   435,   436,   437,   110,   439,   440,   441,
-     442,   112,   114,    57,    21,   474,   474,   110,   453,   386,
-     110,   110,   113,   110,   411,   412,    36,   110,   110,   110,
-     110,   110,   419,   492,   492,   110,   110,   110,   306,   116,
-     116,   428,   113,   113,   312,   113,   413,   110,   113,   481,
-     110,   483,   484,    21,   421,   422,   423,   110,   326,   327,
-     427,   113,   113,   113,   113,   113,   433,   113,   455,   110,
-     113,    21,   110,    76,    21,    21,    97,    97,    97,    97,
-      41,    25,   357,    52,   356,   122,   453,    61,   197,     3,
-      19,   391,   368,   427,    -1,    -1,    -1,   365,    -1,   367,
-       5,     6,   489,   371,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   380,   381,   382,   502,    -1,    22,    -1,    24,
-      -1,    26,   509,    -1,    -1,    -1,   513,   514,    -1,    -1,
-      -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   411,   412,    -1,    -1,    -1,    -1,    -1,
-      -1,   419,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     428,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      37,   130,   130,    53,   228,     3,   251,   252,     0,    15,
+     112,   111,    23,    34,   131,    61,    53,   475,    15,    30,
+     125,   121,    85,   128,    10,    11,    12,    13,    14,    15,
+      16,    17,   270,   271,   279,   493,    57,   111,   492,   111,
+      45,    29,    47,    41,    23,   117,   151,   121,   502,   154,
+     155,    57,   169,   158,   159,   160,   161,   162,   163,   122,
+      57,   299,   167,    10,    11,    12,    13,    14,    15,    16,
+      17,   113,   109,   110,   111,    52,    53,    54,     9,   111,
+     122,   117,    55,    56,    57,   110,   122,   119,   125,    87,
+      21,   128,     5,     6,    71,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+     121,    24,   149,   150,   151,   152,   153,   154,   155,     0,
+      61,   158,   159,   160,   161,   162,   163,   164,   165,   166,
+     167,   117,   120,    24,    22,    48,    24,   200,   201,   202,
+     111,   198,   247,   111,    25,   110,   391,     4,   119,   117,
+      31,   208,   119,    32,    33,   122,   213,   214,    55,    56,
+      41,    42,    43,    44,    45,    46,    47,   204,   225,   115,
+     117,    96,    97,   230,    27,    28,   226,     3,     4,     3,
+       4,    62,     3,     4,   241,   242,   243,     3,     4,   226,
+     110,   415,   110,   417,   110,   245,     3,     4,   110,   112,
+       4,     4,   115,   113,   117,   118,     4,   120,   245,   246,
+     247,   316,   113,   318,   319,   320,    24,     4,    24,    24,
+     116,   326,   116,   113,    59,   288,    64,    65,    66,    67,
+      68,    69,    70,   335,   336,   337,   338,   339,   340,    20,
+       4,     4,     4,     4,     4,   111,   348,   349,   350,   351,
+     307,     7,     7,     7,   114,   111,   313,   111,    36,   111,
+      41,    42,    43,    44,    45,    46,    47,   115,   111,    50,
+     327,   328,   111,    24,   111,   213,   214,   111,   315,   316,
+     317,   318,   319,   320,   321,   322,   284,   225,   111,   326,
+      24,   111,   230,   111,   111,   114,   398,   111,   113,    34,
+     113,   113,   113,   241,   242,   243,    63,    24,    21,   366,
+      21,   368,   113,   113,   113,   372,   113,   422,   423,   424,
+     357,   113,   113,   111,   381,   382,   383,   111,   111,   111,
+     115,   111,   369,   435,   436,   437,   438,   111,   440,   441,
+     442,   443,   111,   111,     4,   111,   475,   475,   113,   454,
+     387,    24,   111,   111,     4,   412,   413,    36,   111,    57,
+       4,   113,   111,   420,   493,   493,   111,   111,   111,   307,
+     111,   111,   429,   111,   111,   313,    24,   414,   111,   111,
+     482,   111,   484,   485,   111,   422,   423,   424,   114,   327,
+     328,   428,   111,   115,   114,    57,   117,   434,   114,   456,
+      10,    11,    12,    13,    14,    15,    16,    17,   114,   111,
+     114,   111,   111,   114,    21,    36,    21,   454,   114,   114,
+     114,   111,   114,   114,   117,   114,    21,   111,   366,    76,
+     368,    21,    21,   490,   372,    41,    97,    25,    97,    97,
+      97,   358,   122,   381,   382,   383,   503,    61,   198,    52,
+     357,     3,    19,   510,   369,   392,   428,   514,   515,    -1,
+       5,     6,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   412,   413,    -1,    22,    -1,    24,
+      -1,    26,   420,    -1,    20,    -1,    22,    -1,    24,    -1,
+      -1,   429,    -1,    38,    39,    31,    32,    33,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    41,    42,    43,    44,    45,
+      46,    47,    -1,    -1,    50,    51,    -1,    -1,   456,    -1,
+      -1,    -1,    58,    -1,    -1,    -1,    62,    -1,    -1,    -1,
       -1,    -1,    -1,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,   455,    -1,    -1,
-      -1,    -1,    97,    -1,    99,   100,   101,   102,    -1,   104,
-     105,   106,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   114,
-      -1,    -1,   117,    -1,   119,    -1,    -1,   122,    -1,    -1,
-      -1,   489,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   502,    -1,    -1,    -1,    -1,    -1,
-      -1,   509,    -1,    -1,    -1,   513,   514,     5,     6,    -1,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    -1,    24,     5,     6,    -1,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,
-      48,    -1,    -1,    -1,    -1,    20,    -1,    22,    -1,    24,
-      -1,    -1,    -1,    -1,    -1,    -1,    31,    32,    33,    -1,
-      48,     3,     4,     5,     6,     7,    41,    42,    43,    44,
-      45,    46,    47,    -1,    -1,    50,    51,    -1,    -1,    -1,
-      22,    -1,    24,    58,    26,    27,    28,    62,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    38,    39,    -1,    -1,
-      -1,    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,
-      -1,   119,   120,    -1,    -1,    -1,    -1,    -1,    -1,    61,
-      -1,    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,
-      -1,   119,   120,    -1,    -1,    -1,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      -1,    -1,    -1,    -1,    -1,    97,    -1,    99,   100,   101,
-     102,    -1,   104,   105,   106,     3,     4,    -1,    -1,     7,
-      -1,    -1,    -1,    -1,    -1,   117,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    26,    27,
-      28,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      38,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      85,    86,    87,    88,    89,    90,    91,    92,    -1,    -1,
+      -1,    -1,   490,    98,    -1,   100,   101,   102,   103,    -1,
+     105,   106,   107,    -1,    -1,   503,    -1,    -1,    -1,    -1,
+     115,    -1,   510,   118,    -1,   120,   514,   515,   123,     5,
+       6,    -1,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    -1,    24,     5,
+       6,    -1,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    -1,    24,    -1,
+      -1,    -1,    48,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    61,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    48,     3,     4,     5,     6,     7,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    -1,    -1,    -1,    -1,    -1,    97,
-      -1,    99,   100,   101,   102,    -1,   104,   105,   106,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,   117,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,
-      48,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    -1,    24,    -1,    -1,
+      -1,    -1,    22,    -1,    24,    -1,    26,    27,    28,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,    39,
+      -1,    -1,    -1,    -1,    -1,    -1,   112,    -1,    -1,   115,
+      -1,    -1,   118,    -1,   120,   121,    -1,    -1,    -1,    -1,
+      -1,    61,    -1,    -1,    -1,    -1,   112,    -1,    -1,   115,
+      -1,    -1,   118,    -1,   120,   121,    -1,    -1,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    -1,    -1,    -1,    -1,    -1,    98,    -1,
+     100,   101,   102,   103,    -1,   105,   106,   107,     3,     4,
+      -1,    -1,     7,    -1,    -1,    -1,    -1,    -1,   118,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      37,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,
-       6,    48,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    -1,    24,    -1,
-      -1,    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,
-      -1,   119,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    48,     5,     6,    -1,     8,     9,    10,    11,
+      -1,    26,    27,    28,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    61,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    -1,    -1,
+      -1,    -1,    -1,    98,    -1,   100,   101,   102,   103,    -1,
+     105,   106,   107,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,     5,     6,   118,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    -1,
+      24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     5,     6,    48,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,     5,     6,    48,     8,     9,    10,    11,
       12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    -1,    24,    -1,   111,    -1,    -1,   114,    -1,    -1,
-     117,    -1,   119,    -1,    -1,    37,    -1,    -1,    -1,    -1,
+      22,    -1,    24,    -1,    -1,    -1,    -1,    -1,   112,    -1,
+      -1,   115,    -1,    -1,   118,    37,   120,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,     5,     6,    48,     8,     9,    10,
       11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    -1,    24,    -1,   111,    -1,    -1,   114,    -1,
-     116,   117,    -1,   119,    -1,    -1,    37,    -1,    -1,    -1,
+      21,    22,    -1,    24,    -1,    -1,    -1,    -1,    -1,   112,
+      -1,    -1,   115,    -1,    -1,   118,    37,   120,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,     5,     6,    48,     8,     9,
       10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,   111,
-      -1,    -1,   114,    -1,    -1,   117,    -1,   119,    -1,    -1,
+      20,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,    -1,
+     112,    -1,    -1,   115,    -1,    -1,   118,    -1,   120,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    48,     8,
        9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
       19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,
-     111,    -1,    -1,   114,    -1,    -1,   117,    -1,   119,    -1,
+      -1,   112,    -1,    -1,   115,    -1,    -1,   118,    -1,   120,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    48,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
       18,    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,
-      -1,   111,    -1,    -1,   114,    -1,    -1,   117,    -1,   119,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,
+      -1,    -1,   112,    -1,    -1,   115,    -1,    -1,   118,    -1,
+     120,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,
       48,     8,     9,    10,    11,    12,    13,    14,    15,    16,
       17,    18,    19,    20,    21,    22,    -1,    24,    -1,    -1,
-      -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,    -1,
-     119,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   112,    -1,    -1,   115,    -1,    -1,   118,
+      -1,   120,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    48,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,
-      -1,   119,    -1,    -1,    -1,    -1,    35,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   112,    -1,    -1,   115,    -1,    -1,
+     118,    -1,   120,    -1,    -1,    -1,    -1,    35,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      59,    60,    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,
-     117,    -1,   119,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    -1,    -1,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108
+      -1,    49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    59,    60,    -1,    -1,   112,    -1,    -1,   115,    -1,
+      -1,   118,    -1,   120,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    -1,    -1,
+      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const unsigned char yystos[] =
 {
-       0,   154,   155,   156,     0,    25,    31,    41,    42,    43,
-      44,    45,    46,    47,    62,   135,   173,   175,   177,   184,
-      22,    24,    51,    58,    62,   134,   166,   177,   178,    61,
-      64,    65,    66,    67,    68,    69,    70,   136,   171,    23,
-     185,   186,    30,   120,   174,   185,    52,    53,    54,    71,
-     163,   109,    61,    20,    45,    47,    50,   135,   109,    45,
-      47,   176,    24,   161,     4,     5,     6,     8,     9,    10,
+       0,   155,   156,   157,     0,    25,    31,    41,    42,    43,
+      44,    45,    46,    47,    62,   136,   174,   176,   178,   185,
+      22,    24,    51,    58,    62,   135,   167,   178,   179,    61,
+      64,    65,    66,    67,    68,    69,    70,   137,   172,    23,
+     186,   187,    30,   121,   175,   186,    52,    53,    54,    71,
+     164,   110,    61,    20,    45,    47,    50,   136,   110,    45,
+      47,   177,    24,   162,     4,     5,     6,     8,     9,    10,
       11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    48,   111,   114,   117,   119,   124,   143,   144,   145,
-     146,   147,   166,   181,    29,   119,   172,   134,   189,   109,
-     109,   109,   109,   114,   164,   161,   143,    32,    33,   153,
-     153,   153,   153,   171,     4,     4,     4,     8,   120,   147,
-     148,   166,   112,   121,    35,    49,    59,    60,    72,    73,
+      21,    48,   112,   115,   118,   120,   125,   144,   145,   146,
+     147,   148,   167,   182,    29,   120,   173,   135,   190,   110,
+     110,   110,   110,   115,   165,   162,   144,    32,    33,   154,
+     154,   154,   154,   172,     4,     4,     4,     8,   121,   148,
+     149,   167,   113,   122,    35,    49,    59,    60,    72,    73,
       74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
       84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-      94,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   126,   127,   128,   129,   187,   193,   194,
-     196,   197,    24,    55,    56,   162,     4,    24,    24,   165,
-     145,   145,   145,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,   130,   131,   133,   145,   150,   115,
-     115,   110,   120,   112,    37,   148,   149,   145,   183,    59,
-       8,   183,     9,    21,    10,    11,    12,    13,    14,    15,
-      16,    17,   130,   131,   132,   136,   145,   145,   183,   145,
-     145,   190,   183,   183,   183,   183,   183,   183,   183,   183,
-     145,   145,   145,   183,   136,    95,    96,   110,   116,   159,
-     160,   158,    27,    28,     3,     4,   125,     4,     7,    26,
-      38,    39,    97,    99,   100,   104,   105,   106,   114,   117,
-     119,   122,   126,   127,   128,   129,   151,   181,   157,   147,
-     147,   147,    37,   145,   168,   169,   170,   110,   113,     3,
-       4,     7,    26,    27,    28,    38,    39,    61,   117,   151,
-     180,   181,   182,   182,   182,   182,   143,   110,   138,   110,
-     138,   182,   114,   110,    36,   110,   110,   110,   110,   110,
-     110,   110,   182,   182,   182,   110,   143,   145,   183,    24,
-     110,   141,   141,   141,   112,   112,   112,   112,   112,   112,
-     116,   150,   152,   152,   120,   152,    24,   112,   112,   112,
-     112,   141,   116,   118,   166,   167,   110,   113,    37,    63,
-     179,   152,   110,   110,   182,    15,    57,    15,   110,   195,
-     182,   114,   145,   183,   145,   183,   183,   183,   145,   145,
-     110,   110,   110,   183,   182,   182,   110,    34,    57,   139,
-     142,   150,   150,   150,   150,   150,   150,   110,   116,   118,
-     120,   150,   150,   150,   150,    37,   168,   139,   140,    24,
-     118,    21,    21,   112,   182,     4,   182,   183,   191,   110,
-     182,   110,   110,   110,   182,   182,   182,   112,   145,    24,
-       4,   141,   195,    36,   110,   110,   110,   110,   150,   110,
-     110,   110,   110,    57,   137,   110,   182,   182,   191,   192,
-     110,   138,   138,   110,   182,   110,   183,   183,   183,   192,
-     182,   113,   145,   150,   150,   150,   150,   150,   150,   150,
-     150,     4,    24,   110,   114,   113,   183,   116,   182,   113,
-     113,   110,   113,   110,   110,   113,   113,   113,   113,    21,
-     116,   132,   188,    36,   116,   150,   150,   150,   182,   180,
-     116,   132,    21,   113,   113,   113,   110,   180,   182,    21,
-     110,    76,   182,    21,    21,   182,   182
+      94,    95,    98,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   127,   128,   129,   130,   188,   194,
+     195,   197,   198,    24,    55,    56,   163,     4,    24,    24,
+     166,   146,   146,   146,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,   131,   132,   134,   146,   151,
+     116,   116,   111,   121,   113,    37,   149,   150,   146,   184,
+      59,     8,   184,     9,    21,    10,    11,    12,    13,    14,
+      15,    16,    17,   131,   132,   133,   137,   146,   146,   184,
+     146,   146,   191,   184,   184,   184,   184,   184,   184,   184,
+     184,   146,   146,   146,   184,   137,    96,    97,   111,   117,
+     160,   161,   159,    27,    28,     3,     4,   126,     4,     7,
+      26,    38,    39,    98,   100,   101,   105,   106,   107,   115,
+     118,   120,   123,   127,   128,   129,   130,   152,   182,   158,
+     148,   148,   148,    37,   146,   169,   170,   171,   111,   114,
+       3,     4,     7,    26,    27,    28,    38,    39,    61,   118,
+     152,   181,   182,   183,   183,   183,   183,   144,   111,   139,
+     111,   139,   183,   115,   111,    36,   111,   111,   111,   111,
+     111,   111,   111,   183,   183,   183,   111,   144,   146,   184,
+      24,   111,   142,   142,   142,   113,   113,   113,   113,   113,
+     113,   117,   151,   153,   153,   121,   153,    24,   113,   113,
+     113,   113,   142,   117,   119,   167,   168,   111,   114,    37,
+      63,   180,   153,   111,   111,   183,    15,    57,    15,   111,
+     196,   183,   115,   146,   184,   146,   184,   184,   184,   146,
+     146,   111,   111,   111,   184,   183,   183,   111,    34,    57,
+     140,   143,   151,   151,   151,   151,   151,   151,   111,   117,
+     119,   121,   151,   151,   151,   151,    37,   169,   140,   141,
+      24,   119,    21,    21,   113,   183,     4,   183,   184,   192,
+     111,   183,   111,   111,   111,   183,   183,   183,   113,   146,
+      24,     4,   142,   196,    36,   111,   111,   111,   111,   151,
+     111,   111,   111,   111,    57,   138,   111,   183,   183,   192,
+     193,   111,   139,   139,   111,   183,   111,   184,   184,   184,
+     193,   183,   114,   146,   151,   151,   151,   151,   151,   151,
+     151,   151,     4,    24,   111,   115,   114,   184,   117,   183,
+     114,   114,   111,   114,   111,   111,   114,   114,   114,   114,
+      21,   117,   133,   189,    36,   117,   151,   151,   151,   183,
+     181,   117,   133,    21,   114,   114,   114,   111,   181,   183,
+      21,   111,    76,   183,    21,    21,   183,   183
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -2955,7 +2969,7 @@
   switch (yyn)
     {
         case 3:
-#line 1098 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1115 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
   if ((yyvsp[0].UIntVal) > (uint32_t)INT32_MAX)     // Outside of my range!
     GEN_ERROR("Value too large for type!");
@@ -2965,7 +2979,7 @@
     break;
 
   case 5:
-#line 1107 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1124 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
   if ((yyvsp[0].UInt64Val) > (uint64_t)INT64_MAX)     // Outside of my range!
     GEN_ERROR("Value too large for type!");
@@ -2974,99 +2988,99 @@
 ;}
     break;
 
-  case 34:
-#line 1131 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 35:
+#line 1148 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[-1].StrVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 35:
-#line 1135 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 36:
+#line 1152 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 36:
-#line 1140 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 37:
+#line 1157 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
-  case 37:
-#line 1141 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 38:
+#line 1158 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
-  case 38:
-#line 1142 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 39:
+#line 1159 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
-  case 39:
-#line 1143 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 40:
+#line 1160 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
-  case 40:
-#line 1144 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 41:
+#line 1161 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
-  case 41:
-#line 1145 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 42:
+#line 1162 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
-  case 42:
-#line 1146 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 43:
+#line 1163 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
-  case 43:
-#line 1147 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 44:
+#line 1164 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
-  case 44:
-#line 1149 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 45:
+#line 1166 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
-  case 45:
-#line 1150 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 46:
+#line 1167 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
-  case 46:
-#line 1151 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 47:
+#line 1168 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::CSRet; ;}
     break;
 
-  case 47:
-#line 1152 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 48:
+#line 1169 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Fast; ;}
     break;
 
-  case 48:
-#line 1153 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 49:
+#line 1170 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Cold; ;}
     break;
 
-  case 49:
-#line 1154 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 50:
+#line 1171 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
     break;
 
-  case 50:
-#line 1155 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 51:
+#line 1172 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
     break;
 
-  case 51:
-#line 1156 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 52:
+#line 1173 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
                    if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val))
                      GEN_ERROR("Calling conv too large!");
@@ -3075,13 +3089,13 @@
                  ;}
     break;
 
-  case 52:
-#line 1165 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 53:
+#line 1182 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 53:
-#line 1166 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 54:
+#line 1183 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3090,13 +3104,13 @@
 ;}
     break;
 
-  case 54:
-#line 1172 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 55:
+#line 1189 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 55:
-#line 1173 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 56:
+#line 1190 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3105,8 +3119,8 @@
 ;}
     break;
 
-  case 56:
-#line 1181 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 57:
+#line 1198 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
   for (unsigned i = 0, e = strlen((yyvsp[0].StrVal)); i != e; ++i)
     if ((yyvsp[0].StrVal)[i] == '"' || (yyvsp[0].StrVal)[i] == '\\')
@@ -3116,28 +3130,28 @@
 ;}
     break;
 
-  case 57:
-#line 1189 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 58:
+#line 1206 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
-  case 58:
-#line 1190 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 59:
+#line 1207 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
     break;
 
-  case 59:
-#line 1195 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 60:
+#line 1212 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
-  case 60:
-#line 1196 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 61:
+#line 1213 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
-  case 61:
-#line 1197 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 62:
+#line 1214 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -3145,8 +3159,8 @@
   ;}
     break;
 
-  case 62:
-#line 1202 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 63:
+#line 1219 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[0].UInt64Val)))
       GEN_ERROR("Alignment must be a power of two!");
@@ -3155,18 +3169,18 @@
   ;}
     break;
 
-  case 64:
-#line 1216 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 65:
+#line 1233 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType)); ;}
     break;
 
-  case 66:
-#line 1217 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 67:
+#line 1234 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType)); ;}
     break;
 
-  case 67:
-#line 1219 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 68:
+#line 1236 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -3175,24 +3189,24 @@
   ;}
     break;
 
-  case 81:
-#line 1231 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 82:
+#line 1248 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 82:
-#line 1235 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 83:
+#line 1252 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 83:
-#line 1239 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 84:
+#line 1256 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
   const Type* tmp = getTypeVal((yyvsp[0].ValIDVal));
   CHECK_FOR_ERROR
@@ -3200,8 +3214,8 @@
 ;}
     break;
 
-  case 84:
-#line 1247 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 85:
+#line 1264 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {                   // Type UpReference
     if ((yyvsp[0].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range!");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
@@ -3212,8 +3226,8 @@
   ;}
     break;
 
-  case 85:
-#line 1255 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 86:
+#line 1272 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {           // Function derived type?
     std::vector<const Type*> Params;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(),
@@ -3229,8 +3243,8 @@
   ;}
     break;
 
-  case 86:
-#line 1268 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 87:
+#line 1285 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val))));
     delete (yyvsp[-1].TypeVal);
@@ -3238,8 +3252,8 @@
   ;}
     break;
 
-  case 87:
-#line 1273 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 88:
+#line 1290 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {          // Packed array type?
      const llvm::Type* ElemTy = (yyvsp[-1].TypeVal)->get();
      if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
@@ -3254,8 +3268,8 @@
   ;}
     break;
 
-  case 88:
-#line 1285 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 89:
+#line 1302 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(),
@@ -3268,16 +3282,16 @@
   ;}
     break;
 
-  case 89:
-#line 1295 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 90:
+#line 1312 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 90:
-#line 1299 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 91:
+#line 1316 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[-1].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -3287,8 +3301,8 @@
   ;}
     break;
 
-  case 91:
-#line 1310 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 92:
+#line 1327 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal);
@@ -3296,40 +3310,40 @@
   ;}
     break;
 
-  case 92:
-#line 1315 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 93:
+#line 1332 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 94:
-#line 1322 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 95:
+#line 1339 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(Type::VoidTy);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 95:
-#line 1326 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 96:
+#line 1343 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList) = new std::list<PATypeHolder>())->push_back(Type::VoidTy);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 96:
-#line 1330 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 97:
+#line 1347 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 97:
-#line 1341 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 98:
+#line 1358 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-3].TypeVal)->get());
     if (ATy == 0)
@@ -3358,8 +3372,8 @@
   ;}
     break;
 
-  case 98:
-#line 1367 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 99:
+#line 1384 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get());
     if (ATy == 0)
@@ -3376,8 +3390,8 @@
   ;}
     break;
 
-  case 99:
-#line 1381 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 100:
+#line 1398 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get());
     if (ATy == 0)
@@ -3410,8 +3424,8 @@
   ;}
     break;
 
-  case 100:
-#line 1411 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 101:
+#line 1428 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     const PackedType *PTy = dyn_cast<PackedType>((yyvsp[-3].TypeVal)->get());
     if (PTy == 0)
@@ -3440,8 +3454,8 @@
   ;}
     break;
 
-  case 101:
-#line 1437 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 102:
+#line 1454 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal)->get());
     if (STy == 0)
@@ -3465,8 +3479,8 @@
   ;}
     break;
 
-  case 102:
-#line 1458 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 103:
+#line 1475 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-2].TypeVal)->get());
     if (STy == 0)
@@ -3482,8 +3496,8 @@
   ;}
     break;
 
-  case 103:
-#line 1471 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 104:
+#line 1488 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
     if (PTy == 0)
@@ -3496,8 +3510,8 @@
   ;}
     break;
 
-  case 104:
-#line 1481 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 105:
+#line 1498 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVal) = UndefValue::get((yyvsp[-1].TypeVal)->get());
     delete (yyvsp[-1].TypeVal);
@@ -3505,8 +3519,8 @@
   ;}
     break;
 
-  case 105:
-#line 1486 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 106:
+#line 1503 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *Ty = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
     if (Ty == 0)
@@ -3570,8 +3584,8 @@
   ;}
     break;
 
-  case 106:
-#line 1547 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 107:
+#line 1564 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-1].TypeVal)->get() != (yyvsp[0].ConstVal)->getType())
       GEN_ERROR("Mismatched types for constant expression!");
@@ -3581,8 +3595,8 @@
   ;}
     break;
 
-  case 107:
-#line 1554 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 108:
+#line 1571 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[-1].TypeVal)->get();
     if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
@@ -3593,8 +3607,8 @@
   ;}
     break;
 
-  case 108:
-#line 1563 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 109:
+#line 1580 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type!");
@@ -3603,8 +3617,8 @@
   ;}
     break;
 
-  case 109:
-#line 1569 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 110:
+#line 1586 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {            // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type!");
@@ -3613,24 +3627,24 @@
   ;}
     break;
 
-  case 110:
-#line 1575 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 111:
+#line 1592 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     (yyval.ConstVal) = ConstantBool::getTrue();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 111:
-#line 1579 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 112:
+#line 1596 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     (yyval.ConstVal) = ConstantBool::getFalse();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 112:
-#line 1583 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 113:
+#line 1600 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {                   // Float & Double constants
     if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].FPVal)))
       GEN_ERROR("Floating point constant invalid for type!!");
@@ -3639,8 +3653,8 @@
   ;}
     break;
 
-  case 113:
-#line 1591 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 114:
+#line 1608 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if (!(yyvsp[-3].ConstVal)->getType()->isFirstClassType())
       GEN_ERROR("cast constant expression from a non-primitive type: '" +
@@ -3654,8 +3668,8 @@
   ;}
     break;
 
-  case 114:
-#line 1602 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 115:
+#line 1619 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-2].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand!");
@@ -3690,8 +3704,8 @@
   ;}
     break;
 
-  case 115:
-#line 1634 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 116:
+#line 1651 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-5].ConstVal)->getType() != Type::BoolTy)
       GEN_ERROR("Select condition must be of boolean type!");
@@ -3702,17 +3716,19 @@
   ;}
     break;
 
-  case 116:
-#line 1642 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 117:
+#line 1659 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match!");
+    sanitizeOpCode((yyvsp[-5].BinaryOpVal),(yyvsp[-3].ConstVal)->getType());
+    CHECK_FOR_ERROR;
     // HACK: llvm 1.3 and earlier used to emit invalid pointer constant exprs.
     // To retain backward compatibility with these early compilers, we emit a
     // cast to the appropriate integer type automatically if we are in the
     // broken case.  See PR424 for more information.
     if (!isa<PointerType>((yyvsp[-3].ConstVal)->getType())) {
-      (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+      (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal).opcode, (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
     } else {
       const Type *IntPtrTy = 0;
       switch (CurModule.CurrentModule->getPointerSize()) {
@@ -3720,7 +3736,7 @@
       case Module::Pointer64: IntPtrTy = Type::LongTy; break;
       default: GEN_ERROR("invalid pointer binary constant expr!");
       }
-      (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), ConstantExpr::getCast((yyvsp[-3].ConstVal), IntPtrTy),
+      (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal).opcode, ConstantExpr::getCast((yyvsp[-3].ConstVal), IntPtrTy),
                              ConstantExpr::getCast((yyvsp[-1].ConstVal), IntPtrTy));
       (yyval.ConstVal) = ConstantExpr::getCast((yyval.ConstVal), (yyvsp[-3].ConstVal)->getType());
     }
@@ -3728,8 +3744,8 @@
   ;}
     break;
 
-  case 117:
-#line 1664 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 118:
+#line 1683 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match!");
@@ -3738,35 +3754,35 @@
           !cast<PackedType>((yyvsp[-3].ConstVal)->getType())->getElementType()->isIntegral())
         GEN_ERROR("Logical operator requires integral operands!");
     }
-    (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal).opcode, (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 118:
-#line 1675 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 119:
+#line 1694 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("setcc operand types must match!");
-    (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal).opcode, (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 119:
-#line 1681 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 120:
+#line 1700 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-1].ConstVal)->getType() != Type::UByteTy)
       GEN_ERROR("Shift count for shift constant must be unsigned byte!");
     if (!(yyvsp[-3].ConstVal)->getType()->isInteger())
       GEN_ERROR("Shift constant expression requires integer operand!");
-    (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].OtherOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].OtherOpVal).opcode, (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 120:
-#line 1689 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 121:
+#line 1708 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid extractelement operands!");
@@ -3775,8 +3791,8 @@
   ;}
     break;
 
-  case 121:
-#line 1695 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 122:
+#line 1714 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid insertelement operands!");
@@ -3785,8 +3801,8 @@
   ;}
     break;
 
-  case 122:
-#line 1701 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 123:
+#line 1720 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid shufflevector operands!");
@@ -3795,16 +3811,16 @@
   ;}
     break;
 
-  case 123:
-#line 1710 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 124:
+#line 1729 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 124:
-#line 1714 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 125:
+#line 1733 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
@@ -3812,18 +3828,18 @@
   ;}
     break;
 
-  case 125:
-#line 1722 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 126:
+#line 1741 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 126:
-#line 1722 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 127:
+#line 1741 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 127:
-#line 1732 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 128:
+#line 1751 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.ModuleVal) = ParserResult = (yyvsp[0].ModuleVal);
   CurModule.ModuleDone();
@@ -3831,8 +3847,8 @@
 ;}
     break;
 
-  case 128:
-#line 1740 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 129:
+#line 1759 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);
     CurFun.FunctionDone();
@@ -3840,32 +3856,32 @@
   ;}
     break;
 
-  case 129:
-#line 1745 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 130:
+#line 1764 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 130:
-#line 1749 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 131:
+#line 1768 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = (yyvsp[-3].ModuleVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 131:
-#line 1753 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 132:
+#line 1772 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 132:
-#line 1757 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 133:
+#line 1776 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = CurModule.CurrentModule;
     // Emit an error if there are any unresolved types left.
@@ -3881,8 +3897,8 @@
   ;}
     break;
 
-  case 133:
-#line 1772 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 134:
+#line 1791 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     // Eagerly resolve types.  This is not an optimization, this is a
     // requirement that is due to the fact that we could have this:
@@ -3907,22 +3923,22 @@
   ;}
     break;
 
-  case 134:
-#line 1794 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 135:
+#line 1813 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {       // Function prototypes can be in const pool
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 135:
-#line 1797 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 136:
+#line 1816 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {  // Asm blocks can be in the const pool
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 136:
-#line 1800 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 137:
+#line 1819 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant!");
@@ -3931,15 +3947,15 @@
   ;}
     break;
 
-  case 137:
-#line 1805 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 138:
+#line 1824 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 138:
-#line 1808 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 139:
+#line 1827 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
     CHECK_FOR_ERROR
@@ -3947,16 +3963,16 @@
   ;}
     break;
 
-  case 139:
-#line 1812 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 140:
+#line 1831 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 140:
-#line 1816 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 141:
+#line 1835 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::DLLImportLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
     CHECK_FOR_ERROR
@@ -3964,16 +3980,16 @@
   ;}
     break;
 
-  case 141:
-#line 1820 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 142:
+#line 1839 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 142:
-#line 1824 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 143:
+#line 1843 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 
       ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalWeakLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
@@ -3982,36 +3998,36 @@
   ;}
     break;
 
-  case 143:
-#line 1829 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 144:
+#line 1848 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 144:
-#line 1833 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 145:
+#line 1852 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 145:
-#line 1836 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 146:
+#line 1855 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 146:
-#line 1839 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 147:
+#line 1858 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { 
   ;}
     break;
 
-  case 147:
-#line 1843 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 148:
+#line 1862 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
@@ -4026,26 +4042,26 @@
 ;}
     break;
 
-  case 148:
-#line 1856 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 149:
+#line 1875 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Endianness) = Module::BigEndian; ;}
     break;
 
-  case 149:
-#line 1857 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 150:
+#line 1876 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Endianness) = Module::LittleEndian; ;}
     break;
 
-  case 150:
-#line 1859 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 151:
+#line 1878 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setEndianness((yyvsp[0].Endianness));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 151:
-#line 1863 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 152:
+#line 1882 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].UInt64Val) == 32)
       CurModule.CurrentModule->setPointerSize(Module::Pointer32);
@@ -4057,8 +4073,8 @@
   ;}
     break;
 
-  case 152:
-#line 1872 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 153:
+#line 1891 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -4066,8 +4082,8 @@
   ;}
     break;
 
-  case 153:
-#line 1877 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 154:
+#line 1896 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -4075,8 +4091,8 @@
   ;}
     break;
 
-  case 155:
-#line 1885 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 156:
+#line 1904 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4084,8 +4100,8 @@
         ;}
     break;
 
-  case 156:
-#line 1890 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 157:
+#line 1909 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4093,20 +4109,20 @@
         ;}
     break;
 
-  case 157:
-#line 1895 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 158:
+#line 1914 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
-  case 161:
-#line 1905 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 162:
+#line 1924 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
-  case 162:
-#line 1907 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 163:
+#line 1926 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
   if (*(yyvsp[-1].TypeVal) == Type::VoidTy)
     GEN_ERROR("void typed arguments are invalid!");
@@ -4115,8 +4131,8 @@
 ;}
     break;
 
-  case 163:
-#line 1914 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 164:
+#line 1933 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[-2].ArgList);
     (yyvsp[-2].ArgList)->push_back(*(yyvsp[0].ArgVal));
@@ -4125,8 +4141,8 @@
   ;}
     break;
 
-  case 164:
-#line 1920 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 165:
+#line 1939 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new std::vector<std::pair<PATypeHolder*,char*> >();
     (yyval.ArgList)->push_back(*(yyvsp[0].ArgVal));
@@ -4135,16 +4151,16 @@
   ;}
     break;
 
-  case 165:
-#line 1927 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 166:
+#line 1946 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[0].ArgList);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 166:
-#line 1931 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 167:
+#line 1950 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[-2].ArgList);
     (yyval.ArgList)->push_back(std::pair<PATypeHolder*,
@@ -4153,8 +4169,8 @@
   ;}
     break;
 
-  case 167:
-#line 1937 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 168:
+#line 1956 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new std::vector<std::pair<PATypeHolder*,char*> >();
     (yyval.ArgList)->push_back(std::make_pair(new PATypeHolder(Type::VoidTy), (char*)0));
@@ -4162,16 +4178,16 @@
   ;}
     break;
 
-  case 168:
-#line 1942 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 169:
+#line 1961 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 169:
-#line 1948 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 170:
+#line 1967 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
   UnEscapeLexed((yyvsp[-5].StrVal));
   std::string FunctionName((yyvsp[-5].StrVal));
@@ -4267,8 +4283,8 @@
 ;}
     break;
 
-  case 172:
-#line 2044 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 173:
+#line 2063 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -4278,31 +4294,31 @@
 ;}
     break;
 
-  case 175:
-#line 2054 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 176:
+#line 2073 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   CHECK_FOR_ERROR
 ;}
     break;
 
-  case 177:
-#line 2060 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 178:
+#line 2079 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { CurFun.Linkage = GlobalValue::DLLImportLinkage ;}
     break;
 
-  case 178:
-#line 2061 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 179:
+#line 2080 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { CurFun.Linkage = GlobalValue::DLLImportLinkage ;}
     break;
 
-  case 179:
-#line 2063 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 180:
+#line 2082 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
-  case 180:
-#line 2063 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 181:
+#line 2082 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = CurFun.CurrentFunction;
     CurFun.FunctionDone();
@@ -4310,88 +4326,88 @@
   ;}
     break;
 
-  case 181:
-#line 2073 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 182:
+#line 2092 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 182:
-#line 2077 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 183:
+#line 2096 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 183:
-#line 2082 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 184:
+#line 2101 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 184:
-#line 2086 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 185:
+#line 2105 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 185:
-#line 2090 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 186:
+#line 2109 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 186:
-#line 2094 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 187:
+#line 2113 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantBool::getTrue());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 187:
-#line 2098 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 188:
+#line 2117 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantBool::getFalse());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 188:
-#line 2102 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 189:
+#line 2121 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 189:
-#line 2106 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 190:
+#line 2125 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 190:
-#line 2110 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 191:
+#line 2129 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 191:
-#line 2114 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 192:
+#line 2133 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[-1].ConstVector))[0]->getType();
     int NumElements = (yyvsp[-1].ConstVector)->size(); 
@@ -4419,16 +4435,16 @@
   ;}
     break;
 
-  case 192:
-#line 2139 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 193:
+#line 2158 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 193:
-#line 2143 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 194:
+#line 2162 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
     std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
@@ -4441,48 +4457,48 @@
   ;}
     break;
 
-  case 194:
-#line 2157 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 195:
+#line 2176 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 195:
-#line 2161 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 196:
+#line 2180 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 198:
-#line 2173 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 199:
+#line 2192 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueVal) = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal)); delete (yyvsp[-1].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 199:
-#line 2178 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 200:
+#line 2197 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 200:
-#line 2182 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 201:
+#line 2201 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 201:
-#line 2191 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 202:
+#line 2210 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
     CHECK_FOR_ERROR
@@ -4495,8 +4511,8 @@
   ;}
     break;
 
-  case 202:
-#line 2202 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 203:
+#line 2221 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyvsp[-1].BasicBlockVal)->getInstList().push_back((yyvsp[0].InstVal));
     (yyval.BasicBlockVal) = (yyvsp[-1].BasicBlockVal);
@@ -4504,8 +4520,8 @@
   ;}
     break;
 
-  case 203:
-#line 2207 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 204:
+#line 2226 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
     CHECK_FOR_ERROR
@@ -4520,8 +4536,8 @@
   ;}
     break;
 
-  case 204:
-#line 2219 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 205:
+#line 2238 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((yyvsp[0].StrVal)), true);
     CHECK_FOR_ERROR
@@ -4536,24 +4552,24 @@
   ;}
     break;
 
-  case 205:
-#line 2232 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 206:
+#line 2251 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {              // Return with a result...
     (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 206:
-#line 2236 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 207:
+#line 2255 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {                                       // Return with no result...
     (yyval.TermInstVal) = new ReturnInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 207:
-#line 2240 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 208:
+#line 2259 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {                         // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
@@ -4561,8 +4577,8 @@
   ;}
     break;
 
-  case 208:
-#line 2245 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 209:
+#line 2264 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {  
     BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
     CHECK_FOR_ERROR
@@ -4574,8 +4590,8 @@
   ;}
     break;
 
-  case 209:
-#line 2254 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 210:
+#line 2273 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-7].PrimType), (yyvsp[-6].ValIDVal));
     CHECK_FOR_ERROR
@@ -4597,8 +4613,8 @@
   ;}
     break;
 
-  case 210:
-#line 2273 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 211:
+#line 2292 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-6].PrimType), (yyvsp[-5].ValIDVal));
     CHECK_FOR_ERROR
@@ -4610,8 +4626,8 @@
   ;}
     break;
 
-  case 211:
-#line 2283 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 212:
+#line 2302 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *PFTy;
     const FunctionType *Ty;
@@ -4669,24 +4685,24 @@
   ;}
     break;
 
-  case 212:
-#line 2338 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 213:
+#line 2357 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 213:
-#line 2342 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 214:
+#line 2361 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 214:
-#line 2349 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 215:
+#line 2368 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[-5].JumpTable);
     Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
@@ -4700,8 +4716,8 @@
   ;}
     break;
 
-  case 215:
-#line 2360 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 216:
+#line 2379 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
@@ -4716,8 +4732,8 @@
   ;}
     break;
 
-  case 216:
-#line 2373 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 217:
+#line 2392 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
   // Is this definition named?? if so, assign the name...
   setValueName((yyvsp[0].InstVal), (yyvsp[-1].StrVal));
@@ -4728,8 +4744,8 @@
 ;}
     break;
 
-  case 217:
-#line 2382 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 218:
+#line 2401 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     (yyval.PHIList) = new std::list<std::pair<Value*, BasicBlock*> >();
     Value* tmpVal = getVal(*(yyvsp[-5].TypeVal), (yyvsp[-3].ValIDVal));
@@ -4741,8 +4757,8 @@
   ;}
     break;
 
-  case 218:
-#line 2391 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 219:
+#line 2410 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.PHIList) = (yyvsp[-6].PHIList);
     Value* tmpVal = getVal((yyvsp[-6].PHIList)->front().first->getType(), (yyvsp[-3].ValIDVal));
@@ -4753,16 +4769,16 @@
   ;}
     break;
 
-  case 219:
-#line 2401 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 220:
+#line 2420 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {    // Used for call statements, and memory insts...
     (yyval.ValueList) = new std::vector<Value*>();
     (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
   ;}
     break;
 
-  case 220:
-#line 2405 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 221:
+#line 2424 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[-2].ValueList);
     (yyvsp[-2].ValueList)->push_back((yyvsp[0].ValueVal));
@@ -4770,49 +4786,51 @@
   ;}
     break;
 
-  case 222:
-#line 2412 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 223:
+#line 2431 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = 0; ;}
     break;
 
-  case 223:
-#line 2414 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 224:
+#line 2433 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 224:
-#line 2418 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 225:
+#line 2437 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 225:
-#line 2423 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 226:
+#line 2442 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if (!(*(yyvsp[-3].TypeVal))->isInteger() && !(*(yyvsp[-3].TypeVal))->isFloatingPoint() && 
         !isa<PackedType>((*(yyvsp[-3].TypeVal)).get()))
       GEN_ERROR(
         "Arithmetic operator requires integer, FP, or packed operands!");
-    if (isa<PackedType>((*(yyvsp[-3].TypeVal)).get()) && (yyvsp[-4].BinaryOpVal) == Instruction::Rem)
+    if (isa<PackedType>((*(yyvsp[-3].TypeVal)).get()) && (yyvsp[-4].BinaryOpVal).opcode == Instruction::Rem)
       GEN_ERROR("Rem not supported on packed types!");
+    sanitizeOpCode((yyvsp[-4].BinaryOpVal),*(yyvsp[-3].TypeVal));
+    CHECK_FOR_ERROR;
     Value* val1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal)); 
     CHECK_FOR_ERROR
     Value* val2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
-    (yyval.InstVal) = BinaryOperator::create((yyvsp[-4].BinaryOpVal), val1, val2);
+    (yyval.InstVal) = BinaryOperator::create((yyvsp[-4].BinaryOpVal).opcode, val1, val2);
     if ((yyval.InstVal) == 0)
       GEN_ERROR("binary operator returned null!");
     delete (yyvsp[-3].TypeVal);
   ;}
     break;
 
-  case 226:
-#line 2439 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 227:
+#line 2460 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if (!(*(yyvsp[-3].TypeVal))->isIntegral()) {
       if (!isa<PackedType>((yyvsp[-3].TypeVal)->get()) ||
@@ -4823,15 +4841,15 @@
     CHECK_FOR_ERROR
     Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
-    (yyval.InstVal) = BinaryOperator::create((yyvsp[-4].BinaryOpVal), tmpVal1, tmpVal2);
+    (yyval.InstVal) = BinaryOperator::create((yyvsp[-4].BinaryOpVal).opcode, tmpVal1, tmpVal2);
     if ((yyval.InstVal) == 0)
       GEN_ERROR("binary operator returned null!");
     delete (yyvsp[-3].TypeVal);
   ;}
     break;
 
-  case 227:
-#line 2454 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 228:
+#line 2475 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if(isa<PackedType>((*(yyvsp[-3].TypeVal)).get())) {
       GEN_ERROR(
@@ -4841,15 +4859,15 @@
     CHECK_FOR_ERROR
     Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
-    (yyval.InstVal) = new SetCondInst((yyvsp[-4].BinaryOpVal), tmpVal1, tmpVal2);
+    (yyval.InstVal) = new SetCondInst((yyvsp[-4].BinaryOpVal).opcode, tmpVal1, tmpVal2);
     if ((yyval.InstVal) == 0)
       GEN_ERROR("binary operator returned null!");
     delete (yyvsp[-3].TypeVal);
   ;}
     break;
 
-  case 228:
-#line 2468 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 229:
+#line 2489 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     std::cerr << "WARNING: Use of eliminated 'not' instruction:"
               << " Replacing with 'xor'.\n";
@@ -4865,20 +4883,20 @@
   ;}
     break;
 
-  case 229:
-#line 2481 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 230:
+#line 2502 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].ValueVal)->getType() != Type::UByteTy)
       GEN_ERROR("Shift amount must be ubyte!");
     if (!(yyvsp[-2].ValueVal)->getType()->isInteger())
       GEN_ERROR("Shift constant expression requires integer operand!");
-    (yyval.InstVal) = new ShiftInst((yyvsp[-3].OtherOpVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal));
+    (yyval.InstVal) = new ShiftInst((yyvsp[-3].OtherOpVal).opcode, (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 230:
-#line 2489 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 231:
+#line 2510 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if (!(yyvsp[0].TypeVal)->get()->isFirstClassType())
       GEN_ERROR("cast instruction to a non-primitive type: '" +
@@ -4889,8 +4907,8 @@
   ;}
     break;
 
-  case 231:
-#line 2497 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 232:
+#line 2518 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-4].ValueVal)->getType() != Type::BoolTy)
       GEN_ERROR("select condition must be boolean!");
@@ -4901,8 +4919,8 @@
   ;}
     break;
 
-  case 232:
-#line 2505 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 233:
+#line 2526 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     NewVarArgs = true;
     (yyval.InstVal) = new VAArgInst((yyvsp[-2].ValueVal), *(yyvsp[0].TypeVal));
@@ -4911,8 +4929,8 @@
   ;}
     break;
 
-  case 233:
-#line 2511 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 234:
+#line 2532 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     ObsoleteVarArgs = true;
     const Type* ArgTy = (yyvsp[-2].ValueVal)->getType();
@@ -4935,8 +4953,8 @@
   ;}
     break;
 
-  case 234:
-#line 2531 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 235:
+#line 2552 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     ObsoleteVarArgs = true;
     const Type* ArgTy = (yyvsp[-2].ValueVal)->getType();
@@ -4962,8 +4980,8 @@
   ;}
     break;
 
-  case 235:
-#line 2554 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 236:
+#line 2575 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid extractelement operands!");
@@ -4972,8 +4990,8 @@
   ;}
     break;
 
-  case 236:
-#line 2560 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 237:
+#line 2581 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid insertelement operands!");
@@ -4982,8 +5000,8 @@
   ;}
     break;
 
-  case 237:
-#line 2566 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 238:
+#line 2587 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands!");
@@ -4992,8 +5010,8 @@
   ;}
     break;
 
-  case 238:
-#line 2572 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 239:
+#line 2593 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[0].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -5011,8 +5029,8 @@
   ;}
     break;
 
-  case 239:
-#line 2587 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 240:
+#line 2608 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *PFTy;
     const FunctionType *Ty;
@@ -5074,48 +5092,48 @@
   ;}
     break;
 
-  case 240:
-#line 2646 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 241:
+#line 2667 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[0].InstVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 241:
-#line 2653 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 242:
+#line 2674 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { 
     (yyval.ValueList) = (yyvsp[0].ValueList); 
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 242:
-#line 2656 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 243:
+#line 2677 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     { 
     (yyval.ValueList) = new std::vector<Value*>(); 
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 243:
-#line 2661 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 244:
+#line 2682 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 244:
-#line 2665 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 245:
+#line 2686 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 245:
-#line 2672 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 246:
+#line 2693 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = new MallocInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal));
     delete (yyvsp[-1].TypeVal);
@@ -5123,8 +5141,8 @@
   ;}
     break;
 
-  case 246:
-#line 2677 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 247:
+#line 2698 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal));
     CHECK_FOR_ERROR
@@ -5133,8 +5151,8 @@
   ;}
     break;
 
-  case 247:
-#line 2683 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 248:
+#line 2704 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = new AllocaInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal));
     delete (yyvsp[-1].TypeVal);
@@ -5142,8 +5160,8 @@
   ;}
     break;
 
-  case 248:
-#line 2688 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 249:
+#line 2709 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal));
     CHECK_FOR_ERROR
@@ -5152,8 +5170,8 @@
   ;}
     break;
 
-  case 249:
-#line 2694 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 250:
+#line 2715 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[0].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
@@ -5163,8 +5181,8 @@
   ;}
     break;
 
-  case 250:
-#line 2702 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 251:
+#line 2723 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-1].TypeVal)->get()))
       GEN_ERROR("Can't load from nonpointer type: " +
@@ -5179,8 +5197,8 @@
   ;}
     break;
 
-  case 251:
-#line 2714 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 252:
+#line 2735 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *PT = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
     if (!PT)
@@ -5198,8 +5216,8 @@
   ;}
     break;
 
-  case 252:
-#line 2729 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 253:
+#line 2750 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-2].TypeVal)->get()))
       GEN_ERROR("getelementptr insn requires pointer operand!");
@@ -5231,7 +5249,7 @@
     }
 
 /* Line 1126 of yacc.c.  */
-#line 5235 "llvmAsmParser.tab.c"
+#line 5253 "llvmAsmParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -5499,7 +5517,7 @@
 }
 
 
-#line 2755 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2776 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
 
 
 void llvm::GenerateError(const std::string &message, int LineNo) {


Index: llvm/lib/AsmParser/llvmAsmParser.h.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.13.2.3 llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.13.2.4
--- llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.13.2.3	Thu Oct 19 19:34:43 2006
+++ llvm/lib/AsmParser/llvmAsmParser.h.cvs	Thu Oct 19 23:27:17 2006
@@ -107,34 +107,35 @@
      ADD = 333,
      SUB = 334,
      MUL = 335,
-     DIV = 336,
-     REM = 337,
-     AND = 338,
-     OR = 339,
-     XOR = 340,
-     SETLE = 341,
-     SETGE = 342,
-     SETLT = 343,
-     SETGT = 344,
-     SETEQ = 345,
-     SETNE = 346,
-     MALLOC = 347,
-     ALLOCA = 348,
-     FREE = 349,
-     LOAD = 350,
-     STORE = 351,
-     GETELEMENTPTR = 352,
-     PHI_TOK = 353,
-     CAST = 354,
-     SELECT = 355,
-     SHL = 356,
-     SHR = 357,
-     VAARG = 358,
-     EXTRACTELEMENT = 359,
-     INSERTELEMENT = 360,
-     SHUFFLEVECTOR = 361,
-     VAARG_old = 362,
-     VANEXT_old = 363
+     UDIV = 336,
+     SDIV = 337,
+     REM = 338,
+     AND = 339,
+     OR = 340,
+     XOR = 341,
+     SETLE = 342,
+     SETGE = 343,
+     SETLT = 344,
+     SETGT = 345,
+     SETEQ = 346,
+     SETNE = 347,
+     MALLOC = 348,
+     ALLOCA = 349,
+     FREE = 350,
+     LOAD = 351,
+     STORE = 352,
+     GETELEMENTPTR = 353,
+     PHI_TOK = 354,
+     CAST = 355,
+     SELECT = 356,
+     SHL = 357,
+     SHR = 358,
+     VAARG = 359,
+     EXTRACTELEMENT = 360,
+     INSERTELEMENT = 361,
+     SHUFFLEVECTOR = 362,
+     VAARG_old = 363,
+     VANEXT_old = 364
    };
 #endif
 /* Tokens.  */
@@ -216,40 +217,41 @@
 #define ADD 333
 #define SUB 334
 #define MUL 335
-#define DIV 336
-#define REM 337
-#define AND 338
-#define OR 339
-#define XOR 340
-#define SETLE 341
-#define SETGE 342
-#define SETLT 343
-#define SETGT 344
-#define SETEQ 345
-#define SETNE 346
-#define MALLOC 347
-#define ALLOCA 348
-#define FREE 349
-#define LOAD 350
-#define STORE 351
-#define GETELEMENTPTR 352
-#define PHI_TOK 353
-#define CAST 354
-#define SELECT 355
-#define SHL 356
-#define SHR 357
-#define VAARG 358
-#define EXTRACTELEMENT 359
-#define INSERTELEMENT 360
-#define SHUFFLEVECTOR 361
-#define VAARG_old 362
-#define VANEXT_old 363
+#define UDIV 336
+#define SDIV 337
+#define REM 338
+#define AND 339
+#define OR 340
+#define XOR 341
+#define SETLE 342
+#define SETGE 343
+#define SETLT 344
+#define SETGT 345
+#define SETEQ 346
+#define SETNE 347
+#define MALLOC 348
+#define ALLOCA 349
+#define FREE 350
+#define LOAD 351
+#define STORE 352
+#define GETELEMENTPTR 353
+#define PHI_TOK 354
+#define CAST 355
+#define SELECT 356
+#define SHL 357
+#define SHR 358
+#define VAARG 359
+#define EXTRACTELEMENT 360
+#define INSERTELEMENT 361
+#define SHUFFLEVECTOR 362
+#define VAARG_old 363
+#define VANEXT_old 364
 
 
 
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 974 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 991 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
 typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -283,14 +285,14 @@
   char                             *StrVal;   // This memory is strdup'd!
   llvm::ValID                             ValIDVal; // strdup'd memory maybe!
 
-  llvm::Instruction::BinaryOps            BinaryOpVal;
-  llvm::Instruction::TermOps              TermOpVal;
-  llvm::Instruction::MemoryOps            MemOpVal;
-  llvm::Instruction::OtherOps             OtherOpVal;
-  llvm::Module::Endianness                Endianness;
+  BinaryOpInfo  BinaryOpVal;
+  TermOpInfo    TermOpVal;
+  MemOpInfo     MemOpVal;
+  OtherOpInfo   OtherOpVal;
+  llvm::Module::Endianness                  Endianness;
 } YYSTYPE;
 /* Line 1447 of yacc.c.  */
-#line 294 "llvmAsmParser.tab.h"
+#line 296 "llvmAsmParser.tab.h"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1


Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.266.2.3 llvm/lib/AsmParser/llvmAsmParser.y:1.266.2.4
--- llvm/lib/AsmParser/llvmAsmParser.y:1.266.2.3	Thu Oct 19 19:34:43 2006
+++ llvm/lib/AsmParser/llvmAsmParser.y	Thu Oct 19 23:27:17 2006
@@ -813,6 +813,23 @@
   return Ty;
 }
 
+// This function is
+template <class EnumKind>
+static void sanitizeOpCode(OpcodeInfo<EnumKind> &OI, const PATypeHolder& Ty) {
+  if (OI.obsolete) {
+    switch (OI.opcode) {
+      default:
+        GenerateError("Invalid Obsolete OpCode");
+        break;
+      case Instruction::UDiv:
+        if (Ty->isSigned())
+          OI.opcode = Instruction::SDiv;
+        break;
+    }
+    OI.obsolete = false;
+  }
+}
+
 
 // common code from the two 'RunVMAsmParser' functions
 static Module* RunParser(Module * M) {
@@ -1004,11 +1021,11 @@
   char                             *StrVal;   // This memory is strdup'd!
   llvm::ValID                             ValIDVal; // strdup'd memory maybe!
 
-  llvm::Instruction::BinaryOps            BinaryOpVal;
-  llvm::Instruction::TermOps              TermOpVal;
-  llvm::Instruction::MemoryOps            MemOpVal;
-  llvm::Instruction::OtherOps             OtherOpVal;
-  llvm::Module::Endianness                Endianness;
+  BinaryOpInfo  BinaryOpVal;
+  TermOpInfo    TermOpVal;
+  MemOpInfo     MemOpVal;
+  OtherOpInfo   OtherOpVal;
+  llvm::Module::Endianness                  Endianness;
 }
 
 %type <ModuleVal>     Module FunctionList
@@ -1076,8 +1093,8 @@
 
 // Binary Operators
 %type  <BinaryOpVal> ArithmeticOps LogicalOps SetCondOps // Binops Subcatagories
-%token <BinaryOpVal> ADD SUB MUL DIV REM AND OR XOR
-%token <BinaryOpVal> SETLE SETGE SETLT SETGT SETEQ SETNE  // Binary Comarators
+%token <BinaryOpVal> ADD SUB MUL UDIV SDIV REM AND OR XOR
+%token <BinaryOpVal> SETLE SETGE SETLT SETGT SETEQ SETNE  // Binary Comparators
 
 // Memory Instructions
 %token <MemOpVal> MALLOC ALLOCA FREE LOAD STORE GETELEMENTPTR
@@ -1114,7 +1131,7 @@
 // Operations that are notably excluded from this list include:
 // RET, BR, & SWITCH because they end basic blocks and are treated specially.
 //
-ArithmeticOps: ADD | SUB | MUL | DIV | REM;
+ArithmeticOps: ADD | SUB | MUL | UDIV | SDIV | REM ;
 LogicalOps   : AND | OR | XOR;
 SetCondOps   : SETLE | SETGE | SETLT | SETGT | SETEQ | SETNE;
 
@@ -1642,12 +1659,14 @@
   | ArithmeticOps '(' ConstVal ',' ConstVal ')' {
     if ($3->getType() != $5->getType())
       GEN_ERROR("Binary operator types must match!");
+    sanitizeOpCode($1,$3->getType());
+    CHECK_FOR_ERROR;
     // HACK: llvm 1.3 and earlier used to emit invalid pointer constant exprs.
     // To retain backward compatibility with these early compilers, we emit a
     // cast to the appropriate integer type automatically if we are in the
     // broken case.  See PR424 for more information.
     if (!isa<PointerType>($3->getType())) {
-      $$ = ConstantExpr::get($1, $3, $5);
+      $$ = ConstantExpr::get($1.opcode, $3, $5);
     } else {
       const Type *IntPtrTy = 0;
       switch (CurModule.CurrentModule->getPointerSize()) {
@@ -1655,7 +1674,7 @@
       case Module::Pointer64: IntPtrTy = Type::LongTy; break;
       default: GEN_ERROR("invalid pointer binary constant expr!");
       }
-      $$ = ConstantExpr::get($1, ConstantExpr::getCast($3, IntPtrTy),
+      $$ = ConstantExpr::get($1.opcode, ConstantExpr::getCast($3, IntPtrTy),
                              ConstantExpr::getCast($5, IntPtrTy));
       $$ = ConstantExpr::getCast($$, $3->getType());
     }
@@ -1669,13 +1688,13 @@
           !cast<PackedType>($3->getType())->getElementType()->isIntegral())
         GEN_ERROR("Logical operator requires integral operands!");
     }
-    $$ = ConstantExpr::get($1, $3, $5);
+    $$ = ConstantExpr::get($1.opcode, $3, $5);
     CHECK_FOR_ERROR
   }
   | SetCondOps '(' ConstVal ',' ConstVal ')' {
     if ($3->getType() != $5->getType())
       GEN_ERROR("setcc operand types must match!");
-    $$ = ConstantExpr::get($1, $3, $5);
+    $$ = ConstantExpr::get($1.opcode, $3, $5);
     CHECK_FOR_ERROR
   }
   | ShiftOps '(' ConstVal ',' ConstVal ')' {
@@ -1683,7 +1702,7 @@
       GEN_ERROR("Shift count for shift constant must be unsigned byte!");
     if (!$3->getType()->isInteger())
       GEN_ERROR("Shift constant expression requires integer operand!");
-    $$ = ConstantExpr::get($1, $3, $5);
+    $$ = ConstantExpr::get($1.opcode, $3, $5);
     CHECK_FOR_ERROR
   }
   | EXTRACTELEMENT '(' ConstVal ',' ConstVal ')' {
@@ -2425,13 +2444,15 @@
         !isa<PackedType>((*$2).get()))
       GEN_ERROR(
         "Arithmetic operator requires integer, FP, or packed operands!");
-    if (isa<PackedType>((*$2).get()) && $1 == Instruction::Rem)
+    if (isa<PackedType>((*$2).get()) && $1.opcode == Instruction::Rem)
       GEN_ERROR("Rem not supported on packed types!");
+    sanitizeOpCode($1,*$2);
+    CHECK_FOR_ERROR;
     Value* val1 = getVal(*$2, $3); 
     CHECK_FOR_ERROR
     Value* val2 = getVal(*$2, $5);
     CHECK_FOR_ERROR
-    $$ = BinaryOperator::create($1, val1, val2);
+    $$ = BinaryOperator::create($1.opcode, val1, val2);
     if ($$ == 0)
       GEN_ERROR("binary operator returned null!");
     delete $2;
@@ -2446,7 +2467,7 @@
     CHECK_FOR_ERROR
     Value* tmpVal2 = getVal(*$2, $5);
     CHECK_FOR_ERROR
-    $$ = BinaryOperator::create($1, tmpVal1, tmpVal2);
+    $$ = BinaryOperator::create($1.opcode, tmpVal1, tmpVal2);
     if ($$ == 0)
       GEN_ERROR("binary operator returned null!");
     delete $2;
@@ -2460,7 +2481,7 @@
     CHECK_FOR_ERROR
     Value* tmpVal2 = getVal(*$2, $5);
     CHECK_FOR_ERROR
-    $$ = new SetCondInst($1, tmpVal1, tmpVal2);
+    $$ = new SetCondInst($1.opcode, tmpVal1, tmpVal2);
     if ($$ == 0)
       GEN_ERROR("binary operator returned null!");
     delete $2;
@@ -2483,7 +2504,7 @@
       GEN_ERROR("Shift amount must be ubyte!");
     if (!$2->getType()->isInteger())
       GEN_ERROR("Shift constant expression requires integer operand!");
-    $$ = new ShiftInst($1, $2, $4);
+    $$ = new ShiftInst($1.opcode, $2, $4);
     CHECK_FOR_ERROR
   }
   | CAST ResolvedVal TO Types {


Index: llvm/lib/AsmParser/llvmAsmParser.y.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.18.2.3 llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.18.2.4
--- llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.18.2.3	Thu Oct 19 19:34:43 2006
+++ llvm/lib/AsmParser/llvmAsmParser.y.cvs	Thu Oct 19 23:27:17 2006
@@ -813,6 +813,23 @@
   return Ty;
 }
 
+// This function is
+template <class EnumKind>
+static void sanitizeOpCode(OpcodeInfo<EnumKind> &OI, const PATypeHolder& Ty) {
+  if (OI.obsolete) {
+    switch (OI.opcode) {
+      default:
+        GenerateError("Invalid Obsolete OpCode");
+        break;
+      case Instruction::UDiv:
+        if (Ty->isSigned())
+          OI.opcode = Instruction::SDiv;
+        break;
+    }
+    OI.obsolete = false;
+  }
+}
+
 
 // common code from the two 'RunVMAsmParser' functions
 static Module* RunParser(Module * M) {
@@ -1004,11 +1021,11 @@
   char                             *StrVal;   // This memory is strdup'd!
   llvm::ValID                             ValIDVal; // strdup'd memory maybe!
 
-  llvm::Instruction::BinaryOps            BinaryOpVal;
-  llvm::Instruction::TermOps              TermOpVal;
-  llvm::Instruction::MemoryOps            MemOpVal;
-  llvm::Instruction::OtherOps             OtherOpVal;
-  llvm::Module::Endianness                Endianness;
+  BinaryOpInfo  BinaryOpVal;
+  TermOpInfo    TermOpVal;
+  MemOpInfo     MemOpVal;
+  OtherOpInfo   OtherOpVal;
+  llvm::Module::Endianness                  Endianness;
 }
 
 %type <ModuleVal>     Module FunctionList
@@ -1076,8 +1093,8 @@
 
 // Binary Operators
 %type  <BinaryOpVal> ArithmeticOps LogicalOps SetCondOps // Binops Subcatagories
-%token <BinaryOpVal> ADD SUB MUL DIV REM AND OR XOR
-%token <BinaryOpVal> SETLE SETGE SETLT SETGT SETEQ SETNE  // Binary Comarators
+%token <BinaryOpVal> ADD SUB MUL UDIV SDIV REM AND OR XOR
+%token <BinaryOpVal> SETLE SETGE SETLT SETGT SETEQ SETNE  // Binary Comparators
 
 // Memory Instructions
 %token <MemOpVal> MALLOC ALLOCA FREE LOAD STORE GETELEMENTPTR
@@ -1114,7 +1131,7 @@
 // Operations that are notably excluded from this list include:
 // RET, BR, & SWITCH because they end basic blocks and are treated specially.
 //
-ArithmeticOps: ADD | SUB | MUL | DIV | REM;
+ArithmeticOps: ADD | SUB | MUL | UDIV | SDIV | REM ;
 LogicalOps   : AND | OR | XOR;
 SetCondOps   : SETLE | SETGE | SETLT | SETGT | SETEQ | SETNE;
 
@@ -1642,12 +1659,14 @@
   | ArithmeticOps '(' ConstVal ',' ConstVal ')' {
     if ($3->getType() != $5->getType())
       GEN_ERROR("Binary operator types must match!");
+    sanitizeOpCode($1,$3->getType());
+    CHECK_FOR_ERROR;
     // HACK: llvm 1.3 and earlier used to emit invalid pointer constant exprs.
     // To retain backward compatibility with these early compilers, we emit a
     // cast to the appropriate integer type automatically if we are in the
     // broken case.  See PR424 for more information.
     if (!isa<PointerType>($3->getType())) {
-      $$ = ConstantExpr::get($1, $3, $5);
+      $$ = ConstantExpr::get($1.opcode, $3, $5);
     } else {
       const Type *IntPtrTy = 0;
       switch (CurModule.CurrentModule->getPointerSize()) {
@@ -1655,7 +1674,7 @@
       case Module::Pointer64: IntPtrTy = Type::LongTy; break;
       default: GEN_ERROR("invalid pointer binary constant expr!");
       }
-      $$ = ConstantExpr::get($1, ConstantExpr::getCast($3, IntPtrTy),
+      $$ = ConstantExpr::get($1.opcode, ConstantExpr::getCast($3, IntPtrTy),
                              ConstantExpr::getCast($5, IntPtrTy));
       $$ = ConstantExpr::getCast($$, $3->getType());
     }
@@ -1669,13 +1688,13 @@
           !cast<PackedType>($3->getType())->getElementType()->isIntegral())
         GEN_ERROR("Logical operator requires integral operands!");
     }
-    $$ = ConstantExpr::get($1, $3, $5);
+    $$ = ConstantExpr::get($1.opcode, $3, $5);
     CHECK_FOR_ERROR
   }
   | SetCondOps '(' ConstVal ',' ConstVal ')' {
     if ($3->getType() != $5->getType())
       GEN_ERROR("setcc operand types must match!");
-    $$ = ConstantExpr::get($1, $3, $5);
+    $$ = ConstantExpr::get($1.opcode, $3, $5);
     CHECK_FOR_ERROR
   }
   | ShiftOps '(' ConstVal ',' ConstVal ')' {
@@ -1683,7 +1702,7 @@
       GEN_ERROR("Shift count for shift constant must be unsigned byte!");
     if (!$3->getType()->isInteger())
       GEN_ERROR("Shift constant expression requires integer operand!");
-    $$ = ConstantExpr::get($1, $3, $5);
+    $$ = ConstantExpr::get($1.opcode, $3, $5);
     CHECK_FOR_ERROR
   }
   | EXTRACTELEMENT '(' ConstVal ',' ConstVal ')' {
@@ -2425,13 +2444,15 @@
         !isa<PackedType>((*$2).get()))
       GEN_ERROR(
         "Arithmetic operator requires integer, FP, or packed operands!");
-    if (isa<PackedType>((*$2).get()) && $1 == Instruction::Rem)
+    if (isa<PackedType>((*$2).get()) && $1.opcode == Instruction::Rem)
       GEN_ERROR("Rem not supported on packed types!");
+    sanitizeOpCode($1,*$2);
+    CHECK_FOR_ERROR;
     Value* val1 = getVal(*$2, $3); 
     CHECK_FOR_ERROR
     Value* val2 = getVal(*$2, $5);
     CHECK_FOR_ERROR
-    $$ = BinaryOperator::create($1, val1, val2);
+    $$ = BinaryOperator::create($1.opcode, val1, val2);
     if ($$ == 0)
       GEN_ERROR("binary operator returned null!");
     delete $2;
@@ -2446,7 +2467,7 @@
     CHECK_FOR_ERROR
     Value* tmpVal2 = getVal(*$2, $5);
     CHECK_FOR_ERROR
-    $$ = BinaryOperator::create($1, tmpVal1, tmpVal2);
+    $$ = BinaryOperator::create($1.opcode, tmpVal1, tmpVal2);
     if ($$ == 0)
       GEN_ERROR("binary operator returned null!");
     delete $2;
@@ -2460,7 +2481,7 @@
     CHECK_FOR_ERROR
     Value* tmpVal2 = getVal(*$2, $5);
     CHECK_FOR_ERROR
-    $$ = new SetCondInst($1, tmpVal1, tmpVal2);
+    $$ = new SetCondInst($1.opcode, tmpVal1, tmpVal2);
     if ($$ == 0)
       GEN_ERROR("binary operator returned null!");
     delete $2;
@@ -2483,7 +2504,7 @@
       GEN_ERROR("Shift amount must be ubyte!");
     if (!$2->getType()->isInteger())
       GEN_ERROR("Shift constant expression requires integer operand!");
-    $$ = new ShiftInst($1, $2, $4);
+    $$ = new ShiftInst($1.opcode, $2, $4);
     CHECK_FOR_ERROR
   }
   | CAST ResolvedVal TO Types {






More information about the llvm-commits mailing list