/* Put the tokens into the symbol table, so that GDB and other debuggers
know about them. */
enum yytokentype {
- VOID = 258,
- BOOL = 259,
- SBYTE = 260,
- UBYTE = 261,
- SHORT = 262,
- USHORT = 263,
- INT = 264,
- UINT = 265,
- LONG = 266,
- ULONG = 267,
- FLOAT = 268,
- DOUBLE = 269,
- LABEL = 270,
- OPAQUE = 271,
- ESINT64VAL = 272,
- EUINT64VAL = 273,
- SINTVAL = 274,
- UINTVAL = 275,
- FPVAL = 276,
- NULL_TOK = 277,
- UNDEF = 278,
- ZEROINITIALIZER = 279,
- TRUETOK = 280,
- FALSETOK = 281,
- TYPE = 282,
- VAR_ID = 283,
- LABELSTR = 284,
- STRINGCONSTANT = 285,
- IMPLEMENTATION = 286,
- BEGINTOK = 287,
- ENDTOK = 288,
- DECLARE = 289,
- GLOBAL = 290,
- CONSTANT = 291,
- SECTION = 292,
- VOLATILE = 293,
- TO = 294,
- DOTDOTDOT = 295,
- CONST = 296,
- INTERNAL = 297,
- LINKONCE = 298,
- WEAK = 299,
+ ESINT64VAL = 258,
+ EUINT64VAL = 259,
+ SINTVAL = 260,
+ UINTVAL = 261,
+ 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,
+ TYPE = 275,
+ LABEL = 276,
+ VAR_ID = 277,
+ LABELSTR = 278,
+ STRINGCONSTANT = 279,
+ IMPLEMENTATION = 280,
+ ZEROINITIALIZER = 281,
+ TRUETOK = 282,
+ FALSETOK = 283,
+ BEGINTOK = 284,
+ ENDTOK = 285,
+ DECLARE = 286,
+ GLOBAL = 287,
+ CONSTANT = 288,
+ SECTION = 289,
+ VOLATILE = 290,
+ TO = 291,
+ DOTDOTDOT = 292,
+ NULL_TOK = 293,
+ UNDEF = 294,
+ CONST = 295,
+ INTERNAL = 296,
+ LINKONCE = 297,
+ WEAK = 298,
+ APPENDING = 299,
DLLIMPORT = 300,
DLLEXPORT = 301,
EXTERN_WEAK = 302,
- APPENDING = 303,
+ OPAQUE = 303,
NOT = 304,
EXTERNAL = 305,
TARGET = 306,
LITTLE = 310,
BIG = 311,
ALIGN = 312,
- UNINITIALIZED = 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,
- EXCEPT = 332,
- UNWIND = 333,
- UNREACHABLE = 334,
- ADD = 335,
- SUB = 336,
- MUL = 337,
- DIV = 338,
- UDIV = 339,
- SDIV = 340,
- FDIV = 341,
- REM = 342,
- UREM = 343,
- SREM = 344,
- FREM = 345,
- AND = 346,
- OR = 347,
- XOR = 348,
- SETLE = 349,
- SETGE = 350,
- SETLT = 351,
- SETGT = 352,
- SETEQ = 353,
- SETNE = 354,
- ICMP = 355,
- FCMP = 356,
- EQ = 357,
- NE = 358,
- SLT = 359,
- SGT = 360,
- SLE = 361,
- SGE = 362,
- OEQ = 363,
- ONE = 364,
- OLT = 365,
- OGT = 366,
- OLE = 367,
- OGE = 368,
- ORD = 369,
- UNO = 370,
- UEQ = 371,
- UNE = 372,
- ULT = 373,
- UGT = 374,
- ULE = 375,
- UGE = 376,
- MALLOC = 377,
- ALLOCA = 378,
- FREE = 379,
- LOAD = 380,
- STORE = 381,
- GETELEMENTPTR = 382,
- PHI_TOK = 383,
- SELECT = 384,
- SHL = 385,
- SHR = 386,
- ASHR = 387,
- LSHR = 388,
- VAARG = 389,
- EXTRACTELEMENT = 390,
- INSERTELEMENT = 391,
- SHUFFLEVECTOR = 392,
- CAST = 393,
- TRUNC = 394,
- ZEXT = 395,
- SEXT = 396,
- FPTRUNC = 397,
- FPEXT = 398,
- FPTOUI = 399,
- FPTOSI = 400,
- UITOFP = 401,
- SITOFP = 402,
- PTRTOINT = 403,
- INTTOPTR = 404,
- BITCAST = 405
+ DEPLIBS = 313,
+ CALL = 314,
+ TAIL = 315,
+ ASM_TOK = 316,
+ MODULE = 317,
+ SIDEEFFECT = 318,
+ CC_TOK = 319,
+ CCC_TOK = 320,
+ CSRETCC_TOK = 321,
+ FASTCC_TOK = 322,
+ COLDCC_TOK = 323,
+ X86_STDCALLCC_TOK = 324,
+ X86_FASTCALLCC_TOK = 325,
+ DATALAYOUT = 326,
+ RET = 327,
+ BR = 328,
+ SWITCH = 329,
+ INVOKE = 330,
+ UNREACHABLE = 331,
+ UNWIND = 332,
+ EXCEPT = 333,
+ ADD = 334,
+ SUB = 335,
+ MUL = 336,
+ DIV = 337,
+ UDIV = 338,
+ SDIV = 339,
+ FDIV = 340,
+ REM = 341,
+ UREM = 342,
+ SREM = 343,
+ FREM = 344,
+ AND = 345,
+ OR = 346,
+ XOR = 347,
+ SHL = 348,
+ SHR = 349,
+ ASHR = 350,
+ LSHR = 351,
+ SETLE = 352,
+ SETGE = 353,
+ SETLT = 354,
+ SETGT = 355,
+ SETEQ = 356,
+ SETNE = 357,
+ ICMP = 358,
+ FCMP = 359,
+ MALLOC = 360,
+ ALLOCA = 361,
+ FREE = 362,
+ LOAD = 363,
+ STORE = 364,
+ GETELEMENTPTR = 365,
+ PHI_TOK = 366,
+ SELECT = 367,
+ VAARG = 368,
+ EXTRACTELEMENT = 369,
+ INSERTELEMENT = 370,
+ SHUFFLEVECTOR = 371,
+ VAARG_old = 372,
+ VANEXT_old = 373,
+ EQ = 374,
+ NE = 375,
+ SLT = 376,
+ SGT = 377,
+ SLE = 378,
+ SGE = 379,
+ ULT = 380,
+ UGT = 381,
+ ULE = 382,
+ UGE = 383,
+ OEQ = 384,
+ ONE = 385,
+ OLT = 386,
+ OGT = 387,
+ OLE = 388,
+ OGE = 389,
+ ORD = 390,
+ UNO = 391,
+ UEQ = 392,
+ UNE = 393,
+ CAST = 394,
+ TRUNC = 395,
+ ZEXT = 396,
+ SEXT = 397,
+ FPTRUNC = 398,
+ FPEXT = 399,
+ FPTOUI = 400,
+ FPTOSI = 401,
+ UITOFP = 402,
+ SITOFP = 403,
+ PTRTOINT = 404,
+ INTTOPTR = 405,
+ BITCAST = 406
};
#endif
/* Tokens. */
-#define VOID 258
-#define BOOL 259
-#define SBYTE 260
-#define UBYTE 261
-#define SHORT 262
-#define USHORT 263
-#define INT 264
-#define UINT 265
-#define LONG 266
-#define ULONG 267
-#define FLOAT 268
-#define DOUBLE 269
-#define LABEL 270
-#define OPAQUE 271
-#define ESINT64VAL 272
-#define EUINT64VAL 273
-#define SINTVAL 274
-#define UINTVAL 275
-#define FPVAL 276
-#define NULL_TOK 277
-#define UNDEF 278
-#define ZEROINITIALIZER 279
-#define TRUETOK 280
-#define FALSETOK 281
-#define TYPE 282
-#define VAR_ID 283
-#define LABELSTR 284
-#define STRINGCONSTANT 285
-#define IMPLEMENTATION 286
-#define BEGINTOK 287
-#define ENDTOK 288
-#define DECLARE 289
-#define GLOBAL 290
-#define CONSTANT 291
-#define SECTION 292
-#define VOLATILE 293
-#define TO 294
-#define DOTDOTDOT 295
-#define CONST 296
-#define INTERNAL 297
-#define LINKONCE 298
-#define WEAK 299
+#define ESINT64VAL 258
+#define EUINT64VAL 259
+#define SINTVAL 260
+#define UINTVAL 261
+#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 TYPE 275
+#define LABEL 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 GLOBAL 287
+#define CONSTANT 288
+#define SECTION 289
+#define VOLATILE 290
+#define TO 291
+#define DOTDOTDOT 292
+#define NULL_TOK 293
+#define UNDEF 294
+#define CONST 295
+#define INTERNAL 296
+#define LINKONCE 297
+#define WEAK 298
+#define APPENDING 299
#define DLLIMPORT 300
#define DLLEXPORT 301
#define EXTERN_WEAK 302
-#define APPENDING 303
+#define OPAQUE 303
#define NOT 304
#define EXTERNAL 305
#define TARGET 306
#define LITTLE 310
#define BIG 311
#define ALIGN 312
-#define UNINITIALIZED 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 EXCEPT 332
-#define UNWIND 333
-#define UNREACHABLE 334
-#define ADD 335
-#define SUB 336
-#define MUL 337
-#define DIV 338
-#define UDIV 339
-#define SDIV 340
-#define FDIV 341
-#define REM 342
-#define UREM 343
-#define SREM 344
-#define FREM 345
-#define AND 346
-#define OR 347
-#define XOR 348
-#define SETLE 349
-#define SETGE 350
-#define SETLT 351
-#define SETGT 352
-#define SETEQ 353
-#define SETNE 354
-#define ICMP 355
-#define FCMP 356
-#define EQ 357
-#define NE 358
-#define SLT 359
-#define SGT 360
-#define SLE 361
-#define SGE 362
-#define OEQ 363
-#define ONE 364
-#define OLT 365
-#define OGT 366
-#define OLE 367
-#define OGE 368
-#define ORD 369
-#define UNO 370
-#define UEQ 371
-#define UNE 372
-#define ULT 373
-#define UGT 374
-#define ULE 375
-#define UGE 376
-#define MALLOC 377
-#define ALLOCA 378
-#define FREE 379
-#define LOAD 380
-#define STORE 381
-#define GETELEMENTPTR 382
-#define PHI_TOK 383
-#define SELECT 384
-#define SHL 385
-#define SHR 386
-#define ASHR 387
-#define LSHR 388
-#define VAARG 389
-#define EXTRACTELEMENT 390
-#define INSERTELEMENT 391
-#define SHUFFLEVECTOR 392
-#define CAST 393
-#define TRUNC 394
-#define ZEXT 395
-#define SEXT 396
-#define FPTRUNC 397
-#define FPEXT 398
-#define FPTOUI 399
-#define FPTOSI 400
-#define UITOFP 401
-#define SITOFP 402
-#define PTRTOINT 403
-#define INTTOPTR 404
-#define BITCAST 405
+#define DEPLIBS 313
+#define CALL 314
+#define TAIL 315
+#define ASM_TOK 316
+#define MODULE 317
+#define SIDEEFFECT 318
+#define CC_TOK 319
+#define CCC_TOK 320
+#define CSRETCC_TOK 321
+#define FASTCC_TOK 322
+#define COLDCC_TOK 323
+#define X86_STDCALLCC_TOK 324
+#define X86_FASTCALLCC_TOK 325
+#define DATALAYOUT 326
+#define RET 327
+#define BR 328
+#define SWITCH 329
+#define INVOKE 330
+#define UNREACHABLE 331
+#define UNWIND 332
+#define EXCEPT 333
+#define ADD 334
+#define SUB 335
+#define MUL 336
+#define DIV 337
+#define UDIV 338
+#define SDIV 339
+#define FDIV 340
+#define REM 341
+#define UREM 342
+#define SREM 343
+#define FREM 344
+#define AND 345
+#define OR 346
+#define XOR 347
+#define SHL 348
+#define SHR 349
+#define ASHR 350
+#define LSHR 351
+#define SETLE 352
+#define SETGE 353
+#define SETLT 354
+#define SETGT 355
+#define SETEQ 356
+#define SETNE 357
+#define ICMP 358
+#define FCMP 359
+#define MALLOC 360
+#define ALLOCA 361
+#define FREE 362
+#define LOAD 363
+#define STORE 364
+#define GETELEMENTPTR 365
+#define PHI_TOK 366
+#define SELECT 367
+#define VAARG 368
+#define EXTRACTELEMENT 369
+#define INSERTELEMENT 370
+#define SHUFFLEVECTOR 371
+#define VAARG_old 372
+#define VANEXT_old 373
+#define EQ 374
+#define NE 375
+#define SLT 376
+#define SGT 377
+#define SLE 378
+#define SGE 379
+#define ULT 380
+#define UGT 381
+#define ULE 382
+#define UGE 383
+#define OEQ 384
+#define ONE 385
+#define OLT 386
+#define OGT 387
+#define OLE 388
+#define OGE 389
+#define ORD 390
+#define UNO 391
+#define UEQ 392
+#define UNE 393
+#define CAST 394
+#define TRUNC 395
+#define ZEXT 396
+#define SEXT 397
+#define FPTRUNC 398
+#define FPEXT 399
+#define FPTOUI 400
+#define FPTOSI 401
+#define UITOFP 402
+#define SITOFP 403
+#define PTRTOINT 404
+#define INTTOPTR 405
+#define BITCAST 406
/* Copy the first part of user declarations. */
-#line 14 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
-
-#include "ParserInternals.h"
-#include <llvm/ADT/StringExtras.h>
+#line 14 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+
+#include "UpgradeInternals.h"
+#include "llvm/CallingConv.h"
+#include "llvm/InlineAsm.h"
+#include "llvm/Instructions.h"
+#include "llvm/Module.h"
+#include "llvm/ValueSymbolTable.h"
+#include "llvm/Support/GetElementPtrTypeIterator.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/Support/MathExtras.h"
#include <algorithm>
-#include <map>
-#include <utility>
#include <iostream>
-#include <cassert>
+#include <list>
+#include <utility>
+
+// DEBUG_UPREFS - Define this symbol if you want to enable debugging output
+// relating to upreferences in the input stream.
+//
+//#define DEBUG_UPREFS 1
+#ifdef DEBUG_UPREFS
+#define UR_OUT(X) std::cerr << X
+#else
+#define UR_OUT(X)
+#endif
#define YYERROR_VERBOSE 1
#define YYINCLUDED_STDLIB_H
#define YYDEBUG 1
-#define UPGRADE_SETCOND_OPS 0
-int yylex(); // declaration" of xxx warnings.
+int yylex();
int yyparse();
-extern int yydebug;
+int yyerror(const char*);
+static void warning(const std::string& WarningMsg);
+
+namespace llvm {
+
+std::istream* LexInput;
static std::string CurFilename;
-static std::ostream *O = 0;
-std::istream* LexInput = 0;
-unsigned SizeOfPointer = 32;
-static uint64_t unique = 1;
-
-typedef std::vector<TypeInfo> TypeVector;
-static TypeVector EnumeratedTypes;
-typedef std::map<std::string,TypeInfo> TypeMap;
-static TypeMap NamedTypes;
-static TypeMap Globals;
-
-void destroy(ValueList* VL) {
- while (!VL->empty()) {
- ValueInfo& VI = VL->back();
- VI.destroy();
- VL->pop_back();
+
+// This bool controls whether attributes are ever added to function declarations
+// definitions and calls.
+static bool AddAttributes = false;
+
+static Module *ParserResult;
+static bool ObsoleteVarArgs;
+static bool NewVarArgs;
+static BasicBlock *CurBB;
+static GlobalVariable *CurGV;
+
+// This contains info used when building the body of a function. It is
+// destroyed when the function is completed.
+//
+typedef std::vector<Value *> ValueList; // Numbered defs
+
+typedef std::pair<std::string,const Type*> RenameMapKey;
+typedef std::map<RenameMapKey,std::string> RenameMapType;
+
+static void
+ResolveDefinitions(std::map<const Type *,ValueList> &LateResolvers,
+ std::map<const Type *,ValueList> *FutureLateResolvers = 0);
+
+static struct PerModuleInfo {
+ Module *CurrentModule;
+ std::map<const Type *, ValueList> Values; // Module level numbered definitions
+ std::map<const Type *,ValueList> LateResolveValues;
+ std::vector<PATypeHolder> Types;
+ std::map<ValID, PATypeHolder> LateResolveTypes;
+ static Module::Endianness Endian;
+ static Module::PointerSize PointerSize;
+ RenameMapType RenameMap;
+
+ /// PlaceHolderInfo - When temporary placeholder objects are created, remember
+ /// how they were referenced and on which line of the input they came from so
+ /// that we can resolve them later and print error messages as appropriate.
+ std::map<Value*, std::pair<ValID, int> > PlaceHolderInfo;
+
+ // GlobalRefs - This maintains a mapping between <Type, ValID>'s and forward
+ // references to global values. Global values may be referenced before they
+ // are defined, and if so, the temporary object that they represent is held
+ // here. This is used for forward references of GlobalValues.
+ //
+ typedef std::map<std::pair<const PointerType *, ValID>, GlobalValue*>
+ GlobalRefsType;
+ GlobalRefsType GlobalRefs;
+
+ void ModuleDone() {
+ // If we could not resolve some functions at function compilation time
+ // (calls to functions before they are defined), resolve them now... Types
+ // are resolved when the constant pool has been completely parsed.
+ //
+ ResolveDefinitions(LateResolveValues);
+
+ // Check to make sure that all global value forward references have been
+ // resolved!
+ //
+ if (!GlobalRefs.empty()) {
+ std::string UndefinedReferences = "Unresolved global references exist:\n";
+
+ for (GlobalRefsType::iterator I = GlobalRefs.begin(), E =GlobalRefs.end();
+ I != E; ++I) {
+ UndefinedReferences += " " + I->first.first->getDescription() + " " +
+ I->first.second.getName() + "\n";
+ }
+ error(UndefinedReferences);
+ return;
+ }
+
+ if (CurrentModule->getDataLayout().empty()) {
+ std::string dataLayout;
+ if (Endian != Module::AnyEndianness)
+ dataLayout.append(Endian == Module::BigEndian ? "E" : "e");
+ if (PointerSize != Module::AnyPointerSize) {
+ if (!dataLayout.empty())
+ dataLayout += "-";
+ dataLayout.append(PointerSize == Module::Pointer64 ?
+ "p:64:64" : "p:32:32");
+ }
+ CurrentModule->setDataLayout(dataLayout);
+ }
+
+ Values.clear(); // Clear out function local definitions
+ Types.clear();
+ CurrentModule = 0;
}
- delete VL;
-}
-void UpgradeAssembly(const std::string &infile, std::istream& in,
- std::ostream &out, bool debug)
-{
- Upgradelineno = 1;
- CurFilename = infile;
- LexInput = ∈
- yydebug = debug;
- O = &out;
+ // GetForwardRefForGlobal - Check to see if there is a forward reference
+ // for this global. If so, remove it from the GlobalRefs map and return it.
+ // If not, just return null.
+ GlobalValue *GetForwardRefForGlobal(const PointerType *PTy, ValID ID) {
+ // Check to see if there is a forward reference to this global variable...
+ // if there is, eliminate it and patch the reference to use the new def'n.
+ GlobalRefsType::iterator I = GlobalRefs.find(std::make_pair(PTy, ID));
+ GlobalValue *Ret = 0;
+ if (I != GlobalRefs.end()) {
+ Ret = I->second;
+ GlobalRefs.erase(I);
+ }
+ return Ret;
+ }
+ void setEndianness(Module::Endianness E) { Endian = E; }
+ void setPointerSize(Module::PointerSize sz) { PointerSize = sz; }
+} CurModule;
+
+Module::Endianness PerModuleInfo::Endian = Module::AnyEndianness;
+Module::PointerSize PerModuleInfo::PointerSize = Module::AnyPointerSize;
+
+static struct PerFunctionInfo {
+ Function *CurrentFunction; // Pointer to current function being created
+
+ std::map<const Type*, ValueList> Values; // Keep track of #'d definitions
+ std::map<const Type*, ValueList> LateResolveValues;
+ bool isDeclare; // Is this function a forward declararation?
+ GlobalValue::LinkageTypes Linkage;// Linkage for forward declaration.
+
+ /// BBForwardRefs - When we see forward references to basic blocks, keep
+ /// track of them here.
+ std::map<BasicBlock*, std::pair<ValID, int> > BBForwardRefs;
+ std::vector<BasicBlock*> NumberedBlocks;
+ RenameMapType RenameMap;
+ unsigned LastCC;
+ unsigned NextBBNum;
+
+ inline PerFunctionInfo() {
+ CurrentFunction = 0;
+ isDeclare = false;
+ Linkage = GlobalValue::ExternalLinkage;
+ }
- if (yyparse()) {
- std::cerr << "Parse failed.\n";
- exit(1);
+ inline void FunctionStart(Function *M) {
+ CurrentFunction = M;
+ NextBBNum = 0;
+ }
+
+ void FunctionDone() {
+ NumberedBlocks.clear();
+
+ // Any forward referenced blocks left?
+ if (!BBForwardRefs.empty()) {
+ error("Undefined reference to label " +
+ BBForwardRefs.begin()->first->getName());
+ return;
+ }
+
+ // Resolve all forward references now.
+ ResolveDefinitions(LateResolveValues, &CurModule.LateResolveValues);
+
+ Values.clear(); // Clear out function local definitions
+ RenameMap.clear();
+ CurrentFunction = 0;
+ isDeclare = false;
+ Linkage = GlobalValue::ExternalLinkage;
}
+} CurFun; // Info for the current function...
+
+static bool inFunctionScope() { return CurFun.CurrentFunction != 0; }
+
+
+//===----------------------------------------------------------------------===//
+// Code to handle definitions of all the types
+//===----------------------------------------------------------------------===//
+
+static int InsertValue(Value *V,
+ std::map<const Type*,ValueList> &ValueTab = CurFun.Values) {
+ if (V->hasName()) return -1; // Is this a numbered definition?
+
+ // Yes, insert the value into the value table...
+ ValueList &List = ValueTab[V->getType()];
+ List.push_back(V);
+ return List.size()-1;
}
-static void ResolveType(TypeInfo& Ty) {
- if (Ty.oldTy == UnresolvedTy) {
- TypeMap::iterator I = NamedTypes.find(*Ty.newTy);
- if (I != NamedTypes.end()) {
- Ty.oldTy = I->second.oldTy;
- Ty.elemTy = I->second.elemTy;
- } else {
- std::string msg("Can't resolve type: ");
- msg += *Ty.newTy;
- yyerror(msg.c_str());
+static const Type *getType(const ValID &D, bool DoNotImprovise = false) {
+ switch (D.Type) {
+ case ValID::NumberVal: // Is it a numbered definition?
+ // Module constants occupy the lowest numbered slots...
+ if ((unsigned)D.Num < CurModule.Types.size()) {
+ return CurModule.Types[(unsigned)D.Num];
+ }
+ break;
+ case ValID::NameVal: // Is it a named definition?
+ if (const Type *N = CurModule.CurrentModule->getTypeByName(D.Name)) {
+ D.destroy(); // Free old strdup'd memory...
+ return N;
}
- } else if (Ty.oldTy == NumericTy) {
- unsigned ref = atoi(&((Ty.newTy->c_str())[1])); // Skip the '\\'
- if (ref < EnumeratedTypes.size()) {
- Ty.oldTy = EnumeratedTypes[ref].oldTy;
- Ty.elemTy = EnumeratedTypes[ref].elemTy;
+ break;
+ default:
+ error("Internal parser error: Invalid symbol type reference");
+ return 0;
+ }
+
+ // If we reached here, we referenced either a symbol that we don't know about
+ // or an id number that hasn't been read yet. We may be referencing something
+ // forward, so just create an entry to be resolved later and get to it...
+ //
+ if (DoNotImprovise) return 0; // Do we just want a null to be returned?
+
+
+ if (inFunctionScope()) {
+ if (D.Type == ValID::NameVal) {
+ error("Reference to an undefined type: '" + D.getName() + "'");
+ return 0;
} else {
- std::string msg("Can't resolve type: ");
- msg += *Ty.newTy;
- yyerror(msg.c_str());
+ error("Reference to an undefined type: #" + itostr(D.Num));
+ return 0;
+ }
+ }
+
+ std::map<ValID, PATypeHolder>::iterator I =CurModule.LateResolveTypes.find(D);
+ if (I != CurModule.LateResolveTypes.end())
+ return I->second;
+
+ Type *Typ = OpaqueType::get();
+ CurModule.LateResolveTypes.insert(std::make_pair(D, Typ));
+ return Typ;
+ }
+
+// getExistingValue - Look up the value specified by the provided type and
+// the provided ValID. If the value exists and has already been defined, return
+// it. Otherwise return null.
+//
+static Value *getExistingValue(const Type *Ty, const ValID &D) {
+ if (isa<FunctionType>(Ty)) {
+ error("Functions are not values and must be referenced as pointers");
+ }
+
+ switch (D.Type) {
+ case ValID::NumberVal: { // Is it a numbered definition?
+ unsigned Num = (unsigned)D.Num;
+
+ // Module constants occupy the lowest numbered slots...
+ std::map<const Type*,ValueList>::iterator VI = CurModule.Values.find(Ty);
+ if (VI != CurModule.Values.end()) {
+ if (Num < VI->second.size())
+ return VI->second[Num];
+ Num -= VI->second.size();
}
+
+ // Make sure that our type is within bounds
+ VI = CurFun.Values.find(Ty);
+ if (VI == CurFun.Values.end()) return 0;
+
+ // Check that the number is within bounds...
+ if (VI->second.size() <= Num) return 0;
+
+ return VI->second[Num];
}
- // otherwise its already resolved.
+
+ case ValID::NameVal: { // Is it a named definition?
+ // Get the name out of the ID
+ std::string Name(D.Name);
+ Value* V = 0;
+ RenameMapKey Key = std::make_pair(Name, Ty);
+ if (inFunctionScope()) {
+ // See if the name was renamed
+ RenameMapType::const_iterator I = CurFun.RenameMap.find(Key);
+ std::string LookupName;
+ if (I != CurFun.RenameMap.end())
+ LookupName = I->second;
+ else
+ LookupName = Name;
+ ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable();
+ V = SymTab.lookup(LookupName);
+ if (V && V->getType() != Ty)
+ V = 0;
+ }
+ if (!V) {
+ RenameMapType::const_iterator I = CurModule.RenameMap.find(Key);
+ std::string LookupName;
+ if (I != CurModule.RenameMap.end())
+ LookupName = I->second;
+ else
+ LookupName = Name;
+ V = CurModule.CurrentModule->getValueSymbolTable().lookup(LookupName);
+ if (V && V->getType() != Ty)
+ V = 0;
+ }
+ if (!V)
+ return 0;
+
+ D.destroy(); // Free old strdup'd memory...
+ return V;
+ }
+
+ // Check to make sure that "Ty" is an integral type, and that our
+ // value will fit into the specified type...
+ case ValID::ConstSIntVal: // Is it a constant pool reference??
+ if (!ConstantInt::isValueValidForType(Ty, D.ConstPool64)) {
+ error("Signed integral constant '" + itostr(D.ConstPool64) +
+ "' is invalid for type '" + Ty->getDescription() + "'");
+ }
+ return ConstantInt::get(Ty, D.ConstPool64);
+
+ case ValID::ConstUIntVal: // Is it an unsigned const pool reference?
+ if (!ConstantInt::isValueValidForType(Ty, D.UConstPool64)) {
+ if (!ConstantInt::isValueValidForType(Ty, D.ConstPool64))
+ error("Integral constant '" + utostr(D.UConstPool64) +
+ "' is invalid or out of range");
+ else // This is really a signed reference. Transmogrify.
+ return ConstantInt::get(Ty, D.ConstPool64);
+ } else
+ return ConstantInt::get(Ty, D.UConstPool64);
+
+ case ValID::ConstFPVal: // Is it a floating point const pool reference?
+ if (!ConstantFP::isValueValidForType(Ty, D.ConstPoolFP))
+ error("FP constant invalid for type");
+ return ConstantFP::get(Ty, D.ConstPoolFP);
+
+ case ValID::ConstNullVal: // Is it a null value?
+ if (!isa<PointerType>(Ty))
+ error("Cannot create a a non pointer null");
+ return ConstantPointerNull::get(cast<PointerType>(Ty));
+
+ case ValID::ConstUndefVal: // Is it an undef value?
+ return UndefValue::get(Ty);
+
+ case ValID::ConstZeroVal: // Is it a zero value?
+ return Constant::getNullValue(Ty);
+
+ case ValID::ConstantVal: // Fully resolved constant?
+ if (D.ConstantValue->getType() != Ty)
+ error("Constant expression type different from required type");
+ return D.ConstantValue;
+
+ case ValID::InlineAsmVal: { // Inline asm expression
+ const PointerType *PTy = dyn_cast<PointerType>(Ty);
+ const FunctionType *FTy =
+ PTy ? dyn_cast<FunctionType>(PTy->getElementType()) : 0;
+ if (!FTy || !InlineAsm::Verify(FTy, D.IAD->Constraints))
+ error("Invalid type for asm constraint string");
+ InlineAsm *IA = InlineAsm::get(FTy, D.IAD->AsmString, D.IAD->Constraints,
+ D.IAD->HasSideEffects);
+ D.destroy(); // Free InlineAsmDescriptor.
+ return IA;
+ }
+ default:
+ assert(0 && "Unhandled case");
+ return 0;
+ } // End of switch
+
+ assert(0 && "Unhandled case");
+ return 0;
}
-static const char* getCastOpcode(
- std::string& Source, const TypeInfo& SrcTy, const TypeInfo& DstTy)
-{
- unsigned SrcBits = SrcTy.getBitWidth();
- unsigned DstBits = DstTy.getBitWidth();
- const char* opcode = "bitcast";
- // Run through the possibilities ...
- if (DstTy.isIntegral()) { // Casting to integral
- if (SrcTy.isIntegral()) { // Casting from integral
- if (DstBits < SrcBits)
- opcode = "trunc";
- else if (DstBits > SrcBits) { // its an extension
- if (SrcTy.isSigned())
- opcode ="sext"; // signed -> SEXT
- else
- opcode = "zext"; // unsigned -> ZEXT
+// getVal - This function is identical to getExistingValue, except that if a
+// value is not already defined, it "improvises" by creating a placeholder var
+// that looks and acts just like the requested variable. When the value is
+// defined later, all uses of the placeholder variable are replaced with the
+// real thing.
+//
+static Value *getVal(const Type *Ty, const ValID &ID) {
+ if (Ty == Type::LabelTy)
+ error("Cannot use a basic block here");
+
+ // See if the value has already been defined.
+ Value *V = getExistingValue(Ty, ID);
+ if (V) return V;
+
+ if (!Ty->isFirstClassType() && !isa<OpaqueType>(Ty))
+ error("Invalid use of a composite type");
+
+ // If we reached here, we referenced either a symbol that we don't know about
+ // or an id number that hasn't been read yet. We may be referencing something
+ // forward, so just create an entry to be resolved later and get to it...
+ V = new Argument(Ty);
+
+ // Remember where this forward reference came from. FIXME, shouldn't we try
+ // to recycle these things??
+ CurModule.PlaceHolderInfo.insert(
+ std::make_pair(V, std::make_pair(ID, Upgradelineno)));
+
+ if (inFunctionScope())
+ InsertValue(V, CurFun.LateResolveValues);
+ else
+ InsertValue(V, CurModule.LateResolveValues);
+ return V;
+}
+
+/// getBBVal - This is used for two purposes:
+/// * If isDefinition is true, a new basic block with the specified ID is being
+/// defined.
+/// * If isDefinition is true, this is a reference to a basic block, which may
+/// or may not be a forward reference.
+///
+static BasicBlock *getBBVal(const ValID &ID, bool isDefinition = false) {
+ assert(inFunctionScope() && "Can't get basic block at global scope");
+
+ std::string Name;
+ BasicBlock *BB = 0;
+ switch (ID.Type) {
+ default:
+ error("Illegal label reference " + ID.getName());
+ break;
+ case ValID::NumberVal: // Is it a numbered definition?
+ if (unsigned(ID.Num) >= CurFun.NumberedBlocks.size())
+ CurFun.NumberedBlocks.resize(ID.Num+1);
+ BB = CurFun.NumberedBlocks[ID.Num];
+ break;
+ case ValID::NameVal: // Is it a named definition?
+ Name = ID.Name;
+ if (Value *N = CurFun.CurrentFunction->
+ getValueSymbolTable().lookup(Name)) {
+ if (N->getType() != Type::LabelTy)
+ error("Name '" + Name + "' does not refer to a BasicBlock");
+ BB = cast<BasicBlock>(N);
+ }
+ break;
+ }
+
+ // See if the block has already been defined.
+ if (BB) {
+ // If this is the definition of the block, make sure the existing value was
+ // just a forward reference. If it was a forward reference, there will be
+ // an entry for it in the PlaceHolderInfo map.
+ if (isDefinition && !CurFun.BBForwardRefs.erase(BB))
+ // The existing value was a definition, not a forward reference.
+ error("Redefinition of label " + ID.getName());
+
+ ID.destroy(); // Free strdup'd memory.
+ return BB;
+ }
+
+ // Otherwise this block has not been seen before.
+ BB = new BasicBlock("", CurFun.CurrentFunction);
+ if (ID.Type == ValID::NameVal) {
+ BB->setName(ID.Name);
+ } else {
+ CurFun.NumberedBlocks[ID.Num] = BB;
+ }
+
+ // If this is not a definition, keep track of it so we can use it as a forward
+ // reference.
+ if (!isDefinition) {
+ // Remember where this forward reference came from.
+ CurFun.BBForwardRefs[BB] = std::make_pair(ID, Upgradelineno);
+ } else {
+ // The forward declaration could have been inserted anywhere in the
+ // function: insert it into the correct place now.
+ CurFun.CurrentFunction->getBasicBlockList().remove(BB);
+ CurFun.CurrentFunction->getBasicBlockList().push_back(BB);
+ }
+ ID.destroy();
+ return BB;
+}
+
+
+//===----------------------------------------------------------------------===//
+// Code to handle forward references in instructions
+//===----------------------------------------------------------------------===//
+//
+// This code handles the late binding needed with statements that reference
+// values not defined yet... for example, a forward branch, or the PHI node for
+// a loop body.
+//
+// This keeps a table (CurFun.LateResolveValues) of all such forward references
+// and back patchs after we are done.
+//
+
+/// This function determines if two function types differ only in their use of
+/// the sret parameter attribute in the first argument. If they are identical
+/// in all other respects, it returns true. Otherwise, it returns false.
+bool FuncTysDifferOnlyBySRet(const FunctionType *F1,
+ const FunctionType *F2) {
+ if (F1->getReturnType() != F2->getReturnType() ||
+ F1->getNumParams() != F2->getNumParams() ||
+ F1->getParamAttrs(0) != F2->getParamAttrs(0))
+ return false;
+ unsigned SRetMask = ~unsigned(FunctionType::StructRetAttribute);
+ for (unsigned i = 0; i < F1->getNumParams(); ++i) {
+ if (F1->getParamType(i) != F2->getParamType(i) ||
+ unsigned(F1->getParamAttrs(i+1)) & SRetMask !=
+ unsigned(F2->getParamAttrs(i+1)) & SRetMask)
+ return false;
+ }
+ return true;
+}
+
+// ResolveDefinitions - If we could not resolve some defs at parsing
+// time (forward branches, phi functions for loops, etc...) resolve the
+// defs now...
+//
+static void
+ResolveDefinitions(std::map<const Type*,ValueList> &LateResolvers,
+ std::map<const Type*,ValueList> *FutureLateResolvers) {
+ // Loop over LateResolveDefs fixing up stuff that couldn't be resolved
+ for (std::map<const Type*,ValueList>::iterator LRI = LateResolvers.begin(),
+ E = LateResolvers.end(); LRI != E; ++LRI) {
+ ValueList &List = LRI->second;
+ while (!List.empty()) {
+ Value *V = List.back();
+ List.pop_back();
+
+ std::map<Value*, std::pair<ValID, int> >::iterator PHI =
+ CurModule.PlaceHolderInfo.find(V);
+ assert(PHI != CurModule.PlaceHolderInfo.end() && "Placeholder error");
+
+ ValID &DID = PHI->second.first;
+
+ Value *TheRealValue = getExistingValue(LRI->first, DID);
+ if (TheRealValue) {
+ V->replaceAllUsesWith(TheRealValue);
+ delete V;
+ CurModule.PlaceHolderInfo.erase(PHI);
+ } else if (FutureLateResolvers) {
+ // Functions have their unresolved items forwarded to the module late
+ // resolver table
+ InsertValue(V, *FutureLateResolvers);
} else {
- opcode = "bitcast"; // Same size, No-op cast
+ if (DID.Type == ValID::NameVal) {
+ // The upgrade of csretcc to sret param attribute may have caused a
+ // function to not be found because the param attribute changed the
+ // type of the called function. Detect this situation and insert a
+ // cast as necessary.
+ bool fixed = false;
+ if (const PointerType *PTy = dyn_cast<PointerType>(V->getType()))
+ if (const FunctionType *FTy =
+ dyn_cast<FunctionType>(PTy->getElementType()))
+ if (Function *OtherF =
+ CurModule.CurrentModule->getNamedFunction(DID.getName()))
+ if (FuncTysDifferOnlyBySRet(FTy,OtherF->getFunctionType())) {
+ V->replaceAllUsesWith(ConstantExpr::getBitCast(OtherF, PTy));
+ fixed = true;
+ }
+ if (!fixed) {
+ error("Reference to an invalid definition: '" +DID.getName()+
+ "' of type '" + V->getType()->getDescription() + "'",
+ PHI->second.second);
+ return;
+ }
+ } else {
+ error("Reference to an invalid definition: #" +
+ itostr(DID.Num) + " of type '" +
+ V->getType()->getDescription() + "'", PHI->second.second);
+ return;
+ }
}
- } else if (SrcTy.isFloatingPoint()) { // Casting from floating pt
- if (DstTy.isSigned())
- opcode = "fptosi"; // FP -> sint
- else
- opcode = "fptoui"; // FP -> uint
- } else if (SrcTy.isPacked()) {
- assert(DstBits == SrcTy.getBitWidth() &&
- "Casting packed to integer of different width");
- opcode = "bitcast"; // same size, no-op cast
- } else {
- assert(SrcTy.isPointer() &&
- "Casting from a value that is not first-class type");
- opcode = "ptrtoint"; // ptr -> int
}
- } else if (DstTy.isFloatingPoint()) { // Casting to floating pt
- if (SrcTy.isIntegral()) { // Casting from integral
- if (SrcTy.isSigned())
- opcode = "sitofp"; // sint -> FP
- else
- opcode = "uitofp"; // uint -> FP
- } else if (SrcTy.isFloatingPoint()) { // Casting from floating pt
- if (DstBits < SrcBits) {
- opcode = "fptrunc"; // FP -> smaller FP
- } else if (DstBits > SrcBits) {
- opcode = "fpext"; // FP -> larger FP
- } else {
- opcode ="bitcast"; // same size, no-op cast
+ }
+
+ LateResolvers.clear();
+}
+
+// ResolveTypeTo - A brand new type was just declared. This means that (if
+// name is not null) things referencing Name can be resolved. Otherwise, things
+// refering to the number can be resolved. Do this now.
+//
+static void ResolveTypeTo(char *Name, const Type *ToTy) {
+ ValID D;
+ if (Name) D = ValID::create(Name);
+ else D = ValID::create((int)CurModule.Types.size());
+
+ std::map<ValID, PATypeHolder>::iterator I =
+ CurModule.LateResolveTypes.find(D);
+ if (I != CurModule.LateResolveTypes.end()) {
+ ((DerivedType*)I->second.get())->refineAbstractTypeTo(ToTy);
+ CurModule.LateResolveTypes.erase(I);
+ }
+}
+
+/// @brief This just makes any name given to it unique, up to MAX_UINT times.
+static std::string makeNameUnique(const std::string& Name) {
+ static unsigned UniqueNameCounter = 1;
+ std::string Result(Name);
+ Result += ".upgrd." + llvm::utostr(UniqueNameCounter++);
+ return Result;
+}
+
+/// This is the implementation portion of TypeHasInteger. It traverses the
+/// type given, avoiding recursive types, and returns true as soon as it finds
+/// an integer type. If no integer type is found, it returns false.
+static bool TypeHasIntegerI(const Type *Ty, std::vector<const Type*> Stack) {
+ // Handle some easy cases
+ if (Ty->isPrimitiveType() || (Ty->getTypeID() == Type::OpaqueTyID))
+ return false;
+ if (Ty->isInteger())
+ return true;
+ if (const SequentialType *STy = dyn_cast<SequentialType>(Ty))
+ return STy->getElementType()->isInteger();
+
+ // Avoid type structure recursion
+ for (std::vector<const Type*>::iterator I = Stack.begin(), E = Stack.end();
+ I != E; ++I)
+ if (Ty == *I)
+ return false;
+
+ // Push us on the type stack
+ Stack.push_back(Ty);
+
+ if (const FunctionType *FTy = dyn_cast<FunctionType>(Ty)) {
+ if (TypeHasIntegerI(FTy->getReturnType(), Stack))
+ return true;
+ FunctionType::param_iterator I = FTy->param_begin();
+ FunctionType::param_iterator E = FTy->param_end();
+ for (; I != E; ++I)
+ if (TypeHasIntegerI(*I, Stack))
+ return true;
+ return false;
+ } else if (const StructType *STy = dyn_cast<StructType>(Ty)) {
+ StructType::element_iterator I = STy->element_begin();
+ StructType::element_iterator E = STy->element_end();
+ for (; I != E; ++I) {
+ if (TypeHasIntegerI(*I, Stack))
+ return true;
+ }
+ return false;
+ }
+ // There shouldn't be anything else, but its definitely not integer
+ assert(0 && "What type is this?");
+ return false;
+}
+
+/// This is the interface to TypeHasIntegerI. It just provides the type stack,
+/// to avoid recursion, and then calls TypeHasIntegerI.
+static inline bool TypeHasInteger(const Type *Ty) {
+ std::vector<const Type*> TyStack;
+ return TypeHasIntegerI(Ty, TyStack);
+}
+
+// setValueName - Set the specified value to the name given. The name may be
+// null potentially, in which case this is a noop. The string passed in is
+// assumed to be a malloc'd string buffer, and is free'd by this function.
+//
+static void setValueName(Value *V, char *NameStr) {
+ if (NameStr) {
+ std::string Name(NameStr); // Copy string
+ free(NameStr); // Free old string
+
+ if (V->getType() == Type::VoidTy) {
+ error("Can't assign name '" + Name + "' to value with void type");
+ return;
+ }
+
+ assert(inFunctionScope() && "Must be in function scope");
+
+ // Search the function's symbol table for an existing value of this name
+ ValueSymbolTable &ST = CurFun.CurrentFunction->getValueSymbolTable();
+ Value* Existing = ST.lookup(Name);
+ if (Existing) {
+ // An existing value of the same name was found. This might have happened
+ // because of the integer type planes collapsing in LLVM 2.0.
+ if (Existing->getType() == V->getType() &&
+ !TypeHasInteger(Existing->getType())) {
+ // If the type does not contain any integers in them then this can't be
+ // a type plane collapsing issue. It truly is a redefinition and we
+ // should error out as the assembly is invalid.
+ error("Redefinition of value named '" + Name + "' of type '" +
+ V->getType()->getDescription() + "'");
+ return;
+ }
+ // In LLVM 2.0 we don't allow names to be re-used for any values in a
+ // function, regardless of Type. Previously re-use of names was okay as
+ // long as they were distinct types. With type planes collapsing because
+ // of the signedness change and because of PR411, this can no longer be
+ // supported. We must search the entire symbol table for a conflicting
+ // name and make the name unique. No warning is needed as this can't
+ // cause a problem.
+ std::string NewName = makeNameUnique(Name);
+ // We're changing the name but it will probably be used by other
+ // instructions as operands later on. Consequently we have to retain
+ // a mapping of the renaming that we're doing.
+ RenameMapKey Key = std::make_pair(Name,V->getType());
+ CurFun.RenameMap[Key] = NewName;
+ Name = NewName;
+ }
+
+ // Set the name.
+ V->setName(Name);
+ }
+}
+
+/// ParseGlobalVariable - Handle parsing of a global. If Initializer is null,
+/// this is a declaration, otherwise it is a definition.
+static GlobalVariable *
+ParseGlobalVariable(char *NameStr,GlobalValue::LinkageTypes Linkage,
+ bool isConstantGlobal, const Type *Ty,
+ Constant *Initializer) {
+ if (isa<FunctionType>(Ty))
+ error("Cannot declare global vars of function type");
+
+ const PointerType *PTy = PointerType::get(Ty);
+
+ std::string Name;
+ if (NameStr) {
+ Name = NameStr; // Copy string
+ free(NameStr); // Free old string
+ }
+
+ // See if this global value was forward referenced. If so, recycle the
+ // object.
+ ValID ID;
+ if (!Name.empty()) {
+ ID = ValID::create((char*)Name.c_str());
+ } else {
+ ID = ValID::create((int)CurModule.Values[PTy].size());
+ }
+
+ if (GlobalValue *FWGV = CurModule.GetForwardRefForGlobal(PTy, ID)) {
+ // Move the global to the end of the list, from whereever it was
+ // previously inserted.
+ GlobalVariable *GV = cast<GlobalVariable>(FWGV);
+ CurModule.CurrentModule->getGlobalList().remove(GV);
+ CurModule.CurrentModule->getGlobalList().push_back(GV);
+ GV->setInitializer(Initializer);
+ GV->setLinkage(Linkage);
+ GV->setConstant(isConstantGlobal);
+ InsertValue(GV, CurModule.Values);
+ return GV;
+ }
+
+ // If this global has a name, check to see if there is already a definition
+ // of this global in the module and emit warnings if there are conflicts.
+ if (!Name.empty()) {
+ // The global has a name. See if there's an existing one of the same name.
+ if (CurModule.CurrentModule->getNamedGlobal(Name)) {
+ // We found an existing global ov the same name. This isn't allowed
+ // in LLVM 2.0. Consequently, we must alter the name of the global so it
+ // can at least compile. This can happen because of type planes
+ // There is alread a global of the same name which means there is a
+ // conflict. Let's see what we can do about it.
+ std::string NewName(makeNameUnique(Name));
+ if (Linkage == GlobalValue::InternalLinkage) {
+ // The linkage type is internal so just warn about the rename without
+ // invoking "scarey language" about linkage failures. GVars with
+ // InternalLinkage can be renamed at will.
+ warning("Global variable '" + Name + "' was renamed to '"+
+ NewName + "'");
+ } else {
+ // The linkage of this gval is external so we can't reliably rename
+ // it because it could potentially create a linking problem.
+ // However, we can't leave the name conflict in the output either or
+ // it won't assemble with LLVM 2.0. So, all we can do is rename
+ // this one to something unique and emit a warning about the problem.
+ warning("Renaming global variable '" + Name + "' to '" + NewName +
+ "' may cause linkage errors");
}
- } else if (SrcTy.isPacked()) {
- assert(DstBits == SrcTy.getBitWidth() &&
- "Casting packed to floating point of different width");
- opcode = "bitcast"; // same size, no-op cast
- } else {
- assert(0 && "Casting pointer or non-first class to float");
+
+ // Put the renaming in the global rename map
+ RenameMapKey Key = std::make_pair(Name,PointerType::get(Ty));
+ CurModule.RenameMap[Key] = NewName;
+
+ // Rename it
+ Name = NewName;
}
- } else if (DstTy.isPacked()) {
- if (SrcTy.isPacked()) {
- assert(DstTy.getBitWidth() == SrcTy.getBitWidth() &&
- "Casting packed to packed of different widths");
- opcode = "bitcast"; // packed -> packed
- } else if (DstTy.getBitWidth() == SrcBits) {
- opcode = "bitcast"; // float/int -> packed
- } else {
- assert(!"Illegal cast to packed (wrong type or size)");
+ }
+
+ // Otherwise there is no existing GV to use, create one now.
+ GlobalVariable *GV =
+ new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer, Name,
+ CurModule.CurrentModule);
+ InsertValue(GV, CurModule.Values);
+ return GV;
+}
+
+// setTypeName - Set the specified type to the name given. The name may be
+// null potentially, in which case this is a noop. The string passed in is
+// assumed to be a malloc'd string buffer, and is freed by this function.
+//
+// This function returns true if the type has already been defined, but is
+// allowed to be redefined in the specified context. If the name is a new name
+// for the type plane, it is inserted and false is returned.
+static bool setTypeName(const Type *T, char *NameStr) {
+ assert(!inFunctionScope() && "Can't give types function-local names");
+ if (NameStr == 0) return false;
+
+ std::string Name(NameStr); // Copy string
+ free(NameStr); // Free old string
+
+ // We don't allow assigning names to void type
+ if (T == Type::VoidTy) {
+ error("Can't assign name '" + Name + "' to the void type");
+ return false;
+ }
+
+ // Set the type name, checking for conflicts as we do so.
+ bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name, T);
+
+ if (AlreadyExists) { // Inserting a name that is already defined???
+ const Type *Existing = CurModule.CurrentModule->getTypeByName(Name);
+ assert(Existing && "Conflict but no matching type?");
+
+ // There is only one case where this is allowed: when we are refining an
+ // opaque type. In this case, Existing will be an opaque type.
+ if (const OpaqueType *OpTy = dyn_cast<OpaqueType>(Existing)) {
+ // We ARE replacing an opaque type!
+ const_cast<OpaqueType*>(OpTy)->refineAbstractTypeTo(T);
+ return true;
}
- } else if (DstTy.isPointer()) {
- if (SrcTy.isPointer()) {
- opcode = "bitcast"; // ptr -> ptr
- } else if (SrcTy.isIntegral()) {
- opcode = "inttoptr"; // int -> ptr
- } else {
- assert(!"Casting invalid type to pointer");
+
+ // Otherwise, this is an attempt to redefine a type. That's okay if
+ // the redefinition is identical to the original. This will be so if
+ // Existing and T point to the same Type object. In this one case we
+ // allow the equivalent redefinition.
+ if (Existing == T) return true; // Yes, it's equal.
+
+ // Any other kind of (non-equivalent) redefinition is an error.
+ error("Redefinition of type named '" + Name + "' in the '" +
+ T->getDescription() + "' type plane");
+ }
+
+ return false;
+}
+
+//===----------------------------------------------------------------------===//
+// Code for handling upreferences in type names...
+//
+
+// TypeContains - Returns true if Ty directly contains E in it.
+//
+static bool TypeContains(const Type *Ty, const Type *E) {
+ return std::find(Ty->subtype_begin(), Ty->subtype_end(),
+ E) != Ty->subtype_end();
+}
+
+namespace {
+ struct UpRefRecord {
+ // NestingLevel - The number of nesting levels that need to be popped before
+ // this type is resolved.
+ unsigned NestingLevel;
+
+ // LastContainedTy - This is the type at the current binding level for the
+ // type. Every time we reduce the nesting level, this gets updated.
+ const Type *LastContainedTy;
+
+ // UpRefTy - This is the actual opaque type that the upreference is
+ // represented with.
+ OpaqueType *UpRefTy;
+
+ UpRefRecord(unsigned NL, OpaqueType *URTy)
+ : NestingLevel(NL), LastContainedTy(URTy), UpRefTy(URTy) {}
+ };
+}
+
+// UpRefs - A list of the outstanding upreferences that need to be resolved.
+static std::vector<UpRefRecord> UpRefs;
+
+/// HandleUpRefs - Every time we finish a new layer of types, this function is
+/// called. It loops through the UpRefs vector, which is a list of the
+/// currently active types. For each type, if the up reference is contained in
+/// the newly completed type, we decrement the level count. When the level
+/// count reaches zero, the upreferenced type is the type that is passed in:
+/// thus we can complete the cycle.
+///
+static PATypeHolder HandleUpRefs(const Type *ty) {
+ // If Ty isn't abstract, or if there are no up-references in it, then there is
+ // nothing to resolve here.
+ if (!ty->isAbstract() || UpRefs.empty()) return ty;
+
+ PATypeHolder Ty(ty);
+ UR_OUT("Type '" << Ty->getDescription() <<
+ "' newly formed. Resolving upreferences.\n" <<
+ UpRefs.size() << " upreferences active!\n");
+
+ // If we find any resolvable upreferences (i.e., those whose NestingLevel goes
+ // to zero), we resolve them all together before we resolve them to Ty. At
+ // the end of the loop, if there is anything to resolve to Ty, it will be in
+ // this variable.
+ OpaqueType *TypeToResolve = 0;
+
+ for (unsigned i = 0; i != UpRefs.size(); ++i) {
+ UR_OUT(" UR#" << i << " - TypeContains(" << Ty->getDescription() << ", "
+ << UpRefs[i].second->getDescription() << ") = "
+ << (TypeContains(Ty, UpRefs[i].second) ? "true" : "false") << "\n");
+ if (TypeContains(Ty, UpRefs[i].LastContainedTy)) {
+ // Decrement level of upreference
+ unsigned Level = --UpRefs[i].NestingLevel;
+ UpRefs[i].LastContainedTy = Ty;
+ UR_OUT(" Uplevel Ref Level = " << Level << "\n");
+ if (Level == 0) { // Upreference should be resolved!
+ if (!TypeToResolve) {
+ TypeToResolve = UpRefs[i].UpRefTy;
+ } else {
+ UR_OUT(" * Resolving upreference for "
+ << UpRefs[i].second->getDescription() << "\n";
+ std::string OldName = UpRefs[i].UpRefTy->getDescription());
+ UpRefs[i].UpRefTy->refineAbstractTypeTo(TypeToResolve);
+ UR_OUT(" * Type '" << OldName << "' refined upreference to: "
+ << (const void*)Ty << ", " << Ty->getDescription() << "\n");
+ }
+ UpRefs.erase(UpRefs.begin()+i); // Remove from upreference list...
+ --i; // Do not skip the next element...
+ }
}
+ }
+
+ if (TypeToResolve) {
+ UR_OUT(" * Resolving upreference for "
+ << UpRefs[i].second->getDescription() << "\n";
+ std::string OldName = TypeToResolve->getDescription());
+ TypeToResolve->refineAbstractTypeTo(Ty);
+ }
+
+ return Ty;
+}
+
+static inline Instruction::TermOps
+getTermOp(TermOps op) {
+ switch (op) {
+ default : assert(0 && "Invalid OldTermOp");
+ case RetOp : return Instruction::Ret;
+ case BrOp : return Instruction::Br;
+ case SwitchOp : return Instruction::Switch;
+ case InvokeOp : return Instruction::Invoke;
+ case UnwindOp : return Instruction::Unwind;
+ case UnreachableOp: return Instruction::Unreachable;
+ }
+}
+
+static inline Instruction::BinaryOps
+getBinaryOp(BinaryOps op, const Type *Ty, Signedness Sign) {
+ switch (op) {
+ default : assert(0 && "Invalid OldBinaryOps");
+ case SetEQ :
+ case SetNE :
+ case SetLE :
+ case SetGE :
+ case SetLT :
+ case SetGT : assert(0 && "Should use getCompareOp");
+ case AddOp : return Instruction::Add;
+ case SubOp : return Instruction::Sub;
+ case MulOp : return Instruction::Mul;
+ case DivOp : {
+ // This is an obsolete instruction so we must upgrade it based on the
+ // types of its operands.
+ bool isFP = Ty->isFloatingPoint();
+ if (const PackedType* PTy = dyn_cast<PackedType>(Ty))
+ // If its a packed type we want to use the element type
+ isFP = PTy->getElementType()->isFloatingPoint();
+ if (isFP)
+ return Instruction::FDiv;
+ else if (Sign == Signed)
+ return Instruction::SDiv;
+ return Instruction::UDiv;
+ }
+ case UDivOp : return Instruction::UDiv;
+ case SDivOp : return Instruction::SDiv;
+ case FDivOp : return Instruction::FDiv;
+ case RemOp : {
+ // This is an obsolete instruction so we must upgrade it based on the
+ // types of its operands.
+ bool isFP = Ty->isFloatingPoint();
+ if (const PackedType* PTy = dyn_cast<PackedType>(Ty))
+ // If its a packed type we want to use the element type
+ isFP = PTy->getElementType()->isFloatingPoint();
+ // Select correct opcode
+ if (isFP)
+ return Instruction::FRem;
+ else if (Sign == Signed)
+ return Instruction::SRem;
+ return Instruction::URem;
+ }
+ case URemOp : return Instruction::URem;
+ case SRemOp : return Instruction::SRem;
+ case FRemOp : return Instruction::FRem;
+ case LShrOp : return Instruction::LShr;
+ case AShrOp : return Instruction::AShr;
+ case ShlOp : return Instruction::Shl;
+ case ShrOp :
+ if (Sign == Signed)
+ return Instruction::AShr;
+ return Instruction::LShr;
+ case AndOp : return Instruction::And;
+ case OrOp : return Instruction::Or;
+ case XorOp : return Instruction::Xor;
+ }
+}
+
+static inline Instruction::OtherOps
+getCompareOp(BinaryOps op, unsigned short &predicate, const Type* &Ty,
+ Signedness Sign) {
+ bool isSigned = Sign == Signed;
+ bool isFP = Ty->isFloatingPoint();
+ switch (op) {
+ default : assert(0 && "Invalid OldSetCC");
+ case SetEQ :
+ if (isFP) {
+ predicate = FCmpInst::FCMP_OEQ;
+ return Instruction::FCmp;
+ } else {
+ predicate = ICmpInst::ICMP_EQ;
+ return Instruction::ICmp;
+ }
+ case SetNE :
+ if (isFP) {
+ predicate = FCmpInst::FCMP_UNE;
+ return Instruction::FCmp;
+ } else {
+ predicate = ICmpInst::ICMP_NE;
+ return Instruction::ICmp;
+ }
+ case SetLE :
+ if (isFP) {
+ predicate = FCmpInst::FCMP_OLE;
+ return Instruction::FCmp;
+ } else {
+ if (isSigned)
+ predicate = ICmpInst::ICMP_SLE;
+ else
+ predicate = ICmpInst::ICMP_ULE;
+ return Instruction::ICmp;
+ }
+ case SetGE :
+ if (isFP) {
+ predicate = FCmpInst::FCMP_OGE;
+ return Instruction::FCmp;
+ } else {
+ if (isSigned)
+ predicate = ICmpInst::ICMP_SGE;
+ else
+ predicate = ICmpInst::ICMP_UGE;
+ return Instruction::ICmp;
+ }
+ case SetLT :
+ if (isFP) {
+ predicate = FCmpInst::FCMP_OLT;
+ return Instruction::FCmp;
+ } else {
+ if (isSigned)
+ predicate = ICmpInst::ICMP_SLT;
+ else
+ predicate = ICmpInst::ICMP_ULT;
+ return Instruction::ICmp;
+ }
+ case SetGT :
+ if (isFP) {
+ predicate = FCmpInst::FCMP_OGT;
+ return Instruction::FCmp;
+ } else {
+ if (isSigned)
+ predicate = ICmpInst::ICMP_SGT;
+ else
+ predicate = ICmpInst::ICMP_UGT;
+ return Instruction::ICmp;
+ }
+ }
+}
+
+static inline Instruction::MemoryOps getMemoryOp(MemoryOps op) {
+ switch (op) {
+ default : assert(0 && "Invalid OldMemoryOps");
+ case MallocOp : return Instruction::Malloc;
+ case FreeOp : return Instruction::Free;
+ case AllocaOp : return Instruction::Alloca;
+ case LoadOp : return Instruction::Load;
+ case StoreOp : return Instruction::Store;
+ case GetElementPtrOp : return Instruction::GetElementPtr;
+ }
+}
+
+static inline Instruction::OtherOps
+getOtherOp(OtherOps op, Signedness Sign) {
+ switch (op) {
+ default : assert(0 && "Invalid OldOtherOps");
+ case PHIOp : return Instruction::PHI;
+ case CallOp : return Instruction::Call;
+ case SelectOp : return Instruction::Select;
+ case UserOp1 : return Instruction::UserOp1;
+ case UserOp2 : return Instruction::UserOp2;
+ case VAArg : return Instruction::VAArg;
+ case ExtractElementOp : return Instruction::ExtractElement;
+ case InsertElementOp : return Instruction::InsertElement;
+ case ShuffleVectorOp : return Instruction::ShuffleVector;
+ case ICmpOp : return Instruction::ICmp;
+ case FCmpOp : return Instruction::FCmp;
+ };
+}
+
+static inline Value*
+getCast(CastOps op, Value *Src, Signedness SrcSign, const Type *DstTy,
+ Signedness DstSign, bool ForceInstruction = false) {
+ Instruction::CastOps Opcode;
+ const Type* SrcTy = Src->getType();
+ if (op == CastOp) {
+ if (SrcTy->isFloatingPoint() && isa<PointerType>(DstTy)) {
+ // fp -> ptr cast is no longer supported but we must upgrade this
+ // by doing a double cast: fp -> int -> ptr
+ SrcTy = Type::Int64Ty;
+ Opcode = Instruction::IntToPtr;
+ if (isa<Constant>(Src)) {
+ Src = ConstantExpr::getCast(Instruction::FPToUI,
+ cast<Constant>(Src), SrcTy);
+ } else {
+ std::string NewName(makeNameUnique(Src->getName()));
+ Src = new FPToUIInst(Src, SrcTy, NewName, CurBB);
+ }
+ } else if (isa<IntegerType>(DstTy) &&
+ cast<IntegerType>(DstTy)->getBitWidth() == 1) {
+ // cast type %x to bool was previously defined as setne type %x, null
+ // The cast semantic is now to truncate, not compare so we must retain
+ // the original intent by replacing the cast with a setne
+ Constant* Null = Constant::getNullValue(SrcTy);
+ Instruction::OtherOps Opcode = Instruction::ICmp;
+ unsigned short predicate = ICmpInst::ICMP_NE;
+ if (SrcTy->isFloatingPoint()) {
+ Opcode = Instruction::FCmp;
+ predicate = FCmpInst::FCMP_ONE;
+ } else if (!SrcTy->isInteger() && !isa<PointerType>(SrcTy)) {
+ error("Invalid cast to bool");
+ }
+ if (isa<Constant>(Src) && !ForceInstruction)
+ return ConstantExpr::getCompare(predicate, cast<Constant>(Src), Null);
+ else
+ return CmpInst::create(Opcode, predicate, Src, Null);
+ }
+ // Determine the opcode to use by calling CastInst::getCastOpcode
+ Opcode =
+ CastInst::getCastOpcode(Src, SrcSign == Signed, DstTy, DstSign == Signed);
+
+ } else switch (op) {
+ default: assert(0 && "Invalid cast token");
+ case TruncOp: Opcode = Instruction::Trunc; break;
+ case ZExtOp: Opcode = Instruction::ZExt; break;
+ case SExtOp: Opcode = Instruction::SExt; break;
+ case FPTruncOp: Opcode = Instruction::FPTrunc; break;
+ case FPExtOp: Opcode = Instruction::FPExt; break;
+ case FPToUIOp: Opcode = Instruction::FPToUI; break;
+ case FPToSIOp: Opcode = Instruction::FPToSI; break;
+ case UIToFPOp: Opcode = Instruction::UIToFP; break;
+ case SIToFPOp: Opcode = Instruction::SIToFP; break;
+ case PtrToIntOp: Opcode = Instruction::PtrToInt; break;
+ case IntToPtrOp: Opcode = Instruction::IntToPtr; break;
+ case BitCastOp: Opcode = Instruction::BitCast; break;
+ }
+
+ if (isa<Constant>(Src) && !ForceInstruction)
+ return ConstantExpr::getCast(Opcode, cast<Constant>(Src), DstTy);
+ return CastInst::create(Opcode, Src, DstTy);
+}
+
+static Instruction *
+upgradeIntrinsicCall(const Type* RetTy, const ValID &ID,
+ std::vector<Value*>& Args) {
+
+ std::string Name = ID.Type == ValID::NameVal ? ID.Name : "";
+ if (Name == "llvm.isunordered.f32" || Name == "llvm.isunordered.f64") {
+ if (Args.size() != 2)
+ error("Invalid prototype for " + Name + " prototype");
+ return new FCmpInst(FCmpInst::FCMP_UNO, Args[0], Args[1]);
} else {
- assert(!"Casting to type that is not first-class");
+ const Type* PtrTy = PointerType::get(Type::Int8Ty);
+ std::vector<const Type*> Params;
+ if (Name == "llvm.va_start" || Name == "llvm.va_end") {
+ if (Args.size() != 1)
+ error("Invalid prototype for " + Name + " prototype");
+ Params.push_back(PtrTy);
+ const FunctionType *FTy = FunctionType::get(Type::VoidTy, Params, false);
+ const PointerType *PFTy = PointerType::get(FTy);
+ Value* Func = getVal(PFTy, ID);
+ Args[0] = new BitCastInst(Args[0], PtrTy, makeNameUnique("va"), CurBB);
+ return new CallInst(Func, Args);
+ } else if (Name == "llvm.va_copy") {
+ if (Args.size() != 2)
+ error("Invalid prototype for " + Name + " prototype");
+ Params.push_back(PtrTy);
+ Params.push_back(PtrTy);
+ const FunctionType *FTy = FunctionType::get(Type::VoidTy, Params, false);
+ const PointerType *PFTy = PointerType::get(FTy);
+ Value* Func = getVal(PFTy, ID);
+ std::string InstName0(makeNameUnique("va0"));
+ std::string InstName1(makeNameUnique("va1"));
+ Args[0] = new BitCastInst(Args[0], PtrTy, InstName0, CurBB);
+ Args[1] = new BitCastInst(Args[1], PtrTy, InstName1, CurBB);
+ return new CallInst(Func, Args);
+ }
}
- return opcode;
+ return 0;
}
-static std::string getCastUpgrade(
- const std::string& Src, TypeInfo& SrcTy, TypeInfo& DstTy, bool isConst)
-{
- std::string Result;
- std::string Source = Src;
- if (SrcTy.isFloatingPoint() && DstTy.isPointer()) {
- // fp -> ptr cast is no longer supported but we must upgrade this
- // by doing a double cast: fp -> int -> ptr
- if (isConst)
- Source = "ulong fptoui(" + Source + " to ulong)";
- else {
- *O << " %cast_upgrade" << unique << " = fptoui " << Source
- << " to ulong\n";
- Source = "ulong %cast_upgrade" + llvm::utostr(unique);
+const Type* upgradeGEPIndices(const Type* PTy,
+ std::vector<ValueInfo> *Indices,
+ std::vector<Value*> &VIndices,
+ std::vector<Constant*> *CIndices = 0) {
+ // Traverse the indices with a gep_type_iterator so we can build the list
+ // of constant and value indices for use later. Also perform upgrades
+ VIndices.clear();
+ if (CIndices) CIndices->clear();
+ for (unsigned i = 0, e = Indices->size(); i != e; ++i)
+ VIndices.push_back((*Indices)[i].V);
+ generic_gep_type_iterator<std::vector<Value*>::iterator>
+ GTI = gep_type_begin(PTy, VIndices.begin(), VIndices.end()),
+ GTE = gep_type_end(PTy, VIndices.begin(), VIndices.end());
+ for (unsigned i = 0, e = Indices->size(); i != e && GTI != GTE; ++i, ++GTI) {
+ Value *Index = VIndices[i];
+ if (CIndices && !isa<Constant>(Index))
+ error("Indices to constant getelementptr must be constants");
+ // LLVM 1.2 and earlier used ubyte struct indices. Convert any ubyte
+ // struct indices to i32 struct indices with ZExt for compatibility.
+ else if (isa<StructType>(*GTI)) { // Only change struct indices
+ if (ConstantInt *CUI = dyn_cast<ConstantInt>(Index))
+ if (CUI->getType()->getBitWidth() == 8)
+ Index =
+ ConstantExpr::getCast(Instruction::ZExt, CUI, Type::Int32Ty);
+ } else {
+ // Make sure that unsigned SequentialType indices are zext'd to
+ // 64-bits if they were smaller than that because LLVM 2.0 will sext
+ // all indices for SequentialType elements. We must retain the same
+ // semantic (zext) for unsigned types.
+ if (const IntegerType *Ity = dyn_cast<IntegerType>(Index->getType()))
+ if (Ity->getBitWidth() < 64 && (*Indices)[i].S == Unsigned) {
+ if (CIndices)
+ Index = ConstantExpr::getCast(Instruction::ZExt,
+ cast<Constant>(Index), Type::Int64Ty);
+ else
+ Index = CastInst::create(Instruction::ZExt, Index, Type::Int64Ty,
+ makeNameUnique("gep"), CurBB);
+ VIndices[i] = Index;
+ }
}
- // Update the SrcTy for the getCastOpcode call below
- SrcTy.destroy();
- SrcTy.newTy = new std::string("ulong");
- SrcTy.oldTy = ULongTy;
- } else if (DstTy.oldTy == BoolTy) {
- // cast ptr %x to bool was previously defined as setne ptr %x, null
- // The ptrtoint semantic is to truncate, not compare so we must retain
- // the original intent by replace the cast with a setne
- const char* comparator = SrcTy.isPointer() ? ", null" :
- (SrcTy.isFloatingPoint() ? ", 0.0" : ", 0");
- if (isConst)
- Result = "setne (" + Source + comparator + ")";
- else
- Result = "setne " + Source + comparator;
- return Result; // skip cast processing below
+ // Add to the CIndices list, if requested.
+ if (CIndices)
+ CIndices->push_back(cast<Constant>(Index));
}
- ResolveType(SrcTy);
- ResolveType(DstTy);
- std::string Opcode(getCastOpcode(Source, SrcTy, DstTy));
- if (isConst)
- Result += Opcode + "( " + Source + " to " + *DstTy.newTy + ")";
- else
- Result += Opcode + " " + Source + " to " + *DstTy.newTy;
- return Result;
+
+ const Type *IdxTy =
+ GetElementPtrInst::getIndexedType(PTy, VIndices, true);
+ if (!IdxTy)
+ error("Index list invalid for constant getelementptr");
+ return IdxTy;
}
-const char* getDivRemOpcode(const std::string& opcode, const TypeInfo& TI) {
- const char* op = opcode.c_str();
- TypeInfo Ty = TI;
- ResolveType(Ty);
- if (Ty.isPacked())
- Ty.oldTy = Ty.getElementType();
- if (opcode == "div")
- if (Ty.isFloatingPoint())
- op = "fdiv";
- else if (Ty.isUnsigned())
- op = "udiv";
- else if (Ty.isSigned())
- op = "sdiv";
- else
- yyerror("Invalid type for div instruction");
- else if (opcode == "rem")
- if (Ty.isFloatingPoint())
- op = "frem";
- else if (Ty.isUnsigned())
- op = "urem";
- else if (Ty.isSigned())
- op = "srem";
- else
- yyerror("Invalid type for rem instruction");
- return op;
+unsigned upgradeCallingConv(unsigned CC) {
+ switch (CC) {
+ case OldCallingConv::C : return CallingConv::C;
+ case OldCallingConv::CSRet : return CallingConv::C;
+ case OldCallingConv::Fast : return CallingConv::Fast;
+ case OldCallingConv::Cold : return CallingConv::Cold;
+ case OldCallingConv::X86_StdCall : return CallingConv::X86_StdCall;
+ case OldCallingConv::X86_FastCall: return CallingConv::X86_FastCall;
+ default:
+ return CC;
+ }
}
-std::string
-getCompareOp(const std::string& setcc, const TypeInfo& TI) {
- assert(setcc.length() == 5);
- char cc1 = setcc[3];
- char cc2 = setcc[4];
- assert(cc1 == 'e' || cc1 == 'n' || cc1 == 'l' || cc1 == 'g');
- assert(cc2 == 'q' || cc2 == 'e' || cc2 == 'e' || cc2 == 't');
- std::string result("xcmp xxx");
- result[6] = cc1;
- result[7] = cc2;
- if (TI.isFloatingPoint()) {
- result[0] = 'f';
- result[5] = 'o'; // FIXME: Always map to ordered comparison ?
- } else if (TI.isIntegral() || TI.isPointer()) {
- result[0] = 'i';
- if ((cc1 == 'e' && cc2 == 'q') || (cc1 == 'n' && cc2 == 'e'))
- result.erase(5,1);
- else if (TI.isSigned())
- result[5] = 's';
- else if (TI.isUnsigned() || TI.isPointer())
- result[5] = 'u';
- else
- yyerror("Invalid integral type for setcc");
+Module* UpgradeAssembly(const std::string &infile, std::istream& in,
+ bool debug, bool addAttrs)
+{
+ Upgradelineno = 1;
+ CurFilename = infile;
+ LexInput = ∈
+ yydebug = debug;
+ AddAttributes = addAttrs;
+ ObsoleteVarArgs = false;
+ NewVarArgs = false;
+
+ CurModule.CurrentModule = new Module(CurFilename);
+
+ // Check to make sure the parser succeeded
+ if (yyparse()) {
+ if (ParserResult)
+ delete ParserResult;
+ std::cerr << "llvm-upgrade: parse failed.\n";
+ return 0;
+ }
+
+ // Check to make sure that parsing produced a result
+ if (!ParserResult) {
+ std::cerr << "llvm-upgrade: no parse result.\n";
+ return 0;
+ }
+
+ // Reset ParserResult variable while saving its value for the result.
+ Module *Result = ParserResult;
+ ParserResult = 0;
+
+ //Not all functions use vaarg, so make a second check for ObsoleteVarArgs
+ {
+ Function* F;
+ if ((F = Result->getNamedFunction("llvm.va_start"))
+ && F->getFunctionType()->getNumParams() == 0)
+ ObsoleteVarArgs = true;
+ if((F = Result->getNamedFunction("llvm.va_copy"))
+ && F->getFunctionType()->getNumParams() == 1)
+ ObsoleteVarArgs = true;
+ }
+
+ if (ObsoleteVarArgs && NewVarArgs) {
+ error("This file is corrupt: it uses both new and old style varargs");
+ return 0;
}
- return result;
+
+ if(ObsoleteVarArgs) {
+ if(Function* F = Result->getNamedFunction("llvm.va_start")) {
+ if (F->arg_size() != 0) {
+ error("Obsolete va_start takes 0 argument");
+ return 0;
+ }
+
+ //foo = va_start()
+ // ->
+ //bar = alloca typeof(foo)
+ //va_start(bar)
+ //foo = load bar
+
+ const Type* RetTy = Type::getPrimitiveType(Type::VoidTyID);
+ const Type* ArgTy = F->getFunctionType()->getReturnType();
+ const Type* ArgTyPtr = PointerType::get(ArgTy);
+ Function* NF = cast<Function>(Result->getOrInsertFunction(
+ "llvm.va_start", RetTy, ArgTyPtr, (Type *)0));
+
+ while (!F->use_empty()) {
+ CallInst* CI = cast<CallInst>(F->use_back());
+ AllocaInst* bar = new AllocaInst(ArgTy, 0, "vastart.fix.1", CI);
+ new CallInst(NF, bar, "", CI);
+ Value* foo = new LoadInst(bar, "vastart.fix.2", CI);
+ CI->replaceAllUsesWith(foo);
+ CI->getParent()->getInstList().erase(CI);
+ }
+ Result->getFunctionList().erase(F);
+ }
+
+ if(Function* F = Result->getNamedFunction("llvm.va_end")) {
+ if(F->arg_size() != 1) {
+ error("Obsolete va_end takes 1 argument");
+ return 0;
+ }
+
+ //vaend foo
+ // ->
+ //bar = alloca 1 of typeof(foo)
+ //vaend bar
+ const Type* RetTy = Type::getPrimitiveType(Type::VoidTyID);
+ const Type* ArgTy = F->getFunctionType()->getParamType(0);
+ const Type* ArgTyPtr = PointerType::get(ArgTy);
+ Function* NF = cast<Function>(Result->getOrInsertFunction(
+ "llvm.va_end", RetTy, ArgTyPtr, (Type *)0));
+
+ while (!F->use_empty()) {
+ CallInst* CI = cast<CallInst>(F->use_back());
+ AllocaInst* bar = new AllocaInst(ArgTy, 0, "vaend.fix.1", CI);
+ new StoreInst(CI->getOperand(1), bar, CI);
+ new CallInst(NF, bar, "", CI);
+ CI->getParent()->getInstList().erase(CI);
+ }
+ Result->getFunctionList().erase(F);
+ }
+
+ if(Function* F = Result->getNamedFunction("llvm.va_copy")) {
+ if(F->arg_size() != 1) {
+ error("Obsolete va_copy takes 1 argument");
+ return 0;
+ }
+ //foo = vacopy(bar)
+ // ->
+ //a = alloca 1 of typeof(foo)
+ //b = alloca 1 of typeof(foo)
+ //store bar -> b
+ //vacopy(a, b)
+ //foo = load a
+
+ const Type* RetTy = Type::getPrimitiveType(Type::VoidTyID);
+ const Type* ArgTy = F->getFunctionType()->getReturnType();
+ const Type* ArgTyPtr = PointerType::get(ArgTy);
+ Function* NF = cast<Function>(Result->getOrInsertFunction(
+ "llvm.va_copy", RetTy, ArgTyPtr, ArgTyPtr, (Type *)0));
+
+ while (!F->use_empty()) {
+ CallInst* CI = cast<CallInst>(F->use_back());
+ AllocaInst* a = new AllocaInst(ArgTy, 0, "vacopy.fix.1", CI);
+ AllocaInst* b = new AllocaInst(ArgTy, 0, "vacopy.fix.2", CI);
+ new StoreInst(CI->getOperand(1), b, CI);
+ new CallInst(NF, a, b, "", CI);
+ Value* foo = new LoadInst(a, "vacopy.fix.3", CI);
+ CI->replaceAllUsesWith(foo);
+ CI->getParent()->getInstList().erase(CI);
+ }
+ Result->getFunctionList().erase(F);
+ }
+ }
+
+ return Result;
}
+} // end llvm namespace
+
+using namespace llvm;
+
/* Enabling traces. */
#endif
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 270 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1431 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
typedef union YYSTYPE {
- std::string* String;
- TypeInfo Type;
- ValueInfo Value;
- ConstInfo Const;
- ValueList* ValList;
+ llvm::Module *ModuleVal;
+ llvm::Function *FunctionVal;
+ std::pair<llvm::PATypeInfo, char*> *ArgVal;
+ llvm::BasicBlock *BasicBlockVal;
+ llvm::TerminatorInst *TermInstVal;
+ llvm::InstrInfo InstVal;
+ llvm::ConstInfo ConstVal;
+ llvm::ValueInfo ValueVal;
+ llvm::PATypeInfo TypeVal;
+ llvm::TypeInfo PrimType;
+ llvm::PHIListInfo PHIList;
+ std::list<llvm::PATypeInfo> *TypeList;
+ std::vector<llvm::ValueInfo> *ValueList;
+ std::vector<llvm::ConstInfo> *ConstVector;
+
+
+ std::vector<std::pair<llvm::PATypeInfo,char*> > *ArgList;
+ // Represent the RHS of PHI node
+ std::vector<std::pair<llvm::Constant*, llvm::BasicBlock*> > *JumpTable;
+
+ llvm::GlobalValue::LinkageTypes Linkage;
+ int64_t SInt64Val;
+ uint64_t UInt64Val;
+ int SIntVal;
+ unsigned UIntVal;
+ double FPVal;
+ bool BoolVal;
+
+ char *StrVal; // This memory is strdup'd!
+ llvm::ValID ValIDVal; // strdup'd memory maybe!
+
+ llvm::BinaryOps BinaryOpVal;
+ llvm::TermOps TermOpVal;
+ llvm::MemoryOps MemOpVal;
+ llvm::OtherOps OtherOpVal;
+ llvm::CastOps CastOpVal;
+ llvm::ICmpInst::Predicate IPred;
+ llvm::FCmpInst::Predicate FPred;
+ llvm::Module::Endianness Endianness;
} YYSTYPE;
/* Line 196 of yacc.c. */
-#line 655 "UpgradeParser.tab.c"
+#line 1854 "UpgradeParser.tab.c"
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
/* Line 219 of yacc.c. */
-#line 667 "UpgradeParser.tab.c"
+#line 1866 "UpgradeParser.tab.c"
#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
# define YYSIZE_T __SIZE_TYPE__
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 4
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1483
+#define YYLAST 1736
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 165
+#define YYNTOKENS 166
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 75
+#define YYNNTS 79
/* YYNRULES -- Number of rules. */
-#define YYNRULES 299
+#define YYNRULES 308
/* YYNRULES -- Number of states. */
-#define YYNSTATES 582
+#define YYNSTATES 604
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 405
+#define YYMAXUTOK 406
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 154, 155, 163, 2, 152, 2, 2, 2, 2, 2,
+ 155, 156, 164, 2, 153, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 159, 151, 160, 2, 2, 2, 2, 2, 2, 2,
+ 160, 152, 161, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 156, 153, 158, 2, 2, 2, 2, 2, 164,
+ 2, 157, 154, 159, 2, 2, 2, 2, 2, 165,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 157, 2, 2, 161, 2, 162, 2, 2, 2, 2,
+ 158, 2, 2, 162, 2, 163, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 147, 148, 149, 150
+ 145, 146, 147, 148, 149, 150, 151
};
#if YYDEBUG
119, 121, 123, 125, 127, 129, 131, 133, 135, 137,
139, 141, 143, 145, 147, 149, 151, 153, 155, 157,
159, 161, 164, 165, 167, 169, 171, 173, 175, 177,
- 179, 180, 182, 184, 186, 188, 190, 192, 195, 196,
+ 179, 180, 181, 183, 185, 187, 189, 191, 193, 196,
197, 200, 201, 205, 208, 209, 211, 212, 216, 218,
221, 223, 225, 227, 229, 231, 233, 235, 237, 239,
241, 243, 245, 247, 249, 251, 253, 255, 257, 259,
- 261, 264, 269, 275, 281, 285, 288, 291, 293, 297,
- 299, 303, 305, 306, 311, 315, 319, 324, 329, 333,
- 336, 339, 342, 345, 348, 351, 354, 357, 360, 363,
- 370, 376, 385, 392, 399, 406, 414, 422, 429, 436,
- 445, 454, 458, 460, 462, 464, 466, 469, 472, 477,
- 480, 482, 484, 486, 491, 494, 499, 506, 513, 520,
- 527, 531, 536, 537, 539, 541, 543, 547, 551, 555,
- 559, 563, 567, 569, 570, 572, 574, 576, 577, 580,
- 584, 586, 588, 592, 594, 595, 604, 606, 608, 612,
- 614, 616, 620, 621, 623, 625, 629, 630, 632, 634,
- 636, 638, 640, 642, 644, 646, 648, 652, 654, 660,
- 662, 664, 666, 668, 671, 674, 676, 679, 682, 683,
- 685, 687, 689, 692, 695, 699, 709, 719, 728, 743,
- 745, 747, 754, 760, 763, 770, 778, 780, 784, 786,
- 787, 790, 792, 798, 804, 810, 818, 826, 829, 834,
- 839, 846, 851, 856, 863, 870, 873, 881, 883, 886,
- 887, 889, 890, 894, 901, 905, 912, 915, 920, 927
+ 261, 264, 269, 275, 281, 285, 288, 294, 299, 302,
+ 304, 308, 310, 314, 316, 317, 322, 326, 330, 335,
+ 340, 344, 351, 357, 360, 363, 366, 369, 372, 375,
+ 378, 381, 384, 387, 394, 400, 409, 416, 423, 430,
+ 438, 446, 453, 460, 469, 478, 482, 484, 486, 488,
+ 490, 493, 496, 501, 504, 506, 511, 514, 519, 520,
+ 528, 529, 537, 538, 546, 547, 555, 559, 564, 565,
+ 567, 569, 571, 575, 579, 583, 587, 591, 595, 597,
+ 598, 600, 602, 604, 605, 608, 612, 614, 616, 620,
+ 622, 623, 632, 634, 636, 640, 642, 644, 647, 648,
+ 650, 652, 653, 658, 659, 661, 663, 665, 667, 669,
+ 671, 673, 675, 677, 681, 683, 689, 691, 693, 695,
+ 697, 700, 703, 706, 710, 713, 714, 716, 718, 720,
+ 723, 726, 730, 740, 750, 759, 773, 775, 777, 784,
+ 790, 793, 800, 808, 810, 814, 816, 817, 820, 822,
+ 828, 834, 840, 847, 854, 857, 862, 867, 874, 879,
+ 884, 889, 894, 901, 908, 911, 919, 921, 924, 925,
+ 927, 928, 932, 939, 943, 950, 953, 958, 965
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const short int yyrhs[] =
{
- 199, 0, -1, 19, -1, 20, -1, 17, -1, 18,
- -1, 80, -1, 81, -1, 82, -1, 83, -1, 84,
- -1, 85, -1, 86, -1, 87, -1, 88, -1, 89,
- -1, 90, -1, 91, -1, 92, -1, 93, -1, 94,
- -1, 95, -1, 96, -1, 97, -1, 98, -1, 99,
- -1, 102, -1, 103, -1, 104, -1, 105, -1, 106,
- -1, 107, -1, 118, -1, 119, -1, 120, -1, 121,
- -1, 108, -1, 109, -1, 110, -1, 111, -1, 112,
- -1, 113, -1, 114, -1, 115, -1, 116, -1, 117,
- -1, 118, -1, 119, -1, 120, -1, 121, -1, 25,
- -1, 26, -1, 130, -1, 131, -1, 132, -1, 133,
- -1, 139, -1, 140, -1, 141, -1, 142, -1, 143,
- -1, 144, -1, 145, -1, 146, -1, 147, -1, 148,
- -1, 149, -1, 150, -1, 138, -1, 11, -1, 9,
- -1, 7, -1, 5, -1, 12, -1, 10, -1, 8,
- -1, 6, -1, 175, -1, 176, -1, 13, -1, 14,
- -1, 208, 151, -1, -1, 42, -1, 43, -1, 44,
- -1, 48, -1, 45, -1, 46, -1, 47, -1, -1,
- 66, -1, 67, -1, 68, -1, 69, -1, 70, -1,
- 71, -1, 65, 18, -1, -1, -1, 57, 18, -1,
- -1, 152, 57, 18, -1, 37, 30, -1, -1, 184,
- -1, -1, 152, 187, 186, -1, 184, -1, 57, 18,
- -1, 190, -1, 3, -1, 192, -1, 3, -1, 192,
- -1, 4, -1, 5, -1, 6, -1, 7, -1, 8,
+ 200, 0, -1, 5, -1, 6, -1, 3, -1, 4,
+ -1, 79, -1, 80, -1, 81, -1, 82, -1, 83,
+ -1, 84, -1, 85, -1, 86, -1, 87, -1, 88,
+ -1, 89, -1, 90, -1, 91, -1, 92, -1, 97,
+ -1, 98, -1, 99, -1, 100, -1, 101, -1, 102,
+ -1, 119, -1, 120, -1, 121, -1, 122, -1, 123,
+ -1, 124, -1, 125, -1, 126, -1, 127, -1, 128,
+ -1, 129, -1, 130, -1, 131, -1, 132, -1, 133,
+ -1, 134, -1, 135, -1, 136, -1, 137, -1, 138,
+ -1, 125, -1, 126, -1, 127, -1, 128, -1, 27,
+ -1, 28, -1, 93, -1, 94, -1, 95, -1, 96,
+ -1, 140, -1, 141, -1, 142, -1, 143, -1, 144,
+ -1, 145, -1, 146, -1, 147, -1, 148, -1, 149,
+ -1, 150, -1, 151, -1, 139, -1, 16, -1, 14,
+ -1, 12, -1, 10, -1, 17, -1, 15, -1, 13,
+ -1, 11, -1, 176, -1, 177, -1, 18, -1, 19,
+ -1, 212, 152, -1, -1, 41, -1, 42, -1, 43,
+ -1, 44, -1, 45, -1, 46, -1, 47, -1, -1,
+ -1, 65, -1, 66, -1, 67, -1, 68, -1, 69,
+ -1, 70, -1, 64, 4, -1, -1, 57, 4, -1,
+ -1, 153, 57, 4, -1, 34, 24, -1, -1, 185,
+ -1, -1, 153, 188, 187, -1, 185, -1, 57, 4,
+ -1, 191, -1, 8, -1, 193, -1, 8, -1, 193,
-1, 9, -1, 10, -1, 11, -1, 12, -1, 13,
- -1, 14, -1, 15, -1, 16, -1, 222, -1, 191,
- -1, 153, 18, -1, 189, 154, 194, 155, -1, 156,
- 18, 157, 192, 158, -1, 159, 18, 157, 192, 160,
- -1, 161, 193, 162, -1, 161, 162, -1, 192, 163,
- -1, 192, -1, 193, 152, 192, -1, 193, -1, 193,
- 152, 40, -1, 40, -1, -1, 190, 156, 197, 158,
- -1, 190, 156, 158, -1, 190, 164, 30, -1, 190,
- 159, 197, 160, -1, 190, 161, 197, 162, -1, 190,
- 161, 162, -1, 190, 22, -1, 190, 23, -1, 190,
- 222, -1, 190, 196, -1, 190, 24, -1, 175, 167,
- -1, 176, 18, -1, 4, 25, -1, 4, 26, -1,
- 178, 21, -1, 174, 154, 195, 39, 190, 155, -1,
- 127, 154, 195, 237, 155, -1, 129, 154, 195, 152,
- 195, 152, 195, 155, -1, 168, 154, 195, 152, 195,
- 155, -1, 169, 154, 195, 152, 195, 155, -1, 170,
- 154, 195, 152, 195, 155, -1, 100, 171, 154, 195,
- 152, 195, 155, -1, 101, 172, 154, 195, 152, 195,
- 155, -1, 173, 154, 195, 152, 195, 155, -1, 135,
- 154, 195, 152, 195, 155, -1, 136, 154, 195, 152,
- 195, 152, 195, 155, -1, 137, 154, 195, 152, 195,
- 152, 195, 155, -1, 197, 152, 195, -1, 195, -1,
- 35, -1, 36, -1, 200, -1, 200, 217, -1, 200,
- 219, -1, 200, 63, 62, 203, -1, 200, 31, -1,
- 202, -1, 50, -1, 58, -1, 202, 179, 27, 188,
- -1, 202, 219, -1, 202, 63, 62, 203, -1, 202,
- 179, 180, 198, 195, 186, -1, 202, 179, 201, 198,
- 190, 186, -1, 202, 179, 45, 198, 190, 186, -1,
- 202, 179, 47, 198, 190, 186, -1, 202, 51, 205,
- -1, 202, 59, 151, 206, -1, -1, 30, -1, 56,
- -1, 55, -1, 53, 151, 204, -1, 54, 151, 18,
- -1, 52, 151, 30, -1, 72, 151, 30, -1, 156,
- 207, 158, -1, 207, 152, 30, -1, 30, -1, -1,
- 28, -1, 30, -1, 208, -1, -1, 190, 209, -1,
- 211, 152, 210, -1, 210, -1, 211, -1, 211, 152,
- 40, -1, 40, -1, -1, 181, 188, 208, 154, 212,
- 155, 185, 182, -1, 32, -1, 161, -1, 180, 213,
- 214, -1, 33, -1, 162, -1, 215, 225, 216, -1,
- -1, 45, -1, 47, -1, 34, 218, 213, -1, -1,
- 64, -1, 17, -1, 18, -1, 21, -1, 25, -1,
- 26, -1, 22, -1, 23, -1, 24, -1, 159, 197,
- 160, -1, 196, -1, 62, 220, 30, 152, 30, -1,
- 166, -1, 208, -1, 222, -1, 221, -1, 190, 223,
- -1, 225, 226, -1, 226, -1, 227, 229, -1, 227,
- 231, -1, -1, 29, -1, 78, -1, 77, -1, 73,
- 224, -1, 73, 3, -1, 74, 15, 223, -1, 74,
- 4, 223, 152, 15, 223, 152, 15, 223, -1, 75,
- 177, 223, 152, 15, 223, 156, 230, 158, -1, 75,
- 177, 223, 152, 15, 223, 156, 158, -1, 179, 76,
- 181, 188, 223, 154, 234, 155, 39, 15, 223, 228,
- 15, 223, -1, 228, -1, 79, -1, 230, 177, 221,
- 152, 15, 223, -1, 177, 221, 152, 15, 223, -1,
- 179, 236, -1, 190, 156, 223, 152, 223, 158, -1,
- 232, 152, 156, 223, 152, 223, 158, -1, 224, -1,
- 233, 152, 224, -1, 233, -1, -1, 61, 60, -1,
- 60, -1, 168, 190, 223, 152, 223, -1, 169, 190,
- 223, 152, 223, -1, 170, 190, 223, 152, 223, -1,
- 100, 171, 190, 223, 152, 223, 155, -1, 101, 172,
- 190, 223, 152, 223, 155, -1, 49, 224, -1, 173,
- 224, 152, 224, -1, 174, 224, 39, 190, -1, 129,
- 224, 152, 224, 152, 224, -1, 134, 224, 152, 190,
- -1, 135, 224, 152, 224, -1, 136, 224, 152, 224,
- 152, 224, -1, 137, 224, 152, 224, 152, 224, -1,
- 128, 232, -1, 235, 181, 188, 223, 154, 234, 155,
- -1, 239, -1, 152, 233, -1, -1, 38, -1, -1,
- 122, 190, 183, -1, 122, 190, 152, 10, 223, 183,
- -1, 123, 190, 183, -1, 123, 190, 152, 10, 223,
- 183, -1, 124, 224, -1, 238, 125, 190, 223, -1,
- 238, 126, 224, 152, 190, 223, -1, 127, 190, 223,
- 237, -1
+ -1, 14, -1, 15, -1, 16, -1, 17, -1, 18,
+ -1, 19, -1, 21, -1, 192, -1, 48, -1, 227,
+ -1, 154, 4, -1, 190, 155, 195, 156, -1, 157,
+ 4, 158, 193, 159, -1, 160, 4, 158, 193, 161,
+ -1, 162, 194, 163, -1, 162, 163, -1, 160, 162,
+ 194, 163, 161, -1, 160, 162, 163, 161, -1, 193,
+ 164, -1, 193, -1, 194, 153, 193, -1, 194, -1,
+ 194, 153, 37, -1, 37, -1, -1, 191, 157, 198,
+ 159, -1, 191, 157, 159, -1, 191, 165, 24, -1,
+ 191, 160, 198, 161, -1, 191, 162, 198, 163, -1,
+ 191, 162, 163, -1, 191, 160, 162, 198, 163, 161,
+ -1, 191, 160, 162, 163, 161, -1, 191, 38, -1,
+ 191, 39, -1, 191, 227, -1, 191, 197, -1, 191,
+ 26, -1, 176, 168, -1, 177, 4, -1, 9, 27,
+ -1, 9, 28, -1, 179, 7, -1, 175, 155, 196,
+ 36, 191, 156, -1, 110, 155, 196, 242, 156, -1,
+ 112, 155, 196, 153, 196, 153, 196, 156, -1, 169,
+ 155, 196, 153, 196, 156, -1, 170, 155, 196, 153,
+ 196, 156, -1, 171, 155, 196, 153, 196, 156, -1,
+ 103, 172, 155, 196, 153, 196, 156, -1, 104, 173,
+ 155, 196, 153, 196, 156, -1, 174, 155, 196, 153,
+ 196, 156, -1, 114, 155, 196, 153, 196, 156, -1,
+ 115, 155, 196, 153, 196, 153, 196, 156, -1, 116,
+ 155, 196, 153, 196, 153, 196, 156, -1, 198, 153,
+ 196, -1, 196, -1, 32, -1, 33, -1, 201, -1,
+ 201, 221, -1, 201, 223, -1, 201, 62, 61, 207,
+ -1, 201, 25, -1, 202, -1, 202, 180, 20, 189,
+ -1, 202, 223, -1, 202, 62, 61, 207, -1, -1,
+ 202, 180, 181, 199, 196, 203, 187, -1, -1, 202,
+ 180, 50, 199, 191, 204, 187, -1, -1, 202, 180,
+ 45, 199, 191, 205, 187, -1, -1, 202, 180, 47,
+ 199, 191, 206, 187, -1, 202, 51, 209, -1, 202,
+ 58, 152, 210, -1, -1, 24, -1, 56, -1, 55,
+ -1, 53, 152, 208, -1, 54, 152, 4, -1, 52,
+ 152, 24, -1, 71, 152, 24, -1, 157, 211, 159,
+ -1, 211, 153, 24, -1, 24, -1, -1, 22, -1,
+ 24, -1, 212, -1, -1, 191, 213, -1, 215, 153,
+ 214, -1, 214, -1, 215, -1, 215, 153, 37, -1,
+ 37, -1, -1, 182, 189, 212, 155, 216, 156, 186,
+ 183, -1, 29, -1, 162, -1, 181, 217, 218, -1,
+ 30, -1, 163, -1, 230, 220, -1, -1, 45, -1,
+ 47, -1, -1, 31, 224, 222, 217, -1, -1, 63,
+ -1, 3, -1, 4, -1, 7, -1, 27, -1, 28,
+ -1, 38, -1, 39, -1, 26, -1, 160, 198, 161,
+ -1, 197, -1, 61, 225, 24, 153, 24, -1, 167,
+ -1, 212, -1, 227, -1, 226, -1, 191, 228, -1,
+ 230, 231, -1, 219, 231, -1, 232, 180, 234, -1,
+ 232, 236, -1, -1, 23, -1, 77, -1, 78, -1,
+ 72, 229, -1, 72, 8, -1, 73, 21, 228, -1,
+ 73, 9, 228, 153, 21, 228, 153, 21, 228, -1,
+ 74, 178, 228, 153, 21, 228, 157, 235, 159, -1,
+ 74, 178, 228, 153, 21, 228, 157, 159, -1, 75,
+ 182, 189, 228, 155, 239, 156, 36, 21, 228, 233,
+ 21, 228, -1, 233, -1, 76, -1, 235, 178, 226,
+ 153, 21, 228, -1, 178, 226, 153, 21, 228, -1,
+ 180, 241, -1, 191, 157, 228, 153, 228, 159, -1,
+ 237, 153, 157, 228, 153, 228, 159, -1, 229, -1,
+ 238, 153, 229, -1, 238, -1, -1, 60, 59, -1,
+ 59, -1, 169, 191, 228, 153, 228, -1, 170, 191,
+ 228, 153, 228, -1, 171, 191, 228, 153, 228, -1,
+ 103, 172, 191, 228, 153, 228, -1, 104, 173, 191,
+ 228, 153, 228, -1, 49, 229, -1, 174, 229, 153,
+ 229, -1, 175, 229, 36, 191, -1, 112, 229, 153,
+ 229, 153, 229, -1, 113, 229, 153, 191, -1, 117,
+ 229, 153, 191, -1, 118, 229, 153, 191, -1, 114,
+ 229, 153, 229, -1, 115, 229, 153, 229, 153, 229,
+ -1, 116, 229, 153, 229, 153, 229, -1, 111, 237,
+ -1, 240, 182, 189, 228, 155, 239, 156, -1, 244,
+ -1, 153, 238, -1, -1, 35, -1, -1, 105, 191,
+ 184, -1, 105, 191, 153, 15, 228, 184, -1, 106,
+ 191, 184, -1, 106, 191, 153, 15, 228, 184, -1,
+ 107, 229, -1, 243, 108, 191, 228, -1, 243, 109,
+ 229, 153, 191, 228, -1, 110, 191, 228, 242, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const unsigned short int yyrline[] =
{
- 0, 333, 333, 333, 334, 334, 338, 338, 338, 338,
- 338, 338, 338, 339, 339, 339, 339, 340, 340, 340,
- 341, 341, 341, 341, 341, 341, 342, 342, 342, 342,
- 342, 342, 342, 342, 342, 342, 343, 343, 343, 343,
- 343, 343, 343, 343, 343, 343, 344, 344, 344, 344,
- 344, 344, 345, 345, 345, 345, 346, 346, 346, 346,
- 346, 346, 346, 347, 347, 347, 347, 347, 347, 352,
- 352, 352, 352, 353, 353, 353, 353, 354, 354, 355,
- 355, 358, 361, 366, 366, 366, 366, 366, 366, 367,
- 368, 371, 371, 371, 371, 371, 372, 373, 378, 383,
- 384, 387, 388, 396, 402, 403, 406, 407, 416, 417,
- 430, 430, 431, 431, 432, 436, 436, 436, 436, 436,
- 436, 436, 437, 437, 437, 437, 437, 439, 443, 447,
- 450, 455, 461, 469, 477, 483, 487, 498, 501, 509,
- 510, 515, 518, 528, 534, 539, 545, 551, 557, 562,
- 568, 574, 580, 586, 592, 598, 604, 610, 616, 624,
- 638, 650, 655, 661, 666, 674, 679, 684, 692, 697,
- 702, 712, 717, 722, 722, 732, 737, 740, 745, 749,
- 753, 755, 755, 758, 770, 775, 780, 789, 798, 807,
- 816, 821, 826, 831, 833, 833, 836, 841, 848, 853,
- 860, 867, 872, 873, 881, 881, 882, 882, 884, 891,
- 895, 899, 902, 907, 910, 912, 932, 933, 935, 944,
- 945, 947, 955, 956, 957, 961, 974, 975, 978, 978,
- 978, 978, 978, 978, 978, 979, 980, 985, 986, 995,
- 995, 999, 1005, 1016, 1022, 1025, 1033, 1037, 1042, 1045,
- 1051, 1051, 1053, 1058, 1063, 1068, 1076, 1083, 1089, 1109,
- 1114, 1120, 1125, 1133, 1142, 1149, 1157, 1161, 1168, 1169,
- 1173, 1178, 1181, 1187, 1192, 1200, 1205, 1210, 1215, 1223,
- 1237, 1242, 1247, 1252, 1257, 1262, 1267, 1284, 1289, 1290,
- 1294, 1295, 1298, 1305, 1312, 1319, 1326, 1331, 1338, 1345
+ 0, 1571, 1571, 1572, 1580, 1581, 1591, 1591, 1591, 1591,
+ 1591, 1591, 1591, 1591, 1591, 1591, 1591, 1595, 1595, 1595,
+ 1599, 1599, 1599, 1599, 1599, 1599, 1603, 1603, 1604, 1604,
+ 1605, 1605, 1606, 1606, 1607, 1607, 1611, 1611, 1612, 1612,
+ 1613, 1613, 1614, 1614, 1615, 1615, 1616, 1616, 1617, 1617,
+ 1618, 1619, 1622, 1622, 1622, 1622, 1626, 1626, 1626, 1626,
+ 1626, 1626, 1626, 1627, 1627, 1627, 1627, 1627, 1627, 1633,
+ 1633, 1633, 1633, 1637, 1637, 1637, 1637, 1641, 1641, 1645,
+ 1645, 1650, 1653, 1658, 1659, 1660, 1661, 1662, 1663, 1664,
+ 1665, 1669, 1670, 1671, 1672, 1673, 1674, 1675, 1676, 1686,
+ 1687, 1695, 1696, 1704, 1713, 1714, 1721, 1722, 1726, 1730,
+ 1746, 1747, 1754, 1755, 1762, 1770, 1770, 1770, 1770, 1770,
+ 1770, 1770, 1771, 1771, 1771, 1771, 1771, 1776, 1780, 1784,
+ 1789, 1798, 1818, 1824, 1837, 1846, 1850, 1861, 1865, 1878,
+ 1882, 1889, 1890, 1896, 1903, 1915, 1945, 1958, 1981, 2009,
+ 2031, 2042, 2064, 2075, 2084, 2089, 2147, 2154, 2162, 2169,
+ 2176, 2180, 2184, 2193, 2208, 2221, 2230, 2258, 2271, 2280,
+ 2286, 2292, 2303, 2309, 2315, 2326, 2327, 2336, 2337, 2349,
+ 2358, 2359, 2360, 2361, 2362, 2378, 2398, 2400, 2402, 2402,
+ 2409, 2409, 2416, 2416, 2423, 2423, 2431, 2433, 2435, 2440,
+ 2454, 2455, 2459, 2462, 2470, 2474, 2481, 2485, 2489, 2493,
+ 2501, 2501, 2505, 2506, 2510, 2518, 2523, 2531, 2532, 2539,
+ 2546, 2550, 2686, 2686, 2690, 2700, 2700, 2704, 2708, 2710,
+ 2711, 2715, 2715, 2727, 2728, 2733, 2734, 2735, 2736, 2737,
+ 2738, 2739, 2740, 2741, 2762, 2765, 2780, 2781, 2786, 2786,
+ 2794, 2803, 2806, 2815, 2825, 2830, 2839, 2850, 2850, 2853,
+ 2856, 2859, 2863, 2869, 2884, 2890, 2946, 2949, 2955, 2965,
+ 2978, 3007, 3015, 3023, 3027, 3034, 3035, 3039, 3042, 3048,
+ 3065, 3081, 3095, 3107, 3119, 3130, 3148, 3157, 3166, 3173,
+ 3194, 3218, 3224, 3230, 3236, 3252, 3330, 3338, 3339, 3343,
+ 3344, 3348, 3354, 3360, 3366, 3372, 3379, 3391, 3405
};
#endif
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
{
- "$end", "error", "$undefined", "VOID", "BOOL", "SBYTE", "UBYTE",
- "SHORT", "USHORT", "INT", "UINT", "LONG", "ULONG", "FLOAT", "DOUBLE",
- "LABEL", "OPAQUE", "ESINT64VAL", "EUINT64VAL", "SINTVAL", "UINTVAL",
- "FPVAL", "NULL_TOK", "UNDEF", "ZEROINITIALIZER", "TRUETOK", "FALSETOK",
- "TYPE", "VAR_ID", "LABELSTR", "STRINGCONSTANT", "IMPLEMENTATION",
- "BEGINTOK", "ENDTOK", "DECLARE", "GLOBAL", "CONSTANT", "SECTION",
- "VOLATILE", "TO", "DOTDOTDOT", "CONST", "INTERNAL", "LINKONCE", "WEAK",
- "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "APPENDING", "NOT", "EXTERNAL",
- "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE", "BIG", "ALIGN",
- "UNINITIALIZED", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE",
+ "$end", "error", "$undefined", "ESINT64VAL", "EUINT64VAL", "SINTVAL",
+ "UINTVAL", "FPVAL", "VOID", "BOOL", "SBYTE", "UBYTE", "SHORT", "USHORT",
+ "INT", "UINT", "LONG", "ULONG", "FLOAT", "DOUBLE", "TYPE", "LABEL",
+ "VAR_ID", "LABELSTR", "STRINGCONSTANT", "IMPLEMENTATION",
+ "ZEROINITIALIZER", "TRUETOK", "FALSETOK", "BEGINTOK", "ENDTOK",
+ "DECLARE", "GLOBAL", "CONSTANT", "SECTION", "VOLATILE", "TO",
+ "DOTDOTDOT", "NULL_TOK", "UNDEF", "CONST", "INTERNAL", "LINKONCE",
+ "WEAK", "APPENDING", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "OPAQUE",
+ "NOT", "EXTERNAL", "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE",
+ "BIG", "ALIGN", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE",
"SIDEEFFECT", "CC_TOK", "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK",
"COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATALAYOUT",
- "RET", "BR", "SWITCH", "INVOKE", "EXCEPT", "UNWIND", "UNREACHABLE",
+ "RET", "BR", "SWITCH", "INVOKE", "UNREACHABLE", "UNWIND", "EXCEPT",
"ADD", "SUB", "MUL", "DIV", "UDIV", "SDIV", "FDIV", "REM", "UREM",
- "SREM", "FREM", "AND", "OR", "XOR", "SETLE", "SETGE", "SETLT", "SETGT",
- "SETEQ", "SETNE", "ICMP", "FCMP", "EQ", "NE", "SLT", "SGT", "SLE", "SGE",
- "OEQ", "ONE", "OLT", "OGT", "OLE", "OGE", "ORD", "UNO", "UEQ", "UNE",
- "ULT", "UGT", "ULE", "UGE", "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE",
- "GETELEMENTPTR", "PHI_TOK", "SELECT", "SHL", "SHR", "ASHR", "LSHR",
- "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR", "CAST",
- "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT", "FPTOUI", "FPTOSI",
- "UITOFP", "SITOFP", "PTRTOINT", "INTTOPTR", "BITCAST", "'='", "','",
- "'\\\\'", "'('", "')'", "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'",
- "'*'", "'c'", "$accept", "IntVal", "EInt64Val", "ArithmeticOps",
- "LogicalOps", "SetCondOps", "IPredicates", "FPredicates", "ShiftOps",
- "CastOps", "SIntType", "UIntType", "IntType", "FPType", "OptAssign",
- "OptLinkage", "OptCallingConv", "OptAlign", "OptCAlign", "SectionString",
- "OptSection", "GlobalVarAttributes", "GlobalVarAttribute", "TypesV",
- "UpRTypesV", "Types", "PrimType", "UpRTypes", "TypeListI",
- "ArgTypeListI", "ConstVal", "ConstExpr", "ConstVector", "GlobalType",
- "Module", "DefinitionList", "External", "ConstPool", "AsmBlock",
- "BigOrLittle", "TargetDefinition", "LibrariesDefinition", "LibList",
- "Name", "OptName", "ArgVal", "ArgListH", "ArgList", "FunctionHeaderH",
- "BEGIN", "FunctionHeader", "END", "Function", "FnDeclareLinkage",
- "FunctionProto", "OptSideEffect", "ConstValueRef", "SymbolicValueRef",
- "ValueRef", "ResolvedVal", "BasicBlockList", "BasicBlock",
- "InstructionList", "Unwind", "BBTerminatorInst", "JumpTable", "Inst",
- "PHIList", "ValueRefList", "ValueRefListE", "OptTailCall", "InstVal",
- "IndexList", "OptVolatile", "MemoryInst", 0
+ "SREM", "FREM", "AND", "OR", "XOR", "SHL", "SHR", "ASHR", "LSHR",
+ "SETLE", "SETGE", "SETLT", "SETGT", "SETEQ", "SETNE", "ICMP", "FCMP",
+ "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE", "GETELEMENTPTR", "PHI_TOK",
+ "SELECT", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR",
+ "VAARG_old", "VANEXT_old", "EQ", "NE", "SLT", "SGT", "SLE", "SGE", "ULT",
+ "UGT", "ULE", "UGE", "OEQ", "ONE", "OLT", "OGT", "OLE", "OGE", "ORD",
+ "UNO", "UEQ", "UNE", "CAST", "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT",
+ "FPTOUI", "FPTOSI", "UITOFP", "SITOFP", "PTRTOINT", "INTTOPTR",
+ "BITCAST", "'='", "','", "'\\\\'", "'('", "')'", "'['", "'x'", "']'",
+ "'<'", "'>'", "'{'", "'}'", "'*'", "'c'", "$accept", "INTVAL",
+ "EINT64VAL", "ArithmeticOps", "LogicalOps", "SetCondOps", "IPredicates",
+ "FPredicates", "ShiftOps", "CastOps", "SIntType", "UIntType", "IntType",
+ "FPType", "OptAssign", "OptLinkage", "OptCallingConv", "OptAlign",
+ "OptCAlign", "SectionString", "OptSection", "GlobalVarAttributes",
+ "GlobalVarAttribute", "TypesV", "UpRTypesV", "Types", "PrimType",
+ "UpRTypes", "TypeListI", "ArgTypeListI", "ConstVal", "ConstExpr",
+ "ConstVector", "GlobalType", "Module", "FunctionList", "ConstPool", "@1",
+ "@2", "@3", "@4", "AsmBlock", "BigOrLittle", "TargetDefinition",
+ "LibrariesDefinition", "LibList", "Name", "OptName", "ArgVal",
+ "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader",
+ "END", "Function", "FnDeclareLinkage", "FunctionProto", "@5",
+ "OptSideEffect", "ConstValueRef", "SymbolicValueRef", "ValueRef",
+ "ResolvedVal", "BasicBlockList", "BasicBlock", "InstructionList",
+ "Unwind", "BBTerminatorInst", "JumpTable", "Inst", "PHIList",
+ "ValueRefList", "ValueRefListE", "OptTailCall", "InstVal", "IndexList",
+ "OptVolatile", "MemoryInst", 0
};
#endif
375, 376, 377, 378, 379, 380, 381, 382, 383, 384,
385, 386, 387, 388, 389, 390, 391, 392, 393, 394,
395, 396, 397, 398, 399, 400, 401, 402, 403, 404,
- 405, 61, 44, 92, 40, 41, 91, 120, 93, 60,
- 62, 123, 125, 42, 99
+ 405, 406, 61, 44, 92, 40, 41, 91, 120, 93,
+ 60, 62, 123, 125, 42, 99
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const unsigned char yyr1[] =
{
- 0, 165, 166, 166, 167, 167, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 169, 169, 169,
- 170, 170, 170, 170, 170, 170, 171, 171, 171, 171,
+ 0, 166, 167, 167, 168, 168, 169, 169, 169, 169,
+ 169, 169, 169, 169, 169, 169, 169, 170, 170, 170,
171, 171, 171, 171, 171, 171, 172, 172, 172, 172,
- 172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
- 172, 172, 173, 173, 173, 173, 174, 174, 174, 174,
- 174, 174, 174, 174, 174, 174, 174, 174, 174, 175,
- 175, 175, 175, 176, 176, 176, 176, 177, 177, 178,
- 178, 179, 179, 180, 180, 180, 180, 180, 180, 180,
- 180, 181, 181, 181, 181, 181, 181, 181, 181, 182,
- 182, 183, 183, 184, 185, 185, 186, 186, 187, 187,
- 188, 188, 189, 189, 190, 191, 191, 191, 191, 191,
- 191, 191, 191, 191, 191, 191, 191, 192, 192, 192,
- 192, 192, 192, 192, 192, 192, 192, 193, 193, 194,
- 194, 194, 194, 195, 195, 195, 195, 195, 195, 195,
- 195, 195, 195, 195, 195, 195, 195, 195, 195, 196,
+ 172, 172, 172, 172, 172, 172, 173, 173, 173, 173,
+ 173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
+ 173, 173, 174, 174, 174, 174, 175, 175, 175, 175,
+ 175, 175, 175, 175, 175, 175, 175, 175, 175, 176,
+ 176, 176, 176, 177, 177, 177, 177, 178, 178, 179,
+ 179, 180, 180, 181, 181, 181, 181, 181, 181, 181,
+ 181, 182, 182, 182, 182, 182, 182, 182, 182, 183,
+ 183, 184, 184, 185, 186, 186, 187, 187, 188, 188,
+ 189, 189, 190, 190, 191, 192, 192, 192, 192, 192,
+ 192, 192, 192, 192, 192, 192, 192, 193, 193, 193,
+ 193, 193, 193, 193, 193, 193, 193, 193, 193, 194,
+ 194, 195, 195, 195, 195, 196, 196, 196, 196, 196,
196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
- 196, 197, 197, 198, 198, 199, 200, 200, 200, 200,
- 200, 201, 201, 202, 202, 202, 202, 202, 202, 202,
- 202, 202, 202, 203, 204, 204, 205, 205, 205, 205,
- 206, 207, 207, 207, 208, 208, 209, 209, 210, 211,
- 211, 212, 212, 212, 212, 213, 214, 214, 215, 216,
- 216, 217, 218, 218, 218, 219, 220, 220, 221, 221,
- 221, 221, 221, 221, 221, 221, 221, 221, 221, 222,
- 222, 223, 223, 224, 225, 225, 226, 227, 227, 227,
- 228, 228, 229, 229, 229, 229, 229, 229, 229, 229,
- 229, 230, 230, 231, 232, 232, 233, 233, 234, 234,
- 235, 235, 236, 236, 236, 236, 236, 236, 236, 236,
- 236, 236, 236, 236, 236, 236, 236, 236, 237, 237,
- 238, 238, 239, 239, 239, 239, 239, 239, 239, 239
+ 196, 196, 196, 197, 197, 197, 197, 197, 197, 197,
+ 197, 197, 197, 197, 197, 198, 198, 199, 199, 200,
+ 201, 201, 201, 201, 201, 202, 202, 202, 203, 202,
+ 204, 202, 205, 202, 206, 202, 202, 202, 202, 207,
+ 208, 208, 209, 209, 209, 209, 210, 211, 211, 211,
+ 212, 212, 213, 213, 214, 215, 215, 216, 216, 216,
+ 216, 217, 218, 218, 219, 220, 220, 221, 222, 222,
+ 222, 224, 223, 225, 225, 226, 226, 226, 226, 226,
+ 226, 226, 226, 226, 226, 226, 227, 227, 228, 228,
+ 229, 230, 230, 231, 232, 232, 232, 233, 233, 234,
+ 234, 234, 234, 234, 234, 234, 234, 234, 235, 235,
+ 236, 237, 237, 238, 238, 239, 239, 240, 240, 241,
+ 241, 241, 241, 241, 241, 241, 241, 241, 241, 241,
+ 241, 241, 241, 241, 241, 241, 241, 242, 242, 243,
+ 243, 244, 244, 244, 244, 244, 244, 244, 244
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 2, 0, 1, 1, 1, 1, 1, 1, 1,
- 0, 1, 1, 1, 1, 1, 1, 2, 0, 0,
+ 0, 0, 1, 1, 1, 1, 1, 1, 2, 0,
2, 0, 3, 2, 0, 1, 0, 3, 1, 2,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 2, 4, 5, 5, 3, 2, 2, 1, 3, 1,
- 3, 1, 0, 4, 3, 3, 4, 4, 3, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 6,
- 5, 8, 6, 6, 6, 7, 7, 6, 6, 8,
- 8, 3, 1, 1, 1, 1, 2, 2, 4, 2,
- 1, 1, 1, 4, 2, 4, 6, 6, 6, 6,
- 3, 4, 0, 1, 1, 1, 3, 3, 3, 3,
- 3, 3, 1, 0, 1, 1, 1, 0, 2, 3,
- 1, 1, 3, 1, 0, 8, 1, 1, 3, 1,
- 1, 3, 0, 1, 1, 3, 0, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 3, 1, 5, 1,
- 1, 1, 1, 2, 2, 1, 2, 2, 0, 1,
- 1, 1, 2, 2, 3, 9, 9, 8, 14, 1,
- 1, 6, 5, 2, 6, 7, 1, 3, 1, 0,
- 2, 1, 5, 5, 5, 7, 7, 2, 4, 4,
- 6, 4, 4, 6, 6, 2, 7, 1, 2, 0,
- 1, 0, 3, 6, 3, 6, 2, 4, 6, 4
+ 2, 4, 5, 5, 3, 2, 5, 4, 2, 1,
+ 3, 1, 3, 1, 0, 4, 3, 3, 4, 4,
+ 3, 6, 5, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 6, 5, 8, 6, 6, 6, 7,
+ 7, 6, 6, 8, 8, 3, 1, 1, 1, 1,
+ 2, 2, 4, 2, 1, 4, 2, 4, 0, 7,
+ 0, 7, 0, 7, 0, 7, 3, 4, 0, 1,
+ 1, 1, 3, 3, 3, 3, 3, 3, 1, 0,
+ 1, 1, 1, 0, 2, 3, 1, 1, 3, 1,
+ 0, 8, 1, 1, 3, 1, 1, 2, 0, 1,
+ 1, 0, 4, 0, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 3, 1, 5, 1, 1, 1, 1,
+ 2, 2, 2, 3, 2, 0, 1, 1, 1, 2,
+ 2, 3, 9, 9, 8, 13, 1, 1, 6, 5,
+ 2, 6, 7, 1, 3, 1, 0, 2, 1, 5,
+ 5, 5, 6, 6, 2, 4, 4, 6, 4, 4,
+ 4, 4, 6, 6, 2, 7, 1, 2, 0, 1,
+ 0, 3, 6, 3, 6, 2, 4, 6, 4
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
means the default is an error. */
static const unsigned short int yydefact[] =
{
- 192, 0, 90, 180, 1, 179, 222, 83, 84, 85,
- 87, 88, 89, 86, 0, 98, 248, 176, 177, 204,
- 205, 0, 0, 0, 90, 0, 184, 223, 224, 98,
- 0, 0, 91, 92, 93, 94, 95, 96, 0, 0,
- 249, 248, 245, 82, 0, 0, 0, 0, 190, 0,
- 0, 0, 0, 0, 181, 182, 0, 0, 81, 225,
- 193, 178, 97, 111, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 2, 3, 0,
- 0, 0, 0, 239, 0, 0, 110, 129, 114, 240,
- 128, 216, 217, 218, 219, 220, 221, 244, 0, 0,
- 0, 251, 250, 260, 291, 259, 246, 247, 0, 0,
- 0, 0, 203, 191, 185, 183, 173, 174, 0, 0,
- 0, 0, 130, 0, 0, 113, 135, 137, 0, 0,
- 142, 136, 253, 0, 252, 0, 0, 72, 76, 71,
- 75, 70, 74, 69, 73, 77, 78, 0, 290, 0,
- 271, 0, 98, 6, 7, 8, 9, 10, 11, 12,
- 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 0, 0, 0, 0, 0, 0, 0,
- 0, 52, 53, 54, 55, 0, 0, 0, 0, 68,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 0, 0, 0, 0, 0, 98, 263, 0,
- 287, 198, 195, 194, 196, 197, 199, 202, 0, 106,
- 106, 115, 116, 117, 118, 119, 120, 121, 122, 123,
- 124, 125, 0, 0, 0, 0, 106, 106, 0, 0,
- 0, 134, 214, 141, 139, 0, 228, 229, 230, 233,
- 234, 235, 231, 232, 226, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 237, 242,
- 241, 243, 0, 254, 0, 277, 270, 0, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 35, 0, 50,
- 51, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 0, 101, 101, 296, 0,
- 0, 285, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 200, 0, 188, 189,
- 156, 157, 4, 5, 154, 155, 158, 149, 150, 153,
- 0, 0, 0, 0, 152, 151, 186, 187, 112, 112,
- 138, 213, 207, 210, 211, 0, 0, 131, 227, 0,
- 0, 0, 0, 0, 0, 0, 0, 172, 0, 0,
+ 198, 0, 90, 184, 1, 183, 231, 83, 84, 85,
+ 86, 87, 88, 89, 0, 91, 255, 180, 181, 255,
+ 210, 211, 0, 0, 0, 90, 0, 186, 228, 0,
+ 0, 92, 93, 94, 95, 96, 97, 0, 0, 256,
+ 252, 82, 225, 226, 227, 251, 0, 0, 0, 0,
+ 196, 0, 0, 0, 0, 0, 0, 0, 81, 229,
+ 230, 91, 199, 182, 98, 2, 3, 111, 115, 116,
+ 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
+ 128, 0, 0, 0, 0, 246, 0, 0, 110, 127,
+ 114, 247, 129, 222, 223, 224, 300, 254, 0, 0,
+ 0, 0, 209, 197, 187, 185, 177, 178, 0, 0,
+ 0, 0, 232, 130, 0, 0, 0, 113, 135, 139,
+ 0, 0, 144, 138, 299, 0, 278, 0, 0, 0,
+ 0, 91, 267, 257, 258, 6, 7, 8, 9, 10,
+ 11, 12, 13, 14, 15, 16, 17, 18, 19, 52,
+ 53, 54, 55, 20, 21, 22, 23, 24, 25, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 68, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 0, 0, 0, 0,
+ 0, 266, 253, 91, 270, 0, 296, 204, 201, 200,
+ 202, 203, 205, 208, 0, 192, 194, 190, 115, 116,
+ 117, 118, 119, 120, 121, 122, 123, 124, 125, 0,
+ 0, 0, 0, 188, 0, 0, 0, 0, 0, 134,
+ 220, 143, 141, 0, 0, 284, 277, 260, 259, 0,
+ 0, 72, 76, 71, 75, 70, 74, 69, 73, 77,
+ 78, 0, 0, 26, 27, 28, 29, 30, 31, 32,
+ 33, 34, 35, 0, 50, 51, 46, 47, 48, 49,
+ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 0, 101, 101, 305, 0, 0, 294, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 206, 106, 106, 106, 160, 161, 4,
+ 5, 158, 159, 162, 157, 153, 154, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 292, 0, 294, 289, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 201,
- 0, 0, 108, 106, 144, 0, 0, 148, 0, 145,
- 132, 133, 206, 208, 0, 104, 140, 0, 0, 0,
- 289, 0, 0, 0, 0, 0, 236, 0, 0, 0,
+ 0, 0, 0, 156, 155, 106, 112, 112, 137, 0,
+ 140, 219, 213, 216, 217, 0, 0, 131, 235, 236,
+ 237, 242, 238, 239, 240, 241, 233, 0, 244, 249,
+ 248, 250, 0, 261, 0, 0, 0, 0, 0, 301,
+ 0, 303, 298, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 299, 0, 0, 0, 281, 282, 0, 0, 0,
- 0, 0, 278, 279, 0, 297, 0, 103, 109, 107,
- 143, 146, 147, 212, 209, 105, 99, 0, 0, 0,
- 0, 0, 0, 0, 0, 171, 0, 0, 0, 0,
- 0, 0, 0, 269, 0, 0, 101, 102, 101, 266,
- 288, 0, 0, 0, 0, 0, 272, 273, 274, 269,
- 0, 0, 215, 238, 0, 0, 160, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 268, 0,
- 0, 0, 0, 293, 295, 0, 0, 0, 280, 283,
- 284, 0, 298, 100, 0, 0, 0, 168, 0, 0,
- 162, 163, 164, 167, 159, 0, 257, 0, 0, 0,
- 275, 276, 267, 264, 0, 286, 165, 166, 0, 0,
- 0, 255, 0, 256, 0, 0, 265, 161, 169, 170,
- 0, 0, 0, 0, 0, 0, 262, 0, 0, 261,
- 0, 258
+ 207, 0, 193, 195, 191, 0, 0, 0, 0, 0,
+ 0, 0, 146, 176, 0, 0, 0, 150, 0, 147,
+ 0, 0, 0, 0, 0, 189, 132, 133, 136, 212,
+ 214, 0, 104, 142, 234, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 308, 0, 0, 0,
+ 288, 291, 0, 0, 289, 290, 0, 0, 0, 285,
+ 286, 0, 306, 0, 0, 0, 108, 106, 0, 0,
+ 298, 0, 0, 0, 0, 0, 145, 135, 114, 0,
+ 148, 149, 0, 0, 0, 0, 0, 218, 215, 105,
+ 99, 0, 243, 0, 0, 276, 0, 0, 101, 102,
+ 101, 273, 297, 0, 0, 0, 0, 0, 279, 280,
+ 281, 276, 0, 103, 109, 107, 0, 0, 0, 0,
+ 0, 0, 0, 175, 152, 0, 0, 0, 0, 0,
+ 0, 0, 221, 0, 0, 0, 275, 0, 282, 283,
+ 0, 302, 304, 0, 0, 0, 287, 292, 293, 0,
+ 307, 0, 0, 164, 0, 0, 0, 0, 151, 0,
+ 0, 0, 0, 0, 100, 245, 0, 0, 0, 274,
+ 271, 0, 295, 0, 0, 0, 172, 0, 0, 166,
+ 167, 168, 171, 163, 0, 264, 0, 0, 0, 272,
+ 169, 170, 0, 0, 0, 262, 0, 263, 0, 0,
+ 165, 173, 174, 0, 0, 0, 0, 0, 0, 269,
+ 0, 0, 268, 265
};
/* YYDEFGOTO[NTERM-NUM]. */
static const short int yydefgoto[] =
{
- -1, 83, 334, 263, 264, 265, 288, 305, 266, 267,
- 232, 233, 147, 234, 24, 15, 38, 502, 380, 402,
- 466, 328, 403, 84, 85, 235, 87, 88, 128, 245,
- 367, 268, 368, 118, 1, 2, 57, 3, 61, 214,
- 48, 113, 218, 89, 413, 353, 354, 355, 39, 93,
- 16, 96, 17, 29, 18, 359, 269, 90, 271, 489,
- 41, 42, 43, 105, 106, 548, 107, 311, 518, 519,
- 207, 208, 441, 209, 210
+ -1, 85, 311, 328, 329, 330, 263, 280, 331, 332,
+ 219, 220, 251, 221, 25, 15, 37, 522, 369, 456,
+ 480, 392, 457, 86, 87, 222, 89, 90, 120, 233,
+ 403, 358, 404, 108, 1, 2, 3, 335, 306, 304,
+ 305, 63, 200, 50, 103, 204, 91, 420, 343, 344,
+ 345, 38, 95, 16, 44, 17, 61, 18, 28, 425,
+ 359, 92, 361, 491, 19, 40, 41, 191, 192, 577,
+ 97, 286, 526, 527, 193, 194, 436, 195, 196
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -501
+#define YYPACT_NINF -541
static const short int yypact[] =
{
- -501, 82, 9, 975, -501, -501, 72, -501, -501, -501,
- -501, -501, -501, -501, 29, 34, 94, -501, -501, -501,
- -501, -28, -42, 66, 127, 25, -501, -501, -501, 34,
- 122, 199, -501, -501, -501, -501, -501, -501, 839, -17,
- -501, -19, -501, 47, 67, 68, 69, 75, -501, 71,
- 122, 839, 11, 11, -501, -501, 11, 11, -501, -501,
- -501, -501, -501, 76, -501, -501, -501, -501, -501, -501,
- -501, -501, -501, -501, -501, -501, -501, -501, -501, 207,
- 210, 211, 518, -501, 123, 77, -501, -501, -84, -501,
- -501, -501, -501, -501, -501, -501, -501, -501, 876, 8,
- 253, -501, -501, -501, 1333, -501, -501, -501, 203, 80,
- 217, 206, 208, -501, -501, -501, -501, -501, 922, 922,
- 960, 922, -501, 83, 84, -501, -501, -84, -134, 88,
- 604, -501, 76, 1131, -501, 1131, 1131, -501, -501, -501,
- -501, -501, -501, -501, -501, -501, -501, 1131, -501, 922,
- -501, 177, 34, -501, -501, -501, -501, -501, -501, -501,
- -501, -501, -501, -501, -501, -501, -501, -501, -501, -501,
- -501, -501, -501, 103, 81, 922, 922, 922, 922, 922,
- 922, -501, -501, -501, -501, 922, 922, 922, 922, -501,
- -501, -501, -501, -501, -501, -501, -501, -501, -501, -501,
- -501, -501, 922, 922, 922, 922, 922, 34, -501, 20,
- -501, -501, -501, -501, -501, -501, -501, -501, -44, 91,
- 91, 130, 143, 226, 145, 227, 161, 230, 163, 231,
- 232, 233, 165, 234, 245, 1042, 91, 91, 922, 922,
- 922, -501, 679, -501, 99, 113, -501, -501, -501, -501,
- -501, -501, -501, -501, 205, 103, 81, 119, 120, 125,
- 128, 129, 960, 133, 134, 135, 139, 140, -501, -501,
- -501, -501, 124, -501, 149, -501, -501, 839, -501, -501,
- -501, -501, -501, -501, -501, -501, -501, -501, 922, -501,
- -501, -501, -501, -501, -501, -501, -501, -501, -501, -501,
- -501, -501, -501, -501, -501, 922, 150, 151, -501, 1131,
- 136, 153, 154, 155, 156, 157, 158, 1131, 1131, 1131,
- 159, 241, 839, 922, 922, 251, -501, -18, -501, -501,
- -501, -501, -501, -501, -501, -501, -501, -501, -501, -501,
- 717, 960, 549, 265, -501, -501, -501, -501, -69, -50,
- -84, -501, 123, -501, 160, 142, 763, -501, -501, 283,
- 164, 166, 960, 960, 960, 960, 960, -501, -110, 960,
- 960, 960, 960, 960, 302, 304, 1131, 1131, 1131, 1,
- -501, 12, -501, 169, 1131, 167, 922, 922, 922, 922,
- 922, 172, 173, 176, 922, 922, 1131, 1131, 178, -501,
- 299, 314, -501, 91, -501, -40, -68, -501, -74, -501,
- -501, -501, -501, -501, 801, 301, -501, 184, 960, 960,
- 169, 187, 188, 189, 190, 960, -501, 194, 195, 201,
- 209, 316, 1131, 1131, 204, 212, 213, 1131, 341, 1131,
- 922, -501, 214, 1131, 215, -501, -501, 216, 220, 1131,
- 1131, 1131, -501, -501, 219, -501, 922, -501, -501, -501,
- -501, -501, -501, -501, -501, -501, 303, 332, 222, 228,
- 229, 960, 960, 960, 960, -501, 960, 960, 960, 960,
- 922, 238, 235, 922, 1131, 1131, 240, -501, 240, -501,
- 243, 1131, 244, 922, 922, 922, -501, -501, -501, 922,
- 1131, 345, -501, -501, 960, 960, -501, 246, 242, 247,
- 248, 252, 254, 255, 256, 257, 354, 26, 243, 258,
- 259, 260, 325, -501, -501, 922, 225, 1131, -501, -501,
- -501, 261, -501, -501, 262, 269, 960, -501, 960, 960,
- -501, -501, -501, -501, -501, 1131, -501, 1220, 56, 347,
- -501, -501, -501, -501, 250, -501, -501, -501, 270, 271,
- 272, -501, 249, -501, 1220, 378, -501, -501, -501, -501,
- 391, 276, 1131, 1131, 415, 138, -501, 1131, 416, -501,
- 1131, -501
+ -541, 28, 61, 478, -541, -541, -541, -541, -541, -541,
+ -541, -541, -541, -541, 23, 152, 45, -541, -541, -9,
+ -541, -541, -20, -51, 76, 69, 12, -541, 97, 149,
+ 172, -541, -541, -541, -541, -541, -541, 1331, -19, -541,
+ -541, 137, -541, -541, -541, -541, 49, 58, 60, 62,
+ -541, 72, 149, 1331, 88, 88, 88, 88, -541, -541,
+ -541, 152, -541, -541, -541, -541, -541, 75, -541, -541,
+ -541, -541, -541, -541, -541, -541, -541, -541, -541, -541,
+ -541, 227, 228, 3, 691, -541, 137, 79, -541, -541,
+ -46, -541, -541, -541, -541, -541, 1585, -541, 212, 136,
+ 233, 214, 216, -541, -541, -541, -541, -541, 1392, 1392,
+ 1392, 1433, -541, -541, 83, 87, 711, -541, -541, -46,
+ -70, 89, 777, -541, -541, 1392, -541, 183, 1453, 6,
+ 309, 152, -541, -541, -541, -541, -541, -541, -541, -541,
+ -541, -541, -541, -541, -541, -541, -541, -541, -541, -541,
+ -541, -541, -541, -541, -541, -541, -541, -541, -541, 59,
+ 142, 1392, 1392, 1392, 1392, 1392, 1392, 1392, 1392, 1392,
+ 1392, 1392, 1392, -541, -541, -541, -541, -541, -541, -541,
+ -541, -541, -541, -541, -541, -541, 1392, 1392, 1392, 1392,
+ 1392, -541, -541, 152, -541, 86, -541, -541, -541, -541,
+ -541, -541, -541, -541, -129, -541, -541, -541, 169, 196,
+ 242, 200, 246, 203, 252, 205, 253, 251, 258, 221,
+ 255, 259, 533, -541, 1392, 1392, 99, -63, 1392, -541,
+ 1173, -541, 128, 126, 894, -541, -541, 75, -541, 894,
+ 894, -541, -541, -541, -541, -541, -541, -541, -541, -541,
+ -541, 894, 1331, -541, -541, -541, -541, -541, -541, -541,
+ -541, -541, -541, 1392, -541, -541, -541, -541, -541, -541,
+ -541, -541, -541, -541, -541, -541, -541, -541, -541, -541,
+ 1392, 130, 133, -541, 894, 132, 138, 139, 143, 144,
+ 151, 155, 156, 157, 894, 894, 894, 163, 254, 1331,
+ 1392, 1392, 271, -541, 164, 164, 164, -541, -541, -541,
+ -541, -541, -541, -541, -541, -541, -541, 59, 142, 173,
+ 174, 175, 176, 177, 1214, 1494, 732, 281, 178, 179,
+ 180, 182, 190, -541, -541, 164, -42, -135, -541, 166,
+ -46, -541, 137, -541, 193, 191, 1234, -541, -541, -541,
+ -541, -541, -541, -541, -541, -541, 290, 1433, -541, -541,
+ -541, -541, 201, -541, 202, 894, 894, 894, 7, -541,
+ 10, -541, 204, 894, 199, 1392, 1392, 1392, 1392, 1392,
+ 1392, 1392, 211, 215, 217, 1392, 1392, 894, 894, 223,
+ -541, -21, -541, -541, -541, 210, 219, 1433, 1433, 1433,
+ 1433, 1433, -541, -541, 4, 752, -91, -541, -8, -541,
+ 1433, 1433, 1433, 1433, 1433, -541, -541, -541, -541, -541,
+ -541, 1275, 324, -541, -541, 343, 37, 348, 356, 224,
+ 225, 229, 894, 376, 894, 1392, -541, 230, 894, 232,
+ -541, -541, 234, 235, -541, -541, 894, 894, 894, -541,
+ -541, 226, -541, 1392, 362, 385, -541, 164, 1433, 1433,
+ 204, 238, 239, 240, 241, 1433, -541, 243, -17, -5,
+ -541, -541, 247, 250, 261, 262, 359, -541, -541, -541,
+ 339, 268, -541, 894, 894, 1392, 894, 894, 269, -541,
+ 269, -541, 270, 894, 272, 1392, 1392, 1392, -541, -541,
+ -541, 1392, 894, -541, -541, -541, 273, 274, 249, 1433,
+ 1433, 1433, 1433, -541, -541, 245, 1433, 1433, 1433, 1433,
+ 1392, 395, -541, 383, 275, 267, 270, 279, -541, -541,
+ 351, -541, -541, 1392, 277, 894, -541, -541, -541, 282,
+ -541, 1433, 1433, -541, 278, 283, 284, 288, -541, 289,
+ 291, 295, 296, 297, -541, -541, 423, 43, 410, -541,
+ -541, 298, -541, 300, 305, 1433, -541, 1433, 1433, -541,
+ -541, -541, -541, -541, 894, -541, 1020, 64, 441, -541,
+ -541, -541, 307, 311, 314, -541, 312, -541, 1020, 894,
+ -541, -541, -541, 450, 319, 150, 894, 452, 453, -541,
+ 894, 894, -541, -541
};
/* YYPGOTO[NTERM-NUM]. */
static const short int yypgoto[] =
{
- -501, -501, -501, 328, 329, 330, 181, 185, 333, 336,
- -98, -97, -500, -501, 400, 420, -136, -501, -300, 31,
- -501, -216, -501, -45, -501, -38, -501, -81, 317, -501,
- 126, 218, -208, 74, -501, -501, -501, -501, 398, -501,
- -501, -501, -501, 2, -501, 35, -501, -501, 423, -501,
- -501, -501, -501, -501, 451, -501, -471, -106, -62, -90,
- -501, 417, -501, -116, -501, -501, -501, -501, 22, -39,
- -501, -501, 43, -501, -501
+ -541, -541, -541, 379, 380, 381, 161, 162, 386, 388,
+ -128, -127, -540, -541, 438, 456, -111, -541, -277, 63,
+ -541, -297, -541, -47, -541, -37, -541, -53, 40, -541,
+ -99, 264, -307, 84, -541, -541, -541, -541, -541, -541,
+ -541, 435, -541, -541, -541, -541, 8, -541, 68, -541,
+ -541, 427, -541, -541, -541, -541, -541, 487, -541, -541,
+ -489, -199, 67, -124, -541, 472, -541, -103, -541, -541,
+ -541, -541, 71, -7, -541, -541, 33, -541, -541
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -176
+#define YYTABLE_NINF -180
static const short int yytable[] =
{
- 86, 127, 145, 146, 329, 25, 115, 382, 134, -175,
- 40, 437, 135, 86, 94, 91, 277, 547, 240, 400,
- 346, 347, 439, 136, 44, 45, 46, 270, 241, 270,
- 270, 137, 138, 139, 140, 141, 142, 143, 144, 401,
- 5, 270, 425, 6, 47, 25, 116, 117, 564, 127,
- 426, 7, 8, 9, 10, 11, 12, 13, 438, 275,
- 133, 137, 138, 139, 140, 141, 142, 143, 144, 438,
- -112, 322, 14, 272, 273, 19, 562, 20, 425, 131,
- 219, 220, 4, 237, 425, 274, 129, 308, 462, 410,
- 312, 30, 461, 571, 131, 313, 314, 315, 316, 31,
- 32, 33, 34, 35, 36, 37, 289, 290, 325, 49,
- 411, 133, 425, 131, 326, 320, 321, 27, 460, 28,
- 98, 99, 100, 40, 101, 102, 103, 119, 50, 345,
- 120, 121, 405, 406, 408, 212, 213, 306, 307, 133,
- 309, 310, 133, 95, 92, 323, 324, 133, 133, 133,
- 133, 19, 60, 20, 51, 330, 331, 348, 349, 350,
- -72, -72, -71, -71, 317, 318, 319, 133, 133, 7,
- 8, 9, 52, 11, 53, 13, 58, 54, -70, -70,
- -69, -69, 332, 333, 546, 55, 523, 459, 524, 291,
- 292, 293, 294, 295, 296, 297, 298, 299, 300, 301,
- 302, 303, 304, 270, 352, 278, 279, 280, 281, 282,
- 283, 270, 270, 270, 563, 101, 102, 62, 108, 109,
- 110, 284, 285, 286, 287, 122, 111, 112, 123, 124,
- -113, 130, 376, 211, 398, 215, 216, 276, 217, 86,
- 238, 239, 242, 327, -76, -75, 236, 383, -74, -73,
- 377, 356, 335, -79, -80, 391, 392, 393, 137, 138,
- 139, 140, 141, 142, 143, 144, 336, 378, 357, 358,
- 270, 270, 270, 362, 363, 350, 374, 396, 270, 364,
- 395, 399, 365, 366, 86, 397, 133, 369, 370, 371,
- 270, 270, 384, 372, 373, 409, 444, 415, 446, 447,
- 448, 375, 379, 381, 452, 385, 386, 387, 388, 389,
- 390, 394, 414, 417, 434, 435, 436, 432, 418, 433,
- 419, 440, 442, 443, 449, 450, 270, 270, 451, 457,
- 456, 270, 458, 270, 454, 455, 467, 270, 400, 471,
- 472, 473, 474, 270, 270, 270, 476, 477, 133, 445,
- 133, 133, 133, 478, 412, 480, 133, 453, 483, 487,
- 501, 479, 503, 533, 484, 485, 491, 493, 494, 545,
- 481, 482, 495, 499, 504, 486, 352, 488, 270, 270,
- 505, 492, 438, 553, 506, 270, 565, 496, 497, 498,
- 516, 517, 522, 572, 270, 525, 527, 537, 536, 538,
- 539, 570, 133, 528, 529, 530, 573, 540, 566, 541,
- 542, 543, 544, 549, 550, 551, 555, 556, 500, 145,
- 146, 270, 520, 521, 557, 567, 568, 569, 574, 526,
- 577, 580, 202, 203, 204, 552, 360, 205, 532, 270,
- 206, 361, 515, 104, 56, 133, 465, 244, 114, 464,
- 145, 146, 59, 344, 26, 133, 133, 133, 97, 578,
- 531, 133, 490, 470, 0, 554, 270, 270, 0, 0,
- 0, 270, 0, 0, 270, 0, 0, 0, 0, 0,
- 0, 0, 0, 561, 0, 0, 0, 133, 420, 421,
- 422, 423, 424, 0, 0, 427, 428, 429, 430, 431,
+ 88, 235, 249, 250, 238, 371, 105, 115, 393, 394,
+ 93, 26, 223, 454, 39, 239, 88, 576, 406, 408,
+ 252, 42, 432, 334, 302, 434, 417, 240, 4, 123,
+ 303, 119, 46, 47, 48, 360, 455, 588, 415, 283,
+ 360, 360, 287, 288, 289, 290, 291, 292, 293, 26,
+ 426, 49, 360, 241, 242, 243, 244, 245, 246, 247,
+ 248, -179, 465, 119, 433, 297, 298, 433, 39, 119,
+ 470, 205, 206, 207, 241, 242, 243, 244, 245, 246,
+ 247, 248, 299, 228, 29, 360, 5, 586, 234, 53,
+ 228, 234, 6, 229, 121, 360, 360, 360, 469, 594,
+ 339, 51, 7, 8, 9, 10, 11, 12, 13, -112,
+ 7, 8, 9, 10, 54, 12, 55, 416, 123, 56,
+ 106, 107, 123, 14, 281, 282, 234, 284, 285, 234,
+ 234, 234, 234, 234, 234, 234, -139, 52, -112, 109,
+ 110, 111, 59, 94, 60, 465, -139, 123, 465, 294,
+ 295, 296, 234, 234, 43, 471, 227, 465, 515, 20,
+ 505, 21, 232, 466, 58, 116, 360, 360, 360, 264,
+ 265, 336, 337, 62, 360, 340, 64, 389, 253, 254,
+ 255, 256, 257, 258, 259, 260, 261, 262, 360, 360,
+ 465, 198, 199, 342, 300, 301, 307, 308, 482, -72,
+ -72, 98, 575, -71, -71, 365, -70, -70, -69, -69,
+ 99, 531, 100, 532, 101, 88, 30, 31, 32, 33,
+ 34, 35, 36, 587, 309, 310, 366, 133, 134, 102,
+ -113, 113, 114, 360, 122, 360, 197, 201, 202, 360,
+ 203, 224, 236, 367, 230, 225, -76, 360, 360, 360,
+ -75, 439, 387, 441, 442, 443, -74, -73, -79, 312,
+ 338, 449, 88, 388, 234, -80, 313, 266, 267, 268,
+ 269, 270, 271, 272, 273, 274, 275, 276, 277, 278,
+ 279, 346, 347, 368, 360, 360, 370, 360, 360, 373,
+ 386, 374, 375, 340, 360, 390, 376, 377, 460, 461,
+ 462, 463, 464, 360, 378, 409, 362, 363, 379, 380,
+ 381, 472, 473, 474, 475, 476, 385, 391, 364, 241,
+ 242, 243, 244, 245, 246, 247, 248, 418, 397, 398,
+ 399, 400, 401, 410, 411, 412, 360, 413, 234, 440,
+ 234, 234, 234, 444, 445, 414, 421, 422, 234, 450,
+ 419, 372, 468, 424, 427, 428, 438, 435, 454, 506,
+ 507, 382, 383, 384, 446, 458, 513, 481, 447, 483,
+ 448, 536, 537, 538, 459, 360, 453, 484, 486, 485,
+ 489, 501, 487, 493, 342, 495, 503, 496, 497, 504,
+ 360, 509, 510, 511, 512, 520, 521, 360, 234, 554,
+ 516, 360, 360, 517, 514, 543, 548, 555, 433, 559,
+ 544, 545, 546, 547, 518, 519, 502, 549, 550, 551,
+ 552, 523, 530, 533, 557, 535, 541, 542, 556, 249,
+ 250, 565, 429, 430, 431, 558, 560, 567, 562, 566,
+ 437, 568, 563, 564, 574, 569, 578, 570, 234, 249,
+ 250, 571, 572, 573, 451, 452, 580, 579, 234, 234,
+ 234, 581, 589, 590, 234, 593, 582, 591, 583, 584,
+ 592, 596, 597, 600, 601, 186, 187, 188, 395, 96,
+ 396, 57, 189, 553, 190, 479, 333, 104, 112, 478,
+ 27, 45, 598, 508, 539, 0, 234, 0, -82, 488,
+ 20, 490, 21, 0, 0, 494, 492, 0, 0, 6,
+ -82, -82, 0, 498, 499, 500, 0, 0, 0, -82,
+ -82, -82, -82, -82, -82, -82, 0, 0, -82, 22,
+ 0, 0, 0, 0, 0, 0, 23, 0, 65, 66,
+ 24, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 524, 525, 0, 528, 529, 20, 0, 21, 0, 314,
+ 534, 0, 0, 0, 0, 0, 0, 0, 0, 540,
+ 0, 315, 316, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 561, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 135, 136, 137, 138, 139, 140, 141, 142,
+ 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+ 153, 154, 155, 156, 157, 158, 317, 318, 0, 0,
+ 0, 585, 0, 319, 0, 320, 0, 321, 322, 323,
+ 0, 0, 0, 0, 0, 0, 595, 0, 0, 0,
+ 0, 0, 0, 599, 0, 0, 0, 602, 603, 0,
+ 0, 0, 173, 174, 175, 176, 177, 178, 179, 180,
+ 181, 182, 183, 184, 185, 0, 0, 0, 0, 0,
+ 324, 0, 0, 325, 0, 326, 65, 66, 327, 117,
+ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 0, 79, 20, 0, 21, 65, 66, 0, 117,
+ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 0, 79, 20, 0, 21, 0, 65, 66, 80,
+ 117, 208, 209, 210, 211, 212, 213, 214, 215, 216,
+ 217, 218, 0, 79, 20, 0, 21, 65, 66, 80,
+ 117, 208, 209, 210, 211, 212, 213, 214, 215, 216,
+ 217, 218, 0, 79, 20, 0, 21, 0, 0, 0,
+ 80, 0, 65, 66, 0, 117, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 0, 79, 20,
+ 80, 21, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 231, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 80, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 81, 0, 0, 82, 0,
+ 0, 83, 0, 84, 118, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 81, 0, 0, 82, 0,
+ 0, 83, 0, 84, 226, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 81, 0, 0, 82,
+ 0, 0, 83, 0, 84, 407, 0, 348, 349, 65,
+ 66, 350, 0, 0, 0, 0, 81, 0, 0, 82,
+ 0, 0, 83, 0, 84, 467, 20, 0, 21, 0,
+ 351, 352, 353, 0, 0, 0, 0, 0, 0, 0,
+ 0, 81, 354, 355, 82, 0, 0, 83, 0, 84,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 356, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 575, 576, 0, 0, 0, 579, 0, 0, 581, 0,
- 0, 125, 64, 65, 66, 67, 68, 69, 70, 71,
- 72, 73, 74, 75, 76, 0, 0, 77, 78, 0,
- 0, 0, 0, 0, 468, 469, 19, 0, 20, 0,
- 0, 475, 125, 221, 222, 223, 224, 225, 226, 227,
- 228, 229, 230, 231, 75, 76, 0, 0, 77, 78,
- 0, 0, 0, 0, 0, 0, 0, 19, 0, 20,
+ 0, 0, 0, 135, 136, 137, 138, 139, 140, 141,
+ 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+ 152, 153, 154, 155, 156, 157, 158, 317, 318, 0,
+ 0, 0, 0, 0, 319, 0, 320, 0, 321, 322,
+ 323, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 348, 349, 0, 0, 350, 0, 0,
+ 0, 0, 0, 173, 174, 175, 176, 177, 178, 179,
+ 180, 181, 182, 183, 184, 185, 351, 352, 353, 0,
+ 0, 0, 0, 0, 357, 0, 0, 0, 354, 355,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 507, 508, 509,
- 510, 0, 511, 512, 513, 514, 0, 125, 64, 65,
- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 0, 0, 77, 78, 0, 0, 0, 0, 0,
- 534, 535, 19, 0, 20, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 243, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 558, 0, 559, 560, 0, 0, 0, 0,
- 0, 79, 0, 0, 80, 0, 0, 81, 0, 82,
- 126, 0, 125, 64, 65, 66, 67, 68, 69, 70,
- 71, 72, 73, 74, 75, 76, 0, 0, 77, 78,
- 0, 0, 79, 0, 0, 80, 0, 19, 81, 20,
- 82, 407, 0, 0, 0, 0, 0, 0, 0, 351,
- 125, 221, 222, 223, 224, 225, 226, 227, 228, 229,
- 230, 231, 75, 76, 0, 0, 77, 78, 0, 0,
- 0, 0, 0, 0, 0, 19, 0, 20, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 79, 0, 0,
- 80, 0, 0, 81, 0, 82, 125, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 0, 0, 77, 78, 0, 0, 0, 0, 0, 0,
- 0, 19, 0, 20, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 416, 125, 64, 65, 66, 67, 68,
- 69, 70, 71, 72, 73, 74, 75, 76, 0, 0,
- 77, 78, 0, 0, 0, 0, 0, 0, 0, 19,
- 0, 20, 79, 0, 0, 80, 0, 0, 81, 0,
- 82, 463, 63, 64, 65, 66, 67, 68, 69, 70,
- 71, 72, 73, 74, 75, 76, 0, 0, 77, 78,
- 0, 0, 0, 0, 0, 0, 0, 19, 0, 20,
- 79, 0, 0, 80, 0, 404, 81, 0, 82, 132,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, 76, 0, 0, 77, 78, 0, 0, 0,
- 0, 0, 0, 0, 19, 0, 20, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 79, 0, 0, 80,
- 0, 0, 81, 0, 82, 125, 64, 65, 66, 67,
- 68, 69, 70, 71, 72, 73, 74, 75, 76, 0,
- 0, 77, 78, 0, 0, 0, 0, 0, 0, 0,
- 19, 0, 20, 0, 79, 0, 0, 80, 0, 0,
- 81, 0, 82, 125, 221, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 75, 76, 0, 0, 77,
- 78, 0, 0, 0, 0, 0, 0, 0, 19, 0,
- 20, 0, 79, 0, 0, 80, 0, 0, 81, 0,
- 82, 0, -82, 19, 0, 20, 0, 0, 0, 6,
- -82, -82, 0, 0, 0, 0, 0, -82, -82, -82,
- -82, -82, -82, -82, 0, -82, 21, 0, 0, 79,
- 0, 0, 80, -82, 22, 81, 0, 82, 23, 0,
+ 0, 356, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 135,
+ 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
+ 146, 147, 148, 149, 150, 151, 152, 153, 154, 155,
+ 156, 157, 158, 317, 318, 0, 0, 0, 0, 0,
+ 319, 0, 320, 0, 321, 322, 323, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 173,
+ 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
+ 184, 185, 0, 0, 0, 0, 0, 0, 65, 66,
+ 357, 117, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 0, 79, 20, 0, 21, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 77, 78, 0, 337, 338, 339, 0, 0, 0,
- 19, 0, 20, 0, 0, 79, 0, 0, 80, 0,
- 0, 81, 0, 82, 0, 0, 0, 0, 0, 0,
+ 341, 0, 0, 0, 0, 0, 0, 0, 0, 65,
+ 66, 80, 117, 208, 209, 210, 211, 212, 213, 214,
+ 215, 216, 217, 218, 0, 79, 20, 0, 21, 65,
+ 66, 0, 117, 68, 69, 70, 71, 72, 73, 74,
+ 75, 76, 77, 78, 0, 79, 20, 0, 21, 0,
+ 0, 0, 80, 0, 0, 0, 0, 0, 0, 0,
+ 0, 423, 0, 0, 0, 0, 0, 0, 0, 0,
+ 65, 66, 80, 117, 68, 69, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 0, 79, 20, 0, 21,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 477, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 80, 0, 0, 0, 81, 0, 0,
+ 82, 0, 0, 83, 0, 84, 65, 66, 0, 67,
+ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 0, 79, 20, 0, 21, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 81, 0,
+ 0, 82, 0, 402, 83, 0, 84, 0, 0, 80,
+ 0, 0, 0, 0, 0, 0, 0, 0, 81, 0,
+ 0, 82, 0, 0, 83, 0, 84, 65, 66, 0,
+ 117, 68, 69, 70, 71, 72, 73, 74, 75, 76,
+ 77, 78, 0, 79, 20, 0, 21, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 81,
+ 0, 0, 82, 0, 0, 83, 0, 84, 65, 66,
+ 80, 117, 208, 209, 210, 211, 212, 213, 214, 215,
+ 216, 217, 218, 0, 79, 20, 0, 21, 65, 66,
+ 0, 237, 68, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 0, 79, 20, 0, 21, 0, 0,
+ 0, 80, 0, 0, 0, 81, 0, 0, 82, 0,
+ 0, 83, 0, 84, 0, 0, 0, 0, 0, 65,
+ 66, 80, 117, 208, 209, 210, 211, 212, 213, 214,
+ 215, 216, 217, 218, 0, 79, 20, 0, 21, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 79, 0, 0, 80, 0, 0, 81,
- 0, 82, 153, 154, 155, 156, 157, 158, 159, 160,
- 161, 162, 163, 164, 165, 166, 167, 168, 169, 170,
- 171, 172, 255, 256, 0, 0, 0, 0, 246, 247,
- 77, 78, 248, 249, 250, 251, 252, 253, 0, 19,
- 0, 20, 0, 0, 0, 0, 0, 0, 0, 257,
- 0, 258, 181, 182, 183, 184, 0, 259, 260, 261,
- 189, 190, 191, 192, 193, 194, 195, 196, 197, 198,
- 199, 200, 201, 254, 0, 0, 0, 0, 340, 0,
- 0, 341, 0, 342, 0, 0, 343, 0, 0, 0,
- 0, 153, 154, 155, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, 165, 166, 167, 168, 169, 170, 171,
- 172, 255, 256, 0, 0, 0, 0, 246, 247, 0,
- 0, 248, 249, 250, 251, 252, 253, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 257, 0,
- 258, 181, 182, 183, 184, 0, 259, 260, 261, 189,
- 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
- 200, 201, 254, 0, 0, 0, 0, 0, 0, 0,
- 262, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 153, 154, 155, 156, 157, 158, 159, 160, 161, 162,
- 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
- 255, 256, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 257, 0, 258,
- 181, 182, 183, 184, 0, 259, 260, 261, 189, 190,
- 191, 192, 193, 194, 195, 196, 197, 198, 199, 200,
- 201, 148, 0, 0, 0, 0, 0, 0, 0, 262,
- 0, 0, 149, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 150, 151, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 152,
- 0, 0, 0, 153, 154, 155, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
- 170, 171, 172, 173, 174, 0, 0, 0, 0, 0,
+ 0, 0, 80, 0, 0, 0, 81, 0, 0, 82,
+ 0, 0, 83, 0, 84, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 175, 176, 177, 0, 0,
- 178, 179, 180, 181, 182, 183, 184, 185, 186, 187,
- 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
- 198, 199, 200, 201
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 81, 0, 0,
+ 82, 0, 0, 83, 0, 84, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 81, 0, 0,
+ 82, 0, 0, 83, 0, 84, 0, 0, 0, 0,
+ 124, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 125, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 126, 127, 0, 0, 81, 0,
+ 0, 82, 0, 0, 83, 0, 405, 128, 129, 130,
+ 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
+ 141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
+ 151, 152, 153, 154, 155, 156, 157, 158, 159, 160,
+ 161, 162, 163, 0, 0, 164, 165, 166, 167, 168,
+ 169, 170, 171, 172, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 173, 174, 175, 176, 177, 178,
+ 179, 180, 181, 182, 183, 184, 185
};
static const short int yycheck[] =
{
- 38, 82, 100, 100, 220, 3, 51, 307, 98, 0,
- 29, 10, 4, 51, 33, 32, 152, 517, 152, 37,
- 236, 237, 10, 15, 52, 53, 54, 133, 162, 135,
- 136, 5, 6, 7, 8, 9, 10, 11, 12, 57,
- 31, 147, 152, 34, 72, 43, 35, 36, 548, 130,
- 160, 42, 43, 44, 45, 46, 47, 48, 57, 149,
- 98, 5, 6, 7, 8, 9, 10, 11, 12, 57,
- 154, 207, 63, 135, 136, 28, 547, 30, 152, 163,
- 118, 119, 0, 121, 152, 147, 84, 177, 162, 158,
- 180, 62, 160, 564, 163, 185, 186, 187, 188, 65,
- 66, 67, 68, 69, 70, 71, 25, 26, 152, 151,
- 160, 149, 152, 163, 158, 205, 206, 45, 158, 47,
- 73, 74, 75, 29, 77, 78, 79, 53, 62, 235,
- 56, 57, 340, 341, 342, 55, 56, 175, 176, 177,
- 178, 179, 180, 162, 161, 125, 126, 185, 186, 187,
- 188, 28, 30, 30, 27, 25, 26, 238, 239, 240,
- 17, 18, 17, 18, 202, 203, 204, 205, 206, 42,
- 43, 44, 45, 46, 47, 48, 151, 50, 17, 18,
- 17, 18, 17, 18, 158, 58, 486, 403, 488, 108,
- 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 120, 121, 309, 242, 102, 103, 104, 105, 106,
- 107, 317, 318, 319, 158, 77, 78, 18, 151, 151,
- 151, 118, 119, 120, 121, 18, 151, 156, 18, 18,
- 154, 154, 277, 30, 324, 18, 30, 60, 30, 277,
- 157, 157, 154, 152, 18, 18, 120, 309, 18, 18,
- 288, 152, 18, 21, 21, 317, 318, 319, 5, 6,
- 7, 8, 9, 10, 11, 12, 21, 305, 155, 64,
- 376, 377, 378, 154, 154, 356, 152, 322, 384, 154,
- 39, 30, 154, 154, 322, 323, 324, 154, 154, 154,
- 396, 397, 156, 154, 154, 30, 386, 155, 388, 389,
- 390, 152, 152, 152, 394, 152, 152, 152, 152, 152,
- 152, 152, 152, 30, 376, 377, 378, 15, 154, 15,
- 154, 152, 384, 156, 152, 152, 432, 433, 152, 30,
- 152, 437, 18, 439, 396, 397, 152, 443, 37, 152,
- 152, 152, 152, 449, 450, 451, 152, 152, 386, 387,
- 388, 389, 390, 152, 352, 39, 394, 395, 154, 18,
- 57, 152, 30, 18, 152, 152, 152, 152, 152, 15,
- 432, 433, 152, 154, 152, 437, 414, 439, 484, 485,
- 152, 443, 57, 158, 155, 491, 39, 449, 450, 451,
- 152, 156, 152, 15, 500, 152, 152, 155, 152, 152,
- 152, 152, 440, 493, 494, 495, 15, 155, 158, 155,
- 155, 155, 155, 155, 155, 155, 155, 155, 456, 517,
- 517, 527, 484, 485, 155, 155, 155, 155, 152, 491,
- 15, 15, 104, 104, 104, 525, 255, 104, 500, 545,
- 104, 256, 480, 43, 24, 483, 415, 130, 50, 414,
- 548, 548, 29, 235, 3, 493, 494, 495, 41, 575,
- 499, 499, 440, 420, -1, 527, 572, 573, -1, -1,
- -1, 577, -1, -1, 580, -1, -1, -1, -1, -1,
- -1, -1, -1, 545, -1, -1, -1, 525, 362, 363,
- 364, 365, 366, -1, -1, 369, 370, 371, 372, 373,
+ 37, 125, 130, 130, 128, 282, 53, 4, 305, 306,
+ 29, 3, 111, 34, 23, 9, 53, 557, 325, 326,
+ 131, 30, 15, 222, 153, 15, 161, 21, 0, 164,
+ 159, 84, 52, 53, 54, 234, 57, 577, 335, 163,
+ 239, 240, 166, 167, 168, 169, 170, 171, 172, 41,
+ 357, 71, 251, 10, 11, 12, 13, 14, 15, 16,
+ 17, 0, 153, 116, 57, 189, 190, 57, 23, 122,
+ 161, 108, 109, 110, 10, 11, 12, 13, 14, 15,
+ 16, 17, 193, 153, 61, 284, 25, 576, 125, 20,
+ 153, 128, 31, 163, 86, 294, 295, 296, 405, 588,
+ 163, 152, 41, 42, 43, 44, 45, 46, 47, 155,
+ 41, 42, 43, 44, 45, 46, 47, 159, 164, 50,
+ 32, 33, 164, 62, 161, 162, 163, 164, 165, 166,
+ 167, 168, 169, 170, 171, 172, 153, 61, 155, 55,
+ 56, 57, 45, 162, 47, 153, 163, 164, 153, 186,
+ 187, 188, 189, 190, 163, 163, 116, 153, 163, 22,
+ 457, 24, 122, 159, 152, 162, 365, 366, 367, 27,
+ 28, 224, 225, 24, 373, 228, 4, 301, 119, 120,
+ 121, 122, 123, 124, 125, 126, 127, 128, 387, 388,
+ 153, 55, 56, 230, 108, 109, 27, 28, 161, 3,
+ 4, 152, 159, 3, 4, 252, 3, 4, 3, 4,
+ 152, 488, 152, 490, 152, 252, 64, 65, 66, 67,
+ 68, 69, 70, 159, 3, 4, 263, 77, 78, 157,
+ 155, 4, 4, 432, 155, 434, 24, 4, 24, 438,
+ 24, 158, 59, 280, 155, 158, 4, 446, 447, 448,
+ 4, 375, 299, 377, 378, 379, 4, 4, 7, 4,
+ 161, 385, 299, 300, 301, 7, 7, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
+ 138, 153, 156, 153, 483, 484, 153, 486, 487, 157,
+ 36, 153, 153, 346, 493, 24, 153, 153, 397, 398,
+ 399, 400, 401, 502, 153, 24, 239, 240, 153, 153,
+ 153, 410, 411, 412, 413, 414, 153, 153, 251, 10,
+ 11, 12, 13, 14, 15, 16, 17, 161, 155, 155,
+ 155, 155, 155, 155, 155, 155, 535, 155, 375, 376,
+ 377, 378, 379, 380, 381, 155, 153, 156, 385, 386,
+ 342, 284, 405, 63, 153, 153, 157, 153, 34, 458,
+ 459, 294, 295, 296, 153, 155, 465, 24, 153, 21,
+ 153, 495, 496, 497, 155, 574, 153, 21, 153, 155,
+ 4, 155, 153, 153, 421, 153, 24, 153, 153, 4,
+ 589, 153, 153, 153, 153, 36, 57, 596, 435, 4,
+ 153, 600, 601, 153, 161, 156, 161, 24, 57, 533,
+ 509, 510, 511, 512, 153, 153, 453, 516, 517, 518,
+ 519, 153, 153, 153, 157, 153, 153, 153, 153, 557,
+ 557, 153, 365, 366, 367, 156, 159, 153, 156, 156,
+ 373, 153, 541, 542, 21, 156, 36, 156, 485, 577,
+ 577, 156, 156, 156, 387, 388, 156, 159, 495, 496,
+ 497, 156, 21, 156, 501, 153, 565, 156, 567, 568,
+ 156, 21, 153, 21, 21, 96, 96, 96, 317, 41,
+ 318, 25, 96, 520, 96, 422, 222, 52, 61, 421,
+ 3, 19, 595, 460, 501, -1, 533, -1, 20, 432,
+ 22, 434, 24, -1, -1, 438, 435, -1, -1, 31,
+ 32, 33, -1, 446, 447, 448, -1, -1, -1, 41,
+ 42, 43, 44, 45, 46, 47, -1, -1, 50, 51,
+ -1, -1, -1, -1, -1, -1, 58, -1, 5, 6,
+ 62, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 483, 484, -1, 486, 487, 22, -1, 24, -1, 26,
+ 493, -1, -1, -1, -1, -1, -1, -1, -1, 502,
+ -1, 38, 39, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 572, 573, -1, -1, -1, 577, -1, -1, 580, -1,
- -1, 3, 4, 5, 6, 7, 8, 9, 10, 11,
- 12, 13, 14, 15, 16, -1, -1, 19, 20, -1,
- -1, -1, -1, -1, 418, 419, 28, -1, 30, -1,
- -1, 425, 3, 4, 5, 6, 7, 8, 9, 10,
- 11, 12, 13, 14, 15, 16, -1, -1, 19, 20,
- -1, -1, -1, -1, -1, -1, -1, 28, -1, 30,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 471, 472, 473,
- 474, -1, 476, 477, 478, 479, -1, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, -1, -1, 19, 20, -1, -1, -1, -1, -1,
- 504, 505, 28, -1, 30, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 40, -1, -1, -1, -1, -1,
+ -1, -1, 535, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 79, 80, 81, 82, 83, 84, 85, 86,
+ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
+ 97, 98, 99, 100, 101, 102, 103, 104, -1, -1,
+ -1, 574, -1, 110, -1, 112, -1, 114, 115, 116,
+ -1, -1, -1, -1, -1, -1, 589, -1, -1, -1,
+ -1, -1, -1, 596, -1, -1, -1, 600, 601, -1,
+ -1, -1, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 149, 150, 151, -1, -1, -1, -1, -1,
+ 157, -1, -1, 160, -1, 162, 5, 6, 165, 8,
+ 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+ 19, -1, 21, 22, -1, 24, 5, 6, -1, 8,
+ 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+ 19, -1, 21, 22, -1, 24, -1, 5, 6, 48,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, -1, 21, 22, -1, 24, 5, 6, 48,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, -1, 21, 22, -1, 24, -1, -1, -1,
+ 48, -1, 5, 6, -1, 8, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18, 19, -1, 21, 22,
+ 48, 24, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 37, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 48, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 536, -1, 538, 539, -1, -1, -1, -1,
- -1, 153, -1, -1, 156, -1, -1, 159, -1, 161,
- 162, -1, 3, 4, 5, 6, 7, 8, 9, 10,
- 11, 12, 13, 14, 15, 16, -1, -1, 19, 20,
- -1, -1, 153, -1, -1, 156, -1, 28, 159, 30,
- 161, 162, -1, -1, -1, -1, -1, -1, -1, 40,
- 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
- 13, 14, 15, 16, -1, -1, 19, 20, -1, -1,
- -1, -1, -1, -1, -1, 28, -1, 30, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 153, -1, -1,
- 156, -1, -1, 159, -1, 161, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- -1, -1, 19, 20, -1, -1, -1, -1, -1, -1,
- -1, 28, -1, 30, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 40, 3, 4, 5, 6, 7, 8,
- 9, 10, 11, 12, 13, 14, 15, 16, -1, -1,
- 19, 20, -1, -1, -1, -1, -1, -1, -1, 28,
- -1, 30, 153, -1, -1, 156, -1, -1, 159, -1,
- 161, 40, 3, 4, 5, 6, 7, 8, 9, 10,
- 11, 12, 13, 14, 15, 16, -1, -1, 19, 20,
- -1, -1, -1, -1, -1, -1, -1, 28, -1, 30,
- 153, -1, -1, 156, -1, 158, 159, -1, 161, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, -1, -1, 19, 20, -1, -1, -1,
- -1, -1, -1, -1, 28, -1, 30, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 153, -1, -1, 156,
- -1, -1, 159, -1, 161, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 14, 15, 16, -1,
- -1, 19, 20, -1, -1, -1, -1, -1, -1, -1,
- 28, -1, 30, -1, 153, -1, -1, 156, -1, -1,
- 159, -1, 161, 3, 4, 5, 6, 7, 8, 9,
- 10, 11, 12, 13, 14, 15, 16, -1, -1, 19,
- 20, -1, -1, -1, -1, -1, -1, -1, 28, -1,
- 30, -1, 153, -1, -1, 156, -1, -1, 159, -1,
- 161, -1, 27, 28, -1, 30, -1, -1, -1, 34,
- 35, 36, -1, -1, -1, -1, -1, 42, 43, 44,
- 45, 46, 47, 48, -1, 50, 51, -1, -1, 153,
- -1, -1, 156, 58, 59, 159, -1, 161, 63, -1,
+ -1, -1, -1, -1, -1, 154, -1, -1, 157, -1,
+ -1, 160, -1, 162, 163, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 154, -1, -1, 157, -1,
+ -1, 160, -1, 162, 163, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 154, -1, -1, 157,
+ -1, -1, 160, -1, 162, 163, -1, 3, 4, 5,
+ 6, 7, -1, -1, -1, -1, 154, -1, -1, 157,
+ -1, -1, 160, -1, 162, 163, 22, -1, 24, -1,
+ 26, 27, 28, -1, -1, -1, -1, -1, -1, -1,
+ -1, 154, 38, 39, 157, -1, -1, 160, -1, 162,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 61, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 19, 20, -1, 22, 23, 24, -1, -1, -1,
- 28, -1, 30, -1, -1, 153, -1, -1, 156, -1,
- -1, 159, -1, 161, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 79, 80, 81, 82, 83, 84, 85,
+ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, -1,
+ -1, -1, -1, -1, 110, -1, 112, -1, 114, 115,
+ 116, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 3, 4, -1, -1, 7, -1, -1,
+ -1, -1, -1, 139, 140, 141, 142, 143, 144, 145,
+ 146, 147, 148, 149, 150, 151, 26, 27, 28, -1,
+ -1, -1, -1, -1, 160, -1, -1, -1, 38, 39,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 153, -1, -1, 156, -1, -1, 159,
- -1, 161, 80, 81, 82, 83, 84, 85, 86, 87,
- 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
- 98, 99, 100, 101, -1, -1, -1, -1, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, -1, 28,
- -1, 30, -1, -1, -1, -1, -1, -1, -1, 127,
- -1, 129, 130, 131, 132, 133, -1, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
- 148, 149, 150, 62, -1, -1, -1, -1, 156, -1,
- -1, 159, -1, 161, -1, -1, 164, -1, -1, -1,
- -1, 80, 81, 82, 83, 84, 85, 86, 87, 88,
- 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
- 99, 100, 101, -1, -1, -1, -1, 17, 18, -1,
- -1, 21, 22, 23, 24, 25, 26, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 127, -1,
- 129, 130, 131, 132, 133, -1, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
- 149, 150, 62, -1, -1, -1, -1, -1, -1, -1,
- 159, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 61, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 79,
80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
- 100, 101, -1, -1, -1, -1, -1, -1, -1, -1,
+ 100, 101, 102, 103, 104, -1, -1, -1, -1, -1,
+ 110, -1, 112, -1, 114, 115, 116, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 127, -1, 129,
- 130, 131, 132, 133, -1, 135, 136, 137, 138, 139,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 139,
140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
- 150, 38, -1, -1, -1, -1, -1, -1, -1, 159,
- -1, -1, 49, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 60, 61, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 76,
- -1, -1, -1, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, -1, -1, -1, -1, -1,
+ 150, 151, -1, -1, -1, -1, -1, -1, 5, 6,
+ 160, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, -1, 21, 22, -1, 24, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 37, -1, -1, -1, -1, -1, -1, -1, -1, 5,
+ 6, 48, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, -1, 21, 22, -1, 24, 5,
+ 6, -1, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, -1, 21, 22, -1, 24, -1,
+ -1, -1, 48, -1, -1, -1, -1, -1, -1, -1,
+ -1, 37, -1, -1, -1, -1, -1, -1, -1, -1,
+ 5, 6, 48, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, -1, 21, 22, -1, 24,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 37, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 48, -1, -1, -1, 154, -1, -1,
+ 157, -1, -1, 160, -1, 162, 5, 6, -1, 8,
+ 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+ 19, -1, 21, 22, -1, 24, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 154, -1,
+ -1, 157, -1, 159, 160, -1, 162, -1, -1, 48,
+ -1, -1, -1, -1, -1, -1, -1, -1, 154, -1,
+ -1, 157, -1, -1, 160, -1, 162, 5, 6, -1,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, -1, 21, 22, -1, 24, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 154,
+ -1, -1, 157, -1, -1, 160, -1, 162, 5, 6,
+ 48, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, -1, 21, 22, -1, 24, 5, 6,
+ -1, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, -1, 21, 22, -1, 24, -1, -1,
+ -1, 48, -1, -1, -1, 154, -1, -1, 157, -1,
+ -1, 160, -1, 162, -1, -1, -1, -1, -1, 5,
+ 6, 48, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, -1, 21, 22, -1, 24, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 48, -1, -1, -1, 154, -1, -1, 157,
+ -1, -1, 160, -1, 162, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 122, 123, 124, -1, -1,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 147, 148, 149, 150
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 154, -1, -1,
+ 157, -1, -1, 160, -1, 162, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 154, -1, -1,
+ 157, -1, -1, 160, -1, 162, -1, -1, -1, -1,
+ 35, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 49, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 59, 60, -1, -1, 154, -1,
+ -1, 157, -1, -1, 160, -1, 162, 72, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
+ 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
+ 105, 106, 107, -1, -1, 110, 111, 112, 113, 114,
+ 115, 116, 117, 118, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 139, 140, 141, 142, 143, 144,
+ 145, 146, 147, 148, 149, 150, 151
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const unsigned char yystos[] =
{
- 0, 199, 200, 202, 0, 31, 34, 42, 43, 44,
- 45, 46, 47, 48, 63, 180, 215, 217, 219, 28,
- 30, 51, 59, 63, 179, 208, 219, 45, 47, 218,
- 62, 65, 66, 67, 68, 69, 70, 71, 181, 213,
- 29, 225, 226, 227, 52, 53, 54, 72, 205, 151,
- 62, 27, 45, 47, 50, 58, 180, 201, 151, 213,
- 30, 203, 18, 3, 4, 5, 6, 7, 8, 9,
- 10, 11, 12, 13, 14, 15, 16, 19, 20, 153,
- 156, 159, 161, 166, 188, 189, 190, 191, 192, 208,
- 222, 32, 161, 214, 33, 162, 216, 226, 73, 74,
- 75, 77, 78, 79, 179, 228, 229, 231, 151, 151,
- 151, 151, 156, 206, 203, 188, 35, 36, 198, 198,
- 198, 198, 18, 18, 18, 3, 162, 192, 193, 208,
- 154, 163, 3, 190, 224, 4, 15, 5, 6, 7,
- 8, 9, 10, 11, 12, 175, 176, 177, 38, 49,
- 60, 61, 76, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 122, 123, 124, 127, 128,
+ 0, 200, 201, 202, 0, 25, 31, 41, 42, 43,
+ 44, 45, 46, 47, 62, 181, 219, 221, 223, 230,
+ 22, 24, 51, 58, 62, 180, 212, 223, 224, 61,
+ 64, 65, 66, 67, 68, 69, 70, 182, 217, 23,
+ 231, 232, 30, 163, 220, 231, 52, 53, 54, 71,
+ 209, 152, 61, 20, 45, 47, 50, 181, 152, 45,
+ 47, 222, 24, 207, 4, 5, 6, 8, 9, 10,
+ 11, 12, 13, 14, 15, 16, 17, 18, 19, 21,
+ 48, 154, 157, 160, 162, 167, 189, 190, 191, 192,
+ 193, 212, 227, 29, 162, 218, 180, 236, 152, 152,
+ 152, 152, 157, 210, 207, 189, 32, 33, 199, 199,
+ 199, 199, 217, 4, 4, 4, 162, 8, 163, 193,
+ 194, 212, 155, 164, 35, 49, 59, 60, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
+ 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
+ 104, 105, 106, 107, 110, 111, 112, 113, 114, 115,
+ 116, 117, 118, 139, 140, 141, 142, 143, 144, 145,
+ 146, 147, 148, 149, 150, 151, 169, 170, 171, 174,
+ 175, 233, 234, 240, 241, 243, 244, 24, 55, 56,
+ 208, 4, 24, 24, 211, 191, 191, 191, 9, 10,
+ 11, 12, 13, 14, 15, 16, 17, 18, 19, 176,
+ 177, 179, 191, 196, 158, 158, 163, 194, 153, 163,
+ 155, 37, 194, 195, 191, 229, 59, 8, 229, 9,
+ 21, 10, 11, 12, 13, 14, 15, 16, 17, 176,
+ 177, 178, 182, 119, 120, 121, 122, 123, 124, 125,
+ 126, 127, 128, 172, 27, 28, 125, 126, 127, 128,
129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
- 149, 150, 168, 169, 170, 173, 174, 235, 236, 238,
- 239, 30, 55, 56, 204, 18, 30, 30, 207, 190,
- 190, 4, 5, 6, 7, 8, 9, 10, 11, 12,
- 13, 14, 175, 176, 178, 190, 195, 190, 157, 157,
- 152, 162, 154, 40, 193, 194, 17, 18, 21, 22,
- 23, 24, 25, 26, 62, 100, 101, 127, 129, 135,
- 136, 137, 159, 168, 169, 170, 173, 174, 196, 221,
- 222, 223, 223, 223, 223, 224, 60, 181, 102, 103,
- 104, 105, 106, 107, 118, 119, 120, 121, 171, 25,
- 26, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 172, 190, 190, 224, 190,
- 190, 232, 224, 224, 224, 224, 224, 190, 190, 190,
- 224, 224, 181, 125, 126, 152, 158, 152, 186, 186,
- 25, 26, 17, 18, 167, 18, 21, 22, 23, 24,
- 156, 159, 161, 164, 196, 222, 186, 186, 192, 192,
- 192, 40, 190, 210, 211, 212, 152, 155, 64, 220,
- 171, 172, 154, 154, 154, 154, 154, 195, 197, 154,
- 154, 154, 154, 154, 152, 152, 188, 190, 190, 152,
- 183, 152, 183, 223, 156, 152, 152, 152, 152, 152,
- 152, 223, 223, 223, 152, 39, 188, 190, 224, 30,
- 37, 57, 184, 187, 158, 197, 197, 162, 197, 30,
- 158, 160, 208, 209, 152, 155, 40, 30, 154, 154,
- 195, 195, 195, 195, 195, 152, 160, 195, 195, 195,
- 195, 195, 15, 15, 223, 223, 223, 10, 57, 10,
- 152, 237, 223, 156, 224, 190, 224, 224, 224, 152,
- 152, 152, 224, 190, 223, 223, 152, 30, 18, 186,
- 158, 160, 162, 40, 210, 184, 185, 152, 195, 195,
- 237, 152, 152, 152, 152, 195, 152, 152, 152, 152,
- 39, 223, 223, 154, 152, 152, 223, 18, 223, 224,
- 233, 152, 223, 152, 152, 152, 223, 223, 223, 154,
- 190, 57, 182, 30, 152, 152, 155, 195, 195, 195,
- 195, 195, 195, 195, 195, 190, 152, 156, 233, 234,
- 223, 223, 152, 183, 183, 152, 223, 152, 224, 224,
- 224, 234, 223, 18, 195, 195, 152, 155, 152, 152,
- 155, 155, 155, 155, 155, 15, 158, 177, 230, 155,
- 155, 155, 224, 158, 223, 155, 155, 155, 195, 195,
- 195, 223, 221, 158, 177, 39, 158, 155, 155, 155,
- 152, 221, 15, 15, 152, 223, 223, 15, 228, 223,
- 15, 223
+ 173, 191, 191, 229, 191, 191, 237, 229, 229, 229,
+ 229, 229, 229, 229, 191, 191, 191, 229, 229, 182,
+ 108, 109, 153, 159, 205, 206, 204, 27, 28, 3,
+ 4, 168, 4, 7, 26, 38, 39, 103, 104, 110,
+ 112, 114, 115, 116, 157, 160, 162, 165, 169, 170,
+ 171, 174, 175, 197, 227, 203, 193, 193, 161, 163,
+ 193, 37, 191, 214, 215, 216, 153, 156, 3, 4,
+ 7, 26, 27, 28, 38, 39, 61, 160, 197, 226,
+ 227, 228, 228, 228, 228, 189, 191, 191, 153, 184,
+ 153, 184, 228, 157, 153, 153, 153, 153, 153, 153,
+ 153, 153, 228, 228, 228, 153, 36, 189, 191, 229,
+ 24, 153, 187, 187, 187, 172, 173, 155, 155, 155,
+ 155, 155, 159, 196, 198, 162, 198, 163, 198, 24,
+ 155, 155, 155, 155, 155, 187, 159, 161, 161, 212,
+ 213, 153, 156, 37, 63, 225, 198, 153, 153, 228,
+ 228, 228, 15, 57, 15, 153, 242, 228, 157, 229,
+ 191, 229, 229, 229, 191, 191, 153, 153, 153, 229,
+ 191, 228, 228, 153, 34, 57, 185, 188, 155, 155,
+ 196, 196, 196, 196, 196, 153, 159, 163, 193, 198,
+ 161, 163, 196, 196, 196, 196, 196, 37, 214, 185,
+ 186, 24, 161, 21, 21, 155, 153, 153, 228, 4,
+ 228, 229, 238, 153, 228, 153, 153, 153, 228, 228,
+ 228, 155, 191, 24, 4, 187, 196, 196, 242, 153,
+ 153, 153, 153, 196, 161, 163, 153, 153, 153, 153,
+ 36, 57, 183, 153, 228, 228, 238, 239, 228, 228,
+ 153, 184, 184, 153, 228, 153, 229, 229, 229, 239,
+ 228, 153, 153, 156, 196, 196, 196, 196, 161, 196,
+ 196, 196, 196, 191, 4, 24, 153, 157, 156, 229,
+ 159, 228, 156, 196, 196, 153, 156, 153, 153, 156,
+ 156, 156, 156, 156, 21, 159, 178, 235, 36, 159,
+ 156, 156, 196, 196, 196, 228, 226, 159, 178, 21,
+ 156, 156, 156, 153, 226, 228, 21, 153, 233, 228,
+ 21, 21, 228, 228
};
#define yyerrok (yyerrstatus = 0)
YY_REDUCE_PRINT (yyn);
switch (yyn)
{
- case 81:
-#line 358 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 3:
+#line 1572 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = (yyvsp[-1].String);
+ if ((yyvsp[0].UIntVal) > (uint32_t)INT32_MAX) // Outside of my range!
+ error("Value too large for type");
+ (yyval.SIntVal) = (int32_t)(yyvsp[0].UIntVal);
+ ;}
+ break;
+
+ case 5:
+#line 1581 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ if ((yyvsp[0].UInt64Val) > (uint64_t)INT64_MAX) // Outside of my range!
+ error("Value too large for type");
+ (yyval.SInt64Val) = (int64_t)(yyvsp[0].UInt64Val);
+ ;}
+ break;
+
+ case 26:
+#line 1603 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_EQ; ;}
+ break;
+
+ case 27:
+#line 1603 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_NE; ;}
+ break;
+
+ case 28:
+#line 1604 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_SLT; ;}
+ break;
+
+ case 29:
+#line 1604 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_SGT; ;}
+ break;
+
+ case 30:
+#line 1605 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_SLE; ;}
+ break;
+
+ case 31:
+#line 1605 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_SGE; ;}
+ break;
+
+ case 32:
+#line 1606 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_ULT; ;}
+ break;
+
+ case 33:
+#line 1606 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_UGT; ;}
+ break;
+
+ case 34:
+#line 1607 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_ULE; ;}
+ break;
+
+ case 35:
+#line 1607 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_UGE; ;}
+ break;
+
+ case 36:
+#line 1611 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_OEQ; ;}
+ break;
+
+ case 37:
+#line 1611 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_ONE; ;}
+ break;
+
+ case 38:
+#line 1612 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_OLT; ;}
+ break;
+
+ case 39:
+#line 1612 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_OGT; ;}
+ break;
+
+ case 40:
+#line 1613 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_OLE; ;}
+ break;
+
+ case 41:
+#line 1613 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_OGE; ;}
+ break;
+
+ case 42:
+#line 1614 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_ORD; ;}
+ break;
+
+ case 43:
+#line 1614 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_UNO; ;}
+ break;
+
+ case 44:
+#line 1615 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_UEQ; ;}
+ break;
+
+ case 45:
+#line 1615 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_UNE; ;}
+ break;
+
+ case 46:
+#line 1616 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_ULT; ;}
+ break;
+
+ case 47:
+#line 1616 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_UGT; ;}
+ break;
+
+ case 48:
+#line 1617 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_ULE; ;}
+ break;
+
+ case 49:
+#line 1617 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_UGE; ;}
+ break;
+
+ case 50:
+#line 1618 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_TRUE; ;}
+ break;
+
+ case 51:
+#line 1619 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_FALSE; ;}
+ break;
+
+ case 81:
+#line 1650 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.StrVal) = (yyvsp[-1].StrVal);
;}
break;
case 82:
-#line 361 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1653 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = new std::string("");
+ (yyval.StrVal) = 0;
;}
break;
+ case 83:
+#line 1658 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
+ break;
+
+ case 84:
+#line 1659 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
+ break;
+
+ case 85:
+#line 1660 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
+ break;
+
+ case 86:
+#line 1661 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
+ break;
+
+ case 87:
+#line 1662 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
+ break;
+
+ case 88:
+#line 1663 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
+ break;
+
+ case 89:
+#line 1664 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
+ break;
+
case 90:
-#line 368 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(""); ;}
+#line 1665 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+ break;
+
+ case 91:
+#line 1669 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { CurFun.LastCC = (yyval.UIntVal) = OldCallingConv::C; ;}
+ break;
+
+ case 92:
+#line 1670 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { CurFun.LastCC = (yyval.UIntVal) = OldCallingConv::C; ;}
+ break;
+
+ case 93:
+#line 1671 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { CurFun.LastCC = (yyval.UIntVal) = OldCallingConv::CSRet; ;}
+ break;
+
+ case 94:
+#line 1672 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { CurFun.LastCC = (yyval.UIntVal) = OldCallingConv::Fast; ;}
+ break;
+
+ case 95:
+#line 1673 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { CurFun.LastCC = (yyval.UIntVal) = OldCallingConv::Cold; ;}
+ break;
+
+ case 96:
+#line 1674 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { CurFun.LastCC = (yyval.UIntVal) = OldCallingConv::X86_StdCall; ;}
break;
case 97:
-#line 373 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- *(yyvsp[-1].String) += *(yyvsp[0].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-1].String);
- ;}
+#line 1675 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { CurFun.LastCC = (yyval.UIntVal) = OldCallingConv::X86_FastCall; ;}
break;
case 98:
-#line 378 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(""); ;}
+#line 1676 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val))
+ error("Calling conv too large");
+ (yyval.UIntVal) = (yyvsp[0].UInt64Val);
+ ;}
break;
case 99:
-#line 383 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+#line 1686 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.UIntVal) = 0; ;}
break;
case 100:
-#line 384 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); (yyval.String) = (yyvsp[-1].String); ;}
+#line 1687 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.UIntVal) = (yyvsp[0].UInt64Val);
+ if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
+ error("Alignment must be a power of two");
+ ;}
break;
case 101:
-#line 387 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+#line 1695 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.UIntVal) = 0; ;}
break;
case 102:
-#line 388 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyvsp[-1].String)->insert(0, ", ");
- *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-1].String);
+#line 1696 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.UIntVal) = (yyvsp[0].UInt64Val);
+ if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
+ error("Alignment must be a power of two");
;}
break;
case 103:
-#line 396 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-1].String);
+#line 1704 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ for (unsigned i = 0, e = strlen((yyvsp[0].StrVal)); i != e; ++i)
+ if ((yyvsp[0].StrVal)[i] == '"' || (yyvsp[0].StrVal)[i] == '\\')
+ error("Invalid character in section name");
+ (yyval.StrVal) = (yyvsp[0].StrVal);
;}
break;
case 104:
-#line 402 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+#line 1713 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.StrVal) = 0; ;}
+ break;
+
+ case 105:
+#line 1714 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
break;
case 106:
-#line 406 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+#line 1721 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {;}
break;
case 107:
-#line 407 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1722 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {;}
+ break;
+
+ case 108:
+#line 1726 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyvsp[-1].String)->insert(0, ", ");
- if (!(yyvsp[0].String)->empty())
- *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-1].String);
- ;}
+ CurGV->setSection((yyvsp[0].StrVal));
+ free((yyvsp[0].StrVal));
+ ;}
break;
case 109:
-#line 417 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1730 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[0].UInt64Val)))
+ error("Alignment must be a power of two");
+ CurGV->setAlignment((yyvsp[0].UInt64Val));
+
+ ;}
+ break;
+
+ case 111:
+#line 1747 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.TypeVal).T = new PATypeHolder((yyvsp[0].PrimType).T);
+ (yyval.TypeVal).S = Signless;
+ ;}
+ break;
+
+ case 113:
+#line 1755 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.TypeVal).T = new PATypeHolder((yyvsp[0].PrimType).T);
+ (yyval.TypeVal).S = Signless;
+ ;}
+ break;
+
+ case 114:
+#line 1762 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-1].String);
- ;}
+ if (!UpRefs.empty())
+ error("Invalid upreference in type: " + (*(yyvsp[0].TypeVal).T)->getDescription());
+ (yyval.TypeVal) = (yyvsp[0].TypeVal);
+ ;}
break;
case 127:
-#line 439 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1776 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Type).newTy = (yyvsp[0].String);
- (yyval.Type).oldTy = OpaqueTy;
+ (yyval.TypeVal).T = new PATypeHolder((yyvsp[0].PrimType).T);
+ (yyval.TypeVal).S = (yyvsp[0].PrimType).S;
;}
break;
case 128:
-#line 443 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.Type).newTy = (yyvsp[0].String);
- (yyval.Type).oldTy = UnresolvedTy;
+#line 1780 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.TypeVal).T = new PATypeHolder(OpaqueType::get());
+ (yyval.TypeVal).S = Signless;
;}
break;
case 129:
-#line 447 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.Type) = (yyvsp[0].Type);
+#line 1784 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Named types are also simple types...
+ const Type* tmp = getType((yyvsp[0].ValIDVal));
+ (yyval.TypeVal).T = new PATypeHolder(tmp);
+ (yyval.TypeVal).S = Signless; // FIXME: what if its signed?
;}
break;
case 130:
-#line 450 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1789 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{ // Type UpReference
- (yyvsp[0].String)->insert(0, "\\");
- (yyval.Type).newTy = (yyvsp[0].String);
- (yyval.Type).oldTy = NumericTy;
+ if ((yyvsp[0].UInt64Val) > (uint64_t)~0U)
+ error("Value out of range");
+ OpaqueType *OT = OpaqueType::get(); // Use temporary placeholder
+ UpRefs.push_back(UpRefRecord((unsigned)(yyvsp[0].UInt64Val), OT)); // Add to vector...
+ (yyval.TypeVal).T = new PATypeHolder(OT);
+ (yyval.TypeVal).S = Signless;
+ UR_OUT("New Upreference!\n");
;}
break;
case 131:
-#line 455 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1798 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{ // Function derived type?
- *(yyvsp[-3].Type).newTy += "( " + *(yyvsp[-1].String) + " )";
- delete (yyvsp[-1].String);
- (yyval.Type).newTy = (yyvsp[-3].Type).newTy;
- (yyval.Type).oldTy = FunctionTy;
+ std::vector<const Type*> Params;
+ for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp[-1].TypeList)->begin(),
+ E = (yyvsp[-1].TypeList)->end(); I != E; ++I) {
+ Params.push_back(I->T->get());
+ }
+ FunctionType::ParamAttrsList ParamAttrs;
+ if (CurFun.LastCC == OldCallingConv::CSRet) {
+ ParamAttrs.push_back(FunctionType::NoAttributeSet);
+ ParamAttrs.push_back(FunctionType::StructRetAttribute);
+ }
+ bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
+ if (isVarArg) Params.pop_back();
+
+ (yyval.TypeVal).T = new PATypeHolder(
+ HandleUpRefs(FunctionType::get((yyvsp[-3].TypeVal).T->get(),Params,isVarArg, ParamAttrs)));
+ (yyval.TypeVal).S = (yyvsp[-3].TypeVal).S;
+ delete (yyvsp[-3].TypeVal).T; // Delete the return type handle
+ delete (yyvsp[-1].TypeList); // Delete the argument list
;}
break;
case 132:
-#line 461 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1818 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{ // Sized array type?
- (yyvsp[-3].String)->insert(0,"[ ");
- *(yyvsp[-3].String) += " x " + *(yyvsp[-1].Type).newTy + " ]";
- delete (yyvsp[-1].Type).newTy;
- (yyval.Type).newTy = (yyvsp[-3].String);
- (yyval.Type).oldTy = ArrayTy;
- (yyval.Type).elemTy = (yyvsp[-1].Type).oldTy;
+ (yyval.TypeVal).T = new PATypeHolder(HandleUpRefs(ArrayType::get((yyvsp[-1].TypeVal).T->get(),
+ (unsigned)(yyvsp[-3].UInt64Val))));
+ (yyval.TypeVal).S = (yyvsp[-1].TypeVal).S;
+ delete (yyvsp[-1].TypeVal).T;
;}
break;
case 133:
-#line 469 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1824 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{ // Packed array type?
- (yyvsp[-3].String)->insert(0,"< ");
- *(yyvsp[-3].String) += " x " + *(yyvsp[-1].Type).newTy + " >";
- delete (yyvsp[-1].Type).newTy;
- (yyval.Type).newTy = (yyvsp[-3].String);
- (yyval.Type).oldTy = PackedTy;
- (yyval.Type).elemTy = (yyvsp[-1].Type).oldTy;
+ const llvm::Type* ElemTy = (yyvsp[-1].TypeVal).T->get();
+ if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
+ error("Unsigned result not equal to signed result");
+ if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint()))
+ error("Elements of a PackedType must be integer or floating point");
+ if (!isPowerOf2_32((yyvsp[-3].UInt64Val)))
+ error("PackedType length should be a power of 2");
+ (yyval.TypeVal).T = new PATypeHolder(HandleUpRefs(PackedType::get(ElemTy,
+ (unsigned)(yyvsp[-3].UInt64Val))));
+ (yyval.TypeVal).S = (yyvsp[-1].TypeVal).S;
+ delete (yyvsp[-1].TypeVal).T;
;}
break;
case 134:
-#line 477 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1837 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{ // Structure type?
- (yyvsp[-1].String)->insert(0, "{ ");
- *(yyvsp[-1].String) += " }";
- (yyval.Type).newTy = (yyvsp[-1].String);
- (yyval.Type).oldTy = StructTy;
+ std::vector<const Type*> Elements;
+ for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp[-1].TypeList)->begin(),
+ E = (yyvsp[-1].TypeList)->end(); I != E; ++I)
+ Elements.push_back(I->T->get());
+ (yyval.TypeVal).T = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
+ (yyval.TypeVal).S = Signless;
+ delete (yyvsp[-1].TypeList);
;}
break;
case 135:
-#line 483 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1846 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{ // Empty structure type?
- (yyval.Type).newTy = new std::string("{}");
- (yyval.Type).oldTy = StructTy;
+ (yyval.TypeVal).T = new PATypeHolder(StructType::get(std::vector<const Type*>()));
+ (yyval.TypeVal).S = Signless;
;}
break;
case 136:
-#line 487 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { // Pointer type?
- *(yyvsp[-1].Type).newTy += '*';
- (yyval.Type).elemTy = (yyvsp[-1].Type).oldTy;
- (yyvsp[-1].Type).oldTy = PointerTy;
- (yyval.Type) = (yyvsp[-1].Type);
+#line 1850 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Packed Structure type?
+ std::vector<const Type*> Elements;
+ for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp[-2].TypeList)->begin(),
+ E = (yyvsp[-2].TypeList)->end(); I != E; ++I) {
+ Elements.push_back(I->T->get());
+ delete I->T;
+ }
+ (yyval.TypeVal).T = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true)));
+ (yyval.TypeVal).S = Signless;
+ delete (yyvsp[-2].TypeList);
;}
break;
case 137:
-#line 498 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.String) = (yyvsp[0].Type).newTy;
+#line 1861 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Empty packed structure type?
+ (yyval.TypeVal).T = new PATypeHolder(StructType::get(std::vector<const Type*>(),true));
+ (yyval.TypeVal).S = Signless;
;}
break;
case 138:
-#line 501 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- *(yyvsp[-2].String) += ", " + *(yyvsp[0].Type).newTy;
- delete (yyvsp[0].Type).newTy;
- (yyval.String) = (yyvsp[-2].String);
+#line 1865 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Pointer type?
+ if ((yyvsp[-1].TypeVal).T->get() == Type::LabelTy)
+ error("Cannot form a pointer to a basic block");
+ (yyval.TypeVal).T = new PATypeHolder(HandleUpRefs(PointerType::get((yyvsp[-1].TypeVal).T->get())));
+ (yyval.TypeVal).S = (yyvsp[-1].TypeVal).S;
+ delete (yyvsp[-1].TypeVal).T;
;}
break;
- case 140:
-#line 510 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 139:
+#line 1878 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-2].String) += ", ...";
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-2].String);
+ (yyval.TypeList) = new std::list<PATypeInfo>();
+ (yyval.TypeList)->push_back((yyvsp[0].TypeVal));
;}
break;
- case 141:
-#line 515 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 140:
+#line 1882 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = (yyvsp[0].String);
+ ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back((yyvsp[0].TypeVal));
;}
break;
case 142:
-#line 518 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1890 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = new std::string();
+ PATypeInfo VoidTI;
+ VoidTI.T = new PATypeHolder(Type::VoidTy);
+ VoidTI.S = Signless;
+ ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(VoidTI);
;}
break;
case 143:
-#line 528 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { // Nonempty unsized arr
- (yyval.Const).type = (yyvsp[-3].Type);
- (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy);
- *(yyval.Const).cnst += " [ " + *(yyvsp[-1].String) + " ]";
- delete (yyvsp[-1].String);
+#line 1896 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.TypeList) = new std::list<PATypeInfo>();
+ PATypeInfo VoidTI;
+ VoidTI.T = new PATypeHolder(Type::VoidTy);
+ VoidTI.S = Signless;
+ (yyval.TypeList)->push_back(VoidTI);
;}
break;
case 144:
-#line 534 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1903 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Const).type = (yyvsp[-2].Type);
- (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy);
- *(yyval.Const).cnst += "[ ]";
+ (yyval.TypeList) = new std::list<PATypeInfo>();
;}
break;
case 145:
-#line 539 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.Const).type = (yyvsp[-2].Type);
- (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy);
- *(yyval.Const).cnst += " c" + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+#line 1915 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Nonempty unsized arr
+ const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-3].TypeVal).T->get());
+ if (ATy == 0)
+ error("Cannot make array constant with type: '" +
+ (yyvsp[-3].TypeVal).T->get()->getDescription() + "'");
+ const Type *ETy = ATy->getElementType();
+ int NumElements = ATy->getNumElements();
+
+ // Verify that we have the correct size...
+ if (NumElements != -1 && NumElements != (int)(yyvsp[-1].ConstVector)->size())
+ error("Type mismatch: constant sized array initialized with " +
+ utostr((yyvsp[-1].ConstVector)->size()) + " arguments, but has size of " +
+ itostr(NumElements) + "");
+
+ // Verify all elements are correct type!
+ std::vector<Constant*> Elems;
+ for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) {
+ Constant *C = (*(yyvsp[-1].ConstVector))[i].C;
+ const Type* ValTy = C->getType();
+ if (ETy != ValTy)
+ error("Element #" + utostr(i) + " is not of type '" +
+ ETy->getDescription() +"' as required!\nIt is of type '"+
+ ValTy->getDescription() + "'");
+ Elems.push_back(C);
+ }
+ (yyval.ConstVal).C = ConstantArray::get(ATy, Elems);
+ (yyval.ConstVal).S = (yyvsp[-3].TypeVal).S;
+ delete (yyvsp[-3].TypeVal).T;
+ delete (yyvsp[-1].ConstVector);
;}
break;
case 146:
-#line 545 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { // Nonempty unsized arr
- (yyval.Const).type = (yyvsp[-3].Type);
- (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy);
- *(yyval.Const).cnst += " < " + *(yyvsp[-1].String) + " >";
- delete (yyvsp[-1].String);
+#line 1945 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal).T->get());
+ if (ATy == 0)
+ error("Cannot make array constant with type: '" +
+ (yyvsp[-2].TypeVal).T->get()->getDescription() + "'");
+ int NumElements = ATy->getNumElements();
+ if (NumElements != -1 && NumElements != 0)
+ error("Type mismatch: constant sized array initialized with 0"
+ " arguments, but has size of " + itostr(NumElements) +"");
+ (yyval.ConstVal).C = ConstantArray::get(ATy, std::vector<Constant*>());
+ (yyval.ConstVal).S = (yyvsp[-2].TypeVal).S;
+ delete (yyvsp[-2].TypeVal).T;
;}
break;
case 147:
-#line 551 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1958 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Const).type = (yyvsp[-3].Type);
- (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy);
- *(yyval.Const).cnst += " { " + *(yyvsp[-1].String) + " }";
- delete (yyvsp[-1].String);
+ const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal).T->get());
+ if (ATy == 0)
+ error("Cannot make array constant with type: '" +
+ (yyvsp[-2].TypeVal).T->get()->getDescription() + "'");
+ int NumElements = ATy->getNumElements();
+ const Type *ETy = dyn_cast<IntegerType>(ATy->getElementType());
+ if (!ETy || cast<IntegerType>(ETy)->getBitWidth() != 8)
+ error("String arrays require type i8, not '" + ETy->getDescription() +
+ "'");
+ char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
+ if (NumElements != -1 && NumElements != (EndStr-(yyvsp[0].StrVal)))
+ error("Can't build string constant of size " +
+ itostr((int)(EndStr-(yyvsp[0].StrVal))) + " when array has size " +
+ itostr(NumElements) + "");
+ std::vector<Constant*> Vals;
+ for (char *C = (char *)(yyvsp[0].StrVal); C != (char *)EndStr; ++C)
+ Vals.push_back(ConstantInt::get(ETy, *C));
+ free((yyvsp[0].StrVal));
+ (yyval.ConstVal).C = ConstantArray::get(ATy, Vals);
+ (yyval.ConstVal).S = (yyvsp[-2].TypeVal).S;
+ delete (yyvsp[-2].TypeVal).T;
;}
break;
case 148:
-#line 557 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.Const).type = (yyvsp[-2].Type);
- (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy);
- *(yyval.Const).cnst += " {}";
+#line 1981 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Nonempty unsized arr
+ const PackedType *PTy = dyn_cast<PackedType>((yyvsp[-3].TypeVal).T->get());
+ if (PTy == 0)
+ error("Cannot make packed constant with type: '" +
+ (yyvsp[-3].TypeVal).T->get()->getDescription() + "'");
+ const Type *ETy = PTy->getElementType();
+ int NumElements = PTy->getNumElements();
+ // Verify that we have the correct size...
+ if (NumElements != -1 && NumElements != (int)(yyvsp[-1].ConstVector)->size())
+ error("Type mismatch: constant sized packed initialized with " +
+ utostr((yyvsp[-1].ConstVector)->size()) + " arguments, but has size of " +
+ itostr(NumElements) + "");
+ // Verify all elements are correct type!
+ std::vector<Constant*> Elems;
+ for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) {
+ Constant *C = (*(yyvsp[-1].ConstVector))[i].C;
+ const Type* ValTy = C->getType();
+ if (ETy != ValTy)
+ error("Element #" + utostr(i) + " is not of type '" +
+ ETy->getDescription() +"' as required!\nIt is of type '"+
+ ValTy->getDescription() + "'");
+ Elems.push_back(C);
+ }
+ (yyval.ConstVal).C = ConstantPacked::get(PTy, Elems);
+ (yyval.ConstVal).S = (yyvsp[-3].TypeVal).S;
+ delete (yyvsp[-3].TypeVal).T;
+ delete (yyvsp[-1].ConstVector);
;}
break;
case 149:
-#line 562 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2009 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+ const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal).T->get());
+ if (STy == 0)
+ error("Cannot make struct constant with type: '" +
+ (yyvsp[-3].TypeVal).T->get()->getDescription() + "'");
+ if ((yyvsp[-1].ConstVector)->size() != STy->getNumContainedTypes())
+ error("Illegal number of initializers for structure type");
+
+ // Check to ensure that constants are compatible with the type initializer!
+ std::vector<Constant*> Fields;
+ for (unsigned i = 0, e = (yyvsp[-1].ConstVector)->size(); i != e; ++i) {
+ Constant *C = (*(yyvsp[-1].ConstVector))[i].C;
+ if (C->getType() != STy->getElementType(i))
+ error("Expected type '" + STy->getElementType(i)->getDescription() +
+ "' for element #" + utostr(i) + " of structure initializer");
+ Fields.push_back(C);
+ }
+ (yyval.ConstVal).C = ConstantStruct::get(STy, Fields);
+ (yyval.ConstVal).S = (yyvsp[-3].TypeVal).S;
+ delete (yyvsp[-3].TypeVal).T;
+ delete (yyvsp[-1].ConstVector);
;}
break;
case 150:
-#line 568 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2031 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+ const StructType *STy = dyn_cast<StructType>((yyvsp[-2].TypeVal).T->get());
+ if (STy == 0)
+ error("Cannot make struct constant with type: '" +
+ (yyvsp[-2].TypeVal).T->get()->getDescription() + "'");
+ if (STy->getNumContainedTypes() != 0)
+ error("Illegal number of initializers for structure type");
+ (yyval.ConstVal).C = ConstantStruct::get(STy, std::vector<Constant*>());
+ (yyval.ConstVal).S = (yyvsp[-2].TypeVal).S;
+ delete (yyvsp[-2].TypeVal).T;
;}
break;
case 151:
-#line 574 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2042 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+ const StructType *STy = dyn_cast<StructType>((yyvsp[-5].TypeVal).T->get());
+ if (STy == 0)
+ error("Cannot make packed struct constant with type: '" +
+ (yyvsp[-5].TypeVal).T->get()->getDescription() + "'");
+ if ((yyvsp[-2].ConstVector)->size() != STy->getNumContainedTypes())
+ error("Illegal number of initializers for packed structure type");
+
+ // Check to ensure that constants are compatible with the type initializer!
+ std::vector<Constant*> Fields;
+ for (unsigned i = 0, e = (yyvsp[-2].ConstVector)->size(); i != e; ++i) {
+ Constant *C = (*(yyvsp[-2].ConstVector))[i].C;
+ if (C->getType() != STy->getElementType(i))
+ error("Expected type '" + STy->getElementType(i)->getDescription() +
+ "' for element #" + utostr(i) + " of packed struct initializer");
+ Fields.push_back(C);
+ }
+ (yyval.ConstVal).C = ConstantStruct::get(STy, Fields);
+ (yyval.ConstVal).S = (yyvsp[-5].TypeVal).S;
+ delete (yyvsp[-5].TypeVal).T;
+ delete (yyvsp[-2].ConstVector);
;}
break;
case 152:
-#line 580 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2064 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+ const StructType *STy = dyn_cast<StructType>((yyvsp[-4].TypeVal).T->get());
+ if (STy == 0)
+ error("Cannot make packed struct constant with type: '" +
+ (yyvsp[-4].TypeVal).T->get()->getDescription() + "'");
+ if (STy->getNumContainedTypes() != 0)
+ error("Illegal number of initializers for packed structure type");
+ (yyval.ConstVal).C = ConstantStruct::get(STy, std::vector<Constant*>());
+ (yyval.ConstVal).S = (yyvsp[-4].TypeVal).S;
+ delete (yyvsp[-4].TypeVal).T;
;}
break;
case 153:
-#line 586 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2075 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+ const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal).T->get());
+ if (PTy == 0)
+ error("Cannot make null pointer constant with type: '" +
+ (yyvsp[-1].TypeVal).T->get()->getDescription() + "'");
+ (yyval.ConstVal).C = ConstantPointerNull::get(PTy);
+ (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
+ delete (yyvsp[-1].TypeVal).T;
;}
break;
case 154:
-#line 592 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { // integral constants
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+#line 2084 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.ConstVal).C = UndefValue::get((yyvsp[-1].TypeVal).T->get());
+ (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
+ delete (yyvsp[-1].TypeVal).T;
;}
break;
case 155:
-#line 598 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { // integral constants
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+#line 2089 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const PointerType *Ty = dyn_cast<PointerType>((yyvsp[-1].TypeVal).T->get());
+ if (Ty == 0)
+ error("Global const reference must be a pointer type, not" +
+ (yyvsp[-1].TypeVal).T->get()->getDescription());
+
+ // ConstExprs can exist in the body of a function, thus creating
+ // GlobalValues whenever they refer to a variable. Because we are in
+ // the context of a function, getExistingValue will search the functions
+ // symbol table instead of the module symbol table for the global symbol,
+ // which throws things all off. To get around this, we just tell
+ // getExistingValue that we are at global scope here.
+ //
+ Function *SavedCurFn = CurFun.CurrentFunction;
+ CurFun.CurrentFunction = 0;
+ Value *V = getExistingValue(Ty, (yyvsp[0].ValIDVal));
+ CurFun.CurrentFunction = SavedCurFn;
+
+ // If this is an initializer for a constant pointer, which is referencing a
+ // (currently) undefined variable, create a stub now that shall be replaced
+ // in the future with the right type of variable.
+ //
+ if (V == 0) {
+ assert(isa<PointerType>(Ty) && "Globals may only be used as pointers");
+ const PointerType *PT = cast<PointerType>(Ty);
+
+ // First check to see if the forward references value is already created!
+ PerModuleInfo::GlobalRefsType::iterator I =
+ CurModule.GlobalRefs.find(std::make_pair(PT, (yyvsp[0].ValIDVal)));
+
+ if (I != CurModule.GlobalRefs.end()) {
+ V = I->second; // Placeholder already exists, use it...
+ (yyvsp[0].ValIDVal).destroy();
+ } else {
+ std::string Name;
+ if ((yyvsp[0].ValIDVal).Type == ValID::NameVal) Name = (yyvsp[0].ValIDVal).Name;
+
+ // Create the forward referenced global.
+ GlobalValue *GV;
+ if (const FunctionType *FTy =
+ dyn_cast<FunctionType>(PT->getElementType())) {
+ GV = new Function(FTy, GlobalValue::ExternalLinkage, Name,
+ CurModule.CurrentModule);
+ } else {
+ GV = new GlobalVariable(PT->getElementType(), false,
+ GlobalValue::ExternalLinkage, 0,
+ Name, CurModule.CurrentModule);
+ }
+
+ // Keep track of the fact that we have a forward ref to recycle it
+ CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, (yyvsp[0].ValIDVal)), GV));
+ V = GV;
+ }
+ }
+ (yyval.ConstVal).C = cast<GlobalValue>(V);
+ (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
+ delete (yyvsp[-1].TypeVal).T; // Free the type handle
;}
break;
case 156:
-#line 604 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { // Boolean constants
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+#line 2147 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ if ((yyvsp[-1].TypeVal).T->get() != (yyvsp[0].ConstVal).C->getType())
+ error("Mismatched types for constant expression");
+ (yyval.ConstVal) = (yyvsp[0].ConstVal);
+ (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
+ delete (yyvsp[-1].TypeVal).T;
;}
break;
case 157:
-#line 610 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { // Boolean constants
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+#line 2154 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type *Ty = (yyvsp[-1].TypeVal).T->get();
+ if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
+ error("Cannot create a null initialized value of this type");
+ (yyval.ConstVal).C = Constant::getNullValue(Ty);
+ (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
+ delete (yyvsp[-1].TypeVal).T;
;}
break;
case 158:
-#line 616 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { // Float & Double constants
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy);
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+#line 2162 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // integral constants
+ const Type *Ty = (yyvsp[-1].PrimType).T;
+ if (!ConstantInt::isValueValidForType(Ty, (yyvsp[0].SInt64Val)))
+ error("Constant value doesn't fit in type");
+ (yyval.ConstVal).C = ConstantInt::get(Ty, (yyvsp[0].SInt64Val));
+ (yyval.ConstVal).S = Signed;
;}
break;
case 159:
-#line 624 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- std::string source = *(yyvsp[-3].Const).cnst;
- TypeInfo DstTy = (yyvsp[-1].Type);
- ResolveType(DstTy);
- if (*(yyvsp[-5].String) == "cast") {
- // Call getCastUpgrade to upgrade the old cast
- (yyval.String) = new std::string(getCastUpgrade(source, (yyvsp[-3].Const).type, (yyvsp[-1].Type), true));
- } else {
- // Nothing to upgrade, just create the cast constant expr
- (yyval.String) = new std::string(*(yyvsp[-5].String));
- *(yyval.String) += "( " + source + " to " + *(yyvsp[-1].Type).newTy + ")";
- }
- delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy();
+#line 2169 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // integral constants
+ const Type *Ty = (yyvsp[-1].PrimType).T;
+ if (!ConstantInt::isValueValidForType(Ty, (yyvsp[0].UInt64Val)))
+ error("Constant value doesn't fit in type");
+ (yyval.ConstVal).C = ConstantInt::get(Ty, (yyvsp[0].UInt64Val));
+ (yyval.ConstVal).S = Unsigned;
;}
break;
case 160:
-#line 638 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- *(yyvsp[-4].String) += "(" + *(yyvsp[-2].Const).cnst;
- for (unsigned i = 0; i < (yyvsp[-1].ValList)->size(); ++i) {
- ValueInfo& VI = (*(yyvsp[-1].ValList))[i];
- *(yyvsp[-4].String) += ", " + *VI.val;
- VI.destroy();
- }
- *(yyvsp[-4].String) += ")";
- (yyval.String) = (yyvsp[-4].String);
- (yyvsp[-2].Const).destroy();
- delete (yyvsp[-1].ValList);
+#line 2176 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Boolean constants
+ (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, true);
+ (yyval.ConstVal).S = Unsigned;
;}
break;
case 161:
-#line 650 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
- (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
- (yyval.String) = (yyvsp[-7].String);
+#line 2180 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Boolean constants
+ (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, false);
+ (yyval.ConstVal).S = Unsigned;
;}
break;
case 162:
-#line 655 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- const char* op = getDivRemOpcode(*(yyvsp[-5].String), (yyvsp[-3].Const).type);
- (yyval.String) = new std::string(op);
- *(yyval.String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
- delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
+#line 2184 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Float & Double constants
+ if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType).T, (yyvsp[0].FPVal)))
+ error("Floating point constant invalid for type");
+ (yyval.ConstVal).C = ConstantFP::get((yyvsp[-1].PrimType).T, (yyvsp[0].FPVal));
+ (yyval.ConstVal).S = Signless;
;}
break;
case 163:
-#line 661 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2193 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
- (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
- (yyval.String) = (yyvsp[-5].String);
+ const Type* SrcTy = (yyvsp[-3].ConstVal).C->getType();
+ const Type* DstTy = (yyvsp[-1].TypeVal).T->get();
+ Signedness SrcSign = (yyvsp[-3].ConstVal).S;
+ Signedness DstSign = (yyvsp[-1].TypeVal).S;
+ if (!SrcTy->isFirstClassType())
+ error("cast constant expression from a non-primitive type: '" +
+ SrcTy->getDescription() + "'");
+ if (!DstTy->isFirstClassType())
+ error("cast constant expression to a non-primitive type: '" +
+ DstTy->getDescription() + "'");
+ (yyval.ConstVal).C = cast<Constant>(getCast((yyvsp[-5].CastOpVal), (yyvsp[-3].ConstVal).C, SrcSign, DstTy, DstSign));
+ (yyval.ConstVal).S = DstSign;
+ delete (yyvsp[-1].TypeVal).T;
;}
break;
case 164:
-#line 666 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2208 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
-#if UPGRADE_SETCOND_OPS
- *(yyvsp[-5].String) = getCompareOp(*(yyvsp[-5].String), (yyvsp[-3].Const).type);
-#endif
- *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
- (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
- (yyval.String) = (yyvsp[-5].String);
+ const Type *Ty = (yyvsp[-2].ConstVal).C->getType();
+ if (!isa<PointerType>(Ty))
+ error("GetElementPtr requires a pointer operand");
+
+ std::vector<Value*> VIndices;
+ std::vector<Constant*> CIndices;
+ upgradeGEPIndices((yyvsp[-2].ConstVal).C->getType(), (yyvsp[-1].ValueList), VIndices, &CIndices);
+
+ delete (yyvsp[-1].ValueList);
+ (yyval.ConstVal).C = ConstantExpr::getGetElementPtr((yyvsp[-2].ConstVal).C, CIndices);
+ (yyval.ConstVal).S = Signless;
;}
break;
case 165:
-#line 674 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2221 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-6].String) += "(" + *(yyvsp[-5].String) + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
- delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
- (yyval.String) = (yyvsp[-6].String);
+ if (!(yyvsp[-5].ConstVal).C->getType()->isInteger() ||
+ cast<IntegerType>((yyvsp[-5].ConstVal).C->getType())->getBitWidth() != 1)
+ error("Select condition must be bool type");
+ if ((yyvsp[-3].ConstVal).C->getType() != (yyvsp[-1].ConstVal).C->getType())
+ error("Select operand types must match");
+ (yyval.ConstVal).C = ConstantExpr::getSelect((yyvsp[-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
+ (yyval.ConstVal).S = Unsigned;
;}
break;
case 166:
-#line 679 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2230 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-6].String) += "(" + *(yyvsp[-5].String) + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
- delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
- (yyval.String) = (yyvsp[-6].String);
+ const Type *Ty = (yyvsp[-3].ConstVal).C->getType();
+ if (Ty != (yyvsp[-1].ConstVal).C->getType())
+ error("Binary operator types must match");
+ // First, make sure we're dealing with the right opcode by upgrading from
+ // obsolete versions.
+ Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[-5].BinaryOpVal), Ty, (yyvsp[-3].ConstVal).S);
+
+ // HACK: llvm 1.3 and earlier used to emit invalid pointer constant exprs.
+ // To retain backward compatibility with these early compilers, we emit a
+ // cast to the appropriate integer type automatically if we are in the
+ // broken case. See PR424 for more information.
+ if (!isa<PointerType>(Ty)) {
+ (yyval.ConstVal).C = ConstantExpr::get(Opcode, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
+ } else {
+ const Type *IntPtrTy = 0;
+ switch (CurModule.CurrentModule->getPointerSize()) {
+ case Module::Pointer32: IntPtrTy = Type::Int32Ty; break;
+ case Module::Pointer64: IntPtrTy = Type::Int64Ty; break;
+ default: error("invalid pointer binary constant expr");
+ }
+ (yyval.ConstVal).C = ConstantExpr::get(Opcode,
+ ConstantExpr::getCast(Instruction::PtrToInt, (yyvsp[-3].ConstVal).C, IntPtrTy),
+ ConstantExpr::getCast(Instruction::PtrToInt, (yyvsp[-1].ConstVal).C, IntPtrTy));
+ (yyval.ConstVal).C = ConstantExpr::getCast(Instruction::IntToPtr, (yyval.ConstVal).C, Ty);
+ }
+ (yyval.ConstVal).S = (yyvsp[-3].ConstVal).S;
;}
break;
case 167:
-#line 684 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2258 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- const char* shiftop = (yyvsp[-5].String)->c_str();
- if (*(yyvsp[-5].String) == "shr")
- shiftop = ((yyvsp[-3].Const).type.isUnsigned()) ? "lshr" : "ashr";
- (yyval.String) = new std::string(shiftop);
- *(yyval.String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
- delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
+ const Type* Ty = (yyvsp[-3].ConstVal).C->getType();
+ if (Ty != (yyvsp[-1].ConstVal).C->getType())
+ error("Logical operator types must match");
+ if (!Ty->isInteger()) {
+ if (!isa<PackedType>(Ty) ||
+ !cast<PackedType>(Ty)->getElementType()->isInteger())
+ error("Logical operator requires integer operands");
+ }
+ Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[-5].BinaryOpVal), Ty, (yyvsp[-3].ConstVal).S);
+ (yyval.ConstVal).C = ConstantExpr::get(Opcode, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
+ (yyval.ConstVal).S = (yyvsp[-3].ConstVal).S;
;}
break;
case 168:
-#line 692 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2271 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
- (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
- (yyval.String) = (yyvsp[-5].String);
+ const Type* Ty = (yyvsp[-3].ConstVal).C->getType();
+ if (Ty != (yyvsp[-1].ConstVal).C->getType())
+ error("setcc operand types must match");
+ unsigned short pred;
+ Instruction::OtherOps Opcode = getCompareOp((yyvsp[-5].BinaryOpVal), pred, Ty, (yyvsp[-3].ConstVal).S);
+ (yyval.ConstVal).C = ConstantExpr::getCompare(Opcode, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
+ (yyval.ConstVal).S = Unsigned;
;}
break;
case 169:
-#line 697 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2280 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
- (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
- (yyval.String) = (yyvsp[-7].String);
+ if ((yyvsp[-3].ConstVal).C->getType() != (yyvsp[-1].ConstVal).C->getType())
+ error("icmp operand types must match");
+ (yyval.ConstVal).C = ConstantExpr::getCompare((yyvsp[-5].IPred), (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
+ (yyval.ConstVal).S = Unsigned;
;}
break;
case 170:
-#line 702 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2286 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")";
- (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy();
- (yyval.String) = (yyvsp[-7].String);
+ if ((yyvsp[-3].ConstVal).C->getType() != (yyvsp[-1].ConstVal).C->getType())
+ error("fcmp operand types must match");
+ (yyval.ConstVal).C = ConstantExpr::getCompare((yyvsp[-5].FPred), (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
+ (yyval.ConstVal).S = Unsigned;
;}
break;
case 171:
-#line 712 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2292 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-2].String) += ", " + *(yyvsp[0].Const).cnst;
- (yyvsp[0].Const).destroy();
- (yyval.String) = (yyvsp[-2].String);
+ if (!(yyvsp[-1].ConstVal).C->getType()->isInteger() ||
+ cast<IntegerType>((yyvsp[-1].ConstVal).C->getType())->getBitWidth() != 8)
+ error("Shift count for shift constant must be unsigned byte");
+ const Type* Ty = (yyvsp[-3].ConstVal).C->getType();
+ if (!(yyvsp[-3].ConstVal).C->getType()->isInteger())
+ error("Shift constant expression requires integer operand");
+ Constant *ShiftAmt = ConstantExpr::getZExt((yyvsp[-1].ConstVal).C, Ty);
+ (yyval.ConstVal).C = ConstantExpr::get(getBinaryOp((yyvsp[-5].BinaryOpVal), Ty, (yyvsp[-3].ConstVal).S), (yyvsp[-3].ConstVal).C, ShiftAmt);
+ (yyval.ConstVal).S = (yyvsp[-3].ConstVal).S;
;}
break;
case 172:
-#line 717 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(*(yyvsp[0].Const).cnst); (yyvsp[0].Const).destroy(); ;}
+#line 2303 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C))
+ error("Invalid extractelement operands");
+ (yyval.ConstVal).C = ConstantExpr::getExtractElement((yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
+ (yyval.ConstVal).S = (yyvsp[-3].ConstVal).S;
+ ;}
break;
- case 175:
-#line 732 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 173:
+#line 2309 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
-;}
+ if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C))
+ error("Invalid insertelement operands");
+ (yyval.ConstVal).C = ConstantExpr::getInsertElement((yyvsp[-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
+ (yyval.ConstVal).S = (yyvsp[-5].ConstVal).S;
+ ;}
break;
- case 176:
-#line 737 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 174:
+#line 2315 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = 0;
+ if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C))
+ error("Invalid shufflevector operands");
+ (yyval.ConstVal).C = ConstantExpr::getShuffleVector((yyvsp[-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
+ (yyval.ConstVal).S = (yyvsp[-5].ConstVal).S;
;}
break;
- case 177:
-#line 740 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 175:
+#line 2326 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal)); ;}
+ break;
+
+ case 176:
+#line 2327 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *O << *(yyvsp[0].String) << "\n";
- delete (yyvsp[0].String);
- (yyval.String) = 0;
+ (yyval.ConstVector) = new std::vector<ConstInfo>();
+ (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
;}
break;
+ case 177:
+#line 2336 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.BoolVal) = false; ;}
+ break;
+
case 178:
-#line 745 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- *O << "module asm " << " " << *(yyvsp[0].String) << "\n";
- (yyval.String) = 0;
- ;}
+#line 2337 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.BoolVal) = true; ;}
break;
case 179:
-#line 749 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2349 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *O << "implementation\n";
- (yyval.String) = 0;
+ (yyval.ModuleVal) = ParserResult = (yyvsp[0].ModuleVal);
+ CurModule.ModuleDone();
;}
break;
case 180:
-#line 753 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = 0; ;}
+#line 2358 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal); CurFun.FunctionDone(); ;}
+ break;
+
+ case 181:
+#line 2359 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal); ;}
break;
case 182:
-#line 755 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "external"; ;}
+#line 2360 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ModuleVal) = (yyvsp[-3].ModuleVal); ;}
break;
case 183:
-#line 758 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2361 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal); ;}
+ break;
+
+ case 184:
+#line 2362 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- EnumeratedTypes.push_back((yyvsp[0].Type));
- if (!(yyvsp[-2].String)->empty()) {
- NamedTypes[*(yyvsp[-2].String)].newTy = new std::string(*(yyvsp[0].Type).newTy);
- NamedTypes[*(yyvsp[-2].String)].oldTy = (yyvsp[0].Type).oldTy;
- NamedTypes[*(yyvsp[-2].String)].elemTy = (yyvsp[0].Type).elemTy;
- *O << *(yyvsp[-2].String) << " = ";
+ (yyval.ModuleVal) = CurModule.CurrentModule;
+ // Emit an error if there are any unresolved types left.
+ if (!CurModule.LateResolveTypes.empty()) {
+ const ValID &DID = CurModule.LateResolveTypes.begin()->first;
+ if (DID.Type == ValID::NameVal) {
+ error("Reference to an undefined type: '"+DID.getName() + "'");
+ } else {
+ error("Reference to an undefined type: #" + itostr(DID.Num));
+ }
}
- *O << "type " << *(yyvsp[0].Type).newTy << "\n";
- delete (yyvsp[-2].String); delete (yyvsp[-1].String); (yyvsp[0].Type).destroy();
- (yyval.String) = 0;
;}
break;
- case 184:
-#line 770 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 185:
+#line 2378 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ // Eagerly resolve types. This is not an optimization, this is a
+ // requirement that is due to the fact that we could have this:
+ //
+ // %list = type { %list * }
+ // %list = type { %list * } ; repeated type decl
+ //
+ // If types are not resolved eagerly, then the two types will not be
+ // determined to be the same type!
+ //
+ const Type* Ty = (yyvsp[0].TypeVal).T->get();
+ ResolveTypeTo((yyvsp[-2].StrVal), Ty);
+
+ if (!setTypeName(Ty, (yyvsp[-2].StrVal)) && !(yyvsp[-2].StrVal)) {
+ // If this is a named type that is not a redefinition, add it to the slot
+ // table.
+ CurModule.Types.push_back(Ty);
+ }
+ delete (yyvsp[0].TypeVal).T;
+ ;}
+ break;
+
+ case 186:
+#line 2398 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{ // Function prototypes can be in const pool
- *O << *(yyvsp[0].String) << "\n";
- delete (yyvsp[0].String);
- (yyval.String) = 0;
;}
break;
- case 185:
-#line 775 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { // Asm blocks can be in the const pool
- *O << *(yyvsp[-2].String) << " " << *(yyvsp[-1].String) << " " << *(yyvsp[0].String) << "\n";
- delete (yyvsp[-2].String); delete (yyvsp[-1].String); delete (yyvsp[0].String);
- (yyval.String) = 0;
+ case 187:
+#line 2400 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Asm blocks can be in the const pool
+ ;}
+ break;
+
+ case 188:
+#line 2402 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ if ((yyvsp[0].ConstVal).C == 0)
+ error("Global value initializer is not a constant");
+ CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), (yyvsp[-2].Linkage), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal).C->getType(), (yyvsp[0].ConstVal).C);
+ ;}
+ break;
+
+ case 189:
+#line 2406 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ CurGV = 0;
+ ;}
+ break;
+
+ case 190:
+#line 2409 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type *Ty = (yyvsp[0].TypeVal).T->get();
+ CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalLinkage, (yyvsp[-1].BoolVal), Ty, 0);
+ delete (yyvsp[0].TypeVal).T;
+ ;}
+ break;
+
+ case 191:
+#line 2413 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ CurGV = 0;
;}
break;
- case 186:
-#line 780 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 192:
+#line 2416 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[-4].String)->empty()) {
- *O << *(yyvsp[-4].String) << " = ";
- Globals[*(yyvsp[-4].String)] = (yyvsp[-1].Const).type.clone();
- }
- *O << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Const).cnst << " " << *(yyvsp[0].String) << "\n";
- delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); (yyvsp[-1].Const).destroy(); delete (yyvsp[0].String);
- (yyval.String) = 0;
+ const Type *Ty = (yyvsp[0].TypeVal).T->get();
+ CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::DLLImportLinkage, (yyvsp[-1].BoolVal), Ty, 0);
+ delete (yyvsp[0].TypeVal).T;
;}
break;
- case 187:
-#line 789 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 193:
+#line 2420 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[-4].String)->empty()) {
- *O << *(yyvsp[-4].String) << " = ";
- Globals[*(yyvsp[-4].String)] = (yyvsp[-1].Type).clone();
- }
- *O << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].String) << "\n";
- delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
- (yyval.String) = 0;
+ CurGV = 0;
;}
break;
- case 188:
-#line 798 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 194:
+#line 2423 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[-4].String)->empty()) {
- *O << *(yyvsp[-4].String) << " = ";
- Globals[*(yyvsp[-4].String)] = (yyvsp[-1].Type).clone();
- }
- *O << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].String) << "\n";
- delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
- (yyval.String) = 0;
+ const Type *Ty = (yyvsp[0].TypeVal).T->get();
+ CurGV =
+ ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalWeakLinkage, (yyvsp[-1].BoolVal), Ty, 0);
+ delete (yyvsp[0].TypeVal).T;
;}
break;
- case 189:
-#line 807 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 195:
+#line 2428 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[-4].String)->empty()) {
- *O << *(yyvsp[-4].String) << " = ";
- Globals[*(yyvsp[-4].String)] = (yyvsp[-1].Type).clone();
- }
- *O << *(yyvsp[-3].String) << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].String) << "\n";
- delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
- (yyval.String) = 0;
+ CurGV = 0;
;}
break;
- case 190:
-#line 816 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 196:
+#line 2431 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *O << *(yyvsp[-1].String) << " " << *(yyvsp[0].String) << "\n";
- delete (yyvsp[-1].String); delete (yyvsp[0].String);
- (yyval.String) = 0;
;}
break;
- case 191:
-#line 821 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 197:
+#line 2433 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *O << *(yyvsp[-2].String) << " = " << *(yyvsp[0].String) << "\n";
- delete (yyvsp[-2].String); delete (yyvsp[0].String);
- (yyval.String) = 0;
;}
break;
- case 192:
-#line 826 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 198:
+#line 2435 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = 0;
;}
break;
- case 196:
-#line 836 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 199:
+#line 2440 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-2].String);
+ const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
+ char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
+ std::string NewAsm((yyvsp[0].StrVal), EndStr);
+ free((yyvsp[0].StrVal));
+
+ if (AsmSoFar.empty())
+ CurModule.CurrentModule->setModuleInlineAsm(NewAsm);
+ else
+ CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+NewAsm);
;}
break;
- case 197:
-#line 841 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
- if (*(yyvsp[0].String) == "64")
- SizeOfPointer = 64;
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-2].String);
- ;}
+ case 200:
+#line 2454 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Endianness) = Module::BigEndian; ;}
break;
- case 198:
-#line 848 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-2].String);
- ;}
+ case 201:
+#line 2455 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Endianness) = Module::LittleEndian; ;}
break;
- case 199:
-#line 853 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 202:
+#line 2459 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-2].String);
+ CurModule.setEndianness((yyvsp[0].Endianness));
;}
break;
- case 200:
-#line 860 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 203:
+#line 2462 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyvsp[-1].String)->insert(0, "[ ");
- *(yyvsp[-1].String) += " ]";
- (yyval.String) = (yyvsp[-1].String);
+ if ((yyvsp[0].UInt64Val) == 32)
+ CurModule.setPointerSize(Module::Pointer32);
+ else if ((yyvsp[0].UInt64Val) == 64)
+ CurModule.setPointerSize(Module::Pointer64);
+ else
+ error("Invalid pointer size: '" + utostr((yyvsp[0].UInt64Val)) + "'");
;}
break;
- case 201:
-#line 867 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 204:
+#line 2470 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-2].String) += ", " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-2].String);
+ CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal));
+ free((yyvsp[0].StrVal));
;}
break;
- case 203:
-#line 873 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 205:
+#line 2474 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = new std::string();
+ CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
+ free((yyvsp[0].StrVal));
;}
break;
case 207:
-#line 882 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+#line 2485 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
+ free((yyvsp[0].StrVal));
+ ;}
break;
case 208:
-#line 884 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2489 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = (yyvsp[-1].Type).newTy;
- if (!(yyvsp[0].String)->empty())
- *(yyval.String) += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
-;}
+ CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
+ free((yyvsp[0].StrVal));
+ ;}
break;
case 209:
-#line 891 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2493 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { ;}
+ break;
+
+ case 213:
+#line 2506 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.StrVal) = 0; ;}
+ break;
+
+ case 214:
+#line 2510 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-2].String) += ", " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+ if ((yyvsp[-1].TypeVal).T->get() == Type::VoidTy)
+ error("void typed arguments are invalid");
+ (yyval.ArgVal) = new std::pair<PATypeInfo, char*>((yyvsp[-1].TypeVal), (yyvsp[0].StrVal));
;}
break;
- case 210:
-#line 895 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 215:
+#line 2518 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = (yyvsp[0].String);
+ (yyval.ArgList) = (yyvsp[-2].ArgList);
+ (yyval.ArgList)->push_back(*(yyvsp[0].ArgVal));
+ delete (yyvsp[0].ArgVal);
;}
break;
- case 211:
-#line 899 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 216:
+#line 2523 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = (yyvsp[0].String);
+ (yyval.ArgList) = new std::vector<std::pair<PATypeInfo,char*> >();
+ (yyval.ArgList)->push_back(*(yyvsp[0].ArgVal));
+ delete (yyvsp[0].ArgVal);
;}
break;
- case 212:
-#line 902 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 217:
+#line 2531 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ArgList) = (yyvsp[0].ArgList); ;}
+ break;
+
+ case 218:
+#line 2532 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-2].String) += ", ...";
- (yyval.String) = (yyvsp[-2].String);
- delete (yyvsp[0].String);
+ (yyval.ArgList) = (yyvsp[-2].ArgList);
+ PATypeInfo VoidTI;
+ VoidTI.T = new PATypeHolder(Type::VoidTy);
+ VoidTI.S = Signless;
+ (yyval.ArgList)->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
;}
break;
- case 213:
-#line 907 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 219:
+#line 2539 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = (yyvsp[0].String);
+ (yyval.ArgList) = new std::vector<std::pair<PATypeInfo,char*> >();
+ PATypeInfo VoidTI;
+ VoidTI.T = new PATypeHolder(Type::VoidTy);
+ VoidTI.S = Signless;
+ (yyval.ArgList)->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
;}
break;
- case 214:
-#line 910 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+ case 220:
+#line 2546 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ArgList) = 0; ;}
break;
- case 215:
-#line 913 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 221:
+#line 2550 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[-7].String)->empty()) {
- *(yyvsp[-7].String) += " ";
+ UnEscapeLexed((yyvsp[-5].StrVal));
+ std::string FunctionName((yyvsp[-5].StrVal));
+ free((yyvsp[-5].StrVal)); // Free strdup'd memory!
+
+ const Type* RetTy = (yyvsp[-6].TypeVal).T->get();
+
+ if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy)
+ error("LLVM functions cannot return aggregate types");
+
+ std::vector<const Type*> ParamTyList;
+
+ // In LLVM 2.0 the signatures of three varargs intrinsics changed to take
+ // i8*. We check here for those names and override the parameter list
+ // types to ensure the prototype is correct.
+ if (FunctionName == "llvm.va_start" || FunctionName == "llvm.va_end") {
+ ParamTyList.push_back(PointerType::get(Type::Int8Ty));
+ } else if (FunctionName == "llvm.va_copy") {
+ ParamTyList.push_back(PointerType::get(Type::Int8Ty));
+ ParamTyList.push_back(PointerType::get(Type::Int8Ty));
+ } else if ((yyvsp[-3].ArgList)) { // If there are arguments...
+ for (std::vector<std::pair<PATypeInfo,char*> >::iterator
+ I = (yyvsp[-3].ArgList)->begin(), E = (yyvsp[-3].ArgList)->end(); I != E; ++I) {
+ const Type *Ty = I->first.T->get();
+ ParamTyList.push_back(Ty);
+ }
+ }
+
+ bool isVarArg = ParamTyList.size() && ParamTyList.back() == Type::VoidTy;
+ if (isVarArg)
+ ParamTyList.pop_back();
+
+ // Convert the CSRet calling convention into the corresponding parameter
+ // attribute.
+ FunctionType::ParamAttrsList ParamAttrs;
+ if ((yyvsp[-7].UIntVal) == OldCallingConv::CSRet) {
+ ParamAttrs.push_back(FunctionType::NoAttributeSet); // result
+ ParamAttrs.push_back(FunctionType::StructRetAttribute); // first arg
+ }
+
+ const FunctionType *FT = FunctionType::get(RetTy, ParamTyList, isVarArg,
+ ParamAttrs);
+ const PointerType *PFT = PointerType::get(FT);
+ delete (yyvsp[-6].TypeVal).T;
+
+ ValID ID;
+ if (!FunctionName.empty()) {
+ ID = ValID::create((char*)FunctionName.c_str());
+ } else {
+ ID = ValID::create((int)CurModule.Values[PFT].size());
+ }
+
+ Function *Fn = 0;
+ // See if this function was forward referenced. If so, recycle the object.
+ if (GlobalValue *FWRef = CurModule.GetForwardRefForGlobal(PFT, ID)) {
+ // Move the function to the end of the list, from whereever it was
+ // previously inserted.
+ Fn = cast<Function>(FWRef);
+ CurModule.CurrentModule->getFunctionList().remove(Fn);
+ CurModule.CurrentModule->getFunctionList().push_back(Fn);
+ } else if (!FunctionName.empty() && // Merge with an earlier prototype?
+ (Fn = CurModule.CurrentModule->getFunction(FunctionName))) {
+ if (Fn->getFunctionType() != FT ) {
+ // The existing function doesn't have the same type. Previously this was
+ // permitted because the symbol tables had "type planes" and names were
+ // distinct within a type plane. After PR411 was fixed, this is no
+ // longer the case. To resolve this we must rename this function.
+ // However, renaming it can cause problems if its linkage is external
+ // because it could cause a link failure. We warn about this.
+ std::string NewName = makeNameUnique(FunctionName);
+ warning("Renaming function '" + FunctionName + "' as '" + NewName +
+ "' may cause linkage errors");
+
+ Fn = new Function(FT, GlobalValue::ExternalLinkage, NewName,
+ CurModule.CurrentModule);
+ InsertValue(Fn, CurModule.Values);
+ RenameMapKey Key = std::make_pair(FunctionName,PFT);
+ CurModule.RenameMap[Key] = NewName;
+ } else {
+ // The types are the same. Either the existing or the current function
+ // needs to be a forward declaration. If not, they're attempting to
+ // redefine a function.
+ if (!CurFun.isDeclare && !Fn->isDeclaration())
+ error("Redefinition of function '" + FunctionName + "'");
+
+ // Make sure to strip off any argument names so we can't get conflicts.
+ if (Fn->isDeclaration())
+ for (Function::arg_iterator AI = Fn->arg_begin(), AE = Fn->arg_end();
+ AI != AE; ++AI)
+ AI->setName("");
+ }
+ } else { // Not already defined?
+ Fn = new Function(FT, GlobalValue::ExternalLinkage, FunctionName,
+ CurModule.CurrentModule);
+
+ InsertValue(Fn, CurModule.Values);
+ }
+
+ CurFun.FunctionStart(Fn);
+
+ if (CurFun.isDeclare) {
+ // If we have declaration, always overwrite linkage. This will allow us
+ // to correctly handle cases, when pointer to function is passed as
+ // argument to another function.
+ Fn->setLinkage(CurFun.Linkage);
}
- *(yyvsp[-7].String) += *(yyvsp[-6].Type).newTy + " " + *(yyvsp[-5].String) + "(" + *(yyvsp[-3].String) + ")";
- if (!(yyvsp[-1].String)->empty()) {
- *(yyvsp[-7].String) += " " + *(yyvsp[-1].String);
+ Fn->setCallingConv(upgradeCallingConv((yyvsp[-7].UIntVal)));
+ Fn->setAlignment((yyvsp[0].UIntVal));
+ if ((yyvsp[-1].StrVal)) {
+ Fn->setSection((yyvsp[-1].StrVal));
+ free((yyvsp[-1].StrVal));
}
- if (!(yyvsp[0].String)->empty()) {
- *(yyvsp[-7].String) += " " + *(yyvsp[0].String);
+
+ // Add all of the arguments we parsed to the function...
+ if ((yyvsp[-3].ArgList)) { // Is null if empty...
+ if (isVarArg) { // Nuke the last entry
+ assert((yyvsp[-3].ArgList)->back().first.T->get() == Type::VoidTy &&
+ (yyvsp[-3].ArgList)->back().second == 0 && "Not a varargs marker");
+ delete (yyvsp[-3].ArgList)->back().first.T;
+ (yyvsp[-3].ArgList)->pop_back(); // Delete the last entry
+ }
+ Function::arg_iterator ArgIt = Fn->arg_begin();
+ Function::arg_iterator ArgEnd = Fn->arg_end();
+ std::vector<std::pair<PATypeInfo,char*> >::iterator I = (yyvsp[-3].ArgList)->begin();
+ std::vector<std::pair<PATypeInfo,char*> >::iterator E = (yyvsp[-3].ArgList)->end();
+ for ( ; I != E && ArgIt != ArgEnd; ++I, ++ArgIt) {
+ delete I->first.T; // Delete the typeholder...
+ setValueName(ArgIt, I->second); // Insert arg into symtab...
+ InsertValue(ArgIt);
+ }
+ delete (yyvsp[-3].ArgList); // We're now done with the argument list
}
- (yyvsp[-6].Type).destroy();
- delete (yyvsp[-5].String);
- delete (yyvsp[-3].String);
- delete (yyvsp[-1].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-7].String);
;}
break;
- case 216:
-#line 932 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string("{"); delete (yyvsp[0].String); ;}
- break;
+ case 224:
+#line 2690 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.FunctionVal) = CurFun.CurrentFunction;
- case 217:
-#line 933 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string ("{"); ;}
+ // Make sure that we keep track of the linkage type even if there was a
+ // previous "declare".
+ (yyval.FunctionVal)->setLinkage((yyvsp[-2].Linkage));
+ ;}
break;
- case 218:
-#line 935 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 227:
+#line 2704 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[-2].String)->empty()) {
- *O << *(yyvsp[-2].String) << " ";
- }
- *O << *(yyvsp[-1].String) << " " << *(yyvsp[0].String) << "\n";
- delete (yyvsp[-2].String); delete (yyvsp[-1].String); delete (yyvsp[0].String);
- (yyval.String) = 0;
-;}
+ (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
+ ;}
break;
- case 219:
-#line 944 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string("}"); delete (yyvsp[0].String); ;}
+ case 229:
+#line 2710 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { CurFun.Linkage = GlobalValue::DLLImportLinkage; ;}
break;
- case 220:
-#line 945 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string("}"); ;}
+ case 230:
+#line 2711 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { CurFun.Linkage = GlobalValue::ExternalWeakLinkage; ;}
break;
- case 221:
-#line 947 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 231:
+#line 2715 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { CurFun.isDeclare = true; ;}
+ break;
+
+ case 232:
+#line 2715 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- if ((yyvsp[-1].String))
- *O << *(yyvsp[-1].String);
- *O << '\n' << *(yyvsp[0].String) << "\n";
- (yyval.String) = 0;
-;}
+ (yyval.FunctionVal) = CurFun.CurrentFunction;
+ CurFun.FunctionDone();
+
+ ;}
break;
- case 222:
-#line 955 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+ case 233:
+#line 2727 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.BoolVal) = false; ;}
break;
- case 225:
-#line 961 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- if (!(yyvsp[-1].String)->empty())
- *(yyvsp[-2].String) += " " + *(yyvsp[-1].String);
- *(yyvsp[-2].String) += " " + *(yyvsp[0].String);
- delete (yyvsp[-1].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-2].String);
- ;}
+ case 234:
+#line 2728 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.BoolVal) = true; ;}
break;
- case 226:
-#line 974 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+ case 235:
+#line 2733 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val)); ;}
break;
case 236:
-#line 980 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyvsp[-1].String)->insert(0, "<");
- *(yyvsp[-1].String) += ">";
- (yyval.String) = (yyvsp[-1].String);
- ;}
+#line 2734 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val)); ;}
+ break;
+
+ case 237:
+#line 2735 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal)); ;}
break;
case 238:
-#line 986 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- if (!(yyvsp[-3].String)->empty()) {
- *(yyvsp[-4].String) += " " + *(yyvsp[-3].String);
- }
- *(yyvsp[-4].String) += " " + *(yyvsp[-2].String) + ", " + *(yyvsp[0].String);
- delete (yyvsp[-3].String); delete (yyvsp[-2].String); delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-4].String);
- ;}
+#line 2736 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, true)); ;}
+ break;
+
+ case 239:
+#line 2737 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, false)); ;}
+ break;
+
+ case 240:
+#line 2738 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::createNull(); ;}
break;
case 241:
-#line 999 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.Value).val = (yyvsp[0].String);
- (yyval.Value).constant = false;
- (yyval.Value).type.newTy = 0;
- (yyval.Value).type.oldTy = UnresolvedTy;
- ;}
+#line 2739 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::createUndef(); ;}
break;
case 242:
-#line 1005 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.Value).val = (yyvsp[0].String);
- (yyval.Value).constant = true;
- (yyval.Value).type.newTy = 0;
- (yyval.Value).type.oldTy = UnresolvedTy;
- ;}
+#line 2740 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::createZeroInit(); ;}
break;
case 243:
-#line 1016 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.Value) = (yyvsp[0].Value);
- (yyval.Value).type = (yyvsp[-1].Type);
- (yyval.Value).val->insert(0, *(yyvsp[-1].Type).newTy + " ");
+#line 2741 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Nonempty unsized packed vector
+ const Type *ETy = (*(yyvsp[-1].ConstVector))[0].C->getType();
+ int NumElements = (yyvsp[-1].ConstVector)->size();
+ PackedType* pt = PackedType::get(ETy, NumElements);
+ PATypeHolder* PTy = new PATypeHolder(
+ HandleUpRefs(PackedType::get(ETy, NumElements)));
+
+ // Verify all elements are correct type!
+ std::vector<Constant*> Elems;
+ for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) {
+ Constant *C = (*(yyvsp[-1].ConstVector))[i].C;
+ const Type *CTy = C->getType();
+ if (ETy != CTy)
+ error("Element #" + utostr(i) + " is not of type '" +
+ ETy->getDescription() +"' as required!\nIt is of type '" +
+ CTy->getDescription() + "'");
+ Elems.push_back(C);
+ }
+ (yyval.ValIDVal) = ValID::create(ConstantPacked::get(pt, Elems));
+ delete PTy; delete (yyvsp[-1].ConstVector);
;}
break;
case 244:
-#line 1022 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2762 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = 0;
+ (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal).C);
;}
break;
case 245:
-#line 1025 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { // Do not allow functions with 0 basic blocks
- (yyval.String) = 0;
+#line 2765 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
+ std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
+ End = UnEscapeLexed((yyvsp[0].StrVal), true);
+ std::string Constraints = std::string((yyvsp[0].StrVal), End);
+ (yyval.ValIDVal) = ValID::createInlineAsm(AsmStr, Constraints, (yyvsp[-3].BoolVal));
+ free((yyvsp[-2].StrVal));
+ free((yyvsp[0].StrVal));
;}
break;
case 246:
-#line 1033 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.String) = 0;
- ;}
+#line 2780 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal)); ;}
break;
case 247:
-#line 1037 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- *O << " " << *(yyvsp[0].String) << "\n";
- delete (yyvsp[0].String);
- (yyval.String) = 0;
- ;}
+#line 2781 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal)); ;}
break;
- case 248:
-#line 1042 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.String) = 0;
+ case 250:
+#line 2794 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type *Ty = (yyvsp[-1].TypeVal).T->get();
+ (yyval.ValueVal).S = (yyvsp[-1].TypeVal).S;
+ (yyval.ValueVal).V = getVal(Ty, (yyvsp[0].ValIDVal));
+ delete (yyvsp[-1].TypeVal).T;
;}
break;
- case 249:
-#line 1045 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 251:
+#line 2803 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *O << *(yyvsp[0].String) << "\n";
- delete (yyvsp[0].String);
- (yyval.String) = 0;
+ (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
;}
break;
- case 251:
-#line 1051 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "unwind"; ;}
- break;
-
case 252:
-#line 1053 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { // Return with a result...
- *O << " " << *(yyvsp[-1].String) << " " << *(yyvsp[0].Value).val << "\n";
- delete (yyvsp[-1].String); (yyvsp[0].Value).destroy();
- (yyval.String) = 0;
+#line 2806 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Do not allow functions with 0 basic blocks
+ (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
;}
break;
case 253:
-#line 1058 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { // Return with no result...
- *O << " " << *(yyvsp[-1].String) << " " << *(yyvsp[0].Type).newTy << "\n";
- delete (yyvsp[-1].String); (yyvsp[0].Type).destroy();
- (yyval.String) = 0;
+#line 2815 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
+ InsertValue((yyvsp[0].TermInstVal));
+ (yyvsp[-2].BasicBlockVal)->getInstList().push_back((yyvsp[0].TermInstVal));
+ InsertValue((yyvsp[-2].BasicBlockVal));
+ (yyval.BasicBlockVal) = (yyvsp[-2].BasicBlockVal);
;}
break;
case 254:
-#line 1063 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { // Unconditional Branch...
- *O << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].Value).val << "\n";
- delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy();
- (yyval.String) = 0;
- ;}
- break;
-
- case 255:
-#line 1068 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- *O << " " << *(yyvsp[-8].String) << " " << *(yyvsp[-7].Type).newTy << " " << *(yyvsp[-6].Value).val << ", "
- << *(yyvsp[-4].Type).newTy << " " << *(yyvsp[-3].Value).val << ", " << *(yyvsp[-1].Type).newTy << " "
- << *(yyvsp[0].Value).val << "\n";
- delete (yyvsp[-8].String); (yyvsp[-7].Type).destroy(); (yyvsp[-6].Value).destroy(); (yyvsp[-4].Type).destroy(); (yyvsp[-3].Value).destroy();
- (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy();
- (yyval.String) = 0;
- ;}
- break;
-
- case 256:
-#line 1076 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2825 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *O << " " << *(yyvsp[-8].String) << " " << *(yyvsp[-7].Type).newTy << " " << *(yyvsp[-6].Value).val << ", "
- << *(yyvsp[-4].Type).newTy << " " << *(yyvsp[-3].Value).val << " [" << *(yyvsp[-1].String) << " ]\n";
- delete (yyvsp[-8].String); (yyvsp[-7].Type).destroy(); (yyvsp[-6].Value).destroy(); (yyvsp[-4].Type).destroy(); (yyvsp[-3].Value).destroy();
- delete (yyvsp[-1].String);
- (yyval.String) = 0;
+ if ((yyvsp[0].InstVal).I)
+ (yyvsp[-1].BasicBlockVal)->getInstList().push_back((yyvsp[0].InstVal).I);
+ (yyval.BasicBlockVal) = (yyvsp[-1].BasicBlockVal);
;}
break;
- case 257:
-#line 1083 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 255:
+#line 2830 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *O << " " << *(yyvsp[-7].String) << " " << *(yyvsp[-6].Type).newTy << " " << *(yyvsp[-5].Value).val << ", "
- << *(yyvsp[-3].Type).newTy << " " << *(yyvsp[-2].Value).val << "[]\n";
- delete (yyvsp[-7].String); (yyvsp[-6].Type).destroy(); (yyvsp[-5].Value).destroy(); (yyvsp[-3].Type).destroy(); (yyvsp[-2].Value).destroy();
- (yyval.String) = 0;
+ (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
+ // Make sure to move the basic block to the correct location in the
+ // function, instead of leaving it inserted wherever it was first
+ // referenced.
+ Function::BasicBlockListType &BBL =
+ CurFun.CurrentFunction->getBasicBlockList();
+ BBL.splice(BBL.end(), BBL, (yyval.BasicBlockVal));
;}
break;
- case 258:
-#line 1090 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 256:
+#line 2839 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *O << " ";
- if (!(yyvsp[-13].String)->empty())
- *O << *(yyvsp[-13].String) << " = ";
- *O << *(yyvsp[-12].String) << " " << *(yyvsp[-11].String) << " " << *(yyvsp[-10].Type).newTy << " " << *(yyvsp[-9].Value).val << " (";
- for (unsigned i = 0; i < (yyvsp[-7].ValList)->size(); ++i) {
- ValueInfo& VI = (*(yyvsp[-7].ValList))[i];
- *O << *VI.val;
- if (i+1 < (yyvsp[-7].ValList)->size())
- *O << ", ";
- VI.destroy();
- }
- *O << ") " << *(yyvsp[-5].String) << " " << *(yyvsp[-4].Type).newTy << " " << *(yyvsp[-3].Value).val << " "
- << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].Value).val << "\n";
- delete (yyvsp[-13].String); delete (yyvsp[-12].String); delete (yyvsp[-11].String); (yyvsp[-10].Type).destroy(); (yyvsp[-9].Value).destroy(); delete (yyvsp[-7].ValList);
- delete (yyvsp[-5].String); (yyvsp[-4].Type).destroy(); (yyvsp[-3].Value).destroy(); delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy();
- (yyvsp[0].Value).destroy();
- (yyval.String) = 0;
+ (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((yyvsp[0].StrVal)), true);
+ // Make sure to move the basic block to the correct location in the
+ // function, instead of leaving it inserted wherever it was first
+ // referenced.
+ Function::BasicBlockListType &BBL =
+ CurFun.CurrentFunction->getBasicBlockList();
+ BBL.splice(BBL.end(), BBL, (yyval.BasicBlockVal));
;}
break;
case 259:
-#line 1109 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- *O << " " << *(yyvsp[0].String) << "\n";
- delete (yyvsp[0].String);
- (yyval.String) = 0;
+#line 2853 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Return with a result...
+ (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal).V);
;}
break;
case 260:
-#line 1114 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- *O << " " << *(yyvsp[0].String) << "\n";
- delete (yyvsp[0].String);
- (yyval.String) = 0;
+#line 2856 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Return with no result...
+ (yyval.TermInstVal) = new ReturnInst();
;}
break;
case 261:
-#line 1120 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + " " + *(yyvsp[-3].String) + ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].Value).val;
- (yyvsp[-4].Type).destroy(); delete (yyvsp[-3].String); (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy();
- (yyval.String) = (yyvsp[-5].String);
+#line 2859 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Unconditional Branch...
+ BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
+ (yyval.TermInstVal) = new BranchInst(tmpBB);
;}
break;
case 262:
-#line 1125 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyvsp[-3].String)->insert(0, *(yyvsp[-4].Type).newTy + " " );
- *(yyvsp[-3].String) += ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].Value).val;
- (yyvsp[-4].Type).destroy(); (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy();
- (yyval.String) = (yyvsp[-3].String);
+#line 2863 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
+ BasicBlock* tmpBBB = getBBVal((yyvsp[0].ValIDVal));
+ Value* tmpVal = getVal(Type::Int1Ty, (yyvsp[-6].ValIDVal));
+ (yyval.TermInstVal) = new BranchInst(tmpBBA, tmpBBB, tmpVal);
;}
break;
case 263:
-#line 1133 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2869 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[-1].String)->empty())
- *(yyvsp[-1].String) += " = ";
- *(yyvsp[-1].String) += *(yyvsp[0].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-1].String);
+ Value* tmpVal = getVal((yyvsp[-7].PrimType).T, (yyvsp[-6].ValIDVal));
+ BasicBlock* tmpBB = getBBVal((yyvsp[-3].ValIDVal));
+ SwitchInst *S = new SwitchInst(tmpVal, tmpBB, (yyvsp[-1].JumpTable)->size());
+ (yyval.TermInstVal) = S;
+ std::vector<std::pair<Constant*,BasicBlock*> >::iterator I = (yyvsp[-1].JumpTable)->begin(),
+ E = (yyvsp[-1].JumpTable)->end();
+ for (; I != E; ++I) {
+ if (ConstantInt *CI = dyn_cast<ConstantInt>(I->first))
+ S->addCase(CI, I->second);
+ else
+ error("Switch case is constant, but not a simple integer");
+ }
+ delete (yyvsp[-1].JumpTable);
;}
break;
case 264:
-#line 1142 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { // Used for PHI nodes
- (yyvsp[-3].Value).val->insert(0, *(yyvsp[-5].Type).newTy + "[");
- *(yyvsp[-3].Value).val += "," + *(yyvsp[-1].Value).val + "]";
- (yyvsp[-5].Type).destroy(); (yyvsp[-1].Value).destroy();
- (yyval.String) = new std::string(*(yyvsp[-3].Value).val);
- (yyvsp[-3].Value).destroy();
+#line 2884 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ Value* tmpVal = getVal((yyvsp[-6].PrimType).T, (yyvsp[-5].ValIDVal));
+ BasicBlock* tmpBB = getBBVal((yyvsp[-2].ValIDVal));
+ SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0);
+ (yyval.TermInstVal) = S;
;}
break;
case 265:
-#line 1149 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2891 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-6].String) += ", [" + *(yyvsp[-3].Value).val + "," + *(yyvsp[-1].Value).val + "]";
- (yyvsp[-3].Value).destroy(); (yyvsp[-1].Value).destroy();
- (yyval.String) = (yyvsp[-6].String);
+ const PointerType *PFTy;
+ const FunctionType *Ty;
+
+ if (!(PFTy = dyn_cast<PointerType>((yyvsp[-10].TypeVal).T->get())) ||
+ !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
+ // Pull out the types of all of the arguments...
+ std::vector<const Type*> ParamTypes;
+ if ((yyvsp[-7].ValueList)) {
+ for (std::vector<ValueInfo>::iterator I = (yyvsp[-7].ValueList)->begin(), E = (yyvsp[-7].ValueList)->end();
+ I != E; ++I)
+ ParamTypes.push_back((*I).V->getType());
+ }
+ FunctionType::ParamAttrsList ParamAttrs;
+ if ((yyvsp[-11].UIntVal) == OldCallingConv::CSRet) {
+ ParamAttrs.push_back(FunctionType::NoAttributeSet);
+ ParamAttrs.push_back(FunctionType::StructRetAttribute);
+ }
+ bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy;
+ if (isVarArg) ParamTypes.pop_back();
+ Ty = FunctionType::get((yyvsp[-10].TypeVal).T->get(), ParamTypes, isVarArg, ParamAttrs);
+ PFTy = PointerType::get(Ty);
+ }
+ Value *V = getVal(PFTy, (yyvsp[-9].ValIDVal)); // Get the function we're calling...
+ BasicBlock *Normal = getBBVal((yyvsp[-3].ValIDVal));
+ BasicBlock *Except = getBBVal((yyvsp[0].ValIDVal));
+
+ // Create the call node...
+ if (!(yyvsp[-7].ValueList)) { // Has no arguments?
+ (yyval.TermInstVal) = new InvokeInst(V, Normal, Except, std::vector<Value*>());
+ } else { // Has arguments?
+ // Loop through FunctionType's arguments and ensure they are specified
+ // correctly!
+ //
+ FunctionType::param_iterator I = Ty->param_begin();
+ FunctionType::param_iterator E = Ty->param_end();
+ std::vector<ValueInfo>::iterator ArgI = (yyvsp[-7].ValueList)->begin(), ArgE = (yyvsp[-7].ValueList)->end();
+
+ std::vector<Value*> Args;
+ for (; ArgI != ArgE && I != E; ++ArgI, ++I) {
+ if ((*ArgI).V->getType() != *I)
+ error("Parameter " +(*ArgI).V->getName()+ " is not of type '" +
+ (*I)->getDescription() + "'");
+ Args.push_back((*ArgI).V);
+ }
+
+ if (I != E || (ArgI != ArgE && !Ty->isVarArg()))
+ error("Invalid number of parameters detected");
+
+ (yyval.TermInstVal) = new InvokeInst(V, Normal, Except, Args);
+ }
+ cast<InvokeInst>((yyval.TermInstVal))->setCallingConv(upgradeCallingConv((yyvsp[-11].UIntVal)));
+ delete (yyvsp[-10].TypeVal).T;
+ delete (yyvsp[-7].ValueList);
;}
break;
case 266:
-#line 1157 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.ValList) = new ValueList();
- (yyval.ValList)->push_back((yyvsp[0].Value));
+#line 2946 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.TermInstVal) = new UnwindInst();
;}
break;
case 267:
-#line 1161 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2949 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyvsp[-2].ValList)->push_back((yyvsp[0].Value));
- (yyval.ValList) = (yyvsp[-2].ValList);
+ (yyval.TermInstVal) = new UnreachableInst();
;}
break;
case 268:
-#line 1168 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValList) = (yyvsp[0].ValList); ;}
+#line 2955 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.JumpTable) = (yyvsp[-5].JumpTable);
+ Constant *V = cast<Constant>(getExistingValue((yyvsp[-4].PrimType).T, (yyvsp[-3].ValIDVal)));
+
+ if (V == 0)
+ error("May only switch on a constant pool value");
+
+ BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
+ (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
+ ;}
break;
case 269:
-#line 1169 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValList) = new ValueList(); ;}
+#line 2965 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
+ Constant *V = cast<Constant>(getExistingValue((yyvsp[-4].PrimType).T, (yyvsp[-3].ValIDVal)));
+
+ if (V == 0)
+ error("May only switch on a constant pool value");
+
+ BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
+ (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
+ ;}
break;
case 270:
-#line 1173 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2978 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-1].String);
+ bool omit = false;
+ if ((yyvsp[-1].StrVal))
+ if (BitCastInst *BCI = dyn_cast<BitCastInst>((yyvsp[0].InstVal).I))
+ if (BCI->getSrcTy() == BCI->getDestTy() &&
+ BCI->getOperand(0)->getName() == (yyvsp[-1].StrVal))
+ // This is a useless bit cast causing a name redefinition. It is
+ // a bit cast from a type to the same type of an operand with the
+ // same name as the name we would give this instruction. Since this
+ // instruction results in no code generation, it is safe to omit
+ // the instruction. This situation can occur because of collapsed
+ // type planes. For example:
+ // %X = add int %Y, %Z
+ // %X = cast int %Y to uint
+ // After upgrade, this looks like:
+ // %X = add i32 %Y, %Z
+ // %X = bitcast i32 to i32
+ // The bitcast is clearly useless so we omit it.
+ omit = true;
+ if (omit) {
+ (yyval.InstVal).I = 0;
+ (yyval.InstVal).S = Signless;
+ } else {
+ setValueName((yyvsp[0].InstVal).I, (yyvsp[-1].StrVal));
+ InsertValue((yyvsp[0].InstVal).I);
+ (yyval.InstVal) = (yyvsp[0].InstVal);
+ }
;}
break;
- case 272:
-#line 1181 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- const char* op = getDivRemOpcode(*(yyvsp[-4].String), (yyvsp[-3].Type));
- (yyval.String) = new std::string(op);
- *(yyval.String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
- delete (yyvsp[-4].String); (yyvsp[-3].Type).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
+ case 271:
+#line 3007 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Used for PHI nodes
+ (yyval.PHIList).P = new std::list<std::pair<Value*, BasicBlock*> >();
+ (yyval.PHIList).S = (yyvsp[-5].TypeVal).S;
+ Value* tmpVal = getVal((yyvsp[-5].TypeVal).T->get(), (yyvsp[-3].ValIDVal));
+ BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal));
+ (yyval.PHIList).P->push_back(std::make_pair(tmpVal, tmpBB));
+ delete (yyvsp[-5].TypeVal).T;
;}
break;
- case 273:
-#line 1187 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 272:
+#line 3015 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
- (yyvsp[-3].Type).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
- (yyval.String) = (yyvsp[-4].String);
+ (yyval.PHIList) = (yyvsp[-6].PHIList);
+ Value* tmpVal = getVal((yyvsp[-6].PHIList).P->front().first->getType(), (yyvsp[-3].ValIDVal));
+ BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal));
+ (yyvsp[-6].PHIList).P->push_back(std::make_pair(tmpVal, tmpBB));
;}
break;
- case 274:
-#line 1192 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
-#if UPGRADE_SETCOND_OPS
- *(yyvsp[-4].String) = getCompareOp(*(yyvsp[-4].String), (yyvsp[-3].Type));
-#endif
- *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
- (yyvsp[-3].Type).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
- (yyval.String) = (yyvsp[-4].String);
+ case 273:
+#line 3023 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { // Used for call statements, and memory insts...
+ (yyval.ValueList) = new std::vector<ValueInfo>();
+ (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
;}
break;
- case 275:
-#line 1200 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 274:
+#line 3027 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-6].String) += " " + *(yyvsp[-5].String) + " " + *(yyvsp[-3].Value).val + "," + *(yyvsp[-1].Value).val + ")";
- delete (yyvsp[-5].String); (yyvsp[-3].Value).destroy(); (yyvsp[-1].Value).destroy();
- (yyval.String) = (yyvsp[-6].String);
+ (yyval.ValueList) = (yyvsp[-2].ValueList);
+ (yyvsp[-2].ValueList)->push_back((yyvsp[0].ValueVal));
;}
break;
case 276:
-#line 1205 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- {
- *(yyvsp[-6].String) += " " + *(yyvsp[-5].String) + " " + *(yyvsp[-3].Value).val + "," + *(yyvsp[-1].Value).val + ")";
- delete (yyvsp[-5].String); (yyvsp[-3].Value).destroy(); (yyvsp[-1].Value).destroy();
- (yyval.String) = (yyvsp[-6].String);
- ;}
+#line 3035 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValueList) = 0; ;}
break;
case 277:
-#line 1210 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3039 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val;
- (yyvsp[0].Value).destroy();
- (yyval.String) = (yyvsp[-1].String);
+ (yyval.BoolVal) = true;
;}
break;
case 278:
-#line 1215 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3042 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- const char* shiftop = (yyvsp[-3].String)->c_str();
- if (*(yyvsp[-3].String) == "shr")
- shiftop = ((yyvsp[-2].Value).type.isUnsigned()) ? "lshr" : "ashr";
- (yyval.String) = new std::string(shiftop);
- *(yyval.String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
- delete (yyvsp[-3].String); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
+ (yyval.BoolVal) = false;
;}
break;
case 279:
-#line 1223 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3048 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- std::string source = *(yyvsp[-2].Value).val;
- TypeInfo SrcTy = (yyvsp[-2].Value).type;
- TypeInfo DstTy = (yyvsp[0].Type);
- ResolveType(DstTy);
- (yyval.String) = new std::string();
- if (*(yyvsp[-3].String) == "cast") {
- *(yyval.String) += getCastUpgrade(source, SrcTy, DstTy, false);
- } else {
- *(yyval.String) += *(yyvsp[-3].String) + " " + source + " to " + *DstTy.newTy;
- }
- delete (yyvsp[-3].String); (yyvsp[-2].Value).destroy();
- delete (yyvsp[-1].String); (yyvsp[0].Type).destroy();
+ const Type* Ty = (yyvsp[-3].TypeVal).T->get();
+ if (!Ty->isInteger() && !Ty->isFloatingPoint() && !isa<PackedType>(Ty))
+ error("Arithmetic operator requires integer, FP, or packed operands");
+ if (isa<PackedType>(Ty) &&
+ ((yyvsp[-4].BinaryOpVal) == URemOp || (yyvsp[-4].BinaryOpVal) == SRemOp || (yyvsp[-4].BinaryOpVal) == FRemOp || (yyvsp[-4].BinaryOpVal) == RemOp))
+ error("Remainder not supported on packed types");
+ // Upgrade the opcode from obsolete versions before we do anything with it.
+ Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[-4].BinaryOpVal), Ty, (yyvsp[-3].TypeVal).S);
+ Value* val1 = getVal(Ty, (yyvsp[-2].ValIDVal));
+ Value* val2 = getVal(Ty, (yyvsp[0].ValIDVal));
+ (yyval.InstVal).I = BinaryOperator::create(Opcode, val1, val2);
+ if ((yyval.InstVal).I == 0)
+ error("binary operator returned null");
+ (yyval.InstVal).S = (yyvsp[-3].TypeVal).S;
+ delete (yyvsp[-3].TypeVal).T;
;}
break;
case 280:
-#line 1237 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3065 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
- (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
- (yyval.String) = (yyvsp[-5].String);
+ const Type *Ty = (yyvsp[-3].TypeVal).T->get();
+ if (!Ty->isInteger()) {
+ if (!isa<PackedType>(Ty) ||
+ !cast<PackedType>(Ty)->getElementType()->isInteger())
+ error("Logical operator requires integral operands");
+ }
+ Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[-4].BinaryOpVal), Ty, (yyvsp[-3].TypeVal).S);
+ Value* tmpVal1 = getVal(Ty, (yyvsp[-2].ValIDVal));
+ Value* tmpVal2 = getVal(Ty, (yyvsp[0].ValIDVal));
+ (yyval.InstVal).I = BinaryOperator::create(Opcode, tmpVal1, tmpVal2);
+ if ((yyval.InstVal).I == 0)
+ error("binary operator returned null");
+ (yyval.InstVal).S = (yyvsp[-3].TypeVal).S;
+ delete (yyvsp[-3].TypeVal).T;
;}
break;
case 281:
-#line 1242 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3081 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Type).newTy;
- (yyvsp[-2].Value).destroy(); (yyvsp[0].Type).destroy();
- (yyval.String) = (yyvsp[-3].String);
+ const Type* Ty = (yyvsp[-3].TypeVal).T->get();
+ if(isa<PackedType>(Ty))
+ error("PackedTypes currently not supported in setcc instructions");
+ unsigned short pred;
+ Instruction::OtherOps Opcode = getCompareOp((yyvsp[-4].BinaryOpVal), pred, Ty, (yyvsp[-3].TypeVal).S);
+ Value* tmpVal1 = getVal(Ty, (yyvsp[-2].ValIDVal));
+ Value* tmpVal2 = getVal(Ty, (yyvsp[0].ValIDVal));
+ (yyval.InstVal).I = CmpInst::create(Opcode, pred, tmpVal1, tmpVal2);
+ if ((yyval.InstVal).I == 0)
+ error("binary operator returned null");
+ (yyval.InstVal).S = Unsigned;
+ delete (yyvsp[-3].TypeVal).T;
;}
break;
case 282:
-#line 1247 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3095 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
- (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
- (yyval.String) = (yyvsp[-3].String);
+ const Type *Ty = (yyvsp[-3].TypeVal).T->get();
+ if (isa<PackedType>(Ty))
+ error("PackedTypes currently not supported in icmp instructions");
+ else if (!Ty->isInteger() && !isa<PointerType>(Ty))
+ error("icmp requires integer or pointer typed operands");
+ Value* tmpVal1 = getVal(Ty, (yyvsp[-2].ValIDVal));
+ Value* tmpVal2 = getVal(Ty, (yyvsp[0].ValIDVal));
+ (yyval.InstVal).I = new ICmpInst((yyvsp[-4].IPred), tmpVal1, tmpVal2);
+ (yyval.InstVal).S = Unsigned;
+ delete (yyvsp[-3].TypeVal).T;
;}
break;
case 283:
-#line 1252 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3107 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
- (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
- (yyval.String) = (yyvsp[-5].String);
+ const Type *Ty = (yyvsp[-3].TypeVal).T->get();
+ if (isa<PackedType>(Ty))
+ error("PackedTypes currently not supported in fcmp instructions");
+ else if (!Ty->isFloatingPoint())
+ error("fcmp instruction requires floating point operands");
+ Value* tmpVal1 = getVal(Ty, (yyvsp[-2].ValIDVal));
+ Value* tmpVal2 = getVal(Ty, (yyvsp[0].ValIDVal));
+ (yyval.InstVal).I = new FCmpInst((yyvsp[-4].FPred), tmpVal1, tmpVal2);
+ (yyval.InstVal).S = Unsigned;
+ delete (yyvsp[-3].TypeVal).T;
;}
break;
case 284:
-#line 1257 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3119 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
- (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
- (yyval.String) = (yyvsp[-5].String);
+ warning("Use of obsolete 'not' instruction: Replacing with 'xor");
+ const Type *Ty = (yyvsp[0].ValueVal).V->getType();
+ Value *Ones = ConstantInt::getAllOnesValue(Ty);
+ if (Ones == 0)
+ error("Expected integral type for not instruction");
+ (yyval.InstVal).I = BinaryOperator::create(Instruction::Xor, (yyvsp[0].ValueVal).V, Ones);
+ if ((yyval.InstVal).I == 0)
+ error("Could not create a xor instruction");
+ (yyval.InstVal).S = (yyvsp[0].ValueVal).S
;}
break;
case 285:
-#line 1262 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3130 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-1].String);
+ if (!(yyvsp[0].ValueVal).V->getType()->isInteger() ||
+ cast<IntegerType>((yyvsp[0].ValueVal).V->getType())->getBitWidth() != 8)
+ error("Shift amount must be int8");
+ const Type* Ty = (yyvsp[-2].ValueVal).V->getType();
+ if (!Ty->isInteger())
+ error("Shift constant expression requires integer operand");
+ Value* ShiftAmt = 0;
+ if (cast<IntegerType>(Ty)->getBitWidth() > Type::Int8Ty->getBitWidth())
+ if (Constant *C = dyn_cast<Constant>((yyvsp[0].ValueVal).V))
+ ShiftAmt = ConstantExpr::getZExt(C, Ty);
+ else
+ ShiftAmt = new ZExtInst((yyvsp[0].ValueVal).V, Ty, makeNameUnique("shift"), CurBB);
+ else
+ ShiftAmt = (yyvsp[0].ValueVal).V;
+ (yyval.InstVal).I = BinaryOperator::create(getBinaryOp((yyvsp[-3].BinaryOpVal), Ty, (yyvsp[-2].ValueVal).S), (yyvsp[-2].ValueVal).V, ShiftAmt);
+ (yyval.InstVal).S = (yyvsp[-2].ValueVal).S;
;}
break;
case 286:
-#line 1267 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3148 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[-5].String)->empty())
- *(yyvsp[-6].String) += " " + *(yyvsp[-5].String);
- if (!(yyvsp[-6].String)->empty())
- *(yyvsp[-6].String) += " ";
- *(yyvsp[-6].String) += *(yyvsp[-4].Type).newTy + " " + *(yyvsp[-3].Value).val + "(";
- for (unsigned i = 0; i < (yyvsp[-1].ValList)->size(); ++i) {
- ValueInfo& VI = (*(yyvsp[-1].ValList))[i];
- *(yyvsp[-6].String) += *VI.val;
- if (i+1 < (yyvsp[-1].ValList)->size())
- *(yyvsp[-6].String) += ", ";
- VI.destroy();
- }
- *(yyvsp[-6].String) += ")";
- delete (yyvsp[-5].String); (yyvsp[-4].Type).destroy(); (yyvsp[-3].Value).destroy(); delete (yyvsp[-1].ValList);
- (yyval.String) = (yyvsp[-6].String);
+ const Type *DstTy = (yyvsp[0].TypeVal).T->get();
+ if (!DstTy->isFirstClassType())
+ error("cast instruction to a non-primitive type: '" +
+ DstTy->getDescription() + "'");
+ (yyval.InstVal).I = cast<Instruction>(getCast((yyvsp[-3].CastOpVal), (yyvsp[-2].ValueVal).V, (yyvsp[-2].ValueVal).S, DstTy, (yyvsp[0].TypeVal).S, true));
+ (yyval.InstVal).S = (yyvsp[0].TypeVal).S;
+ delete (yyvsp[0].TypeVal).T;
+ ;}
+ break;
+
+ case 287:
+#line 3157 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ if (!(yyvsp[-4].ValueVal).V->getType()->isInteger() ||
+ cast<IntegerType>((yyvsp[-4].ValueVal).V->getType())->getBitWidth() != 1)
+ error("select condition must be bool");
+ if ((yyvsp[-2].ValueVal).V->getType() != (yyvsp[0].ValueVal).V->getType())
+ error("select value types should match");
+ (yyval.InstVal).I = new SelectInst((yyvsp[-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V);
+ (yyval.InstVal).S = (yyvsp[-4].ValueVal).S;
;}
break;
case 288:
-#line 1289 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValList) = (yyvsp[0].ValList); ;}
+#line 3166 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type *Ty = (yyvsp[0].TypeVal).T->get();
+ NewVarArgs = true;
+ (yyval.InstVal).I = new VAArgInst((yyvsp[-2].ValueVal).V, Ty);
+ (yyval.InstVal).S = (yyvsp[0].TypeVal).S;
+ delete (yyvsp[0].TypeVal).T;
+ ;}
break;
case 289:
-#line 1290 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValList) = new ValueList(); ;}
+#line 3173 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type* ArgTy = (yyvsp[-2].ValueVal).V->getType();
+ const Type* DstTy = (yyvsp[0].TypeVal).T->get();
+ ObsoleteVarArgs = true;
+ Function* NF = cast<Function>(CurModule.CurrentModule->
+ getOrInsertFunction("llvm.va_copy", ArgTy, ArgTy, (Type *)0));
+
+ //b = vaarg a, t ->
+ //foo = alloca 1 of t
+ //bar = vacopy a
+ //store bar -> foo
+ //b = vaarg foo, t
+ AllocaInst* foo = new AllocaInst(ArgTy, 0, "vaarg.fix");
+ CurBB->getInstList().push_back(foo);
+ CallInst* bar = new CallInst(NF, (yyvsp[-2].ValueVal).V);
+ CurBB->getInstList().push_back(bar);
+ CurBB->getInstList().push_back(new StoreInst(bar, foo));
+ (yyval.InstVal).I = new VAArgInst(foo, DstTy);
+ (yyval.InstVal).S = (yyvsp[0].TypeVal).S;
+ delete (yyvsp[0].TypeVal).T;
+ ;}
+ break;
+
+ case 290:
+#line 3194 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type* ArgTy = (yyvsp[-2].ValueVal).V->getType();
+ const Type* DstTy = (yyvsp[0].TypeVal).T->get();
+ ObsoleteVarArgs = true;
+ Function* NF = cast<Function>(CurModule.CurrentModule->
+ getOrInsertFunction("llvm.va_copy", ArgTy, ArgTy, (Type *)0));
+
+ //b = vanext a, t ->
+ //foo = alloca 1 of t
+ //bar = vacopy a
+ //store bar -> foo
+ //tmp = vaarg foo, t
+ //b = load foo
+ AllocaInst* foo = new AllocaInst(ArgTy, 0, "vanext.fix");
+ CurBB->getInstList().push_back(foo);
+ CallInst* bar = new CallInst(NF, (yyvsp[-2].ValueVal).V);
+ CurBB->getInstList().push_back(bar);
+ CurBB->getInstList().push_back(new StoreInst(bar, foo));
+ Instruction* tmp = new VAArgInst(foo, DstTy);
+ CurBB->getInstList().push_back(tmp);
+ (yyval.InstVal).I = new LoadInst(foo);
+ (yyval.InstVal).S = (yyvsp[0].TypeVal).S;
+ delete (yyvsp[0].TypeVal).T;
+ ;}
break;
case 291:
-#line 1295 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+#line 3218 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V))
+ error("Invalid extractelement operands");
+ (yyval.InstVal).I = new ExtractElementInst((yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V);
+ (yyval.InstVal).S = (yyvsp[-2].ValueVal).S;
+ ;}
break;
case 292:
-#line 1298 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3224 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
- if (!(yyvsp[0].String)->empty())
- *(yyvsp[-2].String) += " " + *(yyvsp[0].String);
- (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-2].String);
+ if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V))
+ error("Invalid insertelement operands");
+ (yyval.InstVal).I = new InsertElementInst((yyvsp[-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V);
+ (yyval.InstVal).S = (yyvsp[-4].ValueVal).S;
;}
break;
case 293:
-#line 1305 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3230 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val;
- if (!(yyvsp[0].String)->empty())
- *(yyvsp[-5].String) += " " + *(yyvsp[0].String);
- (yyvsp[-4].Type).destroy(); (yyvsp[-2].Type).destroy(); (yyvsp[-1].Value).destroy(); delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-5].String);
+ if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V))
+ error("Invalid shufflevector operands");
+ (yyval.InstVal).I = new ShuffleVectorInst((yyvsp[-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V);
+ (yyval.InstVal).S = (yyvsp[-4].ValueVal).S;
;}
break;
case 294:
-#line 1312 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3236 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy;
- if (!(yyvsp[0].String)->empty())
- *(yyvsp[-2].String) += " " + *(yyvsp[0].String);
- (yyvsp[-1].Type).destroy(); delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-2].String);
+ const Type *Ty = (yyvsp[0].PHIList).P->front().first->getType();
+ if (!Ty->isFirstClassType())
+ error("PHI node operands must be of first class type");
+ PHINode *PHI = new PHINode(Ty);
+ PHI->reserveOperandSpace((yyvsp[0].PHIList).P->size());
+ while ((yyvsp[0].PHIList).P->begin() != (yyvsp[0].PHIList).P->end()) {
+ if ((yyvsp[0].PHIList).P->front().first->getType() != Ty)
+ error("All elements of a PHI node must be of the same type");
+ PHI->addIncoming((yyvsp[0].PHIList).P->front().first, (yyvsp[0].PHIList).P->front().second);
+ (yyvsp[0].PHIList).P->pop_front();
+ }
+ (yyval.InstVal).I = PHI;
+ (yyval.InstVal).S = (yyvsp[0].PHIList).S;
+ delete (yyvsp[0].PHIList).P; // Free the list...
;}
break;
case 295:
-#line 1319 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3252 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val;
- if (!(yyvsp[0].String)->empty())
- *(yyvsp[-5].String) += " " + *(yyvsp[0].String);
- (yyvsp[-4].Type).destroy(); (yyvsp[-2].Type).destroy(); (yyvsp[-1].Value).destroy(); delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-5].String);
+
+ // Handle the short call syntax
+ const PointerType *PFTy;
+ const FunctionType *FTy;
+ if (!(PFTy = dyn_cast<PointerType>((yyvsp[-4].TypeVal).T->get())) ||
+ !(FTy = dyn_cast<FunctionType>(PFTy->getElementType()))) {
+ // Pull out the types of all of the arguments...
+ std::vector<const Type*> ParamTypes;
+ if ((yyvsp[-1].ValueList)) {
+ for (std::vector<ValueInfo>::iterator I = (yyvsp[-1].ValueList)->begin(), E = (yyvsp[-1].ValueList)->end();
+ I != E; ++I)
+ ParamTypes.push_back((*I).V->getType());
+ }
+
+ FunctionType::ParamAttrsList ParamAttrs;
+ if ((yyvsp[-5].UIntVal) == OldCallingConv::CSRet) {
+ ParamAttrs.push_back(FunctionType::NoAttributeSet);
+ ParamAttrs.push_back(FunctionType::StructRetAttribute);
+ }
+ bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy;
+ if (isVarArg) ParamTypes.pop_back();
+
+ const Type *RetTy = (yyvsp[-4].TypeVal).T->get();
+ if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy)
+ error("Functions cannot return aggregate types");
+
+ FTy = FunctionType::get(RetTy, ParamTypes, isVarArg, ParamAttrs);
+ PFTy = PointerType::get(FTy);
+ }
+
+ // First upgrade any intrinsic calls.
+ std::vector<Value*> Args;
+ if ((yyvsp[-1].ValueList))
+ for (unsigned i = 0, e = (yyvsp[-1].ValueList)->size(); i < e; ++i)
+ Args.push_back((*(yyvsp[-1].ValueList))[i].V);
+ Instruction *Inst = upgradeIntrinsicCall(FTy, (yyvsp[-3].ValIDVal), Args);
+
+ // If we got an upgraded intrinsic
+ if (Inst) {
+ (yyval.InstVal).I = Inst;
+ (yyval.InstVal).S = Signless;
+ } else {
+ // Get the function we're calling
+ Value *V = getVal(PFTy, (yyvsp[-3].ValIDVal));
+
+ // Check the argument values match
+ if (!(yyvsp[-1].ValueList)) { // Has no arguments?
+ // Make sure no arguments is a good thing!
+ if (FTy->getNumParams() != 0)
+ error("No arguments passed to a function that expects arguments");
+ } else { // Has arguments?
+ // Loop through FunctionType's arguments and ensure they are specified
+ // correctly!
+ //
+ FunctionType::param_iterator I = FTy->param_begin();
+ FunctionType::param_iterator E = FTy->param_end();
+ std::vector<ValueInfo>::iterator ArgI = (yyvsp[-1].ValueList)->begin(), ArgE = (yyvsp[-1].ValueList)->end();
+
+ for (; ArgI != ArgE && I != E; ++ArgI, ++I)
+ if ((*ArgI).V->getType() != *I)
+ error("Parameter " +(*ArgI).V->getName()+ " is not of type '" +
+ (*I)->getDescription() + "'");
+
+ if (I != E || (ArgI != ArgE && !FTy->isVarArg()))
+ error("Invalid number of parameters detected");
+ }
+
+ // Create the call instruction
+ CallInst *CI = new CallInst(V, Args);
+ CI->setTailCall((yyvsp[-6].BoolVal));
+ CI->setCallingConv(upgradeCallingConv((yyvsp[-5].UIntVal)));
+ (yyval.InstVal).I = CI;
+ (yyval.InstVal).S = (yyvsp[-4].TypeVal).S;
+ }
+ delete (yyvsp[-4].TypeVal).T;
+ delete (yyvsp[-1].ValueList);
;}
break;
case 296:
-#line 1326 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3330 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val;
- (yyvsp[0].Value).destroy();
- (yyval.String) = (yyvsp[-1].String);
+ (yyval.InstVal) = (yyvsp[0].InstVal);
;}
break;
case 297:
-#line 1331 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3338 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValueList) = (yyvsp[0].ValueList); ;}
+ break;
+
+ case 298:
+#line 3339 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValueList) = new std::vector<ValueInfo>(); ;}
+ break;
+
+ case 299:
+#line 3343 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.BoolVal) = true; ;}
+ break;
+
+ case 300:
+#line 3344 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.BoolVal) = false; ;}
+ break;
+
+ case 301:
+#line 3348 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[-3].String)->empty())
- *(yyvsp[-3].String) += " ";
- *(yyvsp[-3].String) += *(yyvsp[-2].String) + " " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].Value).val;
- delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy();
- (yyval.String) = (yyvsp[-3].String);
+ const Type *Ty = (yyvsp[-1].TypeVal).T->get();
+ (yyval.InstVal).S = (yyvsp[-1].TypeVal).S;
+ (yyval.InstVal).I = new MallocInst(Ty, 0, (yyvsp[0].UIntVal));
+ delete (yyvsp[-1].TypeVal).T;
;}
break;
- case 298:
-#line 1338 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 302:
+#line 3354 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[-5].String)->empty())
- *(yyvsp[-5].String) += " ";
- *(yyvsp[-5].String) += *(yyvsp[-4].String) + " " + *(yyvsp[-3].Value).val + ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].Value).val;
- delete (yyvsp[-4].String); (yyvsp[-3].Value).destroy(); (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy();
- (yyval.String) = (yyvsp[-5].String);
+ const Type *Ty = (yyvsp[-4].TypeVal).T->get();
+ (yyval.InstVal).S = (yyvsp[-4].TypeVal).S;
+ (yyval.InstVal).I = new MallocInst(Ty, getVal((yyvsp[-2].PrimType).T, (yyvsp[-1].ValIDVal)), (yyvsp[0].UIntVal));
+ delete (yyvsp[-4].TypeVal).T;
;}
break;
- case 299:
-#line 1345 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+ case 303:
+#line 3360 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
{
- // Upgrade the indices
- for (unsigned i = 0; i < (yyvsp[0].ValList)->size(); ++i) {
- ValueInfo& VI = (*(yyvsp[0].ValList))[i];
- if (VI.type.isUnsigned() && !VI.isConstant() &&
- VI.type.getBitWidth() < 64) {
- std::string* old = VI.val;
- *O << " %gep_upgrade" << unique << " = zext " << *old
- << " to ulong\n";
- VI.val = new std::string("ulong %gep_upgrade" + llvm::utostr(unique++));
- VI.type.oldTy = ULongTy;
- delete old;
- }
- }
- *(yyvsp[-3].String) += " " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val;
- for (unsigned i = 0; i < (yyvsp[0].ValList)->size(); ++i) {
- ValueInfo& VI = (*(yyvsp[0].ValList))[i];
- *(yyvsp[-3].String) += ", " + *VI.val;
- VI.destroy();
- }
- (yyvsp[-2].Type).destroy(); (yyvsp[-1].Value).destroy(); delete (yyvsp[0].ValList);
- (yyval.String) = (yyvsp[-3].String);
+ const Type *Ty = (yyvsp[-1].TypeVal).T->get();
+ (yyval.InstVal).S = (yyvsp[-1].TypeVal).S;
+ (yyval.InstVal).I = new AllocaInst(Ty, 0, (yyvsp[0].UIntVal));
+ delete (yyvsp[-1].TypeVal).T;
+ ;}
+ break;
+
+ case 304:
+#line 3366 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type *Ty = (yyvsp[-4].TypeVal).T->get();
+ (yyval.InstVal).S = (yyvsp[-4].TypeVal).S;
+ (yyval.InstVal).I = new AllocaInst(Ty, getVal((yyvsp[-2].PrimType).T, (yyvsp[-1].ValIDVal)), (yyvsp[0].UIntVal));
+ delete (yyvsp[-4].TypeVal).T;
+ ;}
+ break;
+
+ case 305:
+#line 3372 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type *PTy = (yyvsp[0].ValueVal).V->getType();
+ if (!isa<PointerType>(PTy))
+ error("Trying to free nonpointer type '" + PTy->getDescription() + "'");
+ (yyval.InstVal).I = new FreeInst((yyvsp[0].ValueVal).V);
+ (yyval.InstVal).S = Signless;
+ ;}
+ break;
+
+ case 306:
+#line 3379 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type* Ty = (yyvsp[-1].TypeVal).T->get();
+ (yyval.InstVal).S = (yyvsp[-1].TypeVal).S;
+ if (!isa<PointerType>(Ty))
+ error("Can't load from nonpointer type: " + Ty->getDescription());
+ if (!cast<PointerType>(Ty)->getElementType()->isFirstClassType())
+ error("Can't load from pointer of non-first-class type: " +
+ Ty->getDescription());
+ Value* tmpVal = getVal(Ty, (yyvsp[0].ValIDVal));
+ (yyval.InstVal).I = new LoadInst(tmpVal, "", (yyvsp[-3].BoolVal));
+ delete (yyvsp[-1].TypeVal).T;
+ ;}
+ break;
+
+ case 307:
+#line 3391 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal).T->get());
+ if (!PTy)
+ error("Can't store to a nonpointer type: " +
+ (yyvsp[-1].TypeVal).T->get()->getDescription());
+ const Type *ElTy = PTy->getElementType();
+ if (ElTy != (yyvsp[-3].ValueVal).V->getType())
+ error("Can't store '" + (yyvsp[-3].ValueVal).V->getType()->getDescription() +
+ "' into space of type '" + ElTy->getDescription() + "'");
+ Value* tmpVal = getVal(PTy, (yyvsp[0].ValIDVal));
+ (yyval.InstVal).I = new StoreInst((yyvsp[-3].ValueVal).V, tmpVal, (yyvsp[-5].BoolVal));
+ (yyval.InstVal).S = Signless;
+ delete (yyvsp[-1].TypeVal).T;
+ ;}
+ break;
+
+ case 308:
+#line 3405 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type* Ty = (yyvsp[-2].TypeVal).T->get();
+ if (!isa<PointerType>(Ty))
+ error("getelementptr insn requires pointer operand");
+
+ std::vector<Value*> VIndices;
+ upgradeGEPIndices(Ty, (yyvsp[0].ValueList), VIndices);
+
+ Value* tmpVal = getVal(Ty, (yyvsp[-1].ValIDVal));
+ (yyval.InstVal).I = new GetElementPtrInst(tmpVal, VIndices);
+ (yyval.InstVal).S = Signless;
+ delete (yyvsp[-2].TypeVal).T;
+ delete (yyvsp[0].ValueList);
;}
break;
}
/* Line 1126 of yacc.c. */
-#line 3867 "UpgradeParser.tab.c"
+#line 6137 "UpgradeParser.tab.c"
\f
yyvsp -= yylen;
yyssp -= yylen;
}
-#line 1369 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3421 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
int yyerror(const char *ErrorMsg) {
std::string where
= std::string((CurFilename == "-") ? std::string("<stdin>") : CurFilename)
- + ":" + llvm::utostr((unsigned) Upgradelineno) + ": ";
- std::string errMsg = std::string(ErrorMsg) + "\n" + where + " while reading ";
- if (yychar == YYEMPTY || yychar == 0)
- errMsg += "end-of-file.";
- else
- errMsg += "token: '" + std::string(Upgradetext, Upgradeleng) + "'";
- std::cerr << errMsg << '\n';
+ + ":" + llvm::utostr((unsigned) Upgradelineno-1) + ": ";
+ std::string errMsg = where + "error: " + std::string(ErrorMsg);
+ if (yychar != YYEMPTY && yychar != 0)
+ errMsg += " while reading token '" + std::string(Upgradetext, Upgradeleng) +
+ "'.";
+ std::cerr << "llvm-upgrade: " << errMsg << '\n';
+ std::cout << "llvm-upgrade: parse failed.\n";
exit(1);
}
+void warning(const std::string& ErrorMsg) {
+ std::string where
+ = std::string((CurFilename == "-") ? std::string("<stdin>") : CurFilename)
+ + ":" + llvm::utostr((unsigned) Upgradelineno-1) + ": ";
+ std::string errMsg = where + "warning: " + std::string(ErrorMsg);
+ if (yychar != YYEMPTY && yychar != 0)
+ errMsg += " while reading token '" + std::string(Upgradetext, Upgradeleng) +
+ "'.";
+ std::cerr << "llvm-upgrade: " << errMsg << '\n';
+}
+
+void error(const std::string& ErrorMsg, int LineNo) {
+ if (LineNo == -1) LineNo = Upgradelineno;
+ Upgradelineno = LineNo;
+ yyerror(ErrorMsg.c_str());
+}
+
+
projects / oota-llvm.git / blobdiff