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

Reid Spencer reid at x10sys.com
Sat Oct 21 18:37:10 PDT 2006



Changes in directory llvm/lib/AsmParser:

Lexer.cpp.cvs updated: 1.10.2.4 -> 1.10.2.5
Lexer.l updated: 1.78.2.3 -> 1.78.2.4
Lexer.l.cvs updated: 1.8.2.3 -> 1.8.2.4
llvmAsmParser.cpp.cvs updated: 1.18.2.4 -> 1.18.2.5
llvmAsmParser.h.cvs updated: 1.13.2.4 -> 1.13.2.5
llvmAsmParser.y updated: 1.266.2.4 -> 1.266.2.5
llvmAsmParser.y.cvs updated: 1.18.2.4 -> 1.18.2.5
---
Log message:

Fixes to get the DIV -> S/UDIV change working. This now passes MultiSource.


---
Diffs of the changes:  (+360 -351)

 Lexer.cpp.cvs         |  246 +++++++++++++--------------
 Lexer.l               |    2 
 Lexer.l.cvs           |    2 
 llvmAsmParser.cpp.cvs |  453 +++++++++++++++++++++++++-------------------------
 llvmAsmParser.h.cvs   |    2 
 llvmAsmParser.y       |    3 
 llvmAsmParser.y.cvs   |    3 
 7 files changed, 360 insertions(+), 351 deletions(-)


Index: llvm/lib/AsmParser/Lexer.cpp.cvs
diff -u llvm/lib/AsmParser/Lexer.cpp.cvs:1.10.2.4 llvm/lib/AsmParser/Lexer.cpp.cvs:1.10.2.5
--- llvm/lib/AsmParser/Lexer.cpp.cvs:1.10.2.4	Thu Oct 19 23:27:17 2006
+++ llvm/lib/AsmParser/Lexer.cpp.cvs	Sat Oct 21 20:36:52 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.4 2006/10/20 04:27:17 reid Exp $
+ * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.10.2.5 2006/10/22 01:36:52 reid Exp $
  */
 
 #define FLEX_SCANNER
@@ -844,7 +844,7 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 1 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 #define INITIAL 0
 /*===-- Lexer.l - Scanner for llvm assembly files --------------*- C++ -*--===//
 //
@@ -859,7 +859,7 @@
 //
 //===----------------------------------------------------------------------===*/
 #define YY_NEVER_INTERACTIVE 1
-#line 28 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 28 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -1146,7 +1146,7 @@
 	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
-#line 189 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 189 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 
 
 #line 1153 "Lexer.cpp"
@@ -1242,517 +1242,517 @@
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 191 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 191 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 193 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 193 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 194 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 194 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 195 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 195 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 196 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 196 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 197 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 197 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 198 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 198 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 199 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 199 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 200 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 200 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 201 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 201 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 202 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 202 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return WEAK; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 203 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 203 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 204 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 204 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 205 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 205 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 206 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 206 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return EXTERN_WEAK; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 207 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 207 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }    /* Deprecated, turn into external */
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 208 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 208 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 209 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 209 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return IMPLEMENTATION; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 210 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 210 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return ZEROINITIALIZER; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 211 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 211 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return DOTDOTDOT; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 212 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 212 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return UNDEF; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 213 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 213 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return NULL_TOK; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 214 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 214 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return TO; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 215 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 215 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 216 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 216 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return NOT; }  /* Deprecated, turned into XOR */
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 217 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 217 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return TAIL; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 218 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 218 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return TARGET; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 219 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 219 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return TRIPLE; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 220 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 220 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return DEPLIBS; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 221 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 221 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return ENDIAN; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 222 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 222 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return POINTERSIZE; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 223 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 223 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return DATA; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 224 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 224 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return LITTLE; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 225 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 225 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return BIG; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 226 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 226 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return VOLATILE; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 227 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 227 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return ALIGN;  }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 228 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 228 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return SECTION; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 229 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 229 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return MODULE; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 230 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 230 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return ASM_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 231 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 231 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return SIDEEFFECT; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 233 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 233 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return CC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 234 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 234 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return CCC_TOK; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 235 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 235 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return CSRETCC_TOK; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 236 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 236 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return FASTCC_TOK; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 237 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 237 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return COLDCC_TOK; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 238 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 238 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 239 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 239 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 241 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 241 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::VoidTy  ; return VOID;   }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 242 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 242 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::BoolTy  ; return BOOL;   }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 243 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 243 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::SByteTy ; return SBYTE;  }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 244 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 244 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::UByteTy ; return UBYTE;  }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 245 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 245 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::ShortTy ; return SHORT;  }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 246 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 246 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::UShortTy; return USHORT; }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 247 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 247 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::IntTy   ; return INT;    }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 248 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 248 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::UIntTy  ; return UINT;   }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 249 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 249 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::LongTy  ; return LONG;   }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 250 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 250 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::ULongTy ; return ULONG;  }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 251 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 251 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::FloatTy ; return FLOAT;  }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 252 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 252 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::DoubleTy; return DOUBLE; }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 253 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 253 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.PrimType = Type::LabelTy ; return LABEL;  }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 254 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 254 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return TYPE;   }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 255 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 255 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return OPAQUE; }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 257 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 257 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Add, ADD); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 258 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 258 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 259 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 259 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 260 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 260 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK_OBSOLETE(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 261 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 261 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 262 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, UDiv, UDIV); }
+#line 262 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SDiv, SDIV); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 263 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 263 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Rem, REM); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 264 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 264 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 265 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 265 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 266 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 266 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 267 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 267 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetNE, SETNE); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 268 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 268 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetEQ, SETEQ); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 269 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 269 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetLT, SETLT); }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 270 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 270 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetGT, SETGT); }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 271 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 271 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetLE, SETLE); }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 272 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 272 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SetGE, SETGE); }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 274 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 274 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 275 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 275 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 276 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 276 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Cast, CAST); }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 277 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 277 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 278 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 278 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Shl, SHL); }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 279 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 279 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Shr, SHR); }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 280 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 280 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return VANEXT_old; }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 281 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 281 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return VAARG_old; }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 282 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 282 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 283 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 283 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 284 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 284 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 285 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 285 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 286 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 286 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 287 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 287 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 288 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 288 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 290 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 290 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 291 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 291 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 292 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 292 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 293 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 293 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 294 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 294 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 295 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 295 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 297 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 297 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 298 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 298 "/proj/llvm/llvm/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"
+#line 299 "/proj/llvm/llvm/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"
+#line 302 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 {
                   UnEscapeLexed(yytext+1);
                   llvmAsmlval.StrVal = strdup(yytext+1);             // Skip %
@@ -1761,7 +1761,7 @@
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 307 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 307 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-1] = 0;  // nuke colon
                   UnEscapeLexed(yytext);
@@ -1771,7 +1771,7 @@
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 313 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 313 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-2] = 0;  // nuke colon, end quote
                   UnEscapeLexed(yytext+1);
@@ -1781,7 +1781,7 @@
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 320 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 320 "/proj/llvm/llvm/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
@@ -1794,12 +1794,12 @@
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 331 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 331 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.UInt64Val = atoull(yytext); return EUINT64VAL; }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 332 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 332 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   // +1:  we have bigger negative range
@@ -1811,7 +1811,7 @@
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 340 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 340 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 {
                    llvmAsmlval.UInt64Val = HexIntToVal(yytext+3);
                    return yytext[0] == 's' ? ESINT64VAL : EUINT64VAL;
@@ -1819,7 +1819,7 @@
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 345 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 345 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -1830,7 +1830,7 @@
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 352 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 352 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+2);
                   // +1:  we have bigger negative range
@@ -1842,16 +1842,16 @@
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 361 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 361 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 362 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 362 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 364 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 364 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -1862,17 +1862,17 @@
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 372 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 372 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 373 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 373 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 { return yytext[0]; }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 375 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 375 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
 #line 1879 "Lexer.cpp"
@@ -2753,5 +2753,5 @@
 	return 0;
 	}
 #endif
-#line 375 "/proj/llvm/llvm2/lib/AsmParser/Lexer.l"
+#line 375 "/proj/llvm/llvm/lib/AsmParser/Lexer.l"
 


Index: llvm/lib/AsmParser/Lexer.l
diff -u llvm/lib/AsmParser/Lexer.l:1.78.2.3 llvm/lib/AsmParser/Lexer.l:1.78.2.4
--- llvm/lib/AsmParser/Lexer.l:1.78.2.3	Thu Oct 19 23:27:17 2006
+++ llvm/lib/AsmParser/Lexer.l	Sat Oct 21 20:36:52 2006
@@ -259,7 +259,7 @@
 mul             { RET_TOK(BinaryOpVal, Mul, MUL); }
 div             { RET_TOK_OBSOLETE(BinaryOpVal, UDiv, UDIV); }
 udiv            { RET_TOK(BinaryOpVal, UDiv, UDIV); }
-sdiv            { RET_TOK(BinaryOpVal, UDiv, UDIV); }
+sdiv            { RET_TOK(BinaryOpVal, SDiv, SDIV); }
 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.3 llvm/lib/AsmParser/Lexer.l.cvs:1.8.2.4
--- llvm/lib/AsmParser/Lexer.l.cvs:1.8.2.3	Thu Oct 19 23:27:17 2006
+++ llvm/lib/AsmParser/Lexer.l.cvs	Sat Oct 21 20:36:52 2006
@@ -259,7 +259,7 @@
 mul             { RET_TOK(BinaryOpVal, Mul, MUL); }
 div             { RET_TOK_OBSOLETE(BinaryOpVal, UDiv, UDIV); }
 udiv            { RET_TOK(BinaryOpVal, UDiv, UDIV); }
-sdiv            { RET_TOK(BinaryOpVal, UDiv, UDIV); }
+sdiv            { RET_TOK(BinaryOpVal, SDiv, SDIV); }
 rem             { RET_TOK(BinaryOpVal, Rem, REM); }
 and             { RET_TOK(BinaryOpVal, And, AND); }
 or              { RET_TOK(BinaryOpVal, Or , OR ); }


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.18.2.4 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.18.2.5
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.18.2.4	Thu Oct 19 23:27:17 2006
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Sat Oct 21 20:36:52 2006
@@ -286,7 +286,7 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1101,6 +1101,9 @@
         if (Ty->isSigned())
           OI.opcode = Instruction::SDiv;
         break;
+      case Instruction::SDiv:
+        if (Ty->isUnsigned())
+          OI.opcode = Instruction::UDiv;
     }
     OI.obsolete = false;
   }
@@ -1283,7 +1286,7 @@
 #endif
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 991 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 994 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
 typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -1324,7 +1327,7 @@
   llvm::Module::Endianness                  Endianness;
 } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 1328 "llvmAsmParser.tab.c"
+#line 1331 "llvmAsmParser.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -1336,7 +1339,7 @@
 
 
 /* Line 219 of yacc.c.  */
-#line 1340 "llvmAsmParser.tab.c"
+#line 1343 "llvmAsmParser.tab.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -1671,32 +1674,32 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       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
+       0,  1117,  1117,  1118,  1126,  1127,  1137,  1137,  1137,  1137,
+    1137,  1137,  1138,  1138,  1138,  1139,  1139,  1139,  1139,  1139,
+    1139,  1141,  1141,  1145,  1145,  1145,  1145,  1146,  1146,  1146,
+    1146,  1147,  1147,  1148,  1148,  1151,  1155,  1160,  1161,  1162,
+    1163,  1164,  1165,  1166,  1167,  1169,  1170,  1171,  1172,  1173,
+    1174,  1175,  1176,  1185,  1186,  1192,  1193,  1201,  1209,  1210,
+    1215,  1216,  1217,  1222,  1236,  1236,  1237,  1237,  1239,  1249,
+    1249,  1249,  1249,  1249,  1249,  1249,  1250,  1250,  1250,  1250,
+    1250,  1250,  1251,  1255,  1259,  1267,  1275,  1288,  1293,  1305,
+    1315,  1319,  1330,  1335,  1341,  1342,  1346,  1350,  1361,  1387,
+    1401,  1431,  1457,  1478,  1491,  1501,  1506,  1567,  1574,  1583,
+    1589,  1595,  1599,  1603,  1611,  1622,  1654,  1662,  1686,  1697,
+    1703,  1711,  1717,  1723,  1732,  1736,  1744,  1744,  1754,  1762,
+    1767,  1771,  1775,  1779,  1794,  1816,  1819,  1822,  1822,  1830,
+    1830,  1838,  1838,  1846,  1846,  1855,  1858,  1861,  1865,  1878,
+    1879,  1881,  1885,  1894,  1899,  1905,  1907,  1912,  1917,  1926,
+    1926,  1927,  1927,  1929,  1936,  1942,  1949,  1953,  1959,  1964,
+    1969,  2064,  2064,  2066,  2074,  2074,  2076,  2081,  2082,  2083,
+    2085,  2085,  2095,  2099,  2104,  2108,  2112,  2116,  2120,  2124,
+    2128,  2132,  2136,  2161,  2165,  2179,  2183,  2189,  2189,  2195,
+    2200,  2204,  2213,  2224,  2229,  2241,  2254,  2258,  2262,  2267,
+    2276,  2295,  2304,  2360,  2364,  2371,  2382,  2395,  2404,  2413,
+    2423,  2427,  2434,  2434,  2436,  2440,  2445,  2463,  2478,  2492,
+    2505,  2513,  2521,  2529,  2535,  2555,  2578,  2584,  2590,  2596,
+    2611,  2670,  2677,  2680,  2685,  2689,  2696,  2701,  2707,  2712,
+    2718,  2726,  2738,  2753
 };
 #endif
 
@@ -2969,7 +2972,7 @@
   switch (yyn)
     {
         case 3:
-#line 1115 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1118 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   if ((yyvsp[0].UIntVal) > (uint32_t)INT32_MAX)     // Outside of my range!
     GEN_ERROR("Value too large for type!");
@@ -2979,7 +2982,7 @@
     break;
 
   case 5:
-#line 1124 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1127 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   if ((yyvsp[0].UInt64Val) > (uint64_t)INT64_MAX)     // Outside of my range!
     GEN_ERROR("Value too large for type!");
@@ -2989,7 +2992,7 @@
     break;
 
   case 35:
-#line 1148 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1151 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[-1].StrVal);
     CHECK_FOR_ERROR
@@ -2997,7 +3000,7 @@
     break;
 
   case 36:
-#line 1152 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1155 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3005,82 +3008,82 @@
     break;
 
   case 37:
-#line 1157 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1160 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 38:
-#line 1158 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1161 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 39:
-#line 1159 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1162 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 40:
-#line 1160 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1163 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
   case 41:
-#line 1161 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1164 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 42:
-#line 1162 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1165 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 43:
-#line 1163 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1166 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 44:
-#line 1164 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1167 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 45:
-#line 1166 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1169 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 46:
-#line 1167 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1170 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 47:
-#line 1168 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1171 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::CSRet; ;}
     break;
 
   case 48:
-#line 1169 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1172 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Fast; ;}
     break;
 
   case 49:
-#line 1170 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1173 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Cold; ;}
     break;
 
   case 50:
-#line 1171 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1174 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
     break;
 
   case 51:
-#line 1172 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1175 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
     break;
 
   case 52:
-#line 1173 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1176 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
                    if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val))
                      GEN_ERROR("Calling conv too large!");
@@ -3090,12 +3093,12 @@
     break;
 
   case 53:
-#line 1182 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1185 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 54:
-#line 1183 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1186 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3105,12 +3108,12 @@
     break;
 
   case 55:
-#line 1189 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1192 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 56:
-#line 1190 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1193 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3120,7 +3123,7 @@
     break;
 
   case 57:
-#line 1198 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1201 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   for (unsigned i = 0, e = strlen((yyvsp[0].StrVal)); i != e; ++i)
     if ((yyvsp[0].StrVal)[i] == '"' || (yyvsp[0].StrVal)[i] == '\\')
@@ -3131,27 +3134,27 @@
     break;
 
   case 58:
-#line 1206 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1209 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 59:
-#line 1207 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1210 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
     break;
 
   case 60:
-#line 1212 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1215 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 61:
-#line 1213 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1216 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 62:
-#line 1214 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1217 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -3160,7 +3163,7 @@
     break;
 
   case 63:
-#line 1219 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1222 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[0].UInt64Val)))
       GEN_ERROR("Alignment must be a power of two!");
@@ -3170,17 +3173,17 @@
     break;
 
   case 65:
-#line 1233 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1236 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType)); ;}
     break;
 
   case 67:
-#line 1234 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1237 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType)); ;}
     break;
 
   case 68:
-#line 1236 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1239 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -3190,7 +3193,7 @@
     break;
 
   case 82:
-#line 1248 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1251 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
@@ -3198,7 +3201,7 @@
     break;
 
   case 83:
-#line 1252 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1255 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType));
     CHECK_FOR_ERROR
@@ -3206,7 +3209,7 @@
     break;
 
   case 84:
-#line 1256 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1259 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
   const Type* tmp = getTypeVal((yyvsp[0].ValIDVal));
   CHECK_FOR_ERROR
@@ -3215,7 +3218,7 @@
     break;
 
   case 85:
-#line 1264 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1267 "/proj/llvm/llvm/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
@@ -3227,7 +3230,7 @@
     break;
 
   case 86:
-#line 1272 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1275 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {           // Function derived type?
     std::vector<const Type*> Params;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(),
@@ -3244,7 +3247,7 @@
     break;
 
   case 87:
-#line 1285 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1288 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val))));
     delete (yyvsp[-1].TypeVal);
@@ -3253,7 +3256,7 @@
     break;
 
   case 88:
-#line 1290 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1293 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Packed array type?
      const llvm::Type* ElemTy = (yyvsp[-1].TypeVal)->get();
      if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
@@ -3269,7 +3272,7 @@
     break;
 
   case 89:
-#line 1302 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1305 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(),
@@ -3283,7 +3286,7 @@
     break;
 
   case 90:
-#line 1312 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1315 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
@@ -3291,7 +3294,7 @@
     break;
 
   case 91:
-#line 1316 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1319 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[-1].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -3302,7 +3305,7 @@
     break;
 
   case 92:
-#line 1327 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1330 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal);
@@ -3311,7 +3314,7 @@
     break;
 
   case 93:
-#line 1332 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1335 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal);
     CHECK_FOR_ERROR
@@ -3319,7 +3322,7 @@
     break;
 
   case 95:
-#line 1339 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1342 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(Type::VoidTy);
     CHECK_FOR_ERROR
@@ -3327,7 +3330,7 @@
     break;
 
   case 96:
-#line 1343 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1346 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList) = new std::list<PATypeHolder>())->push_back(Type::VoidTy);
     CHECK_FOR_ERROR
@@ -3335,7 +3338,7 @@
     break;
 
   case 97:
-#line 1347 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1350 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     CHECK_FOR_ERROR
@@ -3343,7 +3346,7 @@
     break;
 
   case 98:
-#line 1358 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1361 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-3].TypeVal)->get());
     if (ATy == 0)
@@ -3373,7 +3376,7 @@
     break;
 
   case 99:
-#line 1384 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1387 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get());
     if (ATy == 0)
@@ -3391,7 +3394,7 @@
     break;
 
   case 100:
-#line 1398 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1401 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get());
     if (ATy == 0)
@@ -3425,7 +3428,7 @@
     break;
 
   case 101:
-#line 1428 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1431 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     const PackedType *PTy = dyn_cast<PackedType>((yyvsp[-3].TypeVal)->get());
     if (PTy == 0)
@@ -3455,7 +3458,7 @@
     break;
 
   case 102:
-#line 1454 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1457 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal)->get());
     if (STy == 0)
@@ -3480,7 +3483,7 @@
     break;
 
   case 103:
-#line 1475 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1478 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-2].TypeVal)->get());
     if (STy == 0)
@@ -3497,7 +3500,7 @@
     break;
 
   case 104:
-#line 1488 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1491 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
     if (PTy == 0)
@@ -3511,7 +3514,7 @@
     break;
 
   case 105:
-#line 1498 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1501 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVal) = UndefValue::get((yyvsp[-1].TypeVal)->get());
     delete (yyvsp[-1].TypeVal);
@@ -3520,7 +3523,7 @@
     break;
 
   case 106:
-#line 1503 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1506 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *Ty = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
     if (Ty == 0)
@@ -3585,7 +3588,7 @@
     break;
 
   case 107:
-#line 1564 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1567 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-1].TypeVal)->get() != (yyvsp[0].ConstVal)->getType())
       GEN_ERROR("Mismatched types for constant expression!");
@@ -3596,7 +3599,7 @@
     break;
 
   case 108:
-#line 1571 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1574 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[-1].TypeVal)->get();
     if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
@@ -3608,7 +3611,7 @@
     break;
 
   case 109:
-#line 1580 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1583 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type!");
@@ -3618,7 +3621,7 @@
     break;
 
   case 110:
-#line 1586 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1589 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {            // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type!");
@@ -3628,7 +3631,7 @@
     break;
 
   case 111:
-#line 1592 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1595 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     (yyval.ConstVal) = ConstantBool::getTrue();
     CHECK_FOR_ERROR
@@ -3636,7 +3639,7 @@
     break;
 
   case 112:
-#line 1596 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1599 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     (yyval.ConstVal) = ConstantBool::getFalse();
     CHECK_FOR_ERROR
@@ -3644,7 +3647,7 @@
     break;
 
   case 113:
-#line 1600 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1603 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Float & Double constants
     if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].FPVal)))
       GEN_ERROR("Floating point constant invalid for type!!");
@@ -3654,7 +3657,7 @@
     break;
 
   case 114:
-#line 1608 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1611 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!(yyvsp[-3].ConstVal)->getType()->isFirstClassType())
       GEN_ERROR("cast constant expression from a non-primitive type: '" +
@@ -3669,7 +3672,7 @@
     break;
 
   case 115:
-#line 1619 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1622 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-2].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand!");
@@ -3705,7 +3708,7 @@
     break;
 
   case 116:
-#line 1651 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1654 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-5].ConstVal)->getType() != Type::BoolTy)
       GEN_ERROR("Select condition must be of boolean type!");
@@ -3717,7 +3720,7 @@
     break;
 
   case 117:
-#line 1659 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1662 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match!");
@@ -3745,7 +3748,7 @@
     break;
 
   case 118:
-#line 1683 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1686 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match!");
@@ -3760,7 +3763,7 @@
     break;
 
   case 119:
-#line 1694 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1697 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("setcc operand types must match!");
@@ -3770,7 +3773,7 @@
     break;
 
   case 120:
-#line 1700 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1703 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-1].ConstVal)->getType() != Type::UByteTy)
       GEN_ERROR("Shift count for shift constant must be unsigned byte!");
@@ -3782,7 +3785,7 @@
     break;
 
   case 121:
-#line 1708 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1711 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid extractelement operands!");
@@ -3792,7 +3795,7 @@
     break;
 
   case 122:
-#line 1714 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1717 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid insertelement operands!");
@@ -3802,7 +3805,7 @@
     break;
 
   case 123:
-#line 1720 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1723 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid shufflevector operands!");
@@ -3812,7 +3815,7 @@
     break;
 
   case 124:
-#line 1729 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1732 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
@@ -3820,7 +3823,7 @@
     break;
 
   case 125:
-#line 1733 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1736 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
@@ -3829,17 +3832,17 @@
     break;
 
   case 126:
-#line 1741 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1744 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 127:
-#line 1741 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1744 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 128:
-#line 1751 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1754 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.ModuleVal) = ParserResult = (yyvsp[0].ModuleVal);
   CurModule.ModuleDone();
@@ -3848,7 +3851,7 @@
     break;
 
   case 129:
-#line 1759 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1762 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);
     CurFun.FunctionDone();
@@ -3857,7 +3860,7 @@
     break;
 
   case 130:
-#line 1764 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1767 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);
     CHECK_FOR_ERROR
@@ -3865,7 +3868,7 @@
     break;
 
   case 131:
-#line 1768 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1771 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = (yyvsp[-3].ModuleVal);
     CHECK_FOR_ERROR
@@ -3873,7 +3876,7 @@
     break;
 
   case 132:
-#line 1772 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1775 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);
     CHECK_FOR_ERROR
@@ -3881,7 +3884,7 @@
     break;
 
   case 133:
-#line 1776 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1779 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = CurModule.CurrentModule;
     // Emit an error if there are any unresolved types left.
@@ -3898,7 +3901,7 @@
     break;
 
   case 134:
-#line 1791 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1794 "/proj/llvm/llvm/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:
@@ -3924,21 +3927,21 @@
     break;
 
   case 135:
-#line 1813 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1816 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {       // Function prototypes can be in const pool
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 136:
-#line 1816 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1819 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {  // Asm blocks can be in the const pool
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 137:
-#line 1819 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1822 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant!");
@@ -3948,14 +3951,14 @@
     break;
 
   case 138:
-#line 1824 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1827 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 139:
-#line 1827 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1830 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
     CHECK_FOR_ERROR
@@ -3964,7 +3967,7 @@
     break;
 
   case 140:
-#line 1831 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1834 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
@@ -3972,7 +3975,7 @@
     break;
 
   case 141:
-#line 1835 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1838 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::DLLImportLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
     CHECK_FOR_ERROR
@@ -3981,7 +3984,7 @@
     break;
 
   case 142:
-#line 1839 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1842 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
@@ -3989,7 +3992,7 @@
     break;
 
   case 143:
-#line 1843 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1846 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 
       ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalWeakLinkage, (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
@@ -3999,7 +4002,7 @@
     break;
 
   case 144:
-#line 1848 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1851 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
@@ -4007,27 +4010,27 @@
     break;
 
   case 145:
-#line 1852 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1855 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 146:
-#line 1855 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1858 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 147:
-#line 1858 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1861 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
   ;}
     break;
 
   case 148:
-#line 1862 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1865 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
@@ -4043,17 +4046,17 @@
     break;
 
   case 149:
-#line 1875 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1878 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Endianness) = Module::BigEndian; ;}
     break;
 
   case 150:
-#line 1876 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1879 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Endianness) = Module::LittleEndian; ;}
     break;
 
   case 151:
-#line 1878 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1881 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setEndianness((yyvsp[0].Endianness));
     CHECK_FOR_ERROR
@@ -4061,7 +4064,7 @@
     break;
 
   case 152:
-#line 1882 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1885 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].UInt64Val) == 32)
       CurModule.CurrentModule->setPointerSize(Module::Pointer32);
@@ -4074,7 +4077,7 @@
     break;
 
   case 153:
-#line 1891 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1894 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -4083,7 +4086,7 @@
     break;
 
   case 154:
-#line 1896 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1899 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -4092,7 +4095,7 @@
     break;
 
   case 156:
-#line 1904 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1907 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4101,7 +4104,7 @@
     break;
 
   case 157:
-#line 1909 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1912 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4110,19 +4113,19 @@
     break;
 
   case 158:
-#line 1914 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1917 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
   case 162:
-#line 1924 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1927 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 163:
-#line 1926 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1929 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   if (*(yyvsp[-1].TypeVal) == Type::VoidTy)
     GEN_ERROR("void typed arguments are invalid!");
@@ -4132,7 +4135,7 @@
     break;
 
   case 164:
-#line 1933 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1936 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[-2].ArgList);
     (yyvsp[-2].ArgList)->push_back(*(yyvsp[0].ArgVal));
@@ -4142,7 +4145,7 @@
     break;
 
   case 165:
-#line 1939 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1942 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new std::vector<std::pair<PATypeHolder*,char*> >();
     (yyval.ArgList)->push_back(*(yyvsp[0].ArgVal));
@@ -4152,7 +4155,7 @@
     break;
 
   case 166:
-#line 1946 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1949 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[0].ArgList);
     CHECK_FOR_ERROR
@@ -4160,7 +4163,7 @@
     break;
 
   case 167:
-#line 1950 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1953 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[-2].ArgList);
     (yyval.ArgList)->push_back(std::pair<PATypeHolder*,
@@ -4170,7 +4173,7 @@
     break;
 
   case 168:
-#line 1956 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1959 "/proj/llvm/llvm/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));
@@ -4179,7 +4182,7 @@
     break;
 
   case 169:
-#line 1961 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1964 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
@@ -4187,7 +4190,7 @@
     break;
 
   case 170:
-#line 1967 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 1970 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   UnEscapeLexed((yyvsp[-5].StrVal));
   std::string FunctionName((yyvsp[-5].StrVal));
@@ -4284,7 +4287,7 @@
     break;
 
   case 173:
-#line 2063 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2066 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -4295,7 +4298,7 @@
     break;
 
   case 176:
-#line 2073 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2076 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   CHECK_FOR_ERROR
@@ -4303,22 +4306,22 @@
     break;
 
   case 178:
-#line 2079 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2082 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.Linkage = GlobalValue::DLLImportLinkage ;}
     break;
 
   case 179:
-#line 2080 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2083 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.Linkage = GlobalValue::DLLImportLinkage ;}
     break;
 
   case 180:
-#line 2082 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2085 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
   case 181:
-#line 2082 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2085 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = CurFun.CurrentFunction;
     CurFun.FunctionDone();
@@ -4327,7 +4330,7 @@
     break;
 
   case 182:
-#line 2092 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2095 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -4335,7 +4338,7 @@
     break;
 
   case 183:
-#line 2096 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2099 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -4343,7 +4346,7 @@
     break;
 
   case 184:
-#line 2101 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2104 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val));
     CHECK_FOR_ERROR
@@ -4351,7 +4354,7 @@
     break;
 
   case 185:
-#line 2105 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2108 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val));
     CHECK_FOR_ERROR
@@ -4359,7 +4362,7 @@
     break;
 
   case 186:
-#line 2109 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2112 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal));
     CHECK_FOR_ERROR
@@ -4367,7 +4370,7 @@
     break;
 
   case 187:
-#line 2113 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2116 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantBool::getTrue());
     CHECK_FOR_ERROR
@@ -4375,7 +4378,7 @@
     break;
 
   case 188:
-#line 2117 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2120 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantBool::getFalse());
     CHECK_FOR_ERROR
@@ -4383,7 +4386,7 @@
     break;
 
   case 189:
-#line 2121 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2124 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
@@ -4391,7 +4394,7 @@
     break;
 
   case 190:
-#line 2125 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2128 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
@@ -4399,7 +4402,7 @@
     break;
 
   case 191:
-#line 2129 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2132 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
@@ -4407,7 +4410,7 @@
     break;
 
   case 192:
-#line 2133 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2136 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[-1].ConstVector))[0]->getType();
     int NumElements = (yyvsp[-1].ConstVector)->size(); 
@@ -4436,7 +4439,7 @@
     break;
 
   case 193:
-#line 2158 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2161 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
@@ -4444,7 +4447,7 @@
     break;
 
   case 194:
-#line 2162 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2165 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
     std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
@@ -4458,7 +4461,7 @@
     break;
 
   case 195:
-#line 2176 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2179 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal));
     CHECK_FOR_ERROR
@@ -4466,7 +4469,7 @@
     break;
 
   case 196:
-#line 2180 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2183 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal));
     CHECK_FOR_ERROR
@@ -4474,7 +4477,7 @@
     break;
 
   case 199:
-#line 2192 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2195 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueVal) = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal)); delete (yyvsp[-1].TypeVal);
     CHECK_FOR_ERROR
@@ -4482,7 +4485,7 @@
     break;
 
   case 200:
-#line 2197 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2200 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
@@ -4490,7 +4493,7 @@
     break;
 
   case 201:
-#line 2201 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2204 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
@@ -4498,7 +4501,7 @@
     break;
 
   case 202:
-#line 2210 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2213 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
     CHECK_FOR_ERROR
@@ -4512,7 +4515,7 @@
     break;
 
   case 203:
-#line 2221 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2224 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyvsp[-1].BasicBlockVal)->getInstList().push_back((yyvsp[0].InstVal));
     (yyval.BasicBlockVal) = (yyvsp[-1].BasicBlockVal);
@@ -4521,7 +4524,7 @@
     break;
 
   case 204:
-#line 2226 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2229 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
     CHECK_FOR_ERROR
@@ -4537,7 +4540,7 @@
     break;
 
   case 205:
-#line 2238 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2241 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((yyvsp[0].StrVal)), true);
     CHECK_FOR_ERROR
@@ -4553,7 +4556,7 @@
     break;
 
   case 206:
-#line 2251 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2254 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {              // Return with a result...
     (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
@@ -4561,7 +4564,7 @@
     break;
 
   case 207:
-#line 2255 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2258 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                       // Return with no result...
     (yyval.TermInstVal) = new ReturnInst();
     CHECK_FOR_ERROR
@@ -4569,7 +4572,7 @@
     break;
 
   case 208:
-#line 2259 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2262 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                         // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
@@ -4578,7 +4581,7 @@
     break;
 
   case 209:
-#line 2264 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2267 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {  
     BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
     CHECK_FOR_ERROR
@@ -4591,7 +4594,7 @@
     break;
 
   case 210:
-#line 2273 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2276 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-7].PrimType), (yyvsp[-6].ValIDVal));
     CHECK_FOR_ERROR
@@ -4614,7 +4617,7 @@
     break;
 
   case 211:
-#line 2292 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2295 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-6].PrimType), (yyvsp[-5].ValIDVal));
     CHECK_FOR_ERROR
@@ -4627,7 +4630,7 @@
     break;
 
   case 212:
-#line 2302 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2305 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *PFTy;
     const FunctionType *Ty;
@@ -4686,7 +4689,7 @@
     break;
 
   case 213:
-#line 2357 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2360 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
@@ -4694,7 +4697,7 @@
     break;
 
   case 214:
-#line 2361 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2364 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
@@ -4702,7 +4705,7 @@
     break;
 
   case 215:
-#line 2368 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2371 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[-5].JumpTable);
     Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
@@ -4717,7 +4720,7 @@
     break;
 
   case 216:
-#line 2379 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2382 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
@@ -4733,7 +4736,7 @@
     break;
 
   case 217:
-#line 2392 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2395 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   // Is this definition named?? if so, assign the name...
   setValueName((yyvsp[0].InstVal), (yyvsp[-1].StrVal));
@@ -4745,7 +4748,7 @@
     break;
 
   case 218:
-#line 2401 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2404 "/proj/llvm/llvm/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));
@@ -4758,7 +4761,7 @@
     break;
 
   case 219:
-#line 2410 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2413 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.PHIList) = (yyvsp[-6].PHIList);
     Value* tmpVal = getVal((yyvsp[-6].PHIList)->front().first->getType(), (yyvsp[-3].ValIDVal));
@@ -4770,7 +4773,7 @@
     break;
 
   case 220:
-#line 2420 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2423 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {    // Used for call statements, and memory insts...
     (yyval.ValueList) = new std::vector<Value*>();
     (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
@@ -4778,7 +4781,7 @@
     break;
 
   case 221:
-#line 2424 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2427 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[-2].ValueList);
     (yyvsp[-2].ValueList)->push_back((yyvsp[0].ValueVal));
@@ -4787,12 +4790,12 @@
     break;
 
   case 223:
-#line 2431 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2434 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = 0; ;}
     break;
 
   case 224:
-#line 2433 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2436 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -4800,7 +4803,7 @@
     break;
 
   case 225:
-#line 2437 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2440 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -4808,7 +4811,7 @@
     break;
 
   case 226:
-#line 2442 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2445 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!(*(yyvsp[-3].TypeVal))->isInteger() && !(*(yyvsp[-3].TypeVal))->isFloatingPoint() && 
         !isa<PackedType>((*(yyvsp[-3].TypeVal)).get()))
@@ -4830,7 +4833,7 @@
     break;
 
   case 227:
-#line 2460 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2463 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!(*(yyvsp[-3].TypeVal))->isIntegral()) {
       if (!isa<PackedType>((yyvsp[-3].TypeVal)->get()) ||
@@ -4849,7 +4852,7 @@
     break;
 
   case 228:
-#line 2475 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2478 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if(isa<PackedType>((*(yyvsp[-3].TypeVal)).get())) {
       GEN_ERROR(
@@ -4867,7 +4870,7 @@
     break;
 
   case 229:
-#line 2489 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2492 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::cerr << "WARNING: Use of eliminated 'not' instruction:"
               << " Replacing with 'xor'.\n";
@@ -4884,7 +4887,7 @@
     break;
 
   case 230:
-#line 2502 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2505 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].ValueVal)->getType() != Type::UByteTy)
       GEN_ERROR("Shift amount must be ubyte!");
@@ -4896,7 +4899,7 @@
     break;
 
   case 231:
-#line 2510 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2513 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!(yyvsp[0].TypeVal)->get()->isFirstClassType())
       GEN_ERROR("cast instruction to a non-primitive type: '" +
@@ -4908,7 +4911,7 @@
     break;
 
   case 232:
-#line 2518 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2521 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-4].ValueVal)->getType() != Type::BoolTy)
       GEN_ERROR("select condition must be boolean!");
@@ -4920,7 +4923,7 @@
     break;
 
   case 233:
-#line 2526 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2529 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     NewVarArgs = true;
     (yyval.InstVal) = new VAArgInst((yyvsp[-2].ValueVal), *(yyvsp[0].TypeVal));
@@ -4930,7 +4933,7 @@
     break;
 
   case 234:
-#line 2532 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2535 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ObsoleteVarArgs = true;
     const Type* ArgTy = (yyvsp[-2].ValueVal)->getType();
@@ -4954,7 +4957,7 @@
     break;
 
   case 235:
-#line 2552 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2555 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     ObsoleteVarArgs = true;
     const Type* ArgTy = (yyvsp[-2].ValueVal)->getType();
@@ -4981,7 +4984,7 @@
     break;
 
   case 236:
-#line 2575 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2578 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid extractelement operands!");
@@ -4991,7 +4994,7 @@
     break;
 
   case 237:
-#line 2581 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2584 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid insertelement operands!");
@@ -5001,7 +5004,7 @@
     break;
 
   case 238:
-#line 2587 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2590 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands!");
@@ -5011,7 +5014,7 @@
     break;
 
   case 239:
-#line 2593 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2596 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[0].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -5030,7 +5033,7 @@
     break;
 
   case 240:
-#line 2608 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2611 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *PFTy;
     const FunctionType *Ty;
@@ -5093,7 +5096,7 @@
     break;
 
   case 241:
-#line 2667 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2670 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[0].InstVal);
     CHECK_FOR_ERROR
@@ -5101,7 +5104,7 @@
     break;
 
   case 242:
-#line 2674 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2677 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
     (yyval.ValueList) = (yyvsp[0].ValueList); 
     CHECK_FOR_ERROR
@@ -5109,7 +5112,7 @@
     break;
 
   case 243:
-#line 2677 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2680 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
     (yyval.ValueList) = new std::vector<Value*>(); 
     CHECK_FOR_ERROR
@@ -5117,7 +5120,7 @@
     break;
 
   case 244:
-#line 2682 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2685 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5125,7 +5128,7 @@
     break;
 
   case 245:
-#line 2686 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2689 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -5133,7 +5136,7 @@
     break;
 
   case 246:
-#line 2693 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2696 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = new MallocInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal));
     delete (yyvsp[-1].TypeVal);
@@ -5142,7 +5145,7 @@
     break;
 
   case 247:
-#line 2698 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2701 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal));
     CHECK_FOR_ERROR
@@ -5152,7 +5155,7 @@
     break;
 
   case 248:
-#line 2704 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2707 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = new AllocaInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal));
     delete (yyvsp[-1].TypeVal);
@@ -5161,7 +5164,7 @@
     break;
 
   case 249:
-#line 2709 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2712 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal));
     CHECK_FOR_ERROR
@@ -5171,7 +5174,7 @@
     break;
 
   case 250:
-#line 2715 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2718 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[0].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
@@ -5182,7 +5185,7 @@
     break;
 
   case 251:
-#line 2723 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2726 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-1].TypeVal)->get()))
       GEN_ERROR("Can't load from nonpointer type: " +
@@ -5198,7 +5201,7 @@
     break;
 
   case 252:
-#line 2735 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2738 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     const PointerType *PT = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
     if (!PT)
@@ -5217,7 +5220,7 @@
     break;
 
   case 253:
-#line 2750 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2753 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-2].TypeVal)->get()))
       GEN_ERROR("getelementptr insn requires pointer operand!");
@@ -5249,7 +5252,7 @@
     }
 
 /* Line 1126 of yacc.c.  */
-#line 5253 "llvmAsmParser.tab.c"
+#line 5256 "llvmAsmParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -5517,7 +5520,7 @@
 }
 
 
-#line 2776 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 2779 "/proj/llvm/llvm/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.4 llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.13.2.5
--- llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.13.2.4	Thu Oct 19 23:27:17 2006
+++ llvm/lib/AsmParser/llvmAsmParser.h.cvs	Sat Oct 21 20:36:52 2006
@@ -251,7 +251,7 @@
 
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 991 "/proj/llvm/llvm2/lib/AsmParser/llvmAsmParser.y"
+#line 994 "/proj/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
 typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;


Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.266.2.4 llvm/lib/AsmParser/llvmAsmParser.y:1.266.2.5
--- llvm/lib/AsmParser/llvmAsmParser.y:1.266.2.4	Thu Oct 19 23:27:17 2006
+++ llvm/lib/AsmParser/llvmAsmParser.y	Sat Oct 21 20:36:52 2006
@@ -825,6 +825,9 @@
         if (Ty->isSigned())
           OI.opcode = Instruction::SDiv;
         break;
+      case Instruction::SDiv:
+        if (Ty->isUnsigned())
+          OI.opcode = Instruction::UDiv;
     }
     OI.obsolete = false;
   }


Index: llvm/lib/AsmParser/llvmAsmParser.y.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.18.2.4 llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.18.2.5
--- llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.18.2.4	Thu Oct 19 23:27:17 2006
+++ llvm/lib/AsmParser/llvmAsmParser.y.cvs	Sat Oct 21 20:36:52 2006
@@ -825,6 +825,9 @@
         if (Ty->isSigned())
           OI.opcode = Instruction::SDiv;
         break;
+      case Instruction::SDiv:
+        if (Ty->isUnsigned())
+          OI.opcode = Instruction::UDiv;
     }
     OI.obsolete = false;
   }






More information about the llvm-commits mailing list