/* 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-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 14 "/proj/llvm/llvm-2/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/ParameterAttributes.h"
+#include "llvm/ValueSymbolTable.h"
+#include "llvm/Support/GetElementPtrTypeIterator.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/Support/MathExtras.h"
#include <algorithm>
+#include <iostream>
#include <map>
+#include <list>
#include <utility>
-#include <iostream>
+
+// 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
-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;
// This bool controls whether attributes are ever added to function declarations
// definitions and calls.
static bool AddAttributes = false;
-// This bool is used to communicate between the InstVal and Inst rules about
-// whether or not a cast should be deleted. When the flag is set, InstVal has
-// determined that the cast is a candidate. However, it can only be deleted if
-// the value being casted is the same value name as the instruction. The Inst
-// rule makes that comparison if the flag is set and comments out the
-// instruction if they match.
-static bool deleteUselessCastFlag = false;
-static std::string* deleteUselessCastName = 0;
-
-typedef std::vector<const TypeInfo*> TypeVector;
-static TypeVector EnumeratedTypes;
-typedef std::map<std::string,const TypeInfo*> TypeMap;
-static TypeMap NamedTypes;
-typedef std::map<const TypeInfo*,std::string> TypePlaneMap;
-typedef std::map<std::string,TypePlaneMap> GlobalsTypeMap;
-static GlobalsTypeMap Globals;
-
-static void warning(const std::string& msg);
-
-void destroy(ValueList* VL) {
- while (!VL->empty()) {
- ValueInfo& VI = VL->back();
- VI.destroy();
- VL->pop_back();
+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,TypeInfo> 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::vector<Signedness> TypeSigns;
+ std::map<std::string,Signedness> NamedTypeSigns;
+ std::map<std::string,Signedness> NamedValueSigns;
+ 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();
+ TypeSigns.clear();
+ NamedTypeSigns.clear();
+ NamedValueSigns.clear();
+ CurrentModule = 0;
}
- delete VL;
-}
-void UpgradeAssembly(const std::string &infile, std::istream& in,
- std::ostream &out, bool debug, bool addAttrs)
-{
- Upgradelineno = 1;
- CurFilename = infile;
- LexInput = ∈
- yydebug = debug;
- AddAttributes = addAttrs;
- 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 NextBBNum;
+
+ inline PerFunctionInfo() {
+ CurrentFunction = 0;
+ isDeclare = false;
+ Linkage = GlobalValue::ExternalLinkage;
+ }
- if (yyparse()) {
- std::cerr << "Parse failed.\n";
- out << "llvm-upgrade parse failed.\n";
- exit(1);
+ inline void FunctionStart(Function *M) {
+ CurrentFunction = M;
+ NextBBNum = 0;
}
-}
-TypeInfo::TypeRegMap TypeInfo::registry;
+ void FunctionDone() {
+ NumberedBlocks.clear();
-const TypeInfo* TypeInfo::get(const std::string &newType, Types oldType) {
- TypeInfo* Ty = new TypeInfo();
- Ty->newTy = newType;
- Ty->oldTy = oldType;
- return add_new_type(Ty);
-}
+ // Any forward referenced blocks left?
+ if (!BBForwardRefs.empty()) {
+ error("Undefined reference to label " +
+ BBForwardRefs.begin()->first->getName());
+ return;
+ }
-const TypeInfo* TypeInfo::get(const std::string& newType, Types oldType,
- const TypeInfo* eTy, const TypeInfo* rTy) {
- TypeInfo* Ty= new TypeInfo();
- Ty->newTy = newType;
- Ty->oldTy = oldType;
- Ty->elemTy = const_cast<TypeInfo*>(eTy);
- Ty->resultTy = const_cast<TypeInfo*>(rTy);
- return add_new_type(Ty);
-}
+ // Resolve all forward references now.
+ ResolveDefinitions(LateResolveValues, &CurModule.LateResolveValues);
-const TypeInfo* TypeInfo::get(const std::string& newType, Types oldType,
- const TypeInfo *eTy, uint64_t elems) {
- TypeInfo* Ty = new TypeInfo();
- Ty->newTy = newType;
- Ty->oldTy = oldType;
- Ty->elemTy = const_cast<TypeInfo*>(eTy);
- Ty->nelems = elems;
- return add_new_type(Ty);
+ 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; }
+
+/// This function is just a utility to make a Key value for the rename map.
+/// The Key is a combination of the name, type, Signedness of the original
+/// value (global/function). This just constructs the key and ensures that
+/// named Signedness values are resolved to the actual Signedness.
+/// @brief Make a key for the RenameMaps
+static RenameMapKey makeRenameMapKey(const std::string &Name, const Type* Ty,
+ const Signedness &Sign) {
+ TypeInfo TI;
+ TI.T = Ty;
+ if (Sign.isNamed())
+ // Don't allow Named Signedness nodes because they won't match. The actual
+ // Signedness must be looked up in the NamedTypeSigns map.
+ TI.S.copy(CurModule.NamedTypeSigns[Sign.getName()]);
+ else
+ TI.S.copy(Sign);
+ return std::make_pair(Name, TI);
}
-const TypeInfo* TypeInfo::get(const std::string& newType, Types oldType,
- TypeList* TL) {
- TypeInfo* Ty = new TypeInfo();
- Ty->newTy = newType;
- Ty->oldTy = oldType;
- Ty->elements = TL;
- return add_new_type(Ty);
-}
-const TypeInfo* TypeInfo::get(const std::string& newType, const TypeInfo* resTy,
- TypeList* TL) {
- TypeInfo* Ty = new TypeInfo();
- Ty->newTy = newType;
- Ty->oldTy = FunctionTy;
- Ty->resultTy = const_cast<TypeInfo*>(resTy);
- Ty->elements = TL;
- return add_new_type(Ty);
+//===----------------------------------------------------------------------===//
+// 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;
}
-const TypeInfo* TypeInfo::resolve() const {
- if (isUnresolved()) {
- if (getNewTy()[0] == '%' && isdigit(newTy[1])) {
- unsigned ref = atoi(&((newTy.c_str())[1])); // skip the %
- if (ref < EnumeratedTypes.size()) {
- return EnumeratedTypes[ref];
- } else {
- std::string msg("Can't resolve numbered type: ");
- msg += getNewTy();
- 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)) {
+ return N;
+ }
+ 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 {
- TypeMap::iterator I = NamedTypes.find(newTy);
- if (I != NamedTypes.end()) {
- return I->second;
- } else {
- std::string msg("Cannot resolve type: ");
- msg += getNewTy();
- yyerror(msg.c_str());
- }
+ error("Reference to an undefined type: #" + itostr(D.Num));
+ return 0;
}
}
- // otherwise its already resolved.
- return this;
+
+ 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;
}
-bool TypeInfo::operator<(const TypeInfo& that) const {
- if (this == &that)
- return false;
- if (oldTy != that.oldTy)
- return oldTy < that.oldTy;
- switch (oldTy) {
- case UpRefTy: {
- unsigned thisUp = this->getUpRefNum();
- unsigned thatUp = that.getUpRefNum();
- return thisUp < thatUp;
- }
- case PackedTy:
- case ArrayTy:
- if (this->nelems != that.nelems)
- return nelems < that.nelems;
- case PointerTy: {
- const TypeInfo* thisTy = this->elemTy;
- const TypeInfo* thatTy = that.elemTy;
- return *thisTy < *thatTy;
+/// This is like the getType method except that instead of looking up the type
+/// for a given ID, it looks up that type's sign.
+/// @brief Get the signedness of a referenced type
+static Signedness getTypeSign(const ValID &D) {
+ switch (D.Type) {
+ case ValID::NumberVal: // Is it a numbered definition?
+ // Module constants occupy the lowest numbered slots...
+ if ((unsigned)D.Num < CurModule.TypeSigns.size()) {
+ return CurModule.TypeSigns[(unsigned)D.Num];
}
- case FunctionTy: {
- const TypeInfo* thisTy = this->resultTy;
- const TypeInfo* thatTy = that.resultTy;
- if (!thisTy->sameOldTyAs(thatTy))
- return *thisTy < *thatTy;
- /* FALL THROUGH */
- }
- case StructTy:
- case PackedStructTy: {
- if (elements->size() != that.elements->size())
- return elements->size() < that.elements->size();
- for (unsigned i = 0; i < elements->size(); i++) {
- const TypeInfo* thisTy = (*this->elements)[i];
- const TypeInfo* thatTy = (*that.elements)[i];
- if (!thisTy->sameOldTyAs(thatTy))
- return *thisTy < *thatTy;
- }
+ break;
+ case ValID::NameVal: { // Is it a named definition?
+ std::map<std::string,Signedness>::const_iterator I =
+ CurModule.NamedTypeSigns.find(D.Name);
+ if (I != CurModule.NamedTypeSigns.end())
+ return I->second;
+ // Perhaps its a named forward .. just cache the name
+ Signedness S;
+ S.makeNamed(D.Name);
+ return S;
+ }
+ default:
+ break;
+ }
+ // If we don't find it, its signless
+ Signedness S;
+ S.makeSignless();
+ return S;
+}
+
+/// This function is analagous to getElementType in LLVM. It provides the same
+/// function except that it looks up the Signedness instead of the type. This is
+/// used when processing GEP instructions that need to extract the type of an
+/// indexed struct/array/ptr member.
+/// @brief Look up an element's sign.
+static Signedness getElementSign(const ValueInfo& VI,
+ const std::vector<Value*> &Indices) {
+ const Type *Ptr = VI.V->getType();
+ assert(isa<PointerType>(Ptr) && "Need pointer type");
+
+ unsigned CurIdx = 0;
+ Signedness S(VI.S);
+ while (const CompositeType *CT = dyn_cast<CompositeType>(Ptr)) {
+ if (CurIdx == Indices.size())
break;
+
+ Value *Index = Indices[CurIdx++];
+ assert(!isa<PointerType>(CT) || CurIdx == 1 && "Invalid type");
+ Ptr = CT->getTypeAtIndex(Index);
+ if (const Type* Ty = Ptr->getForwardedType())
+ Ptr = Ty;
+ assert(S.isComposite() && "Bad Signedness type");
+ if (isa<StructType>(CT)) {
+ S = S.get(cast<ConstantInt>(Index)->getZExtValue());
+ } else {
+ S = S.get(0UL);
}
- case UnresolvedTy:
- return this->newTy < that.newTy;
- default:
- break;
+ if (S.isNamed())
+ S = CurModule.NamedTypeSigns[S.getName()];
}
- return false;
+ Signedness Result;
+ Result.makeComposite(S);
+ return Result;
}
-bool TypeInfo::sameOldTyAs(const TypeInfo* that) const {
- if (that == 0)
+/// This function just translates a ConstantInfo into a ValueInfo and calls
+/// getElementSign(ValueInfo,...). Its just a convenience.
+/// @brief ConstantInfo version of getElementSign.
+static Signedness getElementSign(const ConstInfo& CI,
+ const std::vector<Constant*> &Indices) {
+ ValueInfo VI;
+ VI.V = CI.C;
+ VI.S.copy(CI.S);
+ std::vector<Value*> Idx;
+ for (unsigned i = 0; i < Indices.size(); ++i)
+ Idx.push_back(Indices[i]);
+ Signedness result = getElementSign(VI, Idx);
+ VI.destroy();
+ return result;
+}
+
+/// 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.
+static bool FuncTysDifferOnlyBySRet(const FunctionType *F1,
+ const FunctionType *F2) {
+ if (F1->getReturnType() != F2->getReturnType() ||
+ F1->getNumParams() != F2->getNumParams())
return false;
- if ( this == that )
- return true;
- if (oldTy != that->oldTy)
+ ParamAttrsList PAL1;
+ if (F1->getParamAttrs())
+ PAL1 = *F1->getParamAttrs();
+ ParamAttrsList PAL2;
+ if (F2->getParamAttrs())
+ PAL2 = *F2->getParamAttrs();
+ if (PAL1.getParamAttrs(0) != PAL2.getParamAttrs(0))
return false;
- switch (oldTy) {
- case PackedTy:
- case ArrayTy:
- if (nelems != that->nelems)
- return false;
- /* FALL THROUGH */
- case PointerTy: {
- const TypeInfo* thisTy = this->elemTy;
- const TypeInfo* thatTy = that->elemTy;
- return thisTy->sameOldTyAs(thatTy);
+ unsigned SRetMask = ~unsigned(ParamAttr::StructRet);
+ for (unsigned i = 0; i < F1->getNumParams(); ++i) {
+ if (F1->getParamType(i) != F2->getParamType(i) ||
+ unsigned(PAL1.getParamAttrs(i+1)) & SRetMask !=
+ unsigned(PAL2.getParamAttrs(i+1)) & SRetMask)
+ return false;
+ }
+ return true;
+}
+
+/// This function determines if the type of V and Ty differ only by the SRet
+/// parameter attribute. This is a more generalized case of
+/// FuncTysDIfferOnlyBySRet since it doesn't require FunctionType arguments.
+static bool TypesDifferOnlyBySRet(Value *V, const Type* Ty) {
+ if (V->getType() == Ty)
+ return true;
+ const PointerType *PF1 = dyn_cast<PointerType>(Ty);
+ const PointerType *PF2 = dyn_cast<PointerType>(V->getType());
+ if (PF1 && PF2) {
+ const FunctionType* FT1 = dyn_cast<FunctionType>(PF1->getElementType());
+ const FunctionType* FT2 = dyn_cast<FunctionType>(PF2->getElementType());
+ if (FT1 && FT2)
+ return FuncTysDifferOnlyBySRet(FT1, FT2);
+ }
+ return false;
+}
+
+// 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. This helper function, used in getExistingValue, detects that
+// situation and bitcasts the function to the correct type.
+static Value* handleSRetFuncTypeMerge(Value *V, const Type* Ty) {
+ // Handle degenerate cases
+ if (!V)
+ return 0;
+ if (V->getType() == Ty)
+ return V;
+
+ const PointerType *PF1 = dyn_cast<PointerType>(Ty);
+ const PointerType *PF2 = dyn_cast<PointerType>(V->getType());
+ if (PF1 && PF2) {
+ const FunctionType *FT1 = dyn_cast<FunctionType>(PF1->getElementType());
+ const FunctionType *FT2 = dyn_cast<FunctionType>(PF2->getElementType());
+ if (FT1 && FT2 && FuncTysDifferOnlyBySRet(FT1, FT2)) {
+ const ParamAttrsList *PAL2 = FT2->getParamAttrs();
+ if (PAL2 && PAL2->paramHasAttr(1, ParamAttr::StructRet))
+ return V;
+ else if (Constant *C = dyn_cast<Constant>(V))
+ return ConstantExpr::getBitCast(C, PF1);
+ else
+ return new BitCastInst(V, PF1, "upgrd.cast", CurBB);
}
- case FunctionTy: {
- const TypeInfo* thisTy = this->resultTy;
- const TypeInfo* thatTy = that->resultTy;
- if (!thisTy->sameOldTyAs(thatTy))
- return false;
- /* FALL THROUGH */
+
+ }
+ return 0;
+}
+
+// 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();
}
- case StructTy:
- case PackedStructTy: {
- if (elements->size() != that->elements->size())
- return false;
- for (unsigned i = 0; i < elements->size(); i++) {
- const TypeInfo* thisTy = (*this->elements)[i];
- const TypeInfo* thatTy = (*that->elements)[i];
- if (!thisTy->sameOldTyAs(thatTy))
- return false;
- }
- return true;
+
+ // 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];
+ }
+
+ case ValID::NameVal: { // Is it a named definition?
+ // Get the name out of the ID
+ RenameMapKey Key = makeRenameMapKey(D.Name, Ty, D.S);
+ Value *V = 0;
+ 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 = D.Name;
+ ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable();
+ V = SymTab.lookup(LookupName);
+ if (V && V->getType() != Ty)
+ V = handleSRetFuncTypeMerge(V, Ty);
+ assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type");
}
- case UnresolvedTy:
- return this->newTy == that->newTy;
- default:
- return true; // for all others oldTy == that->oldTy is sufficient
+ if (!V) {
+ RenameMapType::const_iterator I = CurModule.RenameMap.find(Key);
+ std::string LookupName;
+ if (I != CurModule.RenameMap.end())
+ LookupName = I->second;
+ else
+ LookupName = D.Name;
+ V = CurModule.CurrentModule->getValueSymbolTable().lookup(LookupName);
+ if (V && V->getType() != Ty)
+ V = handleSRetFuncTypeMerge(V, Ty);
+ assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type");
+ }
+ if (!V)
+ return 0;
+
+ D.destroy(); // Free old strdup'd memory...
+ return V;
}
- return true;
-}
-bool TypeInfo::isUnresolvedDeep() const {
- switch (oldTy) {
- case UnresolvedTy:
- return true;
- case PackedTy:
- case ArrayTy:
- case PointerTy:
- return elemTy->isUnresolvedDeep();
- case PackedStructTy:
- case StructTy:
- for (unsigned i = 0; i < elements->size(); i++)
- if ((*elements)[i]->isUnresolvedDeep())
- return true;
- return false;
- default:
- return false;
+ // 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;
}
-unsigned TypeInfo::getBitWidth() const {
- switch (oldTy) {
- default:
- case LabelTy:
- case VoidTy : return 0;
- case BoolTy : return 1;
- case SByteTy: case UByteTy : return 8;
- case ShortTy: case UShortTy : return 16;
- case IntTy: case UIntTy: case FloatTy: return 32;
- case LongTy: case ULongTy: case DoubleTy : return 64;
- case PointerTy: return SizeOfPointer; // global var
- case PackedTy:
- case ArrayTy:
- return nelems * elemTy->getBitWidth();
- case StructTy:
- case PackedStructTy: {
- uint64_t size = 0;
- for (unsigned i = 0; i < elements->size(); i++) {
- size += (*elements)[i]->getBitWidth();
+// 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;
+}
+
+/// @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;
+}
+
+/// 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) {
+ // Register names didn't use to conflict with basic block names
+ // because of type planes. Now they all have to be unique. So, we just
+ // rename the register and treat this name as if no basic block
+ // had been found.
+ RenameMapKey Key = makeRenameMapKey(ID.Name, N->getType(), ID.S);
+ N->setName(makeNameUnique(N->getName()));
+ CurModule.RenameMap[Key] = N->getName();
+ BB = 0;
+ } else {
+ BB = cast<BasicBlock>(N);
}
- return size;
}
+ 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;
}
-const TypeInfo* TypeInfo::getIndexedType(const ValueInfo& VI) const {
- if (isStruct()) {
- if (VI.isConstant() && VI.type->isInteger()) {
- size_t pos = VI.val->find(' ') + 1;
- if (pos < VI.val->size()) {
- uint64_t idx = atoi(VI.val->substr(pos).c_str());
- return (*elements)[idx];
+
+//===----------------------------------------------------------------------===//
+// 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.
+//
+
+// 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) {
+ const Type* Ty = LRI->first;
+ 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(Ty, 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 {
- yyerror("Invalid value for constant integer");
- return 0;
+ if (DID.Type == ValID::NameVal) {
+ 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 {
- yyerror("Structure requires constant index");
- return 0;
}
}
- if (isArray() || isPacked() || isPointer())
- return elemTy;
- yyerror("Invalid type for getIndexedType");
- return 0;
+
+ LateResolvers.clear();
}
-void TypeInfo::getSignedness(unsigned &sNum, unsigned &uNum,
- UpRefStack& stack) const {
- switch (oldTy) {
- default:
- case OpaqueTy: case LabelTy: case VoidTy: case BoolTy:
- case FloatTy : case DoubleTy: case UpRefTy:
- return;
- case SByteTy: case ShortTy: case LongTy: case IntTy:
- sNum++;
- return;
- case UByteTy: case UShortTy: case UIntTy: case ULongTy:
- uNum++;
- return;
- case PointerTy:
- case PackedTy:
- case ArrayTy:
- stack.push_back(this);
- elemTy->getSignedness(sNum, uNum, stack);
- return;
- case StructTy:
- case PackedStructTy: {
- stack.push_back(this);
- for (unsigned i = 0; i < elements->size(); i++) {
- (*elements)[i]->getSignedness(sNum, uNum, stack);
- }
- return;
+/// This function is used for type resolution and upref handling. When a type
+/// becomes concrete, this function is called to adjust the signedness for the
+/// concrete type.
+static void ResolveTypeSign(const Type* oldTy, const Signedness &Sign) {
+ std::string TyName = CurModule.CurrentModule->getTypeName(oldTy);
+ if (!TyName.empty())
+ CurModule.NamedTypeSigns[TyName] = Sign;
+}
+
+/// 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, const Signedness& Sign){
+ ValID D;
+ if (Name)
+ D = ValID::create(Name);
+ else
+ D = ValID::create((int)CurModule.Types.size());
+ D.S.copy(Sign);
+
+ if (Name)
+ CurModule.NamedTypeSigns[Name] = Sign;
+
+ std::map<ValID, PATypeHolder>::iterator I =
+ CurModule.LateResolveTypes.find(D);
+ if (I != CurModule.LateResolveTypes.end()) {
+ const Type *OldTy = I->second.get();
+ ((DerivedType*)OldTy)->refineAbstractTypeTo(ToTy);
+ CurModule.LateResolveTypes.erase(I);
+ }
+}
+
+/// 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;
}
- case UnresolvedTy: {
- const TypeInfo* Ty = this->resolve();
- // Let's not recurse.
- UpRefStack::const_iterator I = stack.begin(), E = stack.end();
- for ( ; I != E && *I != Ty; ++I)
- ;
- if (I == E)
- Ty->getSignedness(sNum, uNum, stack);
+ 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(const ValueInfo &V, char *NameStr) {
+ if (NameStr) {
+ std::string Name(NameStr); // Copy string
+ free(NameStr); // Free old string
+
+ if (V.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.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.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 = makeRenameMapKey(Name, V.V->getType(), V.S);
+ CurFun.RenameMap[Key] = NewName;
+ Name = NewName;
+ }
+
+ // Set the name.
+ V.V->setName(Name);
}
}
-std::string AddSuffix(const std::string& Name, const std::string& Suffix) {
- if (Name[Name.size()-1] == '"') {
- std::string Result = Name;
- Result.insert(Result.size()-1, Suffix);
- return Result;
+/// 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,
+ const Signedness &Sign) {
+ 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
}
- return Name + Suffix;
+
+ // 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());
+ }
+ ID.S.makeComposite(Sign);
+
+ 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) ||
+ CurModule.CurrentModule->getFunction(Name)) {
+ // We found an existing global of 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 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");
+ }
+
+ // Put the renaming in the global rename map
+ RenameMapKey Key = makeRenameMapKey(Name, PointerType::get(Ty), ID.S);
+ CurModule.RenameMap[Key] = NewName;
+
+ // Rename it
+ Name = NewName;
+ }
+ }
+
+ // 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);
+ // Remember the sign of this global.
+ CurModule.NamedValueSigns[Name] = ID.S;
+ return GV;
}
-std::string TypeInfo::makeUniqueName(const std::string& BaseName) const {
- if (BaseName == "\"alloca point\"")
- return BaseName;
- switch (oldTy) {
- default:
- break;
- case OpaqueTy: case LabelTy: case VoidTy: case BoolTy: case UpRefTy:
- case FloatTy : case DoubleTy: case UnresolvedTy:
- return BaseName;
- case SByteTy: case ShortTy: case LongTy: case IntTy:
- return AddSuffix(BaseName, ".s");
- case UByteTy: case UShortTy: case UIntTy: case ULongTy:
- return AddSuffix(BaseName, ".u");
+// 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 PATypeInfo& TI, 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
+
+ const Type* Ty = TI.PAT->get();
+
+ // We don't allow assigning names to void type
+ if (Ty == Type::VoidTy) {
+ error("Can't assign name '" + Name + "' to the void type");
+ return false;
}
- unsigned uNum = 0, sNum = 0;
- std::string Suffix;
- switch (oldTy) {
- case PointerTy:
- case PackedTy:
- case ArrayTy: {
- TypeInfo::UpRefStack stack;
- elemTy->resolve()->getSignedness(sNum, uNum, stack);
- break;
+ // Set the type name, checking for conflicts as we do so.
+ bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name, Ty);
+
+ // Save the sign information for later use
+ CurModule.NamedTypeSigns[Name] = TI.S;
+
+ 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(Ty);
+ return true;
}
- case StructTy:
- case PackedStructTy: {
- for (unsigned i = 0; i < elements->size(); i++) {
- TypeInfo::UpRefStack stack;
- (*elements)[i]->resolve()->getSignedness(sNum, uNum, stack);
+
+ // 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 == Ty) return true; // Yes, it's equal.
+
+ // Any other kind of (non-equivalent) redefinition is an error.
+ error("Redefinition of type named '" + Name + "' in the '" +
+ Ty->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, const Signedness& Sign) {
+ // 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;
+
+ unsigned i = 0;
+ for (; i != UpRefs.size(); ++i) {
+ UR_OUT(" UR#" << i << " - TypeContains(" << Ty->getDescription() << ", "
+ << UpRefs[i].UpRefTy->getDescription() << ") = "
+ << (TypeContains(Ty, UpRefs[i].UpRefTy) ? "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].UpRefTy->getDescription() << "\n";
+ std::string OldName = UpRefs[i].UpRefTy->getDescription());
+ ResolveTypeSign(UpRefs[i].UpRefTy, Sign);
+ 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...
}
- break;
}
- default:
- assert(0 && "Invalid Type");
- break;
}
- if (sNum == 0 && uNum == 0)
- return BaseName;
+ if (TypeToResolve) {
+ UR_OUT(" * Resolving upreference for "
+ << UpRefs[i].UpRefTy->getDescription() << "\n";
+ std::string OldName = TypeToResolve->getDescription());
+ ResolveTypeSign(TypeToResolve, Sign);
+ TypeToResolve->refineAbstractTypeTo(Ty);
+ }
+
+ return Ty;
+}
- switch (oldTy) {
- default: Suffix += ".nada"; break;
- case PointerTy: Suffix += ".pntr"; break;
- case PackedTy: Suffix += ".pckd"; break;
- case ArrayTy: Suffix += ".arry"; break;
- case StructTy: Suffix += ".strc"; break;
- case PackedStructTy: Suffix += ".pstr"; break;
+bool Signedness::operator<(const Signedness &that) const {
+ if (isNamed()) {
+ if (that.isNamed())
+ return *(this->name) < *(that.name);
+ else
+ return CurModule.NamedTypeSigns[*name] < that;
+ } else if (that.isNamed()) {
+ return *this < CurModule.NamedTypeSigns[*that.name];
}
- Suffix += ".s" + llvm::utostr(sNum);
- Suffix += ".u" + llvm::utostr(uNum);
- return AddSuffix(BaseName, Suffix);
+ if (isComposite() && that.isComposite()) {
+ if (sv->size() == that.sv->size()) {
+ SignVector::const_iterator thisI = sv->begin(), thisE = sv->end();
+ SignVector::const_iterator thatI = that.sv->begin(),
+ thatE = that.sv->end();
+ for (; thisI != thisE; ++thisI, ++thatI) {
+ if (*thisI < *thatI)
+ return true;
+ else if (!(*thisI == *thatI))
+ return false;
+ }
+ return false;
+ }
+ return sv->size() < that.sv->size();
+ }
+ return kind < that.kind;
+}
+
+bool Signedness::operator==(const Signedness &that) const {
+ if (isNamed())
+ if (that.isNamed())
+ return *(this->name) == *(that.name);
+ else
+ return CurModule.NamedTypeSigns[*(this->name)] == that;
+ else if (that.isNamed())
+ return *this == CurModule.NamedTypeSigns[*(that.name)];
+ if (isComposite() && that.isComposite()) {
+ if (sv->size() == that.sv->size()) {
+ SignVector::const_iterator thisI = sv->begin(), thisE = sv->end();
+ SignVector::const_iterator thatI = that.sv->begin(),
+ thatE = that.sv->end();
+ for (; thisI != thisE; ++thisI, ++thatI) {
+ if (!(*thisI == *thatI))
+ return false;
+ }
+ return true;
+ }
+ return false;
+ }
+ return kind == that.kind;
}
-TypeInfo& TypeInfo::operator=(const TypeInfo& that) {
- oldTy = that.oldTy;
- nelems = that.nelems;
- newTy = that.newTy;
- elemTy = that.elemTy;
- resultTy = that.resultTy;
- if (that.elements) {
- elements = new TypeList(that.elements->size());
- *elements = *that.elements;
+void Signedness::copy(const Signedness &that) {
+ if (that.isNamed()) {
+ kind = Named;
+ name = new std::string(*that.name);
+ } else if (that.isComposite()) {
+ kind = Composite;
+ sv = new SignVector();
+ *sv = *that.sv;
} else {
- elements = 0;
+ kind = that.kind;
+ sv = 0;
}
- return *this;
}
-const TypeInfo* TypeInfo::add_new_type(TypeInfo* newTy) {
- TypeRegMap::iterator I = registry.find(newTy);
- if (I != registry.end()) {
- delete newTy;
- return *I;
+void Signedness::destroy() {
+ if (isNamed()) {
+ delete name;
+ } else if (isComposite()) {
+ delete sv;
+ }
+}
+
+#ifndef NDEBUG
+void Signedness::dump() const {
+ if (isComposite()) {
+ if (sv->size() == 1) {
+ (*sv)[0].dump();
+ std::cerr << "*";
+ } else {
+ std::cerr << "{ " ;
+ for (unsigned i = 0; i < sv->size(); ++i) {
+ if (i != 0)
+ std::cerr << ", ";
+ (*sv)[i].dump();
+ }
+ std::cerr << "} " ;
+ }
+ } else if (isNamed()) {
+ std::cerr << *name;
+ } else if (isSigned()) {
+ std::cerr << "S";
+ } else if (isUnsigned()) {
+ std::cerr << "U";
+ } else
+ std::cerr << ".";
+}
+#endif
+
+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;
}
- registry.insert(newTy);
- return newTy;
}
-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
+static inline Instruction::BinaryOps
+getBinaryOp(BinaryOps op, const Type *Ty, const 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 VectorType* PTy = dyn_cast<VectorType>(Ty))
+ // If its a vector type we want to use the element type
+ isFP = PTy->getElementType()->isFloatingPoint();
+ if (isFP)
+ return Instruction::FDiv;
+ else if (Sign.isSigned())
+ 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 VectorType* PTy = dyn_cast<VectorType>(Ty))
+ // If its a vector type we want to use the element type
+ isFP = PTy->getElementType()->isFloatingPoint();
+ // Select correct opcode
+ if (isFP)
+ return Instruction::FRem;
+ else if (Sign.isSigned())
+ 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.isSigned())
+ 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,
+ const Signedness &Sign) {
+ bool isSigned = Sign.isSigned();
+ 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
- opcode = "zext"; // unsigned -> ZEXT
+ 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, const 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, const Signedness &SrcSign, const Type *DstTy,
+ const 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 {
- opcode = "bitcast"; // Same size, No-op cast
+ std::string NewName(makeNameUnique(Src->getName()));
+ Src = new FPToUIInst(Src, SrcTy, NewName, CurBB);
}
- } else if (SrcTy->isFloatingPoint()) { // Casting from floating pt
- if (DstTy->isSigned())
- opcode = "fptosi"; // FP -> sint
+ } 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
- 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
+ return CmpInst::create(Opcode, predicate, Src, Null);
}
- } 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
+ // Determine the opcode to use by calling CastInst::getCastOpcode
+ Opcode =
+ CastInst::getCastOpcode(Src, SrcSign.isSigned(), DstTy,
+ DstSign.isSigned());
+
+ } 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 : "";
+ switch (Name[5]) {
+ case 'i':
+ if (Name == "llvm.isunordered.f32" || Name == "llvm.isunordered.f64") {
+ if (Args.size() != 2)
+ error("Invalid prototype for " + Name);
+ return new FCmpInst(FCmpInst::FCMP_UNO, Args[0], Args[1]);
+ }
+ break;
+ case 'b':
+ if (Name.length() == 14 && !memcmp(&Name[5], "bswap.i", 7)) {
+ const Type* ArgTy = Args[0]->getType();
+ Name += ".i" + utostr(cast<IntegerType>(ArgTy)->getBitWidth());
+ Function *F = cast<Function>(
+ CurModule.CurrentModule->getOrInsertFunction(Name, RetTy, ArgTy,
+ (void*)0));
+ return new CallInst(F, Args[0]);
+ }
+ break;
+ case 'c':
+ if ((Name.length() <= 14 && !memcmp(&Name[5], "ctpop.i", 7)) ||
+ (Name.length() <= 13 && !memcmp(&Name[5], "ctlz.i", 6)) ||
+ (Name.length() <= 13 && !memcmp(&Name[5], "cttz.i", 6))) {
+ // These intrinsics changed their result type.
+ const Type* ArgTy = Args[0]->getType();
+ Function *OldF = CurModule.CurrentModule->getFunction(Name);
+ if (OldF)
+ OldF->setName("upgrd.rm." + Name);
+
+ Function *NewF = cast<Function>(
+ CurModule.CurrentModule->getOrInsertFunction(Name, Type::Int32Ty,
+ ArgTy, (void*)0));
+
+ Instruction *Call = new CallInst(NewF, Args[0], "", CurBB);
+ return CastInst::createIntegerCast(Call, RetTy, false);
+ }
+ break;
+
+ case 'v' : {
+ 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[0], Args.size());
+ } 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[0], Args.size());
}
- } 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");
- }
- } 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)");
- }
- } 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");
}
- } else {
- assert(!"Casting to type that is not first-class");
}
- return opcode;
+ return 0;
}
-static std::string getCastUpgrade(const std::string& Src, const TypeInfo* SrcTy,
- const 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 = "i64 fptoui(" + Source + " to i64)";
- else {
- *O << " %cast_upgrade" << unique << " = fptoui " << Source
- << " to i64\n";
- Source = "i64 %cast_upgrade" + llvm::utostr(unique);
+const Type* upgradeGEPCEIndices(const Type* PTy,
+ std::vector<ValueInfo> *Indices,
+ std::vector<Constant*> &Result) {
+ const Type *Ty = PTy;
+ Result.clear();
+ for (unsigned i = 0, e = Indices->size(); i != e ; ++i) {
+ Constant *Index = cast<Constant>((*Indices)[i].V);
+
+ if (ConstantInt *CI = dyn_cast<ConstantInt>(Index)) {
+ // LLVM 1.2 and earlier used ubyte struct indices. Convert any ubyte
+ // struct indices to i32 struct indices with ZExt for compatibility.
+ if (CI->getBitWidth() < 32)
+ Index = ConstantExpr::getCast(Instruction::ZExt, CI, Type::Int32Ty);
}
- // Update the SrcTy for the getCastOpcode call below
- SrcTy = TypeInfo::get("i64", ULongTy);
- } else if (DstTy->isBool()) {
- // 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
- const char* comparator = SrcTy->isPointer() ? ", null" :
- (SrcTy->isFloatingPoint() ? ", 0.0" :
- (SrcTy->isBool() ? ", false" : ", 0"));
- const char* compareOp = SrcTy->isFloatingPoint() ? "fcmp one " : "icmp ne ";
- if (isConst) {
- Result = "(" + Source + comparator + ")";
- Result = compareOp + Result;
- } else
- Result = compareOp + Source + comparator;
- return Result; // skip cast processing below
+
+ if (isa<SequentialType>(Ty)) {
+ // 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.isUnsigned()) {
+ Index = ConstantExpr::getCast(Instruction::ZExt, Index,Type::Int64Ty);
+ }
+ }
+ }
+ Result.push_back(Index);
+ Ty = GetElementPtrInst::getIndexedType(PTy, (Value**)&Result[0],
+ Result.size(),true);
+ if (!Ty)
+ error("Index list invalid for constant getelementptr");
}
- SrcTy = SrcTy->resolve();
- DstTy = DstTy->resolve();
- std::string Opcode(getCastOpcode(Source, SrcTy, DstTy));
- if (isConst)
- Result += Opcode + "( " + Source + " to " + DstTy->getNewTy() + ")";
- else
- Result += Opcode + " " + Source + " to " + DstTy->getNewTy();
- return Result;
+ return Ty;
}
-const char* getDivRemOpcode(const std::string& opcode, const TypeInfo* TI) {
- const char* op = opcode.c_str();
- const TypeInfo* Ty = TI->resolve();
- if (Ty->isPacked())
- Ty = 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;
-}
+const Type* upgradeGEPInstIndices(const Type* PTy,
+ std::vector<ValueInfo> *Indices,
+ std::vector<Value*> &Result) {
+ const Type *Ty = PTy;
+ Result.clear();
+ for (unsigned i = 0, e = Indices->size(); i != e ; ++i) {
+ Value *Index = (*Indices)[i].V;
+
+ if (ConstantInt *CI = dyn_cast<ConstantInt>(Index)) {
+ // LLVM 1.2 and earlier used ubyte struct indices. Convert any ubyte
+ // struct indices to i32 struct indices with ZExt for compatibility.
+ if (CI->getBitWidth() < 32)
+ Index = ConstantExpr::getCast(Instruction::ZExt, CI, Type::Int32Ty);
+ }
+
-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';
- if (cc1 == 'n')
- result[5] = 'u'; // NE maps to unordered
- else
- result[5] = 'o'; // everything else maps to ordered
- } 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() || TI->isBool())
- result[5] = 'u';
- else
- yyerror("Invalid integral type for setcc");
+ if (isa<StructType>(Ty)) { // Only change struct indices
+ if (!isa<Constant>(Index)) {
+ error("Invalid non-constant structure index");
+ return 0;
+ }
+ } 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.isUnsigned()) {
+ if (isa<Constant>(Index))
+ Index = ConstantExpr::getCast(Instruction::ZExt,
+ cast<Constant>(Index), Type::Int64Ty);
+ else
+ Index = CastInst::create(Instruction::ZExt, Index, Type::Int64Ty,
+ makeNameUnique("gep"), CurBB);
+ }
+ }
+ }
+ Result.push_back(Index);
+ Ty = GetElementPtrInst::getIndexedType(PTy, &Result[0], Result.size(),true);
+ if (!Ty)
+ error("Index list invalid for constant getelementptr");
}
- return result;
+ return Ty;
}
-static const TypeInfo* getFunctionReturnType(const TypeInfo* PFTy) {
- PFTy = PFTy->resolve();
- if (PFTy->isPointer()) {
- const TypeInfo* ElemTy = PFTy->getElementType();
- ElemTy = ElemTy->resolve();
- if (ElemTy->isFunction())
- return ElemTy->getResultType();
- } else if (PFTy->isFunction()) {
- return PFTy->getResultType();
+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;
}
- return PFTy;
}
-static const TypeInfo* ResolveUpReference(const TypeInfo* Ty,
- TypeInfo::UpRefStack* stack) {
- assert(Ty->isUpReference() && "Can't resolve a non-upreference");
- unsigned upref = Ty->getUpRefNum();
- assert(upref < stack->size() && "Invalid up reference");
- return (*stack)[upref - stack->size() - 1];
-}
+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;
-static const TypeInfo* getGEPIndexedType(const TypeInfo* PTy, ValueList* idxs) {
- const TypeInfo* Result = PTy = PTy->resolve();
- assert(PTy->isPointer() && "GEP Operand is not a pointer?");
- TypeInfo::UpRefStack stack;
- for (unsigned i = 0; i < idxs->size(); ++i) {
- if (Result->isComposite()) {
- Result = Result->getIndexedType((*idxs)[i]);
- Result = Result->resolve();
- stack.push_back(Result);
- } else
- yyerror("Invalid type for index");
- }
- // Resolve upreferences so we can return a more natural type
- if (Result->isPointer()) {
- if (Result->getElementType()->isUpReference()) {
- stack.push_back(Result);
- Result = ResolveUpReference(Result->getElementType(), &stack);
- }
- } else if (Result->isUpReference()) {
- Result = ResolveUpReference(Result->getElementType(), &stack);
- }
- return Result->getPointerType();
-}
+ 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;
+ }
-// This function handles appending .u or .s to integer value names that
-// were previously unsigned or signed, respectively. This avoids name
-// collisions since the unsigned and signed type planes have collapsed
-// into a single signless type plane.
-static std::string getUniqueName(const std::string *Name, const TypeInfo* Ty,
- bool isGlobal = false, bool isDef = false) {
-
- // If its not a symbolic name, don't modify it, probably a constant val.
- if ((*Name)[0] != '%' && (*Name)[0] != '"')
- return *Name;
-
- // If its a numeric reference, just leave it alone.
- if (isdigit((*Name)[1]))
- return *Name;
-
- // Resolve the type
- Ty = Ty->resolve();
-
- // If its a global name, get its uniquified name, if any
- GlobalsTypeMap::iterator GI = Globals.find(*Name);
- if (GI != Globals.end()) {
- TypePlaneMap::iterator TPI = GI->second.begin();
- TypePlaneMap::iterator TPE = GI->second.end();
- for ( ; TPI != TPE ; ++TPI) {
- if (TPI->first->sameNewTyAs(Ty))
- return TPI->second;
- }
+ // Check to make sure that parsing produced a result
+ if (!ParserResult) {
+ std::cerr << "llvm-upgrade: no parse result.\n";
+ return 0;
}
- if (isGlobal) {
- // We didn't find a global name, but if its supposed to be global then all
- // we can do is return the name. This is probably a forward reference of a
- // global value that hasn't been defined yet. Since we have no definition
- // we don't know its linkage class. Just assume its an external and the name
- // shouldn't change.
- return *Name;
+ // 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->getFunction("llvm.va_start"))
+ && F->getFunctionType()->getNumParams() == 0)
+ ObsoleteVarArgs = true;
+ if((F = Result->getFunction("llvm.va_copy"))
+ && F->getFunctionType()->getNumParams() == 1)
+ ObsoleteVarArgs = true;
}
- // Default the result to the current name
- std::string Result = Ty->makeUniqueName(*Name);
+ 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->getFunction("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->getFunction("llvm.va_end")) {
+ if(F->arg_size() != 1) {
+ error("Obsolete va_end takes 1 argument");
+ return 0;
+ }
-static unsigned UniqueNameCounter = 0;
-
-std::string getGlobalName(const std::string* Name, const std::string Linkage,
- const TypeInfo* Ty, bool isConstant) {
- // Default to given name
- std::string Result = *Name;
- // Look up the name in the Globals Map
- GlobalsTypeMap::iterator GI = Globals.find(*Name);
- // Did we see this global name before?
- if (GI != Globals.end()) {
- if (Ty->isUnresolvedDeep()) {
- // The Gval's type is unresolved. Consequently, we can't disambiguate it
- // by type. We'll just change its name and emit a warning.
- warning("Cannot disambiguate global value '" + *Name +
- "' because type '" + Ty->getNewTy() + "'is unresolved.\n");
- Result = *Name + ".unique";
- UniqueNameCounter++;
- Result += llvm::utostr(UniqueNameCounter);
- return Result;
- } else {
- TypePlaneMap::iterator TPI = GI->second.find(Ty);
- if (TPI != GI->second.end()) {
- // We found an existing name of the same old type. This isn't allowed
- // in LLVM 2.0. Consequently, we must alter the name of the global so it
- // can at least compile. References to the global will yield the first
- // definition, which is okay. We also must warn about this.
- Result = *Name + ".unique";
- UniqueNameCounter++;
- Result += llvm::utostr(UniqueNameCounter);
- warning(std::string("Global variable '") + *Name + "' was renamed to '"+
- Result + "'");
- } else {
- // There isn't an existing definition for this name according to the
- // old types. Now search the TypePlanMap for types with the same new
- // name.
- TypePlaneMap::iterator TPI = GI->second.begin();
- TypePlaneMap::iterator TPE = GI->second.end();
- for ( ; TPI != TPE; ++TPI) {
- if (TPI->first->sameNewTyAs(Ty)) {
- // The new types are the same but the old types are different so
- // this is a global name collision resulting from type planes
- // collapsing.
- if (Linkage == "external" || Linkage == "dllimport" ||
- Linkage == "extern_weak" || Linkage == "") {
- // 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.
- Result = *Name + ".unique";
- UniqueNameCounter++;
- Result += llvm::utostr(UniqueNameCounter);
- warning("Renaming global value '" + *Name + "' to '" + Result +
- "' may cause linkage errors.");
- return Result;
- } else {
- // Its linkage is internal and its type is known so we can
- // disambiguate the name collision successfully based on the type.
- Result = getUniqueName(Name, Ty);
- TPI->second = Result;
- return Result;
- }
- }
- }
- // We didn't find an entry in the type plane with the same new type and
- // the old types differ so this is a new type plane for this global
- // variable. We just fall through to the logic below which inserts
- // the global.
+ //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);
}
- }
- // Its a new global name, if it is external we can't change it
- if (isConstant || Linkage == "external" || Linkage == "dllimport" ||
- Linkage == "extern_weak" || Linkage == "") {
- Globals[Result][Ty] = Result;
- return Result;
+ if(Function* F = Result->getFunction("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);
+ }
}
- // Its a new global name, and it is internal, change the name to make it
- // unique for its type.
- // Result = getUniqueName(Name, Ty);
- Globals[*Name][Ty] = Result;
return Result;
}
+} // end llvm namespace
+
+using namespace llvm;
+
+
/* Enabling traces. */
#ifndef YYDEBUG
#endif
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 802 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 1771 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
typedef union YYSTYPE {
- std::string* String;
- const TypeInfo* Type;
- ValueInfo Value;
- ConstInfo Const;
- ValueList* ValList;
- TypeList* TypeVec;
+ llvm::Module *ModuleVal;
+ llvm::Function *FunctionVal;
+ std::pair<llvm::PATypeInfo, char*> *ArgVal;
+ llvm::BasicBlock *BasicBlockVal;
+ llvm::TermInstInfo 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 1188 "UpgradeParser.tab.c"
+#line 2194 "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 1200 "UpgradeParser.tab.c"
+#line 2206 "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 1486
+#define YYLAST 1630
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 165
+#define YYNTOKENS 166
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 75
+#define YYNNTS 81
/* YYNRULES -- Number of rules. */
-#define YYNRULES 301
+#define YYNRULES 310
/* YYNRULES -- Number of states. */
-#define YYNSTATES 586
+#define YYNSTATES 606
/* 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, 294, 299, 302,
304, 308, 310, 314, 316, 317, 322, 326, 330, 335,
- 340, 344, 347, 350, 353, 356, 359, 362, 365, 368,
- 371, 374, 381, 387, 396, 403, 410, 417, 425, 433,
- 440, 447, 456, 465, 469, 471, 473, 475, 477, 480,
- 483, 488, 491, 493, 495, 497, 502, 505, 510, 517,
- 524, 531, 538, 542, 547, 548, 550, 552, 554, 558,
- 562, 566, 570, 574, 578, 580, 581, 583, 585, 587,
- 588, 591, 595, 597, 599, 603, 605, 606, 615, 617,
- 619, 623, 625, 627, 631, 632, 634, 636, 640, 641,
- 643, 645, 647, 649, 651, 653, 655, 657, 659, 663,
- 665, 671, 673, 675, 677, 679, 682, 685, 687, 690,
- 693, 694, 696, 698, 700, 703, 706, 710, 720, 730,
- 739, 754, 756, 758, 765, 771, 774, 781, 789, 791,
- 795, 797, 798, 801, 803, 809, 815, 821, 828, 835,
- 838, 843, 848, 855, 860, 865, 872, 879, 882, 890,
- 892, 895, 896, 898, 899, 903, 910, 914, 921, 924,
- 929, 936
+ 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, 637, 642, 644, 646, 649,
+ 650, 652, 654, 655, 656, 662, 663, 665, 667, 669,
+ 671, 673, 675, 677, 679, 681, 685, 687, 693, 695,
+ 697, 699, 701, 704, 707, 710, 714, 717, 718, 720,
+ 722, 724, 727, 730, 734, 744, 754, 763, 777, 779,
+ 781, 788, 794, 797, 804, 812, 814, 818, 820, 821,
+ 824, 826, 832, 838, 844, 851, 858, 861, 866, 871,
+ 878, 883, 888, 893, 898, 905, 912, 915, 923, 925,
+ 928, 929, 931, 932, 936, 943, 947, 954, 957, 962,
+ 969
};
/* 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, 159, 161,
- 193, 162, 160, -1, 159, 161, 162, 160, -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, 167, -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, -1, 101, 172,
- 190, 223, 152, 223, -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, 229,
+ -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, 229, -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, 244, 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, 222, -1, 201, 224, -1, 201, 62, 61, 207,
+ -1, 201, 25, -1, 202, -1, 202, 180, 20, 189,
+ -1, 202, 224, -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, -1, 181, 220, 217,
+ 218, -1, 30, -1, 163, -1, 232, 221, -1, -1,
+ 45, -1, 47, -1, -1, -1, 31, 225, 223, 226,
+ 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, 227, 24,
+ 153, 24, -1, 167, -1, 212, -1, 229, -1, 228,
+ -1, 191, 230, -1, 232, 233, -1, 219, 233, -1,
+ 234, 180, 236, -1, 234, 238, -1, -1, 23, -1,
+ 77, -1, 78, -1, 72, 231, -1, 72, 8, -1,
+ 73, 21, 230, -1, 73, 9, 230, 153, 21, 230,
+ 153, 21, 230, -1, 74, 178, 230, 153, 21, 230,
+ 157, 237, 159, -1, 74, 178, 230, 153, 21, 230,
+ 157, 159, -1, 75, 182, 189, 230, 155, 241, 156,
+ 36, 21, 230, 235, 21, 230, -1, 235, -1, 76,
+ -1, 237, 178, 228, 153, 21, 230, -1, 178, 228,
+ 153, 21, 230, -1, 180, 243, -1, 191, 157, 230,
+ 153, 230, 159, -1, 239, 153, 157, 230, 153, 230,
+ 159, -1, 231, -1, 240, 153, 231, -1, 240, -1,
+ -1, 60, 59, -1, 59, -1, 169, 191, 230, 153,
+ 230, -1, 170, 191, 230, 153, 230, -1, 171, 191,
+ 230, 153, 230, -1, 103, 172, 191, 230, 153, 230,
+ -1, 104, 173, 191, 230, 153, 230, -1, 49, 231,
+ -1, 174, 231, 153, 231, -1, 175, 231, 36, 191,
+ -1, 112, 231, 153, 231, 153, 231, -1, 113, 231,
+ 153, 191, -1, 117, 231, 153, 191, -1, 118, 231,
+ 153, 191, -1, 114, 231, 153, 231, -1, 115, 231,
+ 153, 231, 153, 231, -1, 116, 231, 153, 231, 153,
+ 231, -1, 111, 239, -1, 242, 182, 189, 230, 155,
+ 241, 156, -1, 246, -1, 153, 240, -1, -1, 35,
+ -1, -1, 105, 191, 184, -1, 105, 191, 153, 15,
+ 230, 184, -1, 106, 191, 184, -1, 106, 191, 153,
+ 15, 230, 184, -1, 107, 231, -1, 245, 108, 191,
+ 230, -1, 245, 109, 231, 153, 191, 230, -1, 110,
+ 191, 230, 244, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const unsigned short int yyrline[] =
{
- 0, 867, 867, 867, 868, 868, 872, 872, 872, 872,
- 872, 872, 872, 873, 873, 873, 873, 874, 874, 874,
- 875, 875, 875, 875, 875, 875, 876, 876, 876, 876,
- 876, 876, 876, 876, 876, 876, 877, 877, 877, 877,
- 877, 877, 877, 877, 877, 877, 878, 878, 878, 878,
- 878, 878, 879, 879, 879, 879, 880, 880, 880, 880,
- 880, 880, 880, 881, 881, 881, 881, 881, 881, 886,
- 886, 886, 886, 887, 887, 887, 887, 888, 888, 889,
- 889, 892, 895, 900, 900, 900, 900, 900, 900, 901,
- 902, 905, 905, 905, 905, 905, 906, 907, 912, 917,
- 918, 921, 922, 930, 936, 937, 940, 941, 950, 951,
- 964, 964, 965, 965, 966, 970, 970, 970, 970, 970,
- 970, 970, 971, 971, 971, 971, 971, 973, 976, 979,
- 982, 986, 999, 1005, 1011, 1021, 1024, 1034, 1037, 1045,
- 1049, 1056, 1057, 1062, 1067, 1077, 1083, 1088, 1094, 1100,
- 1106, 1111, 1117, 1123, 1130, 1136, 1142, 1148, 1154, 1160,
- 1166, 1174, 1188, 1200, 1205, 1211, 1216, 1222, 1227, 1232,
- 1240, 1245, 1250, 1260, 1265, 1270, 1270, 1280, 1285, 1288,
- 1293, 1297, 1301, 1303, 1303, 1306, 1316, 1321, 1326, 1336,
- 1346, 1356, 1366, 1371, 1376, 1381, 1383, 1383, 1386, 1391,
- 1398, 1403, 1410, 1417, 1422, 1423, 1431, 1431, 1432, 1432,
- 1434, 1443, 1447, 1451, 1454, 1459, 1462, 1465, 1483, 1484,
- 1487, 1498, 1499, 1501, 1510, 1511, 1512, 1516, 1529, 1530,
- 1533, 1533, 1533, 1533, 1533, 1533, 1533, 1534, 1535, 1540,
- 1541, 1550, 1550, 1554, 1559, 1569, 1578, 1581, 1589, 1593,
- 1598, 1601, 1607, 1607, 1609, 1614, 1619, 1624, 1632, 1640,
- 1647, 1669, 1674, 1680, 1686, 1694, 1712, 1720, 1729, 1733,
- 1740, 1741, 1745, 1750, 1753, 1762, 1770, 1779, 1787, 1795,
- 1800, 1809, 1837, 1843, 1849, 1856, 1862, 1868, 1874, 1892,
- 1897, 1898, 1902, 1903, 1906, 1914, 1923, 1931, 1940, 1946,
- 1955, 1964
+ 0, 1911, 1911, 1912, 1920, 1921, 1931, 1931, 1931, 1931,
+ 1931, 1931, 1931, 1931, 1931, 1931, 1931, 1935, 1935, 1935,
+ 1939, 1939, 1939, 1939, 1939, 1939, 1943, 1943, 1944, 1944,
+ 1945, 1945, 1946, 1946, 1947, 1947, 1951, 1951, 1952, 1952,
+ 1953, 1953, 1954, 1954, 1955, 1955, 1956, 1956, 1957, 1957,
+ 1958, 1959, 1962, 1962, 1962, 1962, 1966, 1966, 1966, 1966,
+ 1966, 1966, 1966, 1967, 1967, 1967, 1967, 1967, 1967, 1973,
+ 1973, 1973, 1973, 1977, 1977, 1977, 1977, 1981, 1981, 1985,
+ 1985, 1990, 1993, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ 2005, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2026,
+ 2027, 2035, 2036, 2044, 2053, 2054, 2061, 2062, 2066, 2070,
+ 2086, 2087, 2094, 2095, 2102, 2110, 2110, 2110, 2110, 2110,
+ 2110, 2110, 2111, 2111, 2111, 2111, 2111, 2116, 2120, 2124,
+ 2129, 2138, 2156, 2162, 2175, 2186, 2190, 2203, 2207, 2221,
+ 2225, 2232, 2233, 2239, 2246, 2258, 2288, 2301, 2324, 2352,
+ 2374, 2385, 2407, 2418, 2427, 2432, 2491, 2498, 2506, 2513,
+ 2520, 2524, 2528, 2537, 2552, 2564, 2573, 2601, 2614, 2623,
+ 2629, 2635, 2646, 2652, 2658, 2669, 2670, 2679, 2680, 2692,
+ 2701, 2702, 2703, 2704, 2705, 2721, 2741, 2743, 2745, 2745,
+ 2752, 2752, 2760, 2760, 2768, 2768, 2777, 2779, 2781, 2786,
+ 2800, 2801, 2805, 2808, 2816, 2820, 2827, 2831, 2835, 2839,
+ 2847, 2847, 2851, 2852, 2856, 2864, 2869, 2877, 2878, 2885,
+ 2892, 2896, 3083, 3083, 3087, 3087, 3097, 3097, 3101, 3106,
+ 3107, 3108, 3112, 3113, 3112, 3125, 3126, 3131, 3132, 3133,
+ 3134, 3138, 3142, 3143, 3144, 3145, 3166, 3170, 3184, 3185,
+ 3190, 3190, 3198, 3208, 3211, 3220, 3231, 3236, 3245, 3256,
+ 3256, 3259, 3263, 3267, 3272, 3282, 3300, 3309, 3379, 3383,
+ 3390, 3402, 3417, 3447, 3457, 3467, 3471, 3478, 3479, 3483,
+ 3486, 3492, 3511, 3529, 3545, 3559, 3573, 3584, 3602, 3611,
+ 3620, 3627, 3648, 3672, 3678, 3684, 3690, 3706, 3796, 3804,
+ 3805, 3809, 3810, 3814, 3820, 3827, 3833, 3840, 3847, 3860,
+ 3886
};
#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",
+ "@5", "END", "Function", "FnDeclareLinkage", "FunctionProto", "@6", "@7",
+ "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, 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, 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
+ 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, 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, 220, 219, 221, 221, 222, 223,
+ 223, 223, 225, 226, 224, 227, 227, 228, 228, 228,
+ 228, 228, 228, 228, 228, 228, 228, 228, 229, 229,
+ 230, 230, 231, 232, 232, 233, 234, 234, 234, 235,
+ 235, 236, 236, 236, 236, 236, 236, 236, 236, 236,
+ 237, 237, 238, 239, 239, 240, 240, 241, 241, 242,
+ 242, 243, 243, 243, 243, 243, 243, 243, 243, 243,
+ 243, 243, 243, 243, 243, 243, 243, 243, 243, 244,
+ 244, 245, 245, 246, 246, 246, 246, 246, 246, 246,
+ 246
};
/* 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, 5, 4, 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, 6, 6, 2,
- 4, 4, 6, 4, 4, 6, 6, 2, 7, 1,
- 2, 0, 1, 0, 3, 6, 3, 6, 2, 4,
- 6, 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, 0, 4, 1, 1, 2, 0,
+ 1, 1, 0, 0, 5, 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[] =
{
- 194, 0, 90, 182, 1, 181, 224, 83, 84, 85,
- 87, 88, 89, 86, 0, 98, 250, 178, 179, 206,
- 207, 0, 0, 0, 90, 0, 186, 225, 226, 98,
- 0, 0, 91, 92, 93, 94, 95, 96, 0, 0,
- 251, 250, 247, 82, 0, 0, 0, 0, 192, 0,
- 0, 0, 0, 0, 183, 184, 0, 0, 81, 227,
- 195, 180, 97, 111, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 2, 3, 0,
- 0, 0, 0, 241, 0, 0, 110, 129, 114, 242,
- 128, 218, 219, 220, 221, 222, 223, 246, 0, 0,
- 0, 253, 252, 262, 293, 261, 248, 249, 0, 0,
- 0, 0, 205, 193, 187, 185, 175, 176, 0, 0,
- 0, 0, 130, 0, 0, 0, 113, 135, 139, 0,
- 0, 144, 138, 255, 0, 254, 0, 0, 72, 76,
- 71, 75, 70, 74, 69, 73, 77, 78, 0, 292,
- 0, 273, 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, 265,
- 0, 289, 200, 197, 196, 198, 199, 201, 204, 0,
- 106, 106, 115, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 0, 0, 0, 0, 106, 106, 0,
- 0, 0, 0, 0, 134, 216, 143, 141, 0, 230,
- 231, 232, 235, 236, 237, 233, 234, 228, 0, 0,
+ 198, 0, 90, 184, 1, 183, 232, 83, 84, 85,
+ 86, 87, 88, 89, 0, 224, 257, 180, 181, 257,
+ 210, 211, 0, 0, 0, 90, 0, 186, 229, 0,
+ 91, 258, 254, 82, 226, 227, 228, 253, 0, 0,
+ 0, 0, 196, 0, 0, 0, 0, 0, 0, 0,
+ 81, 230, 231, 233, 199, 182, 0, 92, 93, 94,
+ 95, 96, 97, 0, 0, 302, 256, 0, 0, 0,
+ 0, 209, 197, 187, 2, 3, 111, 115, 116, 117,
+ 118, 119, 120, 121, 122, 123, 124, 125, 126, 128,
+ 0, 0, 0, 0, 248, 185, 0, 110, 127, 114,
+ 249, 129, 177, 178, 0, 0, 0, 0, 91, 98,
+ 0, 222, 223, 225, 301, 0, 280, 0, 0, 0,
+ 0, 91, 269, 259, 260, 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, 268, 255, 91, 272, 0, 298, 204, 201, 200,
+ 202, 203, 205, 208, 0, 130, 0, 0, 0, 113,
+ 135, 139, 0, 144, 138, 192, 194, 190, 115, 116,
+ 117, 118, 119, 120, 121, 122, 123, 124, 125, 0,
+ 0, 0, 0, 188, 234, 0, 0, 286, 279, 262,
+ 261, 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, 307, 0, 0, 296, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 206, 0, 0, 0, 0,
+ 0, 134, 143, 141, 0, 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, 0, 0, 0, 156, 155, 106, 220, 237, 238,
+ 239, 244, 240, 241, 242, 243, 235, 0, 246, 251,
+ 250, 252, 0, 263, 0, 0, 0, 0, 0, 303,
+ 0, 305, 300, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 239, 244, 243, 245, 0, 256, 0, 279, 272,
- 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, 298, 0, 0, 287, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 202,
- 0, 190, 191, 158, 159, 4, 5, 156, 157, 160,
- 151, 152, 155, 0, 0, 0, 0, 154, 153, 188,
- 189, 112, 112, 137, 0, 140, 215, 209, 212, 213,
- 0, 0, 131, 229, 0, 0, 0, 0, 0, 0,
- 0, 0, 174, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 294, 0, 296, 291, 0,
+ 207, 112, 112, 137, 0, 140, 0, 131, 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, 219, 213, 216, 217, 0, 236, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 203, 0, 0, 108, 106, 146,
- 0, 0, 150, 0, 147, 132, 133, 136, 208, 210,
- 0, 104, 142, 0, 0, 0, 291, 0, 0, 0,
- 0, 0, 238, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 301, 0, 0,
- 0, 283, 284, 0, 0, 0, 0, 0, 280, 281,
- 0, 299, 0, 103, 109, 107, 145, 148, 149, 214,
- 211, 105, 99, 0, 0, 0, 0, 0, 0, 0,
- 0, 173, 0, 0, 0, 0, 0, 0, 0, 271,
- 0, 0, 101, 102, 101, 268, 290, 0, 0, 0,
- 0, 0, 274, 275, 276, 271, 0, 0, 217, 240,
- 0, 0, 162, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 270, 0, 277, 278, 0, 295,
- 297, 0, 0, 0, 282, 285, 286, 0, 300, 100,
- 0, 0, 0, 170, 0, 0, 164, 165, 166, 169,
- 161, 0, 259, 0, 0, 0, 269, 266, 0, 288,
- 167, 168, 0, 0, 0, 257, 0, 258, 0, 0,
- 267, 163, 171, 172, 0, 0, 0, 0, 0, 0,
- 264, 0, 0, 263, 0, 260
+ 310, 0, 0, 0, 290, 293, 0, 0, 291, 292,
+ 0, 0, 0, 287, 288, 0, 308, 0, 132, 133,
+ 136, 142, 0, 0, 108, 106, 0, 0, 300, 0,
+ 0, 0, 0, 0, 145, 135, 114, 0, 148, 149,
+ 0, 0, 0, 0, 0, 212, 214, 0, 104, 0,
+ 245, 0, 0, 278, 0, 0, 101, 102, 101, 275,
+ 299, 0, 0, 0, 0, 0, 281, 282, 283, 278,
+ 0, 103, 109, 107, 0, 0, 0, 0, 0, 0,
+ 0, 175, 152, 0, 0, 0, 0, 0, 0, 218,
+ 215, 105, 99, 0, 0, 0, 277, 0, 284, 285,
+ 0, 304, 306, 0, 0, 0, 289, 294, 295, 0,
+ 309, 0, 0, 164, 0, 0, 0, 0, 151, 0,
+ 0, 0, 0, 0, 0, 221, 247, 0, 0, 0,
+ 276, 273, 0, 297, 0, 0, 0, 172, 0, 0,
+ 166, 167, 168, 171, 163, 100, 0, 266, 0, 0,
+ 0, 274, 169, 170, 0, 0, 0, 264, 0, 265,
+ 0, 0, 165, 173, 174, 0, 0, 0, 0, 0,
+ 0, 271, 0, 0, 270, 267
};
/* YYDEFGOTO[NTERM-NUM]. */
static const short int yydefgoto[] =
{
- -1, 83, 337, 266, 267, 268, 291, 308, 269, 270,
- 233, 234, 148, 235, 24, 15, 38, 508, 385, 407,
- 472, 331, 408, 84, 85, 236, 87, 88, 129, 248,
- 372, 271, 373, 118, 1, 2, 57, 3, 61, 215,
- 48, 113, 219, 89, 419, 358, 359, 360, 39, 93,
- 16, 96, 17, 29, 18, 364, 272, 90, 274, 495,
- 41, 42, 43, 105, 106, 554, 107, 314, 524, 525,
- 208, 209, 447, 210, 211
+ -1, 94, 312, 329, 330, 331, 255, 272, 332, 333,
+ 219, 220, 243, 221, 25, 15, 63, 555, 359, 454,
+ 522, 389, 455, 95, 96, 222, 98, 99, 202, 304,
+ 400, 348, 401, 104, 1, 2, 3, 336, 307, 305,
+ 306, 55, 190, 42, 72, 194, 100, 476, 415, 416,
+ 417, 64, 113, 16, 30, 36, 17, 53, 18, 28,
+ 108, 419, 349, 101, 351, 489, 19, 32, 33, 181,
+ 182, 579, 66, 278, 526, 527, 183, 184, 430, 185,
+ 186
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -513
+#define YYPACT_NINF -542
static const short int yypact[] =
{
- -513, 46, 217, 541, -513, -513, 82, -513, -513, -513,
- -513, -513, -513, -513, 16, 111, 25, -513, -513, -513,
- -513, 34, -55, 61, 26, -23, -513, -513, -513, 111,
- 132, 146, -513, -513, -513, -513, -513, -513, 873, -26,
- -513, -18, -513, 47, 19, 23, 39, 67, -513, 77,
- 132, 873, 81, 81, -513, -513, 81, 81, -513, -513,
- -513, -513, -513, 89, -513, -513, -513, -513, -513, -513,
- -513, -513, -513, -513, -513, -513, -513, -513, -513, 227,
- 229, -9, 506, -513, 133, 95, -513, -513, -111, -513,
- -513, -513, -513, -513, -513, -513, -513, -513, 901, 36,
- 148, -513, -513, -513, 1336, -513, -513, -513, 222, 76,
- 250, 239, 241, -513, -513, -513, -513, -513, 933, 933,
- 963, 933, -513, 115, 116, 614, -513, -513, -111, -104,
- 120, 216, -513, 89, 1134, -513, 1134, 1134, -513, -513,
- -513, -513, -513, -513, -513, -513, -513, -513, 1134, -513,
- 933, -513, 218, 111, -513, -513, -513, -513, -513, -513,
- -513, -513, -513, -513, -513, -513, -513, -513, -513, -513,
- -513, -513, -513, -513, 195, 84, 933, 933, 933, 933,
- 933, 933, -513, -513, -513, -513, 933, 933, 933, 933,
- -513, -513, -513, -513, -513, -513, -513, -513, -513, -513,
- -513, -513, -513, 933, 933, 933, 933, 933, 111, -513,
- 11, -513, -513, -513, -513, -513, -513, -513, -513, -93,
- 129, 129, 121, 166, 169, 191, 193, 220, 223, 237,
- 240, 261, 263, 249, 249, 264, 1045, 129, 129, 933,
- 933, 126, -73, 933, -513, 701, -513, 138, 136, -513,
- -513, -513, -513, -513, -513, -513, -513, 228, 195, 84,
- 140, 150, 154, 156, 158, 963, 167, 168, 170, 171,
- 172, -513, -513, -513, -513, 175, -513, 176, -513, -513,
- 873, -513, -513, -513, -513, -513, -513, -513, -513, -513,
- -513, 933, -513, -513, -513, -513, -513, -513, -513, -513,
- -513, -513, -513, -513, -513, -513, -513, -513, 933, 177,
- 178, -513, 1134, 164, 179, 182, 183, 184, 186, 188,
- 1134, 1134, 1134, 189, 284, 873, 933, 933, 312, -513,
- -8, -513, -513, -513, -513, -513, -513, -513, -513, -513,
- -513, -513, -513, 741, 963, 673, 314, -513, -513, -513,
- -513, -113, -99, -513, 185, -111, -513, 133, -513, 194,
- 192, 774, -513, -513, 318, 198, 205, 963, 963, 963,
- 963, 963, -513, -58, 963, 963, 963, 963, 963, 345,
- 348, 1134, 1134, 1134, -2, -513, 9, -513, 212, 1134,
- 209, 933, 933, 933, 933, 933, 214, 215, 219, 933,
- 933, 1134, 1134, 221, -513, 338, 352, -513, 129, -513,
- -61, -57, -513, -70, -513, -513, -513, -513, -513, -513,
- 833, 337, -513, 224, 963, 963, 212, 231, 235, 236,
- 238, 963, -513, 242, 243, 244, 245, 342, 1134, 1134,
- 247, 251, 252, 1134, 371, 1134, 933, -513, 253, 1134,
- 254, -513, -513, 255, 257, 1134, 1134, 1134, -513, -513,
- 248, -513, 933, -513, -513, -513, -513, -513, -513, -513,
- -513, -513, 335, 363, 258, 262, 260, 963, 963, 963,
- 963, -513, 963, 963, 963, 963, 933, 265, 266, 933,
- 1134, 1134, 267, -513, 267, -513, 268, 1134, 269, 933,
- 933, 933, -513, -513, -513, 933, 1134, 398, -513, -513,
- 963, 963, -513, 271, 273, 277, 278, 276, 279, 282,
- 283, 286, 403, 15, 268, 289, -513, -513, 375, -513,
- -513, 933, 275, 1134, -513, -513, -513, 292, -513, -513,
- 294, 295, 963, -513, 963, 963, -513, -513, -513, -513,
- -513, 1134, -513, 1223, 27, 400, -513, -513, 297, -513,
- -513, -513, 303, 304, 305, -513, 313, -513, 1223, 449,
- -513, -513, -513, -513, 451, 316, 1134, 1134, 454, 135,
- -513, 1134, 457, -513, 1134, -513
+ -542, 13, 162, 567, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, 83, -542, 19, -542, -542, -14,
+ -542, -542, 50, -87, 87, 233, 27, -542, 123, 141,
+ 175, -542, -542, 98, -542, -542, -542, -542, 33, 40,
+ 66, 68, -542, 14, 141, 1265, 156, 156, 156, 156,
+ -542, -542, -542, -542, -542, -542, 221, -542, -542, -542,
+ -542, -542, -542, 1265, -19, 1479, -542, 204, 135, 226,
+ 227, 235, -542, -542, -542, -542, 81, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ 256, 257, 4, 15, -542, -542, 108, -542, -542, 12,
+ -542, -542, -542, -542, 1306, 1306, 1306, 1326, 175, -542,
+ 98, -542, -542, -542, -542, 1306, -542, 205, 1367, 116,
+ 479, 175, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, 355,
+ 429, 1306, 1306, 1306, 1306, 1306, 1306, 1306, 1306, 1306,
+ 1306, 1306, 1306, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, 1306, 1306, 1306, 1306,
+ 1306, -542, -542, 175, -542, 86, -542, -542, -542, -542,
+ -542, -542, -542, -542, -13, -542, 110, 111, 75, -542,
+ -542, 12, -81, 1046, -542, -542, -542, -542, 174, 208,
+ 266, 210, 267, 212, 268, 230, 277, 275, 278, 246,
+ 280, 279, 566, -542, -542, 136, 766, -542, -542, 81,
+ -542, 766, 766, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, -542, 766, 1265, -542, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, 1306, -542, -542, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, -542, -542,
+ -542, -542, 1306, 137, 145, -542, 766, 132, 146, 147,
+ 148, 149, 151, 152, 158, 160, 766, 766, 766, 161,
+ 281, 1265, 1306, 1306, 291, -542, 1306, 1306, 155, -27,
+ 1306, -542, -542, 165, 163, 176, 176, 176, -542, -542,
+ -542, -542, -542, -542, -542, -542, -542, -542, 355, 429,
+ 172, 177, 178, 179, 182, 1087, 1387, 529, 311, 184,
+ 185, 186, 188, 189, -542, -542, 176, 1107, -542, -542,
+ -542, -542, -542, -542, -542, -542, 282, 1326, -542, -542,
+ -542, -542, 193, -542, 194, 766, 766, 766, 7, -542,
+ 20, -542, 195, 766, 192, 1306, 1306, 1306, 1306, 1306,
+ 1306, 1306, 200, 201, 206, 1306, 1306, 766, 766, 207,
+ -542, -59, -149, -542, 196, 12, 1148, -542, 44, -542,
+ -542, -542, 203, 211, 1326, 1326, 1326, 1326, 1326, -542,
+ -542, -8, 741, -82, -542, 10, -542, 1326, 1326, 1326,
+ 1326, 1326, -542, -542, 98, -542, 214, 209, -542, 337,
+ -34, 342, 348, 215, 218, 219, 766, 371, 766, 1306,
+ -542, 223, 766, 224, -542, -542, 225, 234, -542, -542,
+ 766, 766, 766, -542, -542, 228, -542, 1306, -542, -542,
+ -542, -542, 362, 375, -542, 176, 1326, 1326, 195, 236,
+ 237, 240, 243, 1326, -542, 238, -25, 11, -542, -542,
+ 244, 245, 247, 250, 352, -542, -542, 1205, 370, 252,
+ -542, 766, 766, 1306, 766, 766, 258, -542, 258, -542,
+ 259, 766, 264, 1306, 1306, 1306, -542, -542, -542, 1306,
+ 766, -542, -542, -542, 270, 271, 263, 1326, 1326, 1326,
+ 1326, -542, -542, 260, 1326, 1326, 1326, 1326, 1306, -542,
+ -542, -542, 368, 402, 274, 276, 259, 287, -542, -542,
+ 374, -542, -542, 1306, 285, 766, -542, -542, -542, 290,
+ -542, 1326, 1326, -542, 283, 295, 284, 294, -542, 296,
+ 297, 299, 302, 303, 430, -542, -542, 414, 41, 425,
+ -542, -542, 305, -542, 306, 310, 1326, -542, 1326, 1326,
+ -542, -542, -542, -542, -542, -542, 766, -542, 893, 144,
+ 448, -542, -542, -542, 314, 315, 316, -542, 331, -542,
+ 893, 766, -542, -542, -542, 464, 334, 180, 766, 481,
+ 482, -542, 766, 766, -542, -542
};
/* YYPGOTO[NTERM-NUM]. */
static const short int yypgoto[] =
{
- -513, -513, 246, 369, 370, 372, 225, 226, 373, 377,
- -98, -97, -507, -513, 436, 458, -141, -513, -303, 63,
- -513, -220, -513, -46, -513, -38, -513, -68, -20, -513,
- 130, 256, -230, 51, -513, -513, -513, -513, 439, -513,
- -513, -513, -513, 1, -513, 66, -513, -513, 461, -513,
- -513, -513, -513, -513, 488, -513, -512, -106, -3, -88,
- -513, 455, -513, -84, -513, -513, -513, -513, 56, 18,
- -513, -513, 98, -513, -513
+ -542, -542, -542, 435, 439, 441, 191, 197, 442, 445,
+ -119, -116, -541, -542, 478, 489, -107, -542, -267, 37,
+ -542, -238, -542, -60, -542, -45, -542, -74, -51, -542,
+ -101, 300, -252, 134, -542, -542, -542, -542, -542, -542,
+ -542, 473, -542, -542, -542, -542, 8, -542, 46, -542,
+ -542, 410, -542, -542, -542, -542, -542, -542, 518, -542,
+ -542, -542, -528, 142, -90, -113, -542, 505, -542, -72,
+ -542, -542, -542, -542, 97, 28, -542, -542, 70, -542,
+ -542
};
/* 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 -178
+#define YYTABLE_NINF -180
static const short int yytable[] =
{
- 86, 332, 146, 147, 25, 115, 91, 387, 443, 124,
- 135, 40, 280, 86, 128, 94, 553, 349, 350, 445,
- 138, 139, 140, 141, 142, 143, 144, 145, 273, 405,
- 273, 273, 138, 139, 140, 141, 142, 143, 144, 145,
- 136, 566, 273, -112, 25, 415, 4, 568, 243, 406,
- 132, 137, 132, 51, 40, 444, 575, 128, 244, 328,
- 134, 416, 278, 128, 132, 329, 444, 325, 7, 8,
- 9, 52, 11, 53, 13, 19, 54, 20, 30, 243,
- 220, 221, 431, 238, 55, 130, 44, 45, 46, 354,
- 311, 431, 468, 315, 431, 431, 49, 466, 316, 317,
- 318, 319, 432, 467, 119, 242, 47, 120, 121, 292,
- 293, 247, 134, 410, 411, 413, 116, 117, 323, 324,
- 98, 99, 100, 50, 101, 102, 103, 27, 58, 28,
- 348, 213, 214, 275, 276, 92, 326, 327, 309, 310,
- 134, 312, 313, 134, 95, 277, 333, 334, 134, 134,
- 134, 134, 125, 138, 139, 140, 141, 142, 143, 144,
- 145, 19, 60, 20, 62, 320, 321, 322, 134, 134,
- 108, 351, 352, 552, 109, 355, 31, 32, 33, 34,
- 35, 36, 37, -72, -72, 567, -76, -76, 465, 529,
- 110, 530, 294, 295, 296, 297, 298, 299, 300, 301,
- 302, 303, 304, 305, 306, 307, 273, 357, -71, -71,
- -75, -75, 101, 102, 273, 273, 273, -177, 111, 126,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, 76, 112, 381, 77, 78, -70, -70, 403,
- -74, -74, 86, -113, 19, 122, 20, 123, 5, 131,
- 237, 6, 212, 382, -69, -69, 246, -73, -73, 7,
- 8, 9, 10, 11, 12, 13, 335, 336, 216, 217,
- 383, 218, 239, 240, 245, 273, 273, 273, 279, 401,
- 14, 330, -79, 273, -80, 339, 353, 86, 402, 134,
- 361, 362, 363, 355, 367, 273, 273, 281, 282, 283,
- 284, 285, 286, 450, 368, 452, 453, 454, 369, 388,
- 370, 458, 371, 287, 288, 289, 290, 396, 397, 398,
- 389, 374, 375, 400, 376, 377, 378, 379, 380, 384,
- 386, 390, 273, 273, 391, 392, 393, 273, 394, 273,
- 395, 399, 404, 273, 414, 417, 420, 421, 423, 273,
- 273, 273, 424, 134, 451, 134, 134, 134, 418, 425,
- 438, 134, 459, 439, 446, 449, 455, 456, 463, 79,
- 464, 457, 80, 462, 405, 81, 473, 82, 440, 441,
- 442, 486, 357, 477, 273, 273, 448, 478, 479, 493,
- 480, 273, 507, 509, 482, 483, 484, 485, 460, 461,
- 273, 489, 505, 490, 491, 497, 499, 500, 134, 501,
- 510, 534, 535, 536, 511, 512, 539, 522, 551, 528,
- 531, 533, 523, 542, 506, 146, 147, 273, 543, 544,
- 545, 546, 444, 557, 547, 487, 488, 548, 549, 569,
- 492, 550, 494, 556, 555, 273, 498, 559, 521, 560,
- 561, 134, 502, 503, 504, 570, 146, 147, 571, 572,
- 573, 134, 134, 134, 576, 574, 577, 134, 578, 581,
- 273, 273, 584, 203, 204, 273, 205, 206, 273, 104,
- 338, 207, 56, 365, 471, 366, 470, 526, 527, 114,
- 59, 26, 347, 134, 532, 582, 97, 426, 427, 428,
- 429, 430, 496, 538, 433, 434, 435, 436, 437, 126,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, 76, 537, 476, 77, 78, 0, 0, 0,
- 558, 0, 0, 0, 19, 0, 20, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 565, 0,
- 0, 0, 0, 0, 474, 475, 0, 0, 0, 0,
- 0, 481, 0, 0, 0, 0, 0, 0, -82, 19,
- 0, 20, 0, 579, 580, 6, -82, -82, 583, 0,
- 0, 585, 0, -82, -82, -82, -82, -82, -82, -82,
- 0, -82, 21, 0, 0, 0, 0, 0, 0, -82,
- 22, 0, 0, 0, 23, 0, 0, 513, 514, 515,
- 516, 0, 517, 518, 519, 520, 0, 126, 64, 65,
- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 0, 0, 77, 78, 0, 0, 0, 0, 0,
- 540, 541, 19, 0, 20, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 79,
- 0, 0, 80, 0, 0, 81, 0, 82, 127, 0,
- 0, 0, 562, 0, 563, 564, 126, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 75, 76,
- 0, 0, 77, 78, 0, 0, 0, 0, 0, 0,
- 0, 19, 0, 20, 126, 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, 356, 0, 0, 126, 222, 223, 224, 225, 226,
- 227, 228, 229, 230, 231, 232, 75, 76, 0, 0,
- 77, 78, 0, 0, 0, 0, 0, 79, 0, 19,
- 80, 20, 0, 81, 0, 82, 241, 126, 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, 422, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 79, 0, 0, 80,
- 0, 0, 81, 0, 82, 412, 126, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 0, 0, 77, 78, 79, 0, 0, 80, 0, 0,
- 81, 19, 82, 20, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 469, 0, 0, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 0, 0, 77, 78, 79, 0, 0, 80, 0, 409,
- 81, 19, 82, 20, 133, 64, 65, 66, 67, 68,
- 69, 70, 71, 72, 73, 74, 75, 76, 0, 0,
- 77, 78, 0, 0, 0, 0, 0, 79, 0, 19,
- 80, 20, 0, 81, 0, 82, 126, 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, 126, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 232, 75, 76,
- 0, 0, 77, 78, 0, 0, 79, 0, 0, 80,
- 0, 19, 81, 20, 82, 0, 0, 0, 0, 0,
+ 97, 241, 227, 110, 242, 230, 223, 361, 197, 31,
+ 111, 26, 449, 4, 244, 204, 34, 578, 97, 201,
+ 74, 75, 426, 199, 77, 78, 79, 80, 81, 82,
+ 83, 84, 85, 86, 87, 428, 88, 20, 590, 21,
+ 275, 26, 31, 279, 280, 281, 282, 283, 284, 285,
+ 588, 233, 234, 235, 236, 237, 238, 239, 240, 205,
+ 206, 207, 596, 89, 427, 43, 289, 290, 390, 391,
+ 226, 463, 300, 226, 403, 405, 291, 427, 452, 468,
+ 74, 75, 301, 199, 77, 78, 79, 80, 81, 82,
+ 83, 84, 85, 86, 87, 420, 88, 20, 412, 21,
+ 448, 453, 38, 39, 40, 204, 273, 274, 226, 276,
+ 277, 226, 226, 226, 226, 226, 226, 226, 225, 463,
+ 20, 41, 21, 89, 201, 231, 300, 480, -139, 201,
+ -112, 286, 287, 288, 226, 226, 384, 232, -139, 204,
+ 294, 352, 353, 112, 29, 463, 295, 299, 44, 35,
+ 467, 464, 303, 354, 233, 234, 235, 236, 237, 238,
+ 239, 240, -179, 463, 463, 54, 198, -112, 51, 90,
+ 52, 71, 91, 469, 513, 92, 204, 93, 200, 50,
+ 379, 105, 106, 107, 355, 67, 362, 5, 102, 103,
+ 188, 189, 68, 6, 292, 293, 372, 373, 374, 97,
+ 577, 308, 309, 7, 8, 9, 10, 11, 12, 13,
+ 356, -72, -72, -71, -71, -70, -70, 503, 69, 531,
+ 70, 532, 381, 382, 14, 109, 385, 357, 187, 90,
+ 191, 377, 91, -69, -69, 92, -113, 93, 298, 56,
+ 57, 58, 59, 60, 61, 62, 97, 378, 226, 310,
+ 311, 192, 433, 45, 435, 436, 437, 123, 124, 193,
+ 195, 196, 443, 203, 228, 423, 424, 425, 296, 297,
+ -76, -75, -74, 431, 7, 8, 9, 10, 46, 12,
+ 47, -73, -79, 48, 313, -80, 314, 445, 446, 363,
+ 358, 337, 414, 458, 459, 460, 461, 462, 360, 364,
+ 365, 366, 367, 589, 368, 369, 470, 471, 472, 473,
+ 474, 370, 385, 371, 375, 380, 383, 376, 386, 387,
+ 226, 434, 226, 226, 226, 438, 439, 394, 466, 388,
+ 226, 444, 395, 396, 397, 406, 486, 398, 488, 407,
+ 408, 409, 492, 410, 411, 418, 421, 422, 429, 432,
+ 496, 497, 498, 440, 441, 504, 505, 450, 456, 442,
+ 447, 479, 511, 481, 335, 478, 457, 477, 350, 482,
+ 483, 484, 485, 350, 350, 487, 491, 493, 494, 502,
+ 536, 537, 538, 499, 226, 350, 501, 495, 518, 507,
+ 508, 524, 525, 509, 528, 529, 510, 514, 515, 512,
+ 516, 534, 500, 517, 452, 523, 544, 545, 546, 547,
+ 540, 530, 533, 549, 550, 551, 552, 535, 350, 543,
+ 560, 548, 475, 541, 542, 554, 556, 557, 350, 350,
+ 350, 427, 414, 558, 575, 576, 566, 568, 226, 241,
+ 564, 565, 242, 559, 561, 562, 563, 569, 226, 226,
+ 226, 567, 570, 571, 226, 572, 256, 257, 573, 574,
+ 241, 580, 582, 242, 581, 584, 583, 585, 586, 591,
+ 592, 593, 594, 553, 245, 246, 247, 248, 249, 250,
+ 251, 252, 253, 254, 595, 598, 587, 599, 226, 233,
+ 234, 235, 236, 237, 238, 239, 240, 350, 350, 350,
+ 176, 597, 602, 603, 177, 350, 178, 179, 601, 392,
+ 180, 65, 604, 605, 49, 521, 393, 73, 224, 350,
+ 350, 27, 334, 520, 37, 600, 490, 539, 506, 0,
+ 0, 0, 0, 0, 74, 75, 0, 199, 208, 209,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 0,
+ 88, 20, 0, 21, 258, 259, 260, 261, 262, 263,
+ 264, 265, 266, 267, 268, 269, 270, 271, 350, 0,
+ 350, 74, 75, 0, 350, 0, 0, 89, 0, 0,
+ 0, 0, 350, 350, 350, 0, 0, -82, 20, 20,
+ 21, 21, 315, 0, 0, 0, 0, 0, 6, -82,
+ -82, 0, 0, 0, 316, 317, 0, 0, -82, -82,
+ -82, -82, -82, -82, -82, 0, 0, -82, 22, 0,
+ 0, 0, 0, 350, 350, 23, 350, 350, 0, 24,
+ 0, 0, 0, 350, 0, 0, 0, 0, 0, 0,
+ 0, 0, 350, 0, 0, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, 143, 144, 145, 146, 147, 148, 318,
+ 319, 0, 0, 0, 0, 0, 320, 350, 321, 0,
+ 322, 323, 324, 90, 0, 0, 91, 0, 0, 92,
+ 0, 93, 404, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 163, 164, 165, 166, 167,
+ 168, 169, 170, 171, 172, 173, 174, 175, 350, 0,
+ 0, 0, 0, 325, 0, 0, 326, 0, 327, 0,
+ 0, 328, 0, 350, 0, 0, 0, 0, 0, 0,
+ 350, 0, 0, 0, 350, 350, 74, 75, 0, 199,
+ 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
+ 218, 0, 88, 20, 0, 21, 0, 0, 0, 338,
+ 339, 74, 75, 340, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 20, 89,
+ 21, 0, 341, 342, 343, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 344, 345, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 346, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+ 140, 141, 142, 143, 144, 145, 146, 147, 148, 318,
+ 319, 0, 0, 0, 0, 0, 320, 0, 321, 0,
+ 322, 323, 324, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 90, 338, 339, 91, 0,
+ 340, 92, 0, 93, 465, 163, 164, 165, 166, 167,
+ 168, 169, 170, 171, 172, 173, 174, 175, 0, 341,
+ 342, 343, 0, 0, 0, 0, 347, 0, 0, 0,
+ 0, 344, 345, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 346, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 125, 126, 127, 128, 129, 130, 131, 132,
+ 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
+ 143, 144, 145, 146, 147, 148, 318, 319, 0, 0,
+ 0, 0, 0, 320, 0, 321, 0, 322, 323, 324,
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, 79, 0, 0, 80,
- 0, 0, 81, 0, 82, 0, 0, 0, 0, 0,
+ 0, 0, 163, 164, 165, 166, 167, 168, 169, 170,
+ 171, 172, 173, 174, 175, 0, 0, 0, 0, 0,
+ 0, 74, 75, 347, 199, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 0, 88, 20, 0,
+ 21, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 302, 0, 0, 0, 0, 0, 0,
+ 0, 0, 74, 75, 89, 199, 208, 209, 210, 211,
+ 212, 213, 214, 215, 216, 217, 218, 0, 88, 20,
+ 0, 21, 74, 75, 0, 199, 77, 78, 79, 80,
+ 81, 82, 83, 84, 85, 86, 87, 0, 88, 20,
+ 0, 21, 0, 0, 0, 89, 0, 0, 0, 0,
+ 0, 0, 0, 0, 413, 0, 0, 0, 0, 0,
+ 0, 0, 0, 74, 75, 89, 199, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 0, 88,
+ 20, 0, 21, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 451, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 89, 0, 0, 0,
+ 90, 0, 0, 91, 0, 0, 92, 0, 93, 0,
+ 74, 75, 0, 199, 77, 78, 79, 80, 81, 82,
+ 83, 84, 85, 86, 87, 0, 88, 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, 0, 77, 78, 0, 340, 341, 342,
- 0, 0, 0, 19, 0, 20, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 79, 0, 0, 80,
- 0, 0, 81, 0, 82, 0, 0, 0, 0, 0,
+ 0, 90, 519, 0, 91, 0, 399, 92, 0, 93,
+ 0, 0, 0, 89, 0, 0, 0, 0, 0, 0,
+ 0, 90, 0, 0, 91, 0, 0, 92, 0, 93,
+ 74, 75, 0, 76, 77, 78, 79, 80, 81, 82,
+ 83, 84, 85, 86, 87, 0, 88, 20, 0, 21,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 79, 0, 0, 80,
- 0, 0, 81, 0, 82, 154, 155, 156, 157, 158,
- 159, 160, 161, 162, 163, 164, 165, 166, 167, 168,
- 169, 170, 171, 172, 173, 258, 259, 0, 0, 0,
- 0, 249, 250, 77, 78, 251, 252, 253, 254, 255,
- 256, 0, 19, 0, 20, 0, 0, 0, 0, 0,
- 0, 0, 260, 0, 261, 182, 183, 184, 185, 0,
- 262, 263, 264, 190, 191, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 202, 257, 0, 0, 0,
- 0, 343, 0, 0, 344, 0, 345, 0, 0, 346,
- 0, 0, 0, 0, 154, 155, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
- 170, 171, 172, 173, 258, 259, 0, 0, 0, 0,
- 249, 250, 0, 0, 251, 252, 253, 254, 255, 256,
+ 0, 0, 90, 0, 0, 91, 0, 0, 92, 0,
+ 93, 74, 75, 89, 199, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 0, 88, 20, 0,
+ 21, 74, 75, 0, 199, 208, 209, 210, 211, 212,
+ 213, 214, 215, 216, 217, 218, 0, 88, 20, 0,
+ 21, 0, 0, 0, 89, 0, 0, 0, 0, 90,
+ 0, 0, 91, 0, 0, 92, 0, 93, 0, 0,
+ 0, 0, 74, 75, 89, 229, 77, 78, 79, 80,
+ 81, 82, 83, 84, 85, 86, 87, 0, 88, 20,
+ 0, 21, 74, 75, 0, 199, 208, 209, 210, 211,
+ 212, 213, 214, 215, 216, 217, 218, 0, 88, 20,
+ 0, 21, 0, 0, 0, 89, 0, 0, 0, 90,
+ 0, 0, 91, 0, 0, 92, 0, 93, 0, 0,
+ 0, 0, 0, 0, 0, 89, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 260, 0, 261, 182, 183, 184, 185, 0, 262,
- 263, 264, 190, 191, 192, 193, 194, 195, 196, 197,
- 198, 199, 200, 201, 202, 257, 0, 0, 0, 0,
- 0, 0, 0, 265, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 154, 155, 156, 157, 158, 159, 160,
- 161, 162, 163, 164, 165, 166, 167, 168, 169, 170,
- 171, 172, 173, 258, 259, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 90, 0, 0, 91, 0, 0, 92, 0, 93, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 260, 0, 261, 182, 183, 184, 185, 0, 262, 263,
- 264, 190, 191, 192, 193, 194, 195, 196, 197, 198,
- 199, 200, 201, 202, 149, 0, 0, 0, 0, 0,
- 0, 0, 265, 0, 0, 150, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 151, 152, 0, 0,
+ 90, 0, 0, 91, 0, 0, 92, 0, 93, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 153, 0, 0, 0, 154, 155, 156, 157,
- 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
- 168, 169, 170, 171, 172, 173, 174, 175, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 176, 177,
- 178, 0, 0, 179, 180, 181, 182, 183, 184, 185,
- 186, 187, 188, 189, 190, 191, 192, 193, 194, 195,
- 196, 197, 198, 199, 200, 201, 202
+ 0, 0, 0, 0, 114, 0, 0, 0, 0, 0,
+ 0, 90, 0, 0, 91, 0, 0, 92, 115, 93,
+ 0, 0, 0, 0, 0, 0, 0, 0, 116, 117,
+ 0, 90, 0, 0, 91, 0, 0, 92, 0, 402,
+ 0, 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, 151, 152, 153, 0, 0, 154,
+ 155, 156, 157, 158, 159, 160, 161, 162, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 163, 164,
+ 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
+ 175
};
static const short int yycheck[] =
{
- 38, 221, 100, 100, 3, 51, 32, 310, 10, 18,
- 98, 29, 153, 51, 82, 33, 523, 237, 238, 10,
- 5, 6, 7, 8, 9, 10, 11, 12, 134, 37,
- 136, 137, 5, 6, 7, 8, 9, 10, 11, 12,
- 4, 553, 148, 154, 43, 158, 0, 554, 152, 57,
- 163, 15, 163, 27, 29, 57, 568, 125, 162, 152,
- 98, 160, 150, 131, 163, 158, 57, 208, 42, 43,
- 44, 45, 46, 47, 48, 28, 50, 30, 62, 152,
- 118, 119, 152, 121, 58, 84, 52, 53, 54, 162,
- 178, 152, 162, 181, 152, 152, 151, 158, 186, 187,
- 188, 189, 160, 160, 53, 125, 72, 56, 57, 25,
- 26, 131, 150, 343, 344, 345, 35, 36, 206, 207,
- 73, 74, 75, 62, 77, 78, 79, 45, 151, 47,
- 236, 55, 56, 136, 137, 161, 125, 126, 176, 177,
- 178, 179, 180, 181, 162, 148, 25, 26, 186, 187,
- 188, 189, 161, 5, 6, 7, 8, 9, 10, 11,
- 12, 28, 30, 30, 18, 203, 204, 205, 206, 207,
- 151, 239, 240, 158, 151, 243, 65, 66, 67, 68,
- 69, 70, 71, 17, 18, 158, 17, 18, 408, 492,
- 151, 494, 108, 109, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, 120, 121, 312, 245, 17, 18,
- 17, 18, 77, 78, 320, 321, 322, 0, 151, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 156, 280, 19, 20, 17, 18, 327,
- 17, 18, 280, 154, 28, 18, 30, 18, 31, 154,
- 120, 34, 30, 291, 17, 18, 40, 17, 18, 42,
- 43, 44, 45, 46, 47, 48, 17, 18, 18, 30,
- 308, 30, 157, 157, 154, 381, 382, 383, 60, 325,
- 63, 152, 21, 389, 21, 21, 160, 325, 326, 327,
- 152, 155, 64, 361, 154, 401, 402, 102, 103, 104,
- 105, 106, 107, 391, 154, 393, 394, 395, 154, 312,
- 154, 399, 154, 118, 119, 120, 121, 320, 321, 322,
- 156, 154, 154, 39, 154, 154, 154, 152, 152, 152,
- 152, 152, 438, 439, 152, 152, 152, 443, 152, 445,
- 152, 152, 30, 449, 30, 160, 152, 155, 30, 455,
- 456, 457, 154, 391, 392, 393, 394, 395, 357, 154,
- 15, 399, 400, 15, 152, 156, 152, 152, 30, 153,
- 18, 152, 156, 152, 37, 159, 152, 161, 381, 382,
- 383, 39, 420, 152, 490, 491, 389, 152, 152, 18,
- 152, 497, 57, 30, 152, 152, 152, 152, 401, 402,
- 506, 154, 154, 152, 152, 152, 152, 152, 446, 152,
- 152, 499, 500, 501, 152, 155, 18, 152, 15, 152,
- 152, 152, 156, 152, 462, 523, 523, 533, 155, 152,
- 152, 155, 57, 158, 155, 438, 439, 155, 155, 39,
- 443, 155, 445, 531, 155, 551, 449, 155, 486, 155,
- 155, 489, 455, 456, 457, 158, 554, 554, 155, 155,
- 155, 499, 500, 501, 15, 152, 15, 505, 152, 15,
- 576, 577, 15, 104, 104, 581, 104, 104, 584, 43,
- 234, 104, 24, 258, 421, 259, 420, 490, 491, 50,
- 29, 3, 236, 531, 497, 579, 41, 367, 368, 369,
- 370, 371, 446, 506, 374, 375, 376, 377, 378, 3,
- 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 505, 426, 19, 20, -1, -1, -1,
- 533, -1, -1, -1, 28, -1, 30, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 551, -1,
- -1, -1, -1, -1, 424, 425, -1, -1, -1, -1,
- -1, 431, -1, -1, -1, -1, -1, -1, 27, 28,
- -1, 30, -1, 576, 577, 34, 35, 36, 581, -1,
- -1, 584, -1, 42, 43, 44, 45, 46, 47, 48,
- -1, 50, 51, -1, -1, -1, -1, -1, -1, 58,
- 59, -1, -1, -1, 63, -1, -1, 477, 478, 479,
- 480, -1, 482, 483, 484, 485, -1, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, -1, -1, 19, 20, -1, -1, -1, -1, -1,
- 510, 511, 28, -1, 30, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 153,
- -1, -1, 156, -1, -1, 159, -1, 161, 162, -1,
- -1, -1, 542, -1, 544, 545, 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, 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, -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, 153, -1, 28,
- 156, 30, -1, 159, -1, 161, 162, 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, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 153, -1, -1, 156,
- -1, -1, 159, -1, 161, 162, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- -1, -1, 19, 20, 153, -1, -1, 156, -1, -1,
- 159, 28, 161, 30, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 40, -1, -1, 3, 4, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- -1, -1, 19, 20, 153, -1, -1, 156, -1, 158,
- 159, 28, 161, 30, 3, 4, 5, 6, 7, 8,
- 9, 10, 11, 12, 13, 14, 15, 16, -1, -1,
- 19, 20, -1, -1, -1, -1, -1, 153, -1, 28,
- 156, 30, -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, 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, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 45, 120, 115, 63, 120, 118, 107, 274, 4, 23,
+ 29, 3, 161, 0, 121, 164, 30, 558, 63, 93,
+ 5, 6, 15, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 15, 21, 22, 579, 24,
+ 153, 33, 23, 156, 157, 158, 159, 160, 161, 162,
+ 578, 10, 11, 12, 13, 14, 15, 16, 17, 104,
+ 105, 106, 590, 48, 57, 152, 179, 180, 306, 307,
+ 115, 153, 153, 118, 326, 327, 183, 57, 34, 161,
+ 5, 6, 163, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 347, 21, 22, 336, 24,
+ 159, 57, 52, 53, 54, 164, 151, 152, 153, 154,
+ 155, 156, 157, 158, 159, 160, 161, 162, 110, 153,
+ 22, 71, 24, 48, 198, 9, 153, 161, 153, 203,
+ 155, 176, 177, 178, 179, 180, 163, 21, 163, 164,
+ 153, 231, 232, 162, 61, 153, 159, 198, 61, 163,
+ 402, 159, 203, 243, 10, 11, 12, 13, 14, 15,
+ 16, 17, 0, 153, 153, 24, 162, 155, 45, 154,
+ 47, 157, 157, 163, 163, 160, 164, 162, 163, 152,
+ 293, 47, 48, 49, 244, 152, 276, 25, 32, 33,
+ 55, 56, 152, 31, 108, 109, 286, 287, 288, 244,
+ 159, 27, 28, 41, 42, 43, 44, 45, 46, 47,
+ 255, 3, 4, 3, 4, 3, 4, 455, 152, 486,
+ 152, 488, 296, 297, 62, 4, 300, 272, 24, 154,
+ 4, 291, 157, 3, 4, 160, 155, 162, 163, 64,
+ 65, 66, 67, 68, 69, 70, 291, 292, 293, 3,
+ 4, 24, 365, 20, 367, 368, 369, 77, 78, 24,
+ 4, 4, 375, 155, 59, 355, 356, 357, 158, 158,
+ 4, 4, 4, 363, 41, 42, 43, 44, 45, 46,
+ 47, 4, 7, 50, 4, 7, 7, 377, 378, 157,
+ 153, 155, 337, 394, 395, 396, 397, 398, 153, 153,
+ 153, 153, 153, 159, 153, 153, 407, 408, 409, 410,
+ 411, 153, 386, 153, 153, 24, 161, 36, 153, 156,
+ 365, 366, 367, 368, 369, 370, 371, 155, 402, 153,
+ 375, 376, 155, 155, 155, 24, 426, 155, 428, 155,
+ 155, 155, 432, 155, 155, 63, 153, 153, 153, 157,
+ 440, 441, 442, 153, 153, 456, 457, 161, 155, 153,
+ 153, 24, 463, 21, 222, 156, 155, 153, 226, 21,
+ 155, 153, 153, 231, 232, 4, 153, 153, 153, 4,
+ 493, 494, 495, 155, 429, 243, 24, 153, 36, 153,
+ 153, 481, 482, 153, 484, 485, 153, 153, 153, 161,
+ 153, 491, 447, 153, 34, 153, 507, 508, 509, 510,
+ 500, 153, 153, 514, 515, 516, 517, 153, 276, 156,
+ 533, 161, 414, 153, 153, 57, 24, 153, 286, 287,
+ 288, 57, 477, 157, 4, 21, 153, 153, 483, 558,
+ 541, 542, 558, 156, 159, 535, 156, 153, 493, 494,
+ 495, 156, 156, 156, 499, 156, 27, 28, 156, 156,
+ 579, 36, 156, 579, 159, 566, 156, 568, 569, 21,
+ 156, 156, 156, 518, 119, 120, 121, 122, 123, 124,
+ 125, 126, 127, 128, 153, 21, 576, 153, 533, 10,
+ 11, 12, 13, 14, 15, 16, 17, 355, 356, 357,
+ 65, 591, 21, 21, 65, 363, 65, 65, 598, 318,
+ 65, 33, 602, 603, 25, 478, 319, 44, 108, 377,
+ 378, 3, 222, 477, 19, 597, 429, 499, 458, -1,
+ -1, -1, -1, -1, 5, 6, -1, 8, 9, 10,
+ 11, 12, 13, 14, 15, 16, 17, 18, 19, -1,
+ 21, 22, -1, 24, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, 134, 135, 136, 137, 138, 426, -1,
+ 428, 5, 6, -1, 432, -1, -1, 48, -1, -1,
+ -1, -1, 440, 441, 442, -1, -1, 20, 22, 22,
+ 24, 24, 26, -1, -1, -1, -1, -1, 31, 32,
+ 33, -1, -1, -1, 38, 39, -1, -1, 41, 42,
+ 43, 44, 45, 46, 47, -1, -1, 50, 51, -1,
+ -1, -1, -1, 481, 482, 58, 484, 485, -1, 62,
+ -1, -1, -1, 491, -1, -1, -1, -1, -1, -1,
+ -1, -1, 500, -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, 535, 112, -1,
+ 114, 115, 116, 154, -1, -1, 157, -1, -1, 160,
+ -1, 162, 163, -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, 576, -1,
+ -1, -1, -1, 157, -1, -1, 160, -1, 162, -1,
+ -1, 165, -1, 591, -1, -1, -1, -1, -1, -1,
+ 598, -1, -1, -1, 602, 603, 5, 6, -1, 8,
+ 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+ 19, -1, 21, 22, -1, 24, -1, -1, -1, 3,
+ 4, 5, 6, 7, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 22, 48,
+ 24, -1, 26, 27, 28, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 38, 39, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 153, -1, -1, 156,
- -1, -1, 159, -1, 161, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 61, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 153, -1, -1, 156, -1, -1,
- 159, -1, 161, -1, 19, 20, -1, 22, 23, 24,
- -1, -1, -1, 28, -1, 30, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 153, -1, -1, 156,
- -1, -1, 159, -1, 161, -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, 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, 154, 3, 4, 157, -1,
+ 7, 160, -1, 162, 163, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 151, -1, 26,
+ 27, 28, -1, -1, -1, -1, 160, -1, -1, -1,
+ -1, 38, 39, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -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, 61, -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, 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, 80, 81, 82, 83, 84, 85, 86,
+ -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,
+ 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, -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, 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, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 149, 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, -1,
+ 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, 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, 154, 37, -1, 157, -1, 159, 160, -1, 162,
+ -1, -1, -1, 48, -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, -1, 154,
+ -1, -1, 157, -1, -1, 160, -1, 162, -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, 154,
+ -1, -1, 157, -1, -1, 160, -1, 162, -1, -1,
+ -1, -1, -1, -1, -1, 48, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -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, 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
+ 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, -1,
+ -1, -1, -1, -1, 35, -1, -1, -1, -1, -1,
+ -1, 154, -1, -1, 157, -1, -1, 160, 49, 162,
+ -1, -1, -1, -1, -1, -1, -1, -1, 59, 60,
+ -1, 154, -1, -1, 157, -1, -1, 160, -1, 162,
+ -1, 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, 161, 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, 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, 162, 193, 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, 167, 21,
- 22, 23, 24, 156, 159, 161, 164, 196, 222, 186,
- 186, 192, 192, 160, 162, 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, 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, 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
+ 0, 200, 201, 202, 0, 25, 31, 41, 42, 43,
+ 44, 45, 46, 47, 62, 181, 219, 222, 224, 232,
+ 22, 24, 51, 58, 62, 180, 212, 224, 225, 61,
+ 220, 23, 233, 234, 30, 163, 221, 233, 52, 53,
+ 54, 71, 209, 152, 61, 20, 45, 47, 50, 181,
+ 152, 45, 47, 223, 24, 207, 64, 65, 66, 67,
+ 68, 69, 70, 182, 217, 180, 238, 152, 152, 152,
+ 152, 157, 210, 207, 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, 229, 32, 33, 199, 199, 199, 199, 226, 4,
+ 189, 29, 162, 218, 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, 235, 236, 242, 243, 245, 246, 24, 55, 56,
+ 208, 4, 24, 24, 211, 4, 4, 4, 162, 8,
+ 163, 193, 194, 155, 164, 191, 191, 191, 9, 10,
+ 11, 12, 13, 14, 15, 16, 17, 18, 19, 176,
+ 177, 179, 191, 196, 217, 212, 191, 231, 59, 8,
+ 231, 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, 173, 191, 191, 231, 191, 191, 239, 231,
+ 231, 231, 231, 231, 231, 231, 191, 191, 191, 231,
+ 231, 182, 108, 109, 153, 159, 158, 158, 163, 194,
+ 153, 163, 37, 194, 195, 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, 229, 203, 155, 3, 4,
+ 7, 26, 27, 28, 38, 39, 61, 160, 197, 228,
+ 229, 230, 230, 230, 230, 189, 191, 191, 153, 184,
+ 153, 184, 230, 157, 153, 153, 153, 153, 153, 153,
+ 153, 153, 230, 230, 230, 153, 36, 189, 191, 231,
+ 24, 193, 193, 161, 163, 193, 153, 156, 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, 37, 191, 214, 215, 216, 63, 227,
+ 198, 153, 153, 230, 230, 230, 15, 57, 15, 153,
+ 244, 230, 157, 231, 191, 231, 231, 231, 191, 191,
+ 153, 153, 153, 231, 191, 230, 230, 153, 159, 161,
+ 161, 37, 34, 57, 185, 188, 155, 155, 196, 196,
+ 196, 196, 196, 153, 159, 163, 193, 198, 161, 163,
+ 196, 196, 196, 196, 196, 212, 213, 153, 156, 24,
+ 161, 21, 21, 155, 153, 153, 230, 4, 230, 231,
+ 240, 153, 230, 153, 153, 153, 230, 230, 230, 155,
+ 191, 24, 4, 187, 196, 196, 244, 153, 153, 153,
+ 153, 196, 161, 163, 153, 153, 153, 153, 36, 37,
+ 214, 185, 186, 153, 230, 230, 240, 241, 230, 230,
+ 153, 184, 184, 153, 230, 153, 231, 231, 231, 241,
+ 230, 153, 153, 156, 196, 196, 196, 196, 161, 196,
+ 196, 196, 196, 191, 57, 183, 24, 153, 157, 156,
+ 231, 159, 230, 156, 196, 196, 153, 156, 153, 153,
+ 156, 156, 156, 156, 156, 4, 21, 159, 178, 237,
+ 36, 159, 156, 156, 196, 196, 196, 230, 228, 159,
+ 178, 21, 156, 156, 156, 153, 228, 230, 21, 153,
+ 235, 230, 21, 21, 230, 230
};
#define yyerrok (yyerrstatus = 0)
YY_REDUCE_PRINT (yyn);
switch (yyn)
{
- case 81:
-#line 892 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 3:
+#line 1912 "/proj/llvm/llvm-2/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 1921 "/proj/llvm/llvm-2/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 1943 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_EQ; ;}
+ break;
+
+ case 27:
+#line 1943 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_NE; ;}
+ break;
+
+ case 28:
+#line 1944 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_SLT; ;}
+ break;
+
+ case 29:
+#line 1944 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_SGT; ;}
+ break;
+
+ case 30:
+#line 1945 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_SLE; ;}
+ break;
+
+ case 31:
+#line 1945 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_SGE; ;}
+ break;
+
+ case 32:
+#line 1946 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_ULT; ;}
+ break;
+
+ case 33:
+#line 1946 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_UGT; ;}
+ break;
+
+ case 34:
+#line 1947 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_ULE; ;}
+ break;
+
+ case 35:
+#line 1947 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.IPred) = ICmpInst::ICMP_UGE; ;}
+ break;
+
+ case 36:
+#line 1951 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_OEQ; ;}
+ break;
+
+ case 37:
+#line 1951 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_ONE; ;}
+ break;
+
+ case 38:
+#line 1952 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_OLT; ;}
+ break;
+
+ case 39:
+#line 1952 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_OGT; ;}
+ break;
+
+ case 40:
+#line 1953 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_OLE; ;}
+ break;
+
+ case 41:
+#line 1953 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_OGE; ;}
+ break;
+
+ case 42:
+#line 1954 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_ORD; ;}
+ break;
+
+ case 43:
+#line 1954 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_UNO; ;}
+ break;
+
+ case 44:
+#line 1955 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_UEQ; ;}
+ break;
+
+ case 45:
+#line 1955 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_UNE; ;}
+ break;
+
+ case 46:
+#line 1956 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_ULT; ;}
+ break;
+
+ case 47:
+#line 1956 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_UGT; ;}
+ break;
+
+ case 48:
+#line 1957 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_ULE; ;}
+ break;
+
+ case 49:
+#line 1957 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_UGE; ;}
+ break;
+
+ case 50:
+#line 1958 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_TRUE; ;}
+ break;
+
+ case 51:
+#line 1959 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.FPred) = FCmpInst::FCMP_FALSE; ;}
+ break;
+
+ case 81:
+#line 1990 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.StrVal) = (yyvsp[-1].StrVal);
;}
break;
case 82:
-#line 895 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 1993 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = new std::string("");
+ (yyval.StrVal) = 0;
;}
break;
+ case 83:
+#line 1998 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
+ break;
+
+ case 84:
+#line 1999 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
+ break;
+
+ case 85:
+#line 2000 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
+ break;
+
+ case 86:
+#line 2001 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
+ break;
+
+ case 87:
+#line 2002 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
+ break;
+
+ case 88:
+#line 2003 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
+ break;
+
+ case 89:
+#line 2004 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
+ break;
+
case 90:
-#line 902 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(""); ;}
+#line 2005 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+ break;
+
+ case 91:
+#line 2009 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.UIntVal) = OldCallingConv::C; ;}
+ break;
+
+ case 92:
+#line 2010 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.UIntVal) = OldCallingConv::C; ;}
+ break;
+
+ case 93:
+#line 2011 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.UIntVal) = OldCallingConv::CSRet; ;}
+ break;
+
+ case 94:
+#line 2012 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.UIntVal) = OldCallingConv::Fast; ;}
+ break;
+
+ case 95:
+#line 2013 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.UIntVal) = OldCallingConv::Cold; ;}
+ break;
+
+ case 96:
+#line 2014 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.UIntVal) = OldCallingConv::X86_StdCall; ;}
break;
case 97:
-#line 907 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- *(yyvsp[-1].String) += *(yyvsp[0].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-1].String);
- ;}
+#line 2015 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.UIntVal) = OldCallingConv::X86_FastCall; ;}
break;
case 98:
-#line 912 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(""); ;}
+#line 2016 "/proj/llvm/llvm-2/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 917 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+#line 2026 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.UIntVal) = 0; ;}
break;
case 100:
-#line 918 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); (yyval.String) = (yyvsp[-1].String); ;}
+#line 2027 "/proj/llvm/llvm-2/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 921 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+#line 2035 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.UIntVal) = 0; ;}
break;
case 102:
-#line 922 "/proj/llvm/llvm-3/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 2036 "/proj/llvm/llvm-2/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 930 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- *(yyvsp[-1].String) += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-1].String);
+#line 2044 "/proj/llvm/llvm-2/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 936 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+#line 2053 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.StrVal) = 0; ;}
+ break;
+
+ case 105:
+#line 2054 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
break;
case 106:
-#line 940 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+#line 2061 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {;}
break;
case 107:
-#line 941 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2062 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {;}
+ break;
+
+ case 108:
+#line 2066 "/proj/llvm/llvm-2/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 951 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2070 "/proj/llvm/llvm-2/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 2087 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[0].PrimType).T);
+ (yyval.TypeVal).S.makeSignless();
+ ;}
+ break;
+
+ case 113:
+#line 2095 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[0].PrimType).T);
+ (yyval.TypeVal).S.makeSignless();
+ ;}
+ break;
+
+ case 114:
+#line 2102 "/proj/llvm/llvm-2/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).PAT)->getDescription());
+ (yyval.TypeVal) = (yyvsp[0].TypeVal);
+ ;}
break;
case 127:
-#line 973 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2116 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Type) = TypeInfo::get(*(yyvsp[0].String), OpaqueTy);
+ (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[0].PrimType).T);
+ (yyval.TypeVal).S.copy((yyvsp[0].PrimType).S);
;}
break;
case 128:
-#line 976 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.Type) = TypeInfo::get(*(yyvsp[0].String), UnresolvedTy);
+#line 2120 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.TypeVal).PAT = new PATypeHolder(OpaqueType::get());
+ (yyval.TypeVal).S.makeSignless();
;}
break;
case 129:
-#line 979 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.Type) = (yyvsp[0].Type);
+#line 2124 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { // Named types are also simple types...
+ (yyval.TypeVal).S.copy(getTypeSign((yyvsp[0].ValIDVal)));
+ const Type* tmp = getType((yyvsp[0].ValIDVal));
+ (yyval.TypeVal).PAT = new PATypeHolder(tmp);
;}
break;
case 130:
-#line 982 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2129 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{ // Type UpReference
- (yyvsp[0].String)->insert(0, "\\");
- (yyval.Type) = TypeInfo::get(*(yyvsp[0].String), UpRefTy);
+ 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).PAT = new PATypeHolder(OT);
+ (yyval.TypeVal).S.makeSignless();
+ UR_OUT("New Upreference!\n");
;}
break;
case 131:
-#line 986 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2138 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{ // Function derived type?
- std::string newTy( (yyvsp[-3].Type)->getNewTy() + "(");
- for (unsigned i = 0; i < (yyvsp[-1].TypeVec)->size(); ++i) {
- if (i != 0)
- newTy += ", ";
- if ((*(yyvsp[-1].TypeVec))[i]->isVoid())
- newTy += "...";
- else
- newTy += (*(yyvsp[-1].TypeVec))[i]->getNewTy();
+ (yyval.TypeVal).S.makeComposite((yyvsp[-3].TypeVal).S);
+ 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->PAT->get());
+ (yyval.TypeVal).S.add(I->S);
}
- newTy += ")";
- (yyval.Type) = TypeInfo::get(newTy, (yyvsp[-3].Type), (yyvsp[-1].TypeVec));
+ bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
+ if (isVarArg) Params.pop_back();
+
+ const FunctionType *FTy =
+ FunctionType::get((yyvsp[-3].TypeVal).PAT->get(), Params, isVarArg, 0);
+
+ (yyval.TypeVal).PAT = new PATypeHolder( HandleUpRefs(FTy, (yyval.TypeVal).S) );
+ delete (yyvsp[-3].TypeVal).PAT; // Delete the return type handle
+ delete (yyvsp[-1].TypeList); // Delete the argument list
;}
break;
case 132:
-#line 999 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2156 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{ // Sized array type?
- uint64_t elems = atoi((yyvsp[-3].String)->c_str());
- (yyvsp[-3].String)->insert(0,"[ ");
- *(yyvsp[-3].String) += " x " + (yyvsp[-1].Type)->getNewTy() + " ]";
- (yyval.Type) = TypeInfo::get(*(yyvsp[-3].String), ArrayTy, (yyvsp[-1].Type), elems);
+ (yyval.TypeVal).S.makeComposite((yyvsp[-1].TypeVal).S);
+ (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(ArrayType::get((yyvsp[-1].TypeVal).PAT->get(),
+ (unsigned)(yyvsp[-3].UInt64Val)), (yyval.TypeVal).S));
+ delete (yyvsp[-1].TypeVal).PAT;
;}
break;
case 133:
-#line 1005 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { // Packed array type?
- uint64_t elems = atoi((yyvsp[-3].String)->c_str());
- (yyvsp[-3].String)->insert(0,"< ");
- *(yyvsp[-3].String) += " x " + (yyvsp[-1].Type)->getNewTy() + " >";
- (yyval.Type) = TypeInfo::get(*(yyvsp[-3].String), PackedTy, (yyvsp[-1].Type), elems);
+#line 2162 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { // Vector type?
+ const llvm::Type* ElemTy = (yyvsp[-1].TypeVal).PAT->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 VectorType must be integer or floating point");
+ if (!isPowerOf2_32((yyvsp[-3].UInt64Val)))
+ error("VectorType length should be a power of 2");
+ (yyval.TypeVal).S.makeComposite((yyvsp[-1].TypeVal).S);
+ (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy,
+ (unsigned)(yyvsp[-3].UInt64Val)), (yyval.TypeVal).S));
+ delete (yyvsp[-1].TypeVal).PAT;
;}
break;
case 134:
-#line 1011 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2175 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{ // Structure type?
- std::string newTy("{");
- for (unsigned i = 0; i < (yyvsp[-1].TypeVec)->size(); ++i) {
- if (i != 0)
- newTy += ", ";
- newTy += (*(yyvsp[-1].TypeVec))[i]->getNewTy();
+ std::vector<const Type*> Elements;
+ (yyval.TypeVal).S.makeComposite();
+ for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp[-1].TypeList)->begin(),
+ E = (yyvsp[-1].TypeList)->end(); I != E; ++I) {
+ Elements.push_back(I->PAT->get());
+ (yyval.TypeVal).S.add(I->S);
}
- newTy += "}";
- (yyval.Type) = TypeInfo::get(newTy, StructTy, (yyvsp[-1].TypeVec));
+ (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements), (yyval.TypeVal).S));
+ delete (yyvsp[-1].TypeList);
;}
break;
case 135:
-#line 1021 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2186 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{ // Empty structure type?
- (yyval.Type) = TypeInfo::get("{}", StructTy, new TypeList());
+ (yyval.TypeVal).PAT = new PATypeHolder(StructType::get(std::vector<const Type*>()));
+ (yyval.TypeVal).S.makeComposite();
;}
break;
case 136:
-#line 1024 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2190 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{ // Packed Structure type?
- std::string newTy("<{");
- for (unsigned i = 0; i < (yyvsp[-2].TypeVec)->size(); ++i) {
- if (i != 0)
- newTy += ", ";
- newTy += (*(yyvsp[-2].TypeVec))[i]->getNewTy();
+ (yyval.TypeVal).S.makeComposite();
+ 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->PAT->get());
+ (yyval.TypeVal).S.add(I->S);
+ delete I->PAT;
}
- newTy += "}>";
- (yyval.Type) = TypeInfo::get(newTy, PackedStructTy, (yyvsp[-2].TypeVec));
+ (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true),
+ (yyval.TypeVal).S));
+ delete (yyvsp[-2].TypeList);
;}
break;
case 137:
-#line 1034 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2203 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{ // Empty packed structure type?
- (yyval.Type) = TypeInfo::get("<{}>", PackedStructTy, new TypeList());
+ (yyval.TypeVal).PAT = new PATypeHolder(StructType::get(std::vector<const Type*>(),true));
+ (yyval.TypeVal).S.makeComposite();
;}
break;
case 138:
-#line 1037 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2207 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{ // Pointer type?
- (yyval.Type) = (yyvsp[-1].Type)->getPointerType();
+ if ((yyvsp[-1].TypeVal).PAT->get() == Type::LabelTy)
+ error("Cannot form a pointer to a basic block");
+ (yyval.TypeVal).S.makeComposite((yyvsp[-1].TypeVal).S);
+ (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(PointerType::get((yyvsp[-1].TypeVal).PAT->get()),
+ (yyval.TypeVal).S));
+ delete (yyvsp[-1].TypeVal).PAT;
;}
break;
case 139:
-#line 1045 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2221 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.TypeVec) = new TypeList();
- (yyval.TypeVec)->push_back((yyvsp[0].Type));
+ (yyval.TypeList) = new std::list<PATypeInfo>();
+ (yyval.TypeList)->push_back((yyvsp[0].TypeVal));
;}
break;
case 140:
-#line 1049 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2225 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.TypeVec) = (yyvsp[-2].TypeVec);
- (yyval.TypeVec)->push_back((yyvsp[0].Type));
+ ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back((yyvsp[0].TypeVal));
;}
break;
case 142:
-#line 1057 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2233 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.TypeVec) = (yyvsp[-2].TypeVec);
- (yyval.TypeVec)->push_back(TypeInfo::get("void",VoidTy));
- delete (yyvsp[0].String);
+ PATypeInfo VoidTI;
+ VoidTI.PAT = new PATypeHolder(Type::VoidTy);
+ VoidTI.S.makeSignless();
+ ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(VoidTI);
;}
break;
case 143:
-#line 1062 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2239 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.TypeVec) = new TypeList();
- (yyval.TypeVec)->push_back(TypeInfo::get("void",VoidTy));
- delete (yyvsp[0].String);
+ (yyval.TypeList) = new std::list<PATypeInfo>();
+ PATypeInfo VoidTI;
+ VoidTI.PAT = new PATypeHolder(Type::VoidTy);
+ VoidTI.S.makeSignless();
+ (yyval.TypeList)->push_back(VoidTI);
;}
break;
case 144:
-#line 1067 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2246 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.TypeVec) = new TypeList();
+ (yyval.TypeList) = new std::list<PATypeInfo>();
;}
break;
case 145:
-#line 1077 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2258 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{ // Nonempty unsized arr
- (yyval.Const).type = (yyvsp[-3].Type);
- (yyval.Const).cnst = new std::string((yyvsp[-3].Type)->getNewTy());
- *(yyval.Const).cnst += " [ " + *(yyvsp[-1].String) + " ]";
- delete (yyvsp[-1].String);
+ const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-3].TypeVal).PAT->get());
+ if (ATy == 0)
+ error("Cannot make array constant with type: '" +
+ (yyvsp[-3].TypeVal).PAT->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.copy((yyvsp[-3].TypeVal).S);
+ delete (yyvsp[-3].TypeVal).PAT;
+ delete (yyvsp[-1].ConstVector);
;}
break;
case 146:
-#line 1083 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2288 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Const).type = (yyvsp[-2].Type);
- (yyval.Const).cnst = new std::string((yyvsp[-2].Type)->getNewTy());
- *(yyval.Const).cnst += "[ ]";
+ const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal).PAT->get());
+ if (ATy == 0)
+ error("Cannot make array constant with type: '" +
+ (yyvsp[-2].TypeVal).PAT->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.copy((yyvsp[-2].TypeVal).S);
+ delete (yyvsp[-2].TypeVal).PAT;
;}
break;
case 147:
-#line 1088 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2301 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Const).type = (yyvsp[-2].Type);
- (yyval.Const).cnst = new std::string((yyvsp[-2].Type)->getNewTy());
- *(yyval.Const).cnst += " c" + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+ const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal).PAT->get());
+ if (ATy == 0)
+ error("Cannot make array constant with type: '" +
+ (yyvsp[-2].TypeVal).PAT->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.copy((yyvsp[-2].TypeVal).S);
+ delete (yyvsp[-2].TypeVal).PAT;
;}
break;
case 148:
-#line 1094 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2324 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{ // Nonempty unsized arr
- (yyval.Const).type = (yyvsp[-3].Type);
- (yyval.Const).cnst = new std::string((yyvsp[-3].Type)->getNewTy());
- *(yyval.Const).cnst += " < " + *(yyvsp[-1].String) + " >";
- delete (yyvsp[-1].String);
+ const VectorType *PTy = dyn_cast<VectorType>((yyvsp[-3].TypeVal).PAT->get());
+ if (PTy == 0)
+ error("Cannot make packed constant with type: '" +
+ (yyvsp[-3].TypeVal).PAT->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 = ConstantVector::get(PTy, Elems);
+ (yyval.ConstVal).S.copy((yyvsp[-3].TypeVal).S);
+ delete (yyvsp[-3].TypeVal).PAT;
+ delete (yyvsp[-1].ConstVector);
;}
break;
case 149:
-#line 1100 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2352 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Const).type = (yyvsp[-3].Type);
- (yyval.Const).cnst = new std::string((yyvsp[-3].Type)->getNewTy());
- *(yyval.Const).cnst += " { " + *(yyvsp[-1].String) + " }";
- delete (yyvsp[-1].String);
+ const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal).PAT->get());
+ if (STy == 0)
+ error("Cannot make struct constant with type: '" +
+ (yyvsp[-3].TypeVal).PAT->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.copy((yyvsp[-3].TypeVal).S);
+ delete (yyvsp[-3].TypeVal).PAT;
+ delete (yyvsp[-1].ConstVector);
;}
break;
case 150:
-#line 1106 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2374 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Const).type = (yyvsp[-2].Type);
- (yyval.Const).cnst = new std::string((yyvsp[-2].Type)->getNewTy());
- *(yyval.Const).cnst += " {}";
+ const StructType *STy = dyn_cast<StructType>((yyvsp[-2].TypeVal).PAT->get());
+ if (STy == 0)
+ error("Cannot make struct constant with type: '" +
+ (yyvsp[-2].TypeVal).PAT->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.copy((yyvsp[-2].TypeVal).S);
+ delete (yyvsp[-2].TypeVal).PAT;
;}
break;
case 151:
-#line 1111 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2385 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string((yyvsp[-1].Type)->getNewTy());
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+ const StructType *STy = dyn_cast<StructType>((yyvsp[-5].TypeVal).PAT->get());
+ if (STy == 0)
+ error("Cannot make packed struct constant with type: '" +
+ (yyvsp[-5].TypeVal).PAT->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.copy((yyvsp[-5].TypeVal).S);
+ delete (yyvsp[-5].TypeVal).PAT;
+ delete (yyvsp[-2].ConstVector);
;}
break;
case 152:
-#line 1117 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2407 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string((yyvsp[-1].Type)->getNewTy());
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+ const StructType *STy = dyn_cast<StructType>((yyvsp[-4].TypeVal).PAT->get());
+ if (STy == 0)
+ error("Cannot make packed struct constant with type: '" +
+ (yyvsp[-4].TypeVal).PAT->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.copy((yyvsp[-4].TypeVal).S);
+ delete (yyvsp[-4].TypeVal).PAT;
;}
break;
case 153:
-#line 1123 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2418 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- std::string Name = getUniqueName((yyvsp[0].String), (yyvsp[-1].Type)->resolve(), true);
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string((yyvsp[-1].Type)->getNewTy());
- *(yyval.Const).cnst += " " + Name;
- delete (yyvsp[0].String);
+ const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal).PAT->get());
+ if (PTy == 0)
+ error("Cannot make null pointer constant with type: '" +
+ (yyvsp[-1].TypeVal).PAT->get()->getDescription() + "'");
+ (yyval.ConstVal).C = ConstantPointerNull::get(PTy);
+ (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
+ delete (yyvsp[-1].TypeVal).PAT;
;}
break;
case 154:
-#line 1130 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2427 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string((yyvsp[-1].Type)->getNewTy());
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+ (yyval.ConstVal).C = UndefValue::get((yyvsp[-1].TypeVal).PAT->get());
+ (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
+ delete (yyvsp[-1].TypeVal).PAT;
;}
break;
case 155:
-#line 1136 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2432 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string((yyvsp[-1].Type)->getNewTy());
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+ const PointerType *Ty = dyn_cast<PointerType>((yyvsp[-1].TypeVal).PAT->get());
+ if (Ty == 0)
+ error("Global const reference must be a pointer type, not" +
+ (yyvsp[-1].TypeVal).PAT->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;
+ (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
+ 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.copy((yyvsp[-1].TypeVal).S);
+ delete (yyvsp[-1].TypeVal).PAT; // Free the type handle
;}
break;
case 156:
-#line 1142 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { // integral constants
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string((yyvsp[-1].Type)->getNewTy());
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+#line 2491 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ if ((yyvsp[-1].TypeVal).PAT->get() != (yyvsp[0].ConstVal).C->getType())
+ error("Mismatched types for constant expression");
+ (yyval.ConstVal) = (yyvsp[0].ConstVal);
+ (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
+ delete (yyvsp[-1].TypeVal).PAT;
;}
break;
case 157:
-#line 1148 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { // integral constants
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string((yyvsp[-1].Type)->getNewTy());
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+#line 2498 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type *Ty = (yyvsp[-1].TypeVal).PAT->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.copy((yyvsp[-1].TypeVal).S);
+ delete (yyvsp[-1].TypeVal).PAT;
;}
break;
case 158:
-#line 1154 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { // Boolean constants
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string((yyvsp[-1].Type)->getNewTy());
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+#line 2506 "/proj/llvm/llvm-2/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.makeSigned();
;}
break;
case 159:
-#line 1160 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { // Boolean constants
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string((yyvsp[-1].Type)->getNewTy());
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+#line 2513 "/proj/llvm/llvm-2/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.makeUnsigned();
;}
break;
case 160:
-#line 1166 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { // Float & Double constants
- (yyval.Const).type = (yyvsp[-1].Type);
- (yyval.Const).cnst = new std::string((yyvsp[-1].Type)->getNewTy());
- *(yyval.Const).cnst += " " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+#line 2520 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { // Boolean constants
+ (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, true);
+ (yyval.ConstVal).S.makeUnsigned();
;}
break;
case 161:
-#line 1174 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- std::string source = *(yyvsp[-3].Const).cnst;
- const TypeInfo* SrcTy = (yyvsp[-3].Const).type->resolve();
- const TypeInfo* DstTy = (yyvsp[-1].Type)->resolve();
- if (*(yyvsp[-5].String) == "cast") {
- // Call getCastUpgrade to upgrade the old cast
- (yyval.String) = new std::string(getCastUpgrade(source, SrcTy, DstTy, 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)->getNewTy() + ")";
- }
- delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); delete (yyvsp[-2].String);
+#line 2524 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { // Boolean constants
+ (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, false);
+ (yyval.ConstVal).S.makeUnsigned();
;}
break;
case 162:
-#line 1188 "/proj/llvm/llvm-3/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 2528 "/proj/llvm/llvm-2/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.makeSignless();
;}
break;
case 163:
-#line 1200 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2537 "/proj/llvm/llvm-2/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);
+ const Type* SrcTy = (yyvsp[-3].ConstVal).C->getType();
+ const Type* DstTy = (yyvsp[-1].TypeVal).PAT->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.copy(DstSign);
+ delete (yyvsp[-1].TypeVal).PAT;
;}
break;
case 164:
-#line 1205 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2552 "/proj/llvm/llvm-2/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();
+ const Type *Ty = (yyvsp[-2].ConstVal).C->getType();
+ if (!isa<PointerType>(Ty))
+ error("GetElementPtr requires a pointer operand");
+
+ std::vector<Constant*> CIndices;
+ upgradeGEPCEIndices((yyvsp[-2].ConstVal).C->getType(), (yyvsp[-1].ValueList), CIndices);
+
+ delete (yyvsp[-1].ValueList);
+ (yyval.ConstVal).C = ConstantExpr::getGetElementPtr((yyvsp[-2].ConstVal).C, &CIndices[0], CIndices.size());
+ (yyval.ConstVal).S.copy(getElementSign((yyvsp[-2].ConstVal), CIndices));
;}
break;
case 165:
-#line 1211 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2564 "/proj/llvm/llvm-2/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);
+ 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.copy((yyvsp[-3].ConstVal).S);
;}
break;
case 166:
-#line 1216 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2573 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-5].String) = getCompareOp(*(yyvsp[-5].String), (yyvsp[-3].Const).type);
- *(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("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.copy((yyvsp[-3].ConstVal).S);
;}
break;
case 167:
-#line 1222 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2601 "/proj/llvm/llvm-2/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("Logical operator types must match");
+ if (!Ty->isInteger()) {
+ if (!isa<VectorType>(Ty) ||
+ !cast<VectorType>(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.copy((yyvsp[-3].ConstVal).S);
;}
break;
case 168:
-#line 1227 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2614 "/proj/llvm/llvm-2/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("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.makeUnsigned();
;}
break;
case 169:
-#line 1232 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2623 "/proj/llvm/llvm-2/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();
+ 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.makeUnsigned();
;}
break;
case 170:
-#line 1240 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2629 "/proj/llvm/llvm-2/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);
+ 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.makeUnsigned();
;}
break;
case 171:
-#line 1245 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2635 "/proj/llvm/llvm-2/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[-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.copy((yyvsp[-3].ConstVal).S);
;}
break;
case 172:
-#line 1250 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2646 "/proj/llvm/llvm-2/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 (!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.copy((yyvsp[-3].ConstVal).S.get(0));
;}
break;
case 173:
-#line 1260 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2652 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-2].String) += ", " + *(yyvsp[0].Const).cnst;
- (yyvsp[0].Const).destroy();
- (yyval.String) = (yyvsp[-2].String);
+ 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.copy((yyvsp[-5].ConstVal).S);
;}
break;
case 174:
-#line 1265 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(*(yyvsp[0].Const).cnst); (yyvsp[0].Const).destroy(); ;}
+#line 2658 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ 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.copy((yyvsp[-5].ConstVal).S);
+ ;}
break;
- case 177:
-#line 1280 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
-;}
+ case 175:
+#line 2669 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal)); ;}
break;
- case 178:
-#line 1285 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 176:
+#line 2670 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = 0;
+ (yyval.ConstVector) = new std::vector<ConstInfo>();
+ (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
;}
break;
+ case 177:
+#line 2679 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.BoolVal) = false; ;}
+ break;
+
+ case 178:
+#line 2680 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.BoolVal) = true; ;}
+ break;
+
case 179:
-#line 1288 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2692 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *O << *(yyvsp[0].String) << '\n';
- delete (yyvsp[0].String);
- (yyval.String) = 0;
+ (yyval.ModuleVal) = ParserResult = (yyvsp[0].ModuleVal);
+ CurModule.ModuleDone();
;}
break;
case 180:
-#line 1293 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- *O << "module asm " << ' ' << *(yyvsp[0].String) << '\n';
- (yyval.String) = 0;
- ;}
+#line 2701 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal); CurFun.FunctionDone(); ;}
break;
case 181:
-#line 1297 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- *O << "implementation\n";
- (yyval.String) = 0;
- ;}
+#line 2702 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal); ;}
break;
case 182:
-#line 1301 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = 0; ;}
+#line 2703 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ModuleVal) = (yyvsp[-3].ModuleVal); ;}
+ break;
+
+ case 183:
+#line 2704 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal); ;}
break;
case 184:
-#line 1303 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "external"; ;}
+#line 2705 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (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));
+ }
+ }
+ ;}
break;
case 185:
-#line 1306 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2721 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- EnumeratedTypes.push_back((yyvsp[0].Type));
- if (!(yyvsp[-2].String)->empty()) {
- NamedTypes[*(yyvsp[-2].String)] = (yyvsp[0].Type);
- *O << *(yyvsp[-2].String) << " = ";
+ // 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!
+ //
+ ResolveTypeTo((yyvsp[-2].StrVal), (yyvsp[0].TypeVal).PAT->get(), (yyvsp[0].TypeVal).S);
+
+ if (!setTypeName((yyvsp[0].TypeVal), (yyvsp[-2].StrVal)) && !(yyvsp[-2].StrVal)) {
+ // If this is a numbered type that is not a redefinition, add it to the
+ // slot table.
+ CurModule.Types.push_back((yyvsp[0].TypeVal).PAT->get());
+ CurModule.TypeSigns.push_back((yyvsp[0].TypeVal).S);
}
- *O << "type " << (yyvsp[0].Type)->getNewTy() << '\n';
- delete (yyvsp[-2].String); delete (yyvsp[-1].String);
- (yyval.String) = 0;
+ delete (yyvsp[0].TypeVal).PAT;
;}
break;
case 186:
-#line 1316 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2741 "/proj/llvm/llvm-2/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 187:
-#line 1321 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 2743 "/proj/llvm/llvm-2/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;
;}
break;
- case 188:
-#line 1326 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 188:
+#line 2745 "/proj/llvm/llvm-2/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, (yyvsp[0].ConstVal).S);
+ ;}
+ break;
+
+ case 189:
+#line 2749 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ CurGV = 0;
+ ;}
+ break;
+
+ case 190:
+#line 2752 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
+ CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalLinkage, (yyvsp[-1].BoolVal), Ty, 0,
+ (yyvsp[0].TypeVal).S);
+ delete (yyvsp[0].TypeVal).PAT;
+ ;}
+ break;
+
+ case 191:
+#line 2757 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ CurGV = 0;
+ ;}
+ break;
+
+ case 192:
+#line 2760 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[-4].String)->empty()) {
- std::string Name = getGlobalName((yyvsp[-4].String),*(yyvsp[-3].String), (yyvsp[-1].Const).type->getPointerType(),
- *(yyvsp[-2].String) == "constant");
- *O << Name << " = ";
- }
- *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); delete (yyvsp[0].String);
- (yyval.String) = 0;
+ const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
+ CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::DLLImportLinkage, (yyvsp[-1].BoolVal), Ty, 0,
+ (yyvsp[0].TypeVal).S);
+ delete (yyvsp[0].TypeVal).PAT;
;}
break;
- case 189:
-#line 1336 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 193:
+#line 2765 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[-4].String)->empty()) {
- std::string Name = getGlobalName((yyvsp[-4].String),*(yyvsp[-3].String),(yyvsp[-1].Type)->getPointerType(),
- *(yyvsp[-2].String) == "constant");
- *O << Name << " = ";
- }
- *O << *(yyvsp[-3].String) << ' ' << *(yyvsp[-2].String) << ' ' << (yyvsp[-1].Type)->getNewTy() << ' ' << *(yyvsp[0].String) << '\n';
- delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); delete (yyvsp[0].String);
- (yyval.String) = 0;
+ CurGV = 0;
;}
break;
- case 190:
-#line 1346 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 194:
+#line 2768 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[-4].String)->empty()) {
- std::string Name = getGlobalName((yyvsp[-4].String),*(yyvsp[-3].String),(yyvsp[-1].Type)->getPointerType(),
- *(yyvsp[-2].String) == "constant");
- *O << Name << " = ";
- }
- *O << *(yyvsp[-3].String) << ' ' << *(yyvsp[-2].String) << ' ' << (yyvsp[-1].Type)->getNewTy() << ' ' << *(yyvsp[0].String) << '\n';
- delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); delete (yyvsp[0].String);
- (yyval.String) = 0;
+ const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
+ CurGV =
+ ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalWeakLinkage, (yyvsp[-1].BoolVal), Ty, 0,
+ (yyvsp[0].TypeVal).S);
+ delete (yyvsp[0].TypeVal).PAT;
;}
break;
- case 191:
-#line 1356 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 195:
+#line 2774 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[-4].String)->empty()) {
- std::string Name = getGlobalName((yyvsp[-4].String),*(yyvsp[-3].String),(yyvsp[-1].Type)->getPointerType(),
- *(yyvsp[-2].String) == "constant");
- *O << Name << " = ";
- }
- *O << *(yyvsp[-3].String) << ' ' << *(yyvsp[-2].String) << ' ' << (yyvsp[-1].Type)->getNewTy() << ' ' << *(yyvsp[0].String) << '\n';
- delete (yyvsp[-4].String); delete (yyvsp[-3].String); delete (yyvsp[-2].String); delete (yyvsp[0].String);
- (yyval.String) = 0;
+ CurGV = 0;
;}
break;
- case 192:
-#line 1366 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 196:
+#line 2777 "/proj/llvm/llvm-2/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 193:
-#line 1371 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 197:
+#line 2779 "/proj/llvm/llvm-2/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 194:
-#line 1376 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 198:
+#line 2781 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = 0;
;}
break;
- case 198:
-#line 1386 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 199:
+#line 2786 "/proj/llvm/llvm-2/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 199:
-#line 1391 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 200:
+#line 2800 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Endianness) = Module::BigEndian; ;}
+ break;
+
+ case 201:
+#line 2801 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Endianness) = Module::LittleEndian; ;}
+ break;
+
+ case 202:
+#line 2805 "/proj/llvm/llvm-2/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);
+ CurModule.setEndianness((yyvsp[0].Endianness));
;}
break;
- case 200:
-#line 1398 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 203:
+#line 2808 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-2].String) += " = " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-2].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 1403 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 204:
+#line 2816 "/proj/llvm/llvm-2/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 202:
-#line 1410 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 205:
+#line 2820 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyvsp[-1].String)->insert(0, "[ ");
- *(yyvsp[-1].String) += " ]";
- (yyval.String) = (yyvsp[-1].String);
+ CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
+ free((yyvsp[0].StrVal));
;}
break;
- case 203:
-#line 1417 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 207:
+#line 2831 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-2].String) += ", " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-2].String);
+ CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
+ free((yyvsp[0].StrVal));
;}
break;
- case 205:
-#line 1423 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 208:
+#line 2835 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = new std::string();
+ CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
+ free((yyvsp[0].StrVal));
;}
break;
case 209:
-#line 1432 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+#line 2839 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { ;}
break;
- case 210:
-#line 1434 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.String) = new std::string((yyvsp[-1].Type)->getNewTy());
- if (!(yyvsp[0].String)->empty()) {
- std::string Name = getUniqueName((yyvsp[0].String), (yyvsp[-1].Type)->resolve());
- *(yyval.String) += " " + Name;
- }
- delete (yyvsp[0].String);
-;}
+ case 213:
+#line 2852 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.StrVal) = 0; ;}
break;
- case 211:
-#line 1443 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 214:
+#line 2856 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-2].String) += ", " + *(yyvsp[0].String);
- delete (yyvsp[0].String);
+ if ((yyvsp[-1].TypeVal).PAT->get() == Type::VoidTy)
+ error("void typed arguments are invalid");
+ (yyval.ArgVal) = new std::pair<PATypeInfo, char*>((yyvsp[-1].TypeVal), (yyvsp[0].StrVal));
;}
break;
- case 212:
-#line 1447 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 215:
+#line 2864 "/proj/llvm/llvm-2/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 213:
-#line 1451 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 216:
+#line 2869 "/proj/llvm/llvm-2/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 214:
-#line 1454 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 217:
+#line 2877 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ArgList) = (yyvsp[0].ArgList); ;}
+ break;
+
+ case 218:
+#line 2878 "/proj/llvm/llvm-2/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.PAT = new PATypeHolder(Type::VoidTy);
+ VoidTI.S.makeSignless();
+ (yyval.ArgList)->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
;}
break;
- case 215:
-#line 1459 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 219:
+#line 2885 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = (yyvsp[0].String);
+ (yyval.ArgList) = new std::vector<std::pair<PATypeInfo,char*> >();
+ PATypeInfo VoidTI;
+ VoidTI.PAT = new PATypeHolder(Type::VoidTy);
+ VoidTI.S.makeSignless();
+ (yyval.ArgList)->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
;}
break;
- case 216:
-#line 1462 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+ case 220:
+#line 2892 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ArgList) = 0; ;}
break;
- case 217:
-#line 1465 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 221:
+#line 2896 "/proj/llvm/llvm-2/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).PAT->get();
+
+ if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy)
+ error("LLVM functions cannot return aggregate types");
+
+ Signedness FTySign;
+ FTySign.makeComposite((yyvsp[-6].TypeVal).S);
+ 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.PAT->get();
+ ParamTyList.push_back(Ty);
+ FTySign.add(I->first.S);
+ }
+ }
+
+ bool isVarArg = ParamTyList.size() && ParamTyList.back() == Type::VoidTy;
+ if (isVarArg)
+ ParamTyList.pop_back();
+
+ // Convert the CSRet calling convention into the corresponding parameter
+ // attribute.
+ ParamAttrsList *ParamAttrs = 0;
+ if ((yyvsp[-7].UIntVal) == OldCallingConv::CSRet) {
+ ParamAttrs = new ParamAttrsList();
+ ParamAttrs->addAttributes(0, ParamAttr::None); // result
+ ParamAttrs->addAttributes(1, ParamAttr::StructRet); // first arg
+ }
+
+ const FunctionType *FT =
+ FunctionType::get(RetTy, ParamTyList, isVarArg, ParamAttrs);
+ const PointerType *PFT = PointerType::get(FT);
+ delete (yyvsp[-6].TypeVal).PAT;
+
+ ValID ID;
+ if (!FunctionName.empty()) {
+ ID = ValID::create((char*)FunctionName.c_str());
+ } else {
+ ID = ValID::create((int)CurModule.Values[PFT].size());
+ }
+ ID.S.makeComposite(FTySign);
+
+ Function *Fn = 0;
+ Module* M = CurModule.CurrentModule;
+
+ // 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);
+ M->getFunctionList().remove(Fn);
+ M->getFunctionList().push_back(Fn);
+ } else if (!FunctionName.empty()) {
+ GlobalValue *Conflict = M->getFunction(FunctionName);
+ if (!Conflict)
+ Conflict = M->getNamedGlobal(FunctionName);
+ if (Conflict && PFT == Conflict->getType()) {
+ if (!CurFun.isDeclare && !Conflict->isDeclaration()) {
+ // We have two function definitions that conflict, same type, same
+ // name. We should really check to make sure that this is the result
+ // of integer type planes collapsing and generate an error if it is
+ // not, but we'll just rename on the assumption that it is. However,
+ // let's do it intelligently and rename the internal linkage one
+ // if there is one.
+ std::string NewName(makeNameUnique(FunctionName));
+ if (Conflict->hasInternalLinkage()) {
+ Conflict->setName(NewName);
+ RenameMapKey Key =
+ makeRenameMapKey(FunctionName, Conflict->getType(), ID.S);
+ CurModule.RenameMap[Key] = NewName;
+ Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
+ InsertValue(Fn, CurModule.Values);
+ } else {
+ Fn = new Function(FT, CurFun.Linkage, NewName, M);
+ InsertValue(Fn, CurModule.Values);
+ RenameMapKey Key =
+ makeRenameMapKey(FunctionName, PFT, ID.S);
+ CurModule.RenameMap[Key] = NewName;
+ }
+ } else {
+ // If they are not both definitions, then just use the function we
+ // found since the types are the same.
+ Fn = cast<Function>(Conflict);
+
+ // 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 if (Conflict) {
+ // We have two globals with the same name and different types.
+ // Previously, this was permitted because the symbol table had
+ // "type planes" and names only needed to be distinct within a
+ // type plane. After PR411 was fixed, this is no loner the case.
+ // To resolve this we must rename one of the two.
+ if (Conflict->hasInternalLinkage()) {
+ // We can safely rename the Conflict.
+ RenameMapKey Key =
+ makeRenameMapKey(Conflict->getName(), Conflict->getType(),
+ CurModule.NamedValueSigns[Conflict->getName()]);
+ Conflict->setName(makeNameUnique(Conflict->getName()));
+ CurModule.RenameMap[Key] = Conflict->getName();
+ Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
+ InsertValue(Fn, CurModule.Values);
+ } else {
+ // We can't quietly rename either of these things, but we must
+ // rename one of them. Only if the function's linkage is internal can
+ // we forgo a warning message about the renamed function.
+ std::string NewName = makeNameUnique(FunctionName);
+ if (CurFun.Linkage != GlobalValue::InternalLinkage) {
+ warning("Renaming function '" + FunctionName + "' as '" + NewName +
+ "' may cause linkage errors");
+ }
+ // Elect to rename the thing we're now defining.
+ Fn = new Function(FT, CurFun.Linkage, NewName, M);
+ InsertValue(Fn, CurModule.Values);
+ RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
+ CurModule.RenameMap[Key] = NewName;
+ }
+ } else {
+ // There's no conflict, just define the function
+ Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
+ InsertValue(Fn, CurModule.Values);
+ }
+ } else {
+ // There's no conflict, just define the function
+ Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
+ 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)->getNewTy() + " " + *(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.PAT->get() == Type::VoidTy &&
+ (yyvsp[-3].ArgList)->back().second == 0 && "Not a varargs marker");
+ delete (yyvsp[-3].ArgList)->back().first.PAT;
+ (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.PAT; // Delete the typeholder...
+ ValueInfo VI; VI.V = ArgIt; VI.S.copy(I->first.S);
+ setValueName(VI, I->second); // Insert arg into symtab...
+ InsertValue(ArgIt);
+ }
+ delete (yyvsp[-3].ArgList); // We're now done with the argument list
}
- delete (yyvsp[-5].String);
- delete (yyvsp[-3].String);
- delete (yyvsp[-1].String);
- delete (yyvsp[0].String);
- (yyval.String) = (yyvsp[-7].String);
;}
break;
- case 218:
-#line 1483 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string("{"); delete (yyvsp[0].String); ;}
+ case 224:
+#line 3087 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { CurFun.Linkage = (yyvsp[0].Linkage); ;}
break;
- case 219:
-#line 1484 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string ("{"); ;}
+ case 225:
+#line 3087 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.FunctionVal) = CurFun.CurrentFunction;
+
+ // Make sure that we keep track of the linkage type even if there was a
+ // previous "declare".
+ (yyval.FunctionVal)->setLinkage((yyvsp[-3].Linkage));
+ ;}
break;
- case 220:
-#line 1487 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 228:
+#line 3101 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *O << "define ";
- 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 221:
-#line 1498 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string("}"); delete (yyvsp[0].String); ;}
+ case 229:
+#line 3106 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
break;
- case 222:
-#line 1499 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string("}"); ;}
+ case 230:
+#line 3107 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
break;
- case 223:
-#line 1501 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- if ((yyvsp[-1].String))
- *O << *(yyvsp[-1].String);
- *O << *(yyvsp[0].String) << "\n\n";
- delete (yyvsp[-2].String); delete (yyvsp[-1].String); delete (yyvsp[0].String);
- (yyval.String) = 0;
-;}
+ case 231:
+#line 3108 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
break;
- case 224:
-#line 1510 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+ case 232:
+#line 3112 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { CurFun.isDeclare = true; ;}
break;
- case 227:
-#line 1516 "/proj/llvm/llvm-3/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 233:
+#line 3113 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { CurFun.Linkage = (yyvsp[0].Linkage); ;}
+ break;
+
+ case 234:
+#line 3113 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.FunctionVal) = CurFun.CurrentFunction;
+ CurFun.FunctionDone();
+
;}
break;
- case 228:
-#line 1529 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+ case 235:
+#line 3125 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.BoolVal) = false; ;}
+ break;
+
+ case 236:
+#line 3126 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.BoolVal) = true; ;}
+ break;
+
+ case 237:
+#line 3131 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val)); ;}
break;
case 238:
-#line 1535 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3132 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val)); ;}
+ break;
+
+ case 239:
+#line 3133 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal)); ;}
+ break;
+
+ case 240:
+#line 3134 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyvsp[-1].String)->insert(0, "<");
- *(yyvsp[-1].String) += ">";
- (yyval.String) = (yyvsp[-1].String);
+ (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, true));
+ (yyval.ValIDVal).S.makeUnsigned();
;}
break;
- case 240:
-#line 1541 "/proj/llvm/llvm-3/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);
+ case 241:
+#line 3138 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, false));
+ (yyval.ValIDVal).S.makeUnsigned();
;}
break;
+ case 242:
+#line 3142 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::createNull(); ;}
+ break;
+
case 243:
-#line 1554 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.Value).val = (yyvsp[0].String);
- (yyval.Value).constant = false;
- (yyval.Value).type = 0;
- ;}
+#line 3143 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::createUndef(); ;}
break;
case 244:
-#line 1559 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.Value).val = (yyvsp[0].String);
- (yyval.Value).constant = true;
- (yyval.Value).type = 0;
- ;}
+#line 3144 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::createZeroInit(); ;}
break;
case 245:
-#line 1569 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyvsp[-1].Type) = (yyvsp[-1].Type)->resolve();
- std::string Name = getUniqueName((yyvsp[0].Value).val, (yyvsp[-1].Type));
- (yyval.Value) = (yyvsp[0].Value);
- delete (yyval.Value).val;
- (yyval.Value).val = new std::string((yyvsp[-1].Type)->getNewTy() + " " + Name);
- (yyval.Value).type = (yyvsp[-1].Type);
+#line 3145 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { // Nonempty unsized packed vector
+ const Type *ETy = (*(yyvsp[-1].ConstVector))[0].C->getType();
+ int NumElements = (yyvsp[-1].ConstVector)->size();
+ VectorType* pt = VectorType::get(ETy, NumElements);
+ (yyval.ValIDVal).S.makeComposite((*(yyvsp[-1].ConstVector))[0].S);
+ PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt, (yyval.ValIDVal).S));
+
+ // 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(ConstantVector::get(pt, Elems));
+ delete PTy; delete (yyvsp[-1].ConstVector);
;}
break;
case 246:
-#line 1578 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3166 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.String) = 0;
+ (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal).C);
+ (yyval.ValIDVal).S.copy((yyvsp[0].ConstVal).S);
;}
break;
case 247:
-#line 1581 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { // Do not allow functions with 0 basic blocks
- (yyval.String) = 0;
+#line 3170 "/proj/llvm/llvm-2/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 248:
-#line 1589 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.String) = 0;
- ;}
+#line 3184 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal)); (yyval.ValIDVal).S.makeSignless(); ;}
break;
case 249:
-#line 1593 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- *O << " " << *(yyvsp[0].String) << '\n';
- delete (yyvsp[0].String);
- (yyval.String) = 0;
- ;}
+#line 3185 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal)); (yyval.ValIDVal).S.makeSignless(); ;}
break;
- case 250:
-#line 1598 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyval.String) = 0;
+ case 252:
+#line 3198 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
+ (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
+ (yyval.ValueVal).V = getVal(Ty, (yyvsp[0].ValIDVal));
+ (yyval.ValueVal).S.copy((yyvsp[-1].TypeVal).S);
+ delete (yyvsp[-1].TypeVal).PAT;
;}
break;
- case 251:
-#line 1601 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 253:
+#line 3208 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *O << *(yyvsp[0].String) << '\n';
- delete (yyvsp[0].String);
- (yyval.String) = 0;
+ (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
;}
break;
- case 253:
-#line 1607 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "unwind"; ;}
- break;
-
case 254:
-#line 1609 "/proj/llvm/llvm-3/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 3211 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { // Do not allow functions with 0 basic blocks
+ (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
;}
break;
case 255:
-#line 1614 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { // Return with no result...
- *O << " " << *(yyvsp[-1].String) << ' ' << (yyvsp[0].Type)->getNewTy() << '\n';
- delete (yyvsp[-1].String);
- (yyval.String) = 0;
+#line 3220 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ ValueInfo VI; VI.V = (yyvsp[0].TermInstVal).TI; VI.S.copy((yyvsp[0].TermInstVal).S);
+ setValueName(VI, (yyvsp[-1].StrVal));
+ InsertValue((yyvsp[0].TermInstVal).TI);
+ (yyvsp[-2].BasicBlockVal)->getInstList().push_back((yyvsp[0].TermInstVal).TI);
+ InsertValue((yyvsp[-2].BasicBlockVal));
+ (yyval.BasicBlockVal) = (yyvsp[-2].BasicBlockVal);
;}
break;
case 256:
-#line 1619 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { // Unconditional Branch...
- *O << " " << *(yyvsp[-2].String) << ' ' << (yyvsp[-1].Type)->getNewTy() << ' ' << *(yyvsp[0].Value).val << '\n';
- delete (yyvsp[-2].String); (yyvsp[0].Value).destroy();
- (yyval.String) = 0;
- ;}
- break;
-
- case 257:
-#line 1624 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- std::string Name = getUniqueName((yyvsp[-6].Value).val, (yyvsp[-7].Type));
- *O << " " << *(yyvsp[-8].String) << ' ' << (yyvsp[-7].Type)->getNewTy() << ' ' << Name << ", "
- << (yyvsp[-4].Type)->getNewTy() << ' ' << *(yyvsp[-3].Value).val << ", " << (yyvsp[-1].Type)->getNewTy() << ' '
- << *(yyvsp[0].Value).val << '\n';
- delete (yyvsp[-8].String); (yyvsp[-6].Value).destroy(); (yyvsp[-3].Value).destroy(); (yyvsp[0].Value).destroy();
- (yyval.String) = 0;
- ;}
- break;
-
- case 258:
-#line 1632 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3231 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- std::string Name = getUniqueName((yyvsp[-6].Value).val, (yyvsp[-7].Type));
- *O << " " << *(yyvsp[-8].String) << ' ' << (yyvsp[-7].Type)->getNewTy() << ' ' << Name << ", "
- << (yyvsp[-4].Type)->getNewTy() << ' ' << *(yyvsp[-3].Value).val << " [" << *(yyvsp[-1].String) << " ]\n";
- delete (yyvsp[-8].String); (yyvsp[-6].Value).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 259:
-#line 1640 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 257:
+#line 3236 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- std::string Name = getUniqueName((yyvsp[-5].Value).val, (yyvsp[-6].Type));
- *O << " " << *(yyvsp[-7].String) << ' ' << (yyvsp[-6].Type)->getNewTy() << ' ' << Name << ", "
- << (yyvsp[-3].Type)->getNewTy() << ' ' << *(yyvsp[-2].Value).val << "[]\n";
- delete (yyvsp[-7].String); (yyvsp[-5].Value).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 260:
-#line 1648 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 258:
+#line 3245 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- const TypeInfo* ResTy = getFunctionReturnType((yyvsp[-10].Type));
- *O << " ";
- if (!(yyvsp[-13].String)->empty()) {
- std::string Name = getUniqueName((yyvsp[-13].String), ResTy);
- *O << Name << " = ";
- }
- *O << *(yyvsp[-12].String) << ' ' << *(yyvsp[-11].String) << ' ' << (yyvsp[-10].Type)->getNewTy() << ' ' << *(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)->getNewTy() << ' ' << *(yyvsp[-3].Value).val << ' '
- << *(yyvsp[-2].String) << ' ' << (yyvsp[-1].Type)->getNewTy() << ' ' << *(yyvsp[0].Value).val << '\n';
- delete (yyvsp[-13].String); delete (yyvsp[-12].String); delete (yyvsp[-11].String); (yyvsp[-9].Value).destroy(); delete (yyvsp[-7].ValList);
- delete (yyvsp[-5].String); (yyvsp[-3].Value).destroy(); delete (yyvsp[-2].String); (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 261:
-#line 1669 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- *O << " " << *(yyvsp[0].String) << '\n';
- delete (yyvsp[0].String);
- (yyval.String) = 0;
+#line 3259 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { // Return with a result...
+ (yyval.TermInstVal).TI = new ReturnInst((yyvsp[0].ValueVal).V);
+ (yyval.TermInstVal).S.makeSignless();
;}
break;
case 262:
-#line 1674 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- *O << " " << *(yyvsp[0].String) << '\n';
- delete (yyvsp[0].String);
- (yyval.String) = 0;
+#line 3263 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { // Return with no result...
+ (yyval.TermInstVal).TI = new ReturnInst();
+ (yyval.TermInstVal).S.makeSignless();
;}
break;
case 263:
-#line 1680 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- *(yyvsp[-5].String) += " " + (yyvsp[-4].Type)->getNewTy() + " " + *(yyvsp[-3].String) + ", " + (yyvsp[-1].Type)->getNewTy() + " " +
- *(yyvsp[0].Value).val;
- delete (yyvsp[-3].String); (yyvsp[0].Value).destroy();
- (yyval.String) = (yyvsp[-5].String);
+#line 3267 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { // Unconditional Branch...
+ BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
+ (yyval.TermInstVal).TI = new BranchInst(tmpBB);
+ (yyval.TermInstVal).S.makeSignless();
;}
break;
case 264:
-#line 1686 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- (yyvsp[-3].String)->insert(0, (yyvsp[-4].Type)->getNewTy() + " " );
- *(yyvsp[-3].String) += ", " + (yyvsp[-1].Type)->getNewTy() + " " + *(yyvsp[0].Value).val;
- (yyvsp[0].Value).destroy();
- (yyval.String) = (yyvsp[-3].String);
+#line 3272 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyvsp[-3].ValIDVal).S.makeSignless();
+ (yyvsp[0].ValIDVal).S.makeSignless();
+ BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
+ BasicBlock* tmpBBB = getBBVal((yyvsp[0].ValIDVal));
+ (yyvsp[-6].ValIDVal).S.makeUnsigned();
+ Value* tmpVal = getVal(Type::Int1Ty, (yyvsp[-6].ValIDVal));
+ (yyval.TermInstVal).TI = new BranchInst(tmpBBA, tmpBBB, tmpVal);
+ (yyval.TermInstVal).S.makeSignless();
;}
break;
case 265:
-#line 1694 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3282 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- if (!(yyvsp[-1].String)->empty()) {
- // Get a unique name for this value, based on its type.
- std::string Name = getUniqueName((yyvsp[-1].String), (yyvsp[0].Value).type);
- *(yyvsp[-1].String) = Name + " = ";
- if (deleteUselessCastFlag && *deleteUselessCastName == Name) {
- // don't actually delete it, just comment it out
- (yyvsp[-1].String)->insert(0, "; USELSS BITCAST: ");
- delete deleteUselessCastName;
- }
+ (yyvsp[-6].ValIDVal).S.copy((yyvsp[-7].PrimType).S);
+ Value* tmpVal = getVal((yyvsp[-7].PrimType).T, (yyvsp[-6].ValIDVal));
+ (yyvsp[-3].ValIDVal).S.makeSignless();
+ BasicBlock* tmpBB = getBBVal((yyvsp[-3].ValIDVal));
+ SwitchInst *S = new SwitchInst(tmpVal, tmpBB, (yyvsp[-1].JumpTable)->size());
+ (yyval.TermInstVal).TI = S;
+ (yyval.TermInstVal).S.makeSignless();
+ 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");
}
- *(yyvsp[-1].String) += *(yyvsp[0].Value).val;
- (yyvsp[0].Value).destroy();
- deleteUselessCastFlag = false;
- (yyval.String) = (yyvsp[-1].String);
+ delete (yyvsp[-1].JumpTable);
;}
break;
case 266:
-#line 1712 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { // Used for PHI nodes
- std::string Name = getUniqueName((yyvsp[-3].Value).val, (yyvsp[-5].Type));
- Name.insert(0, (yyvsp[-5].Type)->getNewTy() + "[");
- Name += "," + *(yyvsp[-1].Value).val + "]";
- (yyval.Value).val = new std::string(Name);
- (yyval.Value).type = (yyvsp[-5].Type);
- (yyvsp[-3].Value).destroy(); (yyvsp[-1].Value).destroy();
+#line 3300 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyvsp[-5].ValIDVal).S.copy((yyvsp[-6].PrimType).S);
+ Value* tmpVal = getVal((yyvsp[-6].PrimType).T, (yyvsp[-5].ValIDVal));
+ (yyvsp[-2].ValIDVal).S.makeSignless();
+ BasicBlock* tmpBB = getBBVal((yyvsp[-2].ValIDVal));
+ SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0);
+ (yyval.TermInstVal).TI = S;
+ (yyval.TermInstVal).S.makeSignless();
;}
break;
case 267:
-#line 1720 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3310 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- std::string Name = getUniqueName((yyvsp[-3].Value).val, (yyvsp[-6].Value).type);
- *(yyvsp[-6].Value).val += ", [" + Name + "," + *(yyvsp[-1].Value).val + "]";
- (yyvsp[-3].Value).destroy(); (yyvsp[-1].Value).destroy();
- (yyval.Value) = (yyvsp[-6].Value);
+ const PointerType *PFTy;
+ const FunctionType *Ty;
+ Signedness FTySign;
+
+ if (!(PFTy = dyn_cast<PointerType>((yyvsp[-10].TypeVal).PAT->get())) ||
+ !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
+ // Pull out the types of all of the arguments...
+ std::vector<const Type*> ParamTypes;
+ FTySign.makeComposite((yyvsp[-10].TypeVal).S);
+ 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());
+ FTySign.add(I->S);
+ }
+ }
+ ParamAttrsList *ParamAttrs = 0;
+ if ((yyvsp[-11].UIntVal) == OldCallingConv::CSRet) {
+ ParamAttrs = new ParamAttrsList();
+ ParamAttrs->addAttributes(0, ParamAttr::None); // Function result
+ ParamAttrs->addAttributes(1, ParamAttr::StructRet); // first param
+ }
+ bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy;
+ if (isVarArg) ParamTypes.pop_back();
+ Ty = FunctionType::get((yyvsp[-10].TypeVal).PAT->get(), ParamTypes, isVarArg, ParamAttrs);
+ PFTy = PointerType::get(Ty);
+ (yyval.TermInstVal).S.copy((yyvsp[-10].TypeVal).S);
+ } else {
+ FTySign = (yyvsp[-10].TypeVal).S;
+ // Get the signedness of the result type. $3 is the pointer to the
+ // function type so we get the 0th element to extract the function type,
+ // and then the 0th element again to get the result type.
+ (yyval.TermInstVal).S.copy((yyvsp[-10].TypeVal).S.get(0).get(0));
+ }
+
+ (yyvsp[-9].ValIDVal).S.makeComposite(FTySign);
+ 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).TI = new InvokeInst(V, Normal, Except, 0, 0);
+ } 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).TI = new InvokeInst(V, Normal, Except, &Args[0], Args.size());
+ }
+ cast<InvokeInst>((yyval.TermInstVal).TI)->setCallingConv(upgradeCallingConv((yyvsp[-11].UIntVal)));
+ delete (yyvsp[-10].TypeVal).PAT;
+ delete (yyvsp[-7].ValueList);
;}
break;
case 268:
-#line 1729 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3379 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.ValList) = new ValueList();
- (yyval.ValList)->push_back((yyvsp[0].Value));
+ (yyval.TermInstVal).TI = new UnwindInst();
+ (yyval.TermInstVal).S.makeSignless();
;}
break;
case 269:
-#line 1733 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3383 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.ValList) = (yyvsp[-2].ValList);
- (yyval.ValList)->push_back((yyvsp[0].Value));
+ (yyval.TermInstVal).TI = new UnreachableInst();
+ (yyval.TermInstVal).S.makeSignless();
;}
break;
case 270:
-#line 1740 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValList) = (yyvsp[0].ValList); ;}
+#line 3390 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.JumpTable) = (yyvsp[-5].JumpTable);
+ (yyvsp[-3].ValIDVal).S.copy((yyvsp[-4].PrimType).S);
+ Constant *V = cast<Constant>(getExistingValue((yyvsp[-4].PrimType).T, (yyvsp[-3].ValIDVal)));
+
+ if (V == 0)
+ error("May only switch on a constant pool value");
+
+ (yyvsp[0].ValIDVal).S.makeSignless();
+ BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
+ (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
+ ;}
break;
case 271:
-#line 1741 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValList) = new ValueList(); ;}
+#line 3402 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
+ (yyvsp[-3].ValIDVal).S.copy((yyvsp[-4].PrimType).S);
+ Constant *V = cast<Constant>(getExistingValue((yyvsp[-4].PrimType).T, (yyvsp[-3].ValIDVal)));
+
+ if (V == 0)
+ error("May only switch on a constant pool value");
+
+ (yyvsp[0].ValIDVal).S.makeSignless();
+ BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
+ (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
+ ;}
break;
case 272:
-#line 1745 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3417 "/proj/llvm/llvm-2/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.makeSignless();
+ } else {
+ ValueInfo VI; VI.V = (yyvsp[0].InstVal).I; VI.S.copy((yyvsp[0].InstVal).S);
+ setValueName(VI, (yyvsp[-1].StrVal));
+ InsertValue((yyvsp[0].InstVal).I);
+ (yyval.InstVal) = (yyvsp[0].InstVal);
+ }
;}
break;
- case 274:
-#line 1753 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- const char* op = getDivRemOpcode(*(yyvsp[-4].String), (yyvsp[-3].Type));
- std::string Name1 = getUniqueName((yyvsp[-2].Value).val, (yyvsp[-3].Type));
- std::string Name2 = getUniqueName((yyvsp[0].Value).val, (yyvsp[-3].Type));
- (yyval.Value).val = new std::string(op);
- *(yyval.Value).val += " " + (yyvsp[-3].Type)->getNewTy() + " " + Name1 + ", " + Name2;
- (yyval.Value).type = (yyvsp[-3].Type);
- delete (yyvsp[-4].String); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
+ case 273:
+#line 3447 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { // Used for PHI nodes
+ (yyval.PHIList).P = new std::list<std::pair<Value*, BasicBlock*> >();
+ (yyval.PHIList).S.copy((yyvsp[-5].TypeVal).S);
+ (yyvsp[-3].ValIDVal).S.copy((yyvsp[-5].TypeVal).S);
+ Value* tmpVal = getVal((yyvsp[-5].TypeVal).PAT->get(), (yyvsp[-3].ValIDVal));
+ (yyvsp[-1].ValIDVal).S.makeSignless();
+ BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal));
+ (yyval.PHIList).P->push_back(std::make_pair(tmpVal, tmpBB));
+ delete (yyvsp[-5].TypeVal).PAT;
;}
break;
- case 275:
-#line 1762 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 274:
+#line 3457 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- std::string Name1 = getUniqueName((yyvsp[-2].Value).val, (yyvsp[-3].Type));
- std::string Name2 = getUniqueName((yyvsp[0].Value).val, (yyvsp[-3].Type));
- *(yyvsp[-4].String) += " " + (yyvsp[-3].Type)->getNewTy() + " " + Name1 + ", " + Name2;
- (yyval.Value).val = (yyvsp[-4].String);
- (yyval.Value).type = (yyvsp[-3].Type);
- (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
+ (yyval.PHIList) = (yyvsp[-6].PHIList);
+ (yyvsp[-3].ValIDVal).S.copy((yyvsp[-6].PHIList).S);
+ Value* tmpVal = getVal((yyvsp[-6].PHIList).P->front().first->getType(), (yyvsp[-3].ValIDVal));
+ (yyvsp[-1].ValIDVal).S.makeSignless();
+ BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal));
+ (yyvsp[-6].PHIList).P->push_back(std::make_pair(tmpVal, tmpBB));
;}
break;
- case 276:
-#line 1770 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- std::string Name1 = getUniqueName((yyvsp[-2].Value).val, (yyvsp[-3].Type));
- std::string Name2 = getUniqueName((yyvsp[0].Value).val, (yyvsp[-3].Type));
- *(yyvsp[-4].String) = getCompareOp(*(yyvsp[-4].String), (yyvsp[-3].Type));
- *(yyvsp[-4].String) += " " + (yyvsp[-3].Type)->getNewTy() + " " + Name1 + ", " + Name2;
- (yyval.Value).val = (yyvsp[-4].String);
- (yyval.Value).type = TypeInfo::get("bool",BoolTy);
- (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
+ case 275:
+#line 3467 "/proj/llvm/llvm-2/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 277:
-#line 1779 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 276:
+#line 3471 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- std::string Name1 = getUniqueName((yyvsp[-2].Value).val, (yyvsp[-3].Type));
- std::string Name2 = getUniqueName((yyvsp[0].Value).val, (yyvsp[-3].Type));
- *(yyvsp[-5].String) += " " + *(yyvsp[-4].String) + " " + (yyvsp[-3].Type)->getNewTy() + " " + Name1 + "," + Name2;
- (yyval.Value).val = (yyvsp[-5].String);
- (yyval.Value).type = TypeInfo::get("bool",BoolTy);
- delete (yyvsp[-4].String); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
+ (yyval.ValueList) = (yyvsp[-2].ValueList);
+ (yyvsp[-2].ValueList)->push_back((yyvsp[0].ValueVal));
;}
break;
case 278:
-#line 1787 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- {
- std::string Name1 = getUniqueName((yyvsp[-2].Value).val, (yyvsp[-3].Type));
- std::string Name2 = getUniqueName((yyvsp[0].Value).val, (yyvsp[-3].Type));
- *(yyvsp[-5].String) += " " + *(yyvsp[-4].String) + " " + (yyvsp[-3].Type)->getNewTy() + " " + Name1 + "," + Name2;
- (yyval.Value).val = (yyvsp[-5].String);
- (yyval.Value).type = TypeInfo::get("bool",BoolTy);
- delete (yyvsp[-4].String); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
- ;}
+#line 3479 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValueList) = 0; ;}
break;
case 279:
-#line 1795 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3483 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- (yyval.Value) = (yyvsp[0].Value);
- (yyval.Value).val->insert(0, *(yyvsp[-1].String) + " ");
- delete (yyvsp[-1].String);
+ (yyval.BoolVal) = true;
;}
break;
case 280:
-#line 1800 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3486 "/proj/llvm/llvm-2/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.Value).val = new std::string(shiftop);
- *(yyval.Value).val += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
- (yyval.Value).type = (yyvsp[-2].Value).type;
- delete (yyvsp[-3].String); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
+ (yyval.BoolVal) = false;
;}
break;
case 281:
-#line 1809 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3492 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- std::string source = *(yyvsp[-2].Value).val;
- const TypeInfo* SrcTy = (yyvsp[-2].Value).type->resolve();
- const TypeInfo* DstTy = (yyvsp[0].Type)->resolve();
- (yyval.Value).val = new std::string();
- (yyval.Value).type = DstTy;
- if (*(yyvsp[-3].String) == "cast") {
- *(yyval.Value).val += getCastUpgrade(source, SrcTy, DstTy, false);
- } else {
- *(yyval.Value).val += *(yyvsp[-3].String) + " " + source + " to " + DstTy->getNewTy();
- }
- // Check to see if this is a useless cast of a value to the same name
- // and the same type. Such casts will probably cause redefinition errors
- // when assembled and perform no code gen action so just remove them.
- if (*(yyvsp[-3].String) == "cast" || *(yyvsp[-3].String) == "bitcast")
- if (SrcTy->isInteger() && DstTy->isInteger() &&
- SrcTy->getBitWidth() == DstTy->getBitWidth()) {
- deleteUselessCastFlag = true; // Flag the "Inst" rule
- deleteUselessCastName = new std::string(*(yyvsp[-2].Value).val); // save the name
- size_t pos = deleteUselessCastName->find_first_of("%\"",0);
- if (pos != std::string::npos) {
- // remove the type portion before val
- deleteUselessCastName->erase(0, pos);
- }
- }
- delete (yyvsp[-3].String); (yyvsp[-2].Value).destroy();
- delete (yyvsp[-1].String);
+ (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
+ (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
+ const Type* Ty = (yyvsp[-3].TypeVal).PAT->get();
+ if (!Ty->isInteger() && !Ty->isFloatingPoint() && !isa<VectorType>(Ty))
+ error("Arithmetic operator requires integer, FP, or packed operands");
+ if (isa<VectorType>(Ty) &&
+ ((yyvsp[-4].BinaryOpVal) == URemOp || (yyvsp[-4].BinaryOpVal) == SRemOp || (yyvsp[-4].BinaryOpVal) == FRemOp || (yyvsp[-4].BinaryOpVal) == RemOp))
+ error("Remainder not supported on vector 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.copy((yyvsp[-3].TypeVal).S);
+ delete (yyvsp[-3].TypeVal).PAT;
;}
break;
case 282:
-#line 1837 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3511 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
- (yyval.Value).val = (yyvsp[-5].String);
- (yyval.Value).type = (yyvsp[-2].Value).type;
- (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
+ (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
+ (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
+ const Type *Ty = (yyvsp[-3].TypeVal).PAT->get();
+ if (!Ty->isInteger()) {
+ if (!isa<VectorType>(Ty) ||
+ !cast<VectorType>(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.copy((yyvsp[-3].TypeVal).S);
+ delete (yyvsp[-3].TypeVal).PAT;
;}
break;
case 283:
-#line 1843 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3529 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + (yyvsp[0].Type)->getNewTy();
- (yyval.Value).val = (yyvsp[-3].String);
- (yyval.Value).type = (yyvsp[0].Type);
- (yyvsp[-2].Value).destroy();
+ (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
+ (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
+ const Type* Ty = (yyvsp[-3].TypeVal).PAT->get();
+ if(isa<VectorType>(Ty))
+ error("VectorTypes 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.makeUnsigned();
+ delete (yyvsp[-3].TypeVal).PAT;
;}
break;
case 284:
-#line 1849 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3545 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
- (yyval.Value).val = (yyvsp[-3].String);
- (yyvsp[-2].Value).type = (yyvsp[-2].Value).type->resolve();;
- (yyval.Value).type = (yyvsp[-2].Value).type->getElementType();
- (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
+ (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
+ (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
+ const Type *Ty = (yyvsp[-3].TypeVal).PAT->get();
+ if (isa<VectorType>(Ty))
+ error("VectorTypes 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.makeUnsigned();
+ delete (yyvsp[-3].TypeVal).PAT;
;}
break;
case 285:
-#line 1856 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3559 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
- (yyval.Value).val = (yyvsp[-5].String);
- (yyval.Value).type = (yyvsp[-4].Value).type;
- (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
+ (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
+ (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
+ const Type *Ty = (yyvsp[-3].TypeVal).PAT->get();
+ if (isa<VectorType>(Ty))
+ error("VectorTypes 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.makeUnsigned();
+ delete (yyvsp[-3].TypeVal).PAT;
;}
break;
case 286:
-#line 1862 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3573 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val;
- (yyval.Value).val = (yyvsp[-5].String);
- (yyval.Value).type = (yyvsp[-4].Value).type;
- (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy();
+ 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.copy((yyvsp[0].ValueVal).S);
;}
break;
case 287:
-#line 1868 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3584 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val;
- (yyval.Value).val = (yyvsp[-1].String);
- (yyval.Value).type = (yyvsp[0].Value).type;
- delete (yyvsp[0].Value).val;
+ 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.copy((yyvsp[-2].ValueVal).S);
;}
break;
case 288:
-#line 1874 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3602 "/proj/llvm/llvm-2/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)->getNewTy() + " " + *(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) += ")";
- (yyval.Value).val = (yyvsp[-6].String);
- (yyval.Value).type = getFunctionReturnType((yyvsp[-4].Type));
- delete (yyvsp[-5].String); (yyvsp[-3].Value).destroy(); delete (yyvsp[-1].ValList);
+ const Type *DstTy = (yyvsp[0].TypeVal).PAT->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.copy((yyvsp[0].TypeVal).S);
+ delete (yyvsp[0].TypeVal).PAT;
+ ;}
+ break;
+
+ case 289:
+#line 3611 "/proj/llvm/llvm-2/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.copy((yyvsp[-2].ValueVal).S);
;}
break;
case 290:
-#line 1897 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValList) = (yyvsp[0].ValList); ;}
+#line 3620 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
+ NewVarArgs = true;
+ (yyval.InstVal).I = new VAArgInst((yyvsp[-2].ValueVal).V, Ty);
+ (yyval.InstVal).S.copy((yyvsp[0].TypeVal).S);
+ delete (yyvsp[0].TypeVal).PAT;
+ ;}
break;
case 291:
-#line 1898 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.ValList) = new ValueList(); ;}
+#line 3627 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type* ArgTy = (yyvsp[-2].ValueVal).V->getType();
+ const Type* DstTy = (yyvsp[0].TypeVal).PAT->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.copy((yyvsp[0].TypeVal).S);
+ delete (yyvsp[0].TypeVal).PAT;
+ ;}
+ break;
+
+ case 292:
+#line 3648 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type* ArgTy = (yyvsp[-2].ValueVal).V->getType();
+ const Type* DstTy = (yyvsp[0].TypeVal).PAT->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.copy((yyvsp[0].TypeVal).S);
+ delete (yyvsp[0].TypeVal).PAT;
+ ;}
break;
case 293:
-#line 1903 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
- { (yyval.String) = new std::string(); ;}
+#line 3672 "/proj/llvm/llvm-2/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.copy((yyvsp[-2].ValueVal).S.get(0));
+ ;}
break;
case 294:
-#line 1906 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3678 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-2].String) += " " + (yyvsp[-1].Type)->getNewTy();
- if (!(yyvsp[0].String)->empty())
- *(yyvsp[-2].String) += " " + *(yyvsp[0].String);
- (yyval.Value).val = (yyvsp[-2].String);
- (yyval.Value).type = (yyvsp[-1].Type)->getPointerType();
- delete (yyvsp[0].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.copy((yyvsp[-4].ValueVal).S);
;}
break;
case 295:
-#line 1914 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3684 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- std::string Name = getUniqueName((yyvsp[-1].Value).val, (yyvsp[-2].Type));
- *(yyvsp[-5].String) += " " + (yyvsp[-4].Type)->getNewTy() + ", " + (yyvsp[-2].Type)->getNewTy() + " " + Name;
- if (!(yyvsp[0].String)->empty())
- *(yyvsp[-5].String) += " " + *(yyvsp[0].String);
- (yyval.Value).val = (yyvsp[-5].String);
- (yyval.Value).type = (yyvsp[-4].Type)->getPointerType();
- (yyvsp[-1].Value).destroy(); delete (yyvsp[0].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.copy((yyvsp[-4].ValueVal).S);
;}
break;
case 296:
-#line 1923 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3690 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-2].String) += " " + (yyvsp[-1].Type)->getNewTy();
- if (!(yyvsp[0].String)->empty())
- *(yyvsp[-2].String) += " " + *(yyvsp[0].String);
- (yyval.Value).val = (yyvsp[-2].String);
- (yyval.Value).type = (yyvsp[-1].Type)->getPointerType();
- delete (yyvsp[0].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.copy((yyvsp[0].PHIList).S);
+ delete (yyvsp[0].PHIList).P; // Free the list...
;}
break;
case 297:
-#line 1931 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3706 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- std::string Name = getUniqueName((yyvsp[-1].Value).val, (yyvsp[-2].Type));
- *(yyvsp[-5].String) += " " + (yyvsp[-4].Type)->getNewTy() + ", " + (yyvsp[-2].Type)->getNewTy() + " " + Name;
- if (!(yyvsp[0].String)->empty())
- *(yyvsp[-5].String) += " " + *(yyvsp[0].String);
- (yyval.Value).val = (yyvsp[-5].String);
- (yyval.Value).type = (yyvsp[-4].Type)->getPointerType();
- (yyvsp[-1].Value).destroy(); delete (yyvsp[0].String);
+ // Handle the short call syntax
+ const PointerType *PFTy;
+ const FunctionType *FTy;
+ Signedness FTySign;
+ if (!(PFTy = dyn_cast<PointerType>((yyvsp[-4].TypeVal).PAT->get())) ||
+ !(FTy = dyn_cast<FunctionType>(PFTy->getElementType()))) {
+ // Pull out the types of all of the arguments...
+ std::vector<const Type*> ParamTypes;
+ FTySign.makeComposite((yyvsp[-4].TypeVal).S);
+ 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());
+ FTySign.add(I->S);
+ }
+ }
+
+ bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy;
+ if (isVarArg) ParamTypes.pop_back();
+
+ const Type *RetTy = (yyvsp[-4].TypeVal).PAT->get();
+ if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy)
+ error("Functions cannot return aggregate types");
+
+ // Deal with CSRetCC
+ ParamAttrsList *ParamAttrs = 0;
+ if ((yyvsp[-5].UIntVal) == OldCallingConv::CSRet) {
+ ParamAttrs = new ParamAttrsList();
+ ParamAttrs->addAttributes(0, ParamAttr::None); // function result
+ ParamAttrs->addAttributes(1, ParamAttr::StructRet); // first parameter
+ }
+
+ FTy = FunctionType::get(RetTy, ParamTypes, isVarArg, ParamAttrs);
+ PFTy = PointerType::get(FTy);
+ (yyval.InstVal).S.copy((yyvsp[-4].TypeVal).S);
+ } else {
+ FTySign = (yyvsp[-4].TypeVal).S;
+ // Get the signedness of the result type. $3 is the pointer to the
+ // function type so we get the 0th element to extract the function type,
+ // and then the 0th element again to get the result type.
+ (yyval.InstVal).S.copy((yyvsp[-4].TypeVal).S.get(0).get(0));
+ }
+ (yyvsp[-3].ValIDVal).S.makeComposite(FTySign);
+
+ // 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->getReturnType(), (yyvsp[-3].ValIDVal), Args);
+
+ // If we got an upgraded intrinsic
+ if (Inst) {
+ (yyval.InstVal).I = Inst;
+ } 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[0], Args.size());
+ CI->setTailCall((yyvsp[-6].BoolVal));
+ CI->setCallingConv(upgradeCallingConv((yyvsp[-5].UIntVal)));
+ (yyval.InstVal).I = CI;
+ }
+ delete (yyvsp[-4].TypeVal).PAT;
+ delete (yyvsp[-1].ValueList);
;}
break;
case 298:
-#line 1940 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3796 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val;
- (yyval.Value).val = (yyvsp[-1].String);
- (yyval.Value).type = TypeInfo::get("void", VoidTy);
- (yyvsp[0].Value).destroy();
+ (yyval.InstVal) = (yyvsp[0].InstVal);
;}
break;
case 299:
-#line 1946 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3804 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValueList) = (yyvsp[0].ValueList); ;}
+ break;
+
+ case 300:
+#line 3805 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.ValueList) = new std::vector<ValueInfo>(); ;}
+ break;
+
+ case 301:
+#line 3809 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.BoolVal) = true; ;}
+ break;
+
+ case 302:
+#line 3810 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ { (yyval.BoolVal) = false; ;}
+ break;
+
+ case 303:
+#line 3814 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- std::string Name = getUniqueName((yyvsp[0].Value).val, (yyvsp[-1].Type));
- if (!(yyvsp[-3].String)->empty())
- *(yyvsp[-3].String) += " ";
- *(yyvsp[-3].String) += *(yyvsp[-2].String) + " " + (yyvsp[-1].Type)->getNewTy() + " " + Name;
- (yyval.Value).val = (yyvsp[-3].String);
- (yyval.Value).type = (yyvsp[-1].Type)->getElementType();
- delete (yyvsp[-2].String); (yyvsp[0].Value).destroy();
+ const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
+ (yyval.InstVal).S.makeComposite((yyvsp[-1].TypeVal).S);
+ (yyval.InstVal).I = new MallocInst(Ty, 0, (yyvsp[0].UIntVal));
+ delete (yyvsp[-1].TypeVal).PAT;
;}
break;
- case 300:
-#line 1955 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 304:
+#line 3820 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- std::string Name = getUniqueName((yyvsp[0].Value).val, (yyvsp[-1].Type));
- if (!(yyvsp[-5].String)->empty())
- *(yyvsp[-5].String) += " ";
- *(yyvsp[-5].String) += *(yyvsp[-4].String) + " " + *(yyvsp[-3].Value).val + ", " + (yyvsp[-1].Type)->getNewTy() + " " + Name;
- (yyval.Value).val = (yyvsp[-5].String);
- (yyval.Value).type = TypeInfo::get("void", VoidTy);
- delete (yyvsp[-4].String); (yyvsp[-3].Value).destroy(); (yyvsp[0].Value).destroy();
+ const Type *Ty = (yyvsp[-4].TypeVal).PAT->get();
+ (yyvsp[-1].ValIDVal).S.makeUnsigned();
+ (yyval.InstVal).S.makeComposite((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).PAT;
;}
break;
- case 301:
-#line 1964 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+ case 305:
+#line 3827 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
+ (yyval.InstVal).S.makeComposite((yyvsp[-1].TypeVal).S);
+ (yyval.InstVal).I = new AllocaInst(Ty, 0, (yyvsp[0].UIntVal));
+ delete (yyvsp[-1].TypeVal).PAT;
+ ;}
+ break;
+
+ case 306:
+#line 3833 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ const Type *Ty = (yyvsp[-4].TypeVal).PAT->get();
+ (yyvsp[-1].ValIDVal).S.makeUnsigned();
+ (yyval.InstVal).S.makeComposite((yyvsp[-2].PrimType).S);
+ (yyval.InstVal).I = new AllocaInst(Ty, getVal((yyvsp[-2].PrimType).T, (yyvsp[-1].ValIDVal)), (yyvsp[0].UIntVal));
+ delete (yyvsp[-4].TypeVal).PAT;
+ ;}
+ break;
+
+ case 307:
+#line 3840 "/proj/llvm/llvm-2/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.makeSignless();
+ ;}
+ break;
+
+ case 308:
+#line 3847 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
{
- std::string Name = getUniqueName((yyvsp[-1].Value).val, (yyvsp[-2].Type));
- // 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) {
- *O << " %gep_upgrade" << unique << " = zext " << *VI.val
- << " to i64\n";
- *VI.val = "i64 %gep_upgrade" + llvm::utostr(unique++);
- VI.type = TypeInfo::get("i64",ULongTy);
+ const Type* Ty = (yyvsp[-1].TypeVal).PAT->get();
+ (yyvsp[0].ValIDVal).S.copy((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));
+ (yyval.InstVal).S.copy((yyvsp[-1].TypeVal).S.get(0));
+ delete (yyvsp[-1].TypeVal).PAT;
+ ;}
+ break;
+
+ case 309:
+#line 3860 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
+ const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal).PAT->get());
+ if (!PTy)
+ error("Can't store to a nonpointer type: " +
+ (yyvsp[-1].TypeVal).PAT->get()->getDescription());
+ const Type *ElTy = PTy->getElementType();
+ Value *StoreVal = (yyvsp[-3].ValueVal).V;
+ Value* tmpVal = getVal(PTy, (yyvsp[0].ValIDVal));
+ if (ElTy != (yyvsp[-3].ValueVal).V->getType()) {
+ StoreVal = handleSRetFuncTypeMerge((yyvsp[-3].ValueVal).V, ElTy);
+ if (!StoreVal)
+ error("Can't store '" + (yyvsp[-3].ValueVal).V->getType()->getDescription() +
+ "' into space of type '" + ElTy->getDescription() + "'");
+ else {
+ PTy = PointerType::get(StoreVal->getType());
+ if (Constant *C = dyn_cast<Constant>(tmpVal))
+ tmpVal = ConstantExpr::getBitCast(C, PTy);
+ else
+ tmpVal = new BitCastInst(tmpVal, PTy, "upgrd.cast", CurBB);
}
}
- *(yyvsp[-3].String) += " " + (yyvsp[-2].Type)->getNewTy() + " " + Name;
- for (unsigned i = 0; i < (yyvsp[0].ValList)->size(); ++i) {
- ValueInfo& VI = (*(yyvsp[0].ValList))[i];
- *(yyvsp[-3].String) += ", " + *VI.val;
- }
- (yyval.Value).val = (yyvsp[-3].String);
- (yyval.Value).type = getGEPIndexedType((yyvsp[-2].Type),(yyvsp[0].ValList));
- (yyvsp[-1].Value).destroy(); delete (yyvsp[0].ValList);
+ (yyval.InstVal).I = new StoreInst(StoreVal, tmpVal, (yyvsp[-5].BoolVal));
+ (yyval.InstVal).S.makeSignless();
+ delete (yyvsp[-1].TypeVal).PAT;
+ ;}
+ break;
+
+ case 310:
+#line 3886 "/proj/llvm/llvm-2/tools/llvm-upgrade/UpgradeParser.y"
+ {
+ (yyvsp[-1].ValIDVal).S.copy((yyvsp[-2].TypeVal).S);
+ const Type* Ty = (yyvsp[-2].TypeVal).PAT->get();
+ if (!isa<PointerType>(Ty))
+ error("getelementptr insn requires pointer operand");
+
+ std::vector<Value*> VIndices;
+ upgradeGEPInstIndices(Ty, (yyvsp[0].ValueList), VIndices);
+
+ Value* tmpVal = getVal(Ty, (yyvsp[-1].ValIDVal));
+ (yyval.InstVal).I = new GetElementPtrInst(tmpVal, &VIndices[0], VIndices.size());
+ ValueInfo VI; VI.V = tmpVal; VI.S.copy((yyvsp[-2].TypeVal).S);
+ (yyval.InstVal).S.copy(getElementSign(VI, VIndices));
+ delete (yyvsp[-2].TypeVal).PAT;
+ delete (yyvsp[0].ValueList);
;}
break;
}
/* Line 1126 of yacc.c. */
-#line 4495 "UpgradeParser.tab.c"
+#line 6622 "UpgradeParser.tab.c"
\f
yyvsp -= yylen;
yyssp -= yylen;
}
-#line 1987 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y"
+#line 3904 "/proj/llvm/llvm-2/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 = where + "error: " + std::string(ErrorMsg) +
- " while reading ";
- if (yychar == YYEMPTY || yychar == 0)
- errMsg += "end-of-file.";
- else
- errMsg += "token: '" + std::string(Upgradetext, Upgradeleng) + "'";
+ 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';
- *O << "llvm-upgrade parse failed.\n";
+ std::cout << "llvm-upgrade: parse failed.\n";
exit(1);
}
-static void warning(const std::string& ErrorMsg) {
+void warning(const std::string& ErrorMsg) {
std::string where
= std::string((CurFilename == "-") ? std::string("<stdin>") : CurFilename)
+ ":" + llvm::utostr((unsigned) Upgradelineno) + ": ";
- std::string errMsg = where + "warning: " + std::string(ErrorMsg) +
- " while reading ";
- if (yychar == YYEMPTY || yychar == 0)
- errMsg += "end-of-file.";
- else
- errMsg += "token: '" + std::string(Upgradetext, Upgradeleng) + "'";
+ 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());
+}
+
+