1 files changed, 259 insertions, 266 deletions
diff --git a/llvm/lib/AsmParser/llvmAsmParser.h.cvs b/llvm/lib/AsmParser/llvmAsmParser.h.cvs
index e249522172a..46cdcc51532 100644
--- a/llvm/lib/AsmParser/llvmAsmParser.h.cvs
+++ b/llvm/lib/AsmParser/llvmAsmParser.h.cvs
@@ -36,136 +36,131 @@
      FPVAL = 262,
      VOID = 263,
      BOOL = 264,
-     SBYTE = 265,
-     UBYTE = 266,
-     SHORT = 267,
-     USHORT = 268,
-     INT = 269,
-     UINT = 270,
-     LONG = 271,
-     ULONG = 272,
-     FLOAT = 273,
-     DOUBLE = 274,
-     LABEL = 275,
-     TYPE = 276,
-     VAR_ID = 277,
-     LABELSTR = 278,
-     STRINGCONSTANT = 279,
-     IMPLEMENTATION = 280,
-     ZEROINITIALIZER = 281,
-     TRUETOK = 282,
-     FALSETOK = 283,
-     BEGINTOK = 284,
-     ENDTOK = 285,
-     DECLARE = 286,
-     DEFINE = 287,
-     GLOBAL = 288,
-     CONSTANT = 289,
-     SECTION = 290,
-     VOLATILE = 291,
-     TO = 292,
-     DOTDOTDOT = 293,
-     NULL_TOK = 294,
-     UNDEF = 295,
-     CONST = 296,
-     INTERNAL = 297,
-     LINKONCE = 298,
-     WEAK = 299,
-     APPENDING = 300,
-     DLLIMPORT = 301,
-     DLLEXPORT = 302,
-     EXTERN_WEAK = 303,
-     OPAQUE = 304,
-     NOT = 305,
-     EXTERNAL = 306,
-     TARGET = 307,
-     TRIPLE = 308,
-     ENDIAN = 309,
-     POINTERSIZE = 310,
-     LITTLE = 311,
-     BIG = 312,
-     ALIGN = 313,
-     DEPLIBS = 314,
-     CALL = 315,
-     TAIL = 316,
-     ASM_TOK = 317,
-     MODULE = 318,
-     SIDEEFFECT = 319,
-     CC_TOK = 320,
-     CCC_TOK = 321,
-     CSRETCC_TOK = 322,
-     FASTCC_TOK = 323,
-     COLDCC_TOK = 324,
-     X86_STDCALLCC_TOK = 325,
-     X86_FASTCALLCC_TOK = 326,
-     DATALAYOUT = 327,
-     RET = 328,
-     BR = 329,
-     SWITCH = 330,
-     INVOKE = 331,
-     UNWIND = 332,
-     UNREACHABLE = 333,
-     ADD = 334,
-     SUB = 335,
-     MUL = 336,
-     UDIV = 337,
-     SDIV = 338,
-     FDIV = 339,
-     UREM = 340,
-     SREM = 341,
-     FREM = 342,
-     AND = 343,
-     OR = 344,
-     XOR = 345,
-     ICMP = 346,
-     FCMP = 347,
-     EQ = 348,
-     NE = 349,
-     SLT = 350,
-     SGT = 351,
-     SLE = 352,
-     SGE = 353,
-     ULT = 354,
-     UGT = 355,
-     ULE = 356,
-     UGE = 357,
-     OEQ = 358,
-     ONE = 359,
-     OLT = 360,
-     OGT = 361,
-     OLE = 362,
-     OGE = 363,
-     ORD = 364,
-     UNO = 365,
-     UEQ = 366,
-     UNE = 367,
-     MALLOC = 368,
-     ALLOCA = 369,
-     FREE = 370,
-     LOAD = 371,
-     STORE = 372,
-     GETELEMENTPTR = 373,
-     TRUNC = 374,
-     ZEXT = 375,
-     SEXT = 376,
-     FPTRUNC = 377,
-     FPEXT = 378,
-     BITCAST = 379,
-     UITOFP = 380,
-     SITOFP = 381,
-     FPTOUI = 382,
-     FPTOSI = 383,
-     INTTOPTR = 384,
-     PTRTOINT = 385,
-     PHI_TOK = 386,
-     SELECT = 387,
-     SHL = 388,
-     LSHR = 389,
-     ASHR = 390,
-     VAARG = 391,
-     EXTRACTELEMENT = 392,
-     INSERTELEMENT = 393,
-     SHUFFLEVECTOR = 394
+     INT8 = 265,
+     INT16 = 266,
+     INT32 = 267,
+     INT64 = 268,
+     FLOAT = 269,
+     DOUBLE = 270,
+     LABEL = 271,
+     TYPE = 272,
+     VAR_ID = 273,
+     LABELSTR = 274,
+     STRINGCONSTANT = 275,
+     IMPLEMENTATION = 276,
+     ZEROINITIALIZER = 277,
+     TRUETOK = 278,
+     FALSETOK = 279,
+     BEGINTOK = 280,
+     ENDTOK = 281,
+     DECLARE = 282,
+     DEFINE = 283,
+     GLOBAL = 284,
+     CONSTANT = 285,
+     SECTION = 286,
+     VOLATILE = 287,
+     TO = 288,
+     DOTDOTDOT = 289,
+     NULL_TOK = 290,
+     UNDEF = 291,
+     INTERNAL = 292,
+     LINKONCE = 293,
+     WEAK = 294,
+     APPENDING = 295,
+     DLLIMPORT = 296,
+     DLLEXPORT = 297,
+     EXTERN_WEAK = 298,
+     OPAQUE = 299,
+     NOT = 300,
+     EXTERNAL = 301,
+     TARGET = 302,
+     TRIPLE = 303,
+     ENDIAN = 304,
+     POINTERSIZE = 305,
+     LITTLE = 306,
+     BIG = 307,
+     ALIGN = 308,
+     DEPLIBS = 309,
+     CALL = 310,
+     TAIL = 311,
+     ASM_TOK = 312,
+     MODULE = 313,
+     SIDEEFFECT = 314,
+     CC_TOK = 315,
+     CCC_TOK = 316,
+     CSRETCC_TOK = 317,
+     FASTCC_TOK = 318,
+     COLDCC_TOK = 319,
+     X86_STDCALLCC_TOK = 320,
+     X86_FASTCALLCC_TOK = 321,
+     DATALAYOUT = 322,
+     RET = 323,
+     BR = 324,
+     SWITCH = 325,
+     INVOKE = 326,
+     UNWIND = 327,
+     UNREACHABLE = 328,
+     ADD = 329,
+     SUB = 330,
+     MUL = 331,
+     UDIV = 332,
+     SDIV = 333,
+     FDIV = 334,
+     UREM = 335,
+     SREM = 336,
+     FREM = 337,
+     AND = 338,
+     OR = 339,
+     XOR = 340,
+     ICMP = 341,
+     FCMP = 342,
+     EQ = 343,
+     NE = 344,
+     SLT = 345,
+     SGT = 346,
+     SLE = 347,
+     SGE = 348,
+     ULT = 349,
+     UGT = 350,
+     ULE = 351,
+     UGE = 352,
+     OEQ = 353,
+     ONE = 354,
+     OLT = 355,
+     OGT = 356,
+     OLE = 357,
+     OGE = 358,
+     ORD = 359,
+     UNO = 360,
+     UEQ = 361,
+     UNE = 362,
+     MALLOC = 363,
+     ALLOCA = 364,
+     FREE = 365,
+     LOAD = 366,
+     STORE = 367,
+     GETELEMENTPTR = 368,
+     TRUNC = 369,
+     ZEXT = 370,
+     SEXT = 371,
+     FPTRUNC = 372,
+     FPEXT = 373,
+     BITCAST = 374,
+     UITOFP = 375,
+     SITOFP = 376,
+     FPTOUI = 377,
+     FPTOSI = 378,
+     INTTOPTR = 379,
+     PTRTOINT = 380,
+     PHI_TOK = 381,
+     SELECT = 382,
+     SHL = 383,
+     LSHR = 384,
+     ASHR = 385,
+     VAARG = 386,
+     EXTRACTELEMENT = 387,
+     INSERTELEMENT = 388,
+     SHUFFLEVECTOR = 389
    };
 #endif
 /* Tokens.  */
@@ -176,158 +171,155 @@
 #define FPVAL 262
 #define VOID 263
 #define BOOL 264
-#define SBYTE 265
-#define UBYTE 266
-#define SHORT 267
-#define USHORT 268
-#define INT 269
-#define UINT 270
-#define LONG 271
-#define ULONG 272
-#define FLOAT 273
-#define DOUBLE 274
-#define LABEL 275
-#define TYPE 276
-#define VAR_ID 277
-#define LABELSTR 278
-#define STRINGCONSTANT 279
-#define IMPLEMENTATION 280
-#define ZEROINITIALIZER 281
-#define TRUETOK 282
-#define FALSETOK 283
-#define BEGINTOK 284
-#define ENDTOK 285
-#define DECLARE 286
-#define DEFINE 287
-#define GLOBAL 288
-#define CONSTANT 289
-#define SECTION 290
-#define VOLATILE 291
-#define TO 292
-#define DOTDOTDOT 293
-#define NULL_TOK 294
-#define UNDEF 295
-#define CONST 296
-#define INTERNAL 297
-#define LINKONCE 298
-#define WEAK 299
-#define APPENDING 300
-#define DLLIMPORT 301
-#define DLLEXPORT 302
-#define EXTERN_WEAK 303
-#define OPAQUE 304
-#define NOT 305
-#define EXTERNAL 306
-#define TARGET 307
-#define TRIPLE 308
-#define ENDIAN 309
-#define POINTERSIZE 310
-#define LITTLE 311
-#define BIG 312
-#define ALIGN 313
-#define DEPLIBS 314
-#define CALL 315
-#define TAIL 316
-#define ASM_TOK 317
-#define MODULE 318
-#define SIDEEFFECT 319
-#define CC_TOK 320
-#define CCC_TOK 321
-#define CSRETCC_TOK 322
-#define FASTCC_TOK 323
-#define COLDCC_TOK 324
-#define X86_STDCALLCC_TOK 325
-#define X86_FASTCALLCC_TOK 326
-#define DATALAYOUT 327
-#define RET 328
-#define BR 329
-#define SWITCH 330
-#define INVOKE 331
-#define UNWIND 332
-#define UNREACHABLE 333
-#define ADD 334
-#define SUB 335
-#define MUL 336
-#define UDIV 337
-#define SDIV 338
-#define FDIV 339
-#define UREM 340
-#define SREM 341
-#define FREM 342
-#define AND 343
-#define OR 344
-#define XOR 345
-#define ICMP 346
-#define FCMP 347
-#define EQ 348
-#define NE 349
-#define SLT 350
-#define SGT 351
-#define SLE 352
-#define SGE 353
-#define ULT 354
-#define UGT 355
-#define ULE 356
-#define UGE 357
-#define OEQ 358
-#define ONE 359
-#define OLT 360
-#define OGT 361
-#define OLE 362
-#define OGE 363
-#define ORD 364
-#define UNO 365
-#define UEQ 366
-#define UNE 367
-#define MALLOC 368
-#define ALLOCA 369
-#define FREE 370
-#define LOAD 371
-#define STORE 372
-#define GETELEMENTPTR 373
-#define TRUNC 374
-#define ZEXT 375
-#define SEXT 376
-#define FPTRUNC 377
-#define FPEXT 378
-#define BITCAST 379
-#define UITOFP 380
-#define SITOFP 381
-#define FPTOUI 382
-#define FPTOSI 383
-#define INTTOPTR 384
-#define PTRTOINT 385
-#define PHI_TOK 386
-#define SELECT 387
-#define SHL 388
-#define LSHR 389
-#define ASHR 390
-#define VAARG 391
-#define EXTRACTELEMENT 392
-#define INSERTELEMENT 393
-#define SHUFFLEVECTOR 394
+#define INT8 265
+#define INT16 266
+#define INT32 267
+#define INT64 268
+#define FLOAT 269
+#define DOUBLE 270
+#define LABEL 271
+#define TYPE 272
+#define VAR_ID 273
+#define LABELSTR 274
+#define STRINGCONSTANT 275
+#define IMPLEMENTATION 276
+#define ZEROINITIALIZER 277
+#define TRUETOK 278
+#define FALSETOK 279
+#define BEGINTOK 280
+#define ENDTOK 281
+#define DECLARE 282
+#define DEFINE 283
+#define GLOBAL 284
+#define CONSTANT 285
+#define SECTION 286
+#define VOLATILE 287
+#define TO 288
+#define DOTDOTDOT 289
+#define NULL_TOK 290
+#define UNDEF 291
+#define INTERNAL 292
+#define LINKONCE 293
+#define WEAK 294
+#define APPENDING 295
+#define DLLIMPORT 296
+#define DLLEXPORT 297
+#define EXTERN_WEAK 298
+#define OPAQUE 299
+#define NOT 300
+#define EXTERNAL 301
+#define TARGET 302
+#define TRIPLE 303
+#define ENDIAN 304
+#define POINTERSIZE 305
+#define LITTLE 306
+#define BIG 307
+#define ALIGN 308
+#define DEPLIBS 309
+#define CALL 310
+#define TAIL 311
+#define ASM_TOK 312
+#define MODULE 313
+#define SIDEEFFECT 314
+#define CC_TOK 315
+#define CCC_TOK 316
+#define CSRETCC_TOK 317
+#define FASTCC_TOK 318
+#define COLDCC_TOK 319
+#define X86_STDCALLCC_TOK 320
+#define X86_FASTCALLCC_TOK 321
+#define DATALAYOUT 322
+#define RET 323
+#define BR 324
+#define SWITCH 325
+#define INVOKE 326
+#define UNWIND 327
+#define UNREACHABLE 328
+#define ADD 329
+#define SUB 330
+#define MUL 331
+#define UDIV 332
+#define SDIV 333
+#define FDIV 334
+#define UREM 335
+#define SREM 336
+#define FREM 337
+#define AND 338
+#define OR 339
+#define XOR 340
+#define ICMP 341
+#define FCMP 342
+#define EQ 343
+#define NE 344
+#define SLT 345
+#define SGT 346
+#define SLE 347
+#define SGE 348
+#define ULT 349
+#define UGT 350
+#define ULE 351
+#define UGE 352
+#define OEQ 353
+#define ONE 354
+#define OLT 355
+#define OGT 356
+#define OLE 357
+#define OGE 358
+#define ORD 359
+#define UNO 360
+#define UEQ 361
+#define UNE 362
+#define MALLOC 363
+#define ALLOCA 364
+#define FREE 365
+#define LOAD 366
+#define STORE 367
+#define GETELEMENTPTR 368
+#define TRUNC 369
+#define ZEXT 370
+#define SEXT 371
+#define FPTRUNC 372
+#define FPEXT 373
+#define BITCAST 374
+#define UITOFP 375
+#define SITOFP 376
+#define FPTOUI 377
+#define FPTOSI 378
+#define INTTOPTR 379
+#define PTRTOINT 380
+#define PHI_TOK 381
+#define SELECT 382
+#define SHL 383
+#define LSHR 384
+#define ASHR 385
+#define VAARG 386
+#define EXTRACTELEMENT 387
+#define INSERTELEMENT 388
+#define SHUFFLEVECTOR 389
 
 
 
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 855 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 843 "/proj/llvm/llvm-3/lib/AsmParser/llvmAsmParser.y"
 typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
-  std::pair<llvm::PATypeHolder*, char*>  *ArgVal;
   llvm::BasicBlock                       *BasicBlockVal;
   llvm::TerminatorInst                   *TermInstVal;
   llvm::Instruction                      *InstVal;
   llvm::Constant                         *ConstVal;
 
   const llvm::Type                       *PrimType;
+  std::list<llvm::PATypeHolder>          *TypeList;
   llvm::PATypeHolder                     *TypeVal;
   llvm::Value                            *ValueVal;
-
-  std::vector<std::pair<llvm::PATypeHolder*,char*> > *ArgList;
   std::vector<llvm::Value*>              *ValueList;
-  std::list<llvm::PATypeHolder>          *TypeList;
+  llvm::ArgListType                      *ArgList;
+  llvm::TypeWithAttrs                     TypeWithAttrs;
+  llvm::TypeWithAttrsList                *TypeWithAttrsList;
+  llvm::ValueRefList                     *ValueRefList;
+
   // Represent the RHS of PHI node
   std::list<std::pair<llvm::Value*,
                       llvm::BasicBlock*> > *PHIList;
@@ -335,6 +327,7 @@ typedef union YYSTYPE {
   std::vector<llvm::Constant*>           *ConstVector;
 
   llvm::GlobalValue::LinkageTypes         Linkage;
+  llvm::FunctionType::ParameterAttributes ParamAttrs;
   int64_t                           SInt64Val;
   uint64_t                          UInt64Val;
   int                               SIntVal;
@@ -355,7 +348,7 @@ typedef union YYSTYPE {
   llvm::FCmpInst::Predicate         FPredicate;
 } YYSTYPE;
 /* Line 1447 of yacc.c.  */
-#line 359 "llvmAsmParser.tab.h"
+#line 352 "llvmAsmParser.tab.h"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1