forked from OSchip/llvm-project
Reid Spencer
parent
ca82a908e3
commit
ae7e9c5b35
File diff suppressed because it is too large
Load Diff
|
|
@ -75,108 +75,107 @@
|
||||||
DLLEXPORT = 301,
|
DLLEXPORT = 301,
|
||||||
EXTERN_WEAK = 302,
|
EXTERN_WEAK = 302,
|
||||||
APPENDING = 303,
|
APPENDING = 303,
|
||||||
NOT = 304,
|
EXTERNAL = 304,
|
||||||
EXTERNAL = 305,
|
TARGET = 305,
|
||||||
TARGET = 306,
|
TRIPLE = 306,
|
||||||
TRIPLE = 307,
|
ENDIAN = 307,
|
||||||
ENDIAN = 308,
|
POINTERSIZE = 308,
|
||||||
POINTERSIZE = 309,
|
LITTLE = 309,
|
||||||
LITTLE = 310,
|
BIG = 310,
|
||||||
BIG = 311,
|
ALIGN = 311,
|
||||||
ALIGN = 312,
|
UNINITIALIZED = 312,
|
||||||
UNINITIALIZED = 313,
|
DEPLIBS = 313,
|
||||||
DEPLIBS = 314,
|
CALL = 314,
|
||||||
CALL = 315,
|
TAIL = 315,
|
||||||
TAIL = 316,
|
ASM_TOK = 316,
|
||||||
ASM_TOK = 317,
|
MODULE = 317,
|
||||||
MODULE = 318,
|
SIDEEFFECT = 318,
|
||||||
SIDEEFFECT = 319,
|
CC_TOK = 319,
|
||||||
CC_TOK = 320,
|
CCC_TOK = 320,
|
||||||
CCC_TOK = 321,
|
CSRETCC_TOK = 321,
|
||||||
CSRETCC_TOK = 322,
|
FASTCC_TOK = 322,
|
||||||
FASTCC_TOK = 323,
|
COLDCC_TOK = 323,
|
||||||
COLDCC_TOK = 324,
|
X86_STDCALLCC_TOK = 324,
|
||||||
X86_STDCALLCC_TOK = 325,
|
X86_FASTCALLCC_TOK = 325,
|
||||||
X86_FASTCALLCC_TOK = 326,
|
DATALAYOUT = 326,
|
||||||
DATALAYOUT = 327,
|
RET = 327,
|
||||||
RET = 328,
|
BR = 328,
|
||||||
BR = 329,
|
SWITCH = 329,
|
||||||
SWITCH = 330,
|
INVOKE = 330,
|
||||||
INVOKE = 331,
|
EXCEPT = 331,
|
||||||
EXCEPT = 332,
|
UNWIND = 332,
|
||||||
UNWIND = 333,
|
UNREACHABLE = 333,
|
||||||
UNREACHABLE = 334,
|
ADD = 334,
|
||||||
ADD = 335,
|
SUB = 335,
|
||||||
SUB = 336,
|
MUL = 336,
|
||||||
MUL = 337,
|
DIV = 337,
|
||||||
DIV = 338,
|
UDIV = 338,
|
||||||
UDIV = 339,
|
SDIV = 339,
|
||||||
SDIV = 340,
|
FDIV = 340,
|
||||||
FDIV = 341,
|
REM = 341,
|
||||||
REM = 342,
|
UREM = 342,
|
||||||
UREM = 343,
|
SREM = 343,
|
||||||
SREM = 344,
|
FREM = 344,
|
||||||
FREM = 345,
|
AND = 345,
|
||||||
AND = 346,
|
OR = 346,
|
||||||
OR = 347,
|
XOR = 347,
|
||||||
XOR = 348,
|
SETLE = 348,
|
||||||
SETLE = 349,
|
SETGE = 349,
|
||||||
SETGE = 350,
|
SETLT = 350,
|
||||||
SETLT = 351,
|
SETGT = 351,
|
||||||
SETGT = 352,
|
SETEQ = 352,
|
||||||
SETEQ = 353,
|
SETNE = 353,
|
||||||
SETNE = 354,
|
ICMP = 354,
|
||||||
ICMP = 355,
|
FCMP = 355,
|
||||||
FCMP = 356,
|
EQ = 356,
|
||||||
EQ = 357,
|
NE = 357,
|
||||||
NE = 358,
|
SLT = 358,
|
||||||
SLT = 359,
|
SGT = 359,
|
||||||
SGT = 360,
|
SLE = 360,
|
||||||
SLE = 361,
|
SGE = 361,
|
||||||
SGE = 362,
|
OEQ = 362,
|
||||||
OEQ = 363,
|
ONE = 363,
|
||||||
ONE = 364,
|
OLT = 364,
|
||||||
OLT = 365,
|
OGT = 365,
|
||||||
OGT = 366,
|
OLE = 366,
|
||||||
OLE = 367,
|
OGE = 367,
|
||||||
OGE = 368,
|
ORD = 368,
|
||||||
ORD = 369,
|
UNO = 369,
|
||||||
UNO = 370,
|
UEQ = 370,
|
||||||
UEQ = 371,
|
UNE = 371,
|
||||||
UNE = 372,
|
ULT = 372,
|
||||||
ULT = 373,
|
UGT = 373,
|
||||||
UGT = 374,
|
ULE = 374,
|
||||||
ULE = 375,
|
UGE = 375,
|
||||||
UGE = 376,
|
MALLOC = 376,
|
||||||
MALLOC = 377,
|
ALLOCA = 377,
|
||||||
ALLOCA = 378,
|
FREE = 378,
|
||||||
FREE = 379,
|
LOAD = 379,
|
||||||
LOAD = 380,
|
STORE = 380,
|
||||||
STORE = 381,
|
GETELEMENTPTR = 381,
|
||||||
GETELEMENTPTR = 382,
|
PHI_TOK = 382,
|
||||||
PHI_TOK = 383,
|
SELECT = 383,
|
||||||
SELECT = 384,
|
SHL = 384,
|
||||||
SHL = 385,
|
SHR = 385,
|
||||||
SHR = 386,
|
ASHR = 386,
|
||||||
ASHR = 387,
|
LSHR = 387,
|
||||||
LSHR = 388,
|
VAARG = 388,
|
||||||
VAARG = 389,
|
EXTRACTELEMENT = 389,
|
||||||
EXTRACTELEMENT = 390,
|
INSERTELEMENT = 390,
|
||||||
INSERTELEMENT = 391,
|
SHUFFLEVECTOR = 391,
|
||||||
SHUFFLEVECTOR = 392,
|
CAST = 392,
|
||||||
CAST = 393,
|
TRUNC = 393,
|
||||||
TRUNC = 394,
|
ZEXT = 394,
|
||||||
ZEXT = 395,
|
SEXT = 395,
|
||||||
SEXT = 396,
|
FPTRUNC = 396,
|
||||||
FPTRUNC = 397,
|
FPEXT = 397,
|
||||||
FPEXT = 398,
|
FPTOUI = 398,
|
||||||
FPTOUI = 399,
|
FPTOSI = 399,
|
||||||
FPTOSI = 400,
|
UITOFP = 400,
|
||||||
UITOFP = 401,
|
SITOFP = 401,
|
||||||
SITOFP = 402,
|
PTRTOINT = 402,
|
||||||
PTRTOINT = 403,
|
INTTOPTR = 403,
|
||||||
INTTOPTR = 404,
|
BITCAST = 404
|
||||||
BITCAST = 405
|
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
/* Tokens. */
|
/* Tokens. */
|
||||||
|
|
@ -226,114 +225,113 @@
|
||||||
#define DLLEXPORT 301
|
#define DLLEXPORT 301
|
||||||
#define EXTERN_WEAK 302
|
#define EXTERN_WEAK 302
|
||||||
#define APPENDING 303
|
#define APPENDING 303
|
||||||
#define NOT 304
|
#define EXTERNAL 304
|
||||||
#define EXTERNAL 305
|
#define TARGET 305
|
||||||
#define TARGET 306
|
#define TRIPLE 306
|
||||||
#define TRIPLE 307
|
#define ENDIAN 307
|
||||||
#define ENDIAN 308
|
#define POINTERSIZE 308
|
||||||
#define POINTERSIZE 309
|
#define LITTLE 309
|
||||||
#define LITTLE 310
|
#define BIG 310
|
||||||
#define BIG 311
|
#define ALIGN 311
|
||||||
#define ALIGN 312
|
#define UNINITIALIZED 312
|
||||||
#define UNINITIALIZED 313
|
#define DEPLIBS 313
|
||||||
#define DEPLIBS 314
|
#define CALL 314
|
||||||
#define CALL 315
|
#define TAIL 315
|
||||||
#define TAIL 316
|
#define ASM_TOK 316
|
||||||
#define ASM_TOK 317
|
#define MODULE 317
|
||||||
#define MODULE 318
|
#define SIDEEFFECT 318
|
||||||
#define SIDEEFFECT 319
|
#define CC_TOK 319
|
||||||
#define CC_TOK 320
|
#define CCC_TOK 320
|
||||||
#define CCC_TOK 321
|
#define CSRETCC_TOK 321
|
||||||
#define CSRETCC_TOK 322
|
#define FASTCC_TOK 322
|
||||||
#define FASTCC_TOK 323
|
#define COLDCC_TOK 323
|
||||||
#define COLDCC_TOK 324
|
#define X86_STDCALLCC_TOK 324
|
||||||
#define X86_STDCALLCC_TOK 325
|
#define X86_FASTCALLCC_TOK 325
|
||||||
#define X86_FASTCALLCC_TOK 326
|
#define DATALAYOUT 326
|
||||||
#define DATALAYOUT 327
|
#define RET 327
|
||||||
#define RET 328
|
#define BR 328
|
||||||
#define BR 329
|
#define SWITCH 329
|
||||||
#define SWITCH 330
|
#define INVOKE 330
|
||||||
#define INVOKE 331
|
#define EXCEPT 331
|
||||||
#define EXCEPT 332
|
#define UNWIND 332
|
||||||
#define UNWIND 333
|
#define UNREACHABLE 333
|
||||||
#define UNREACHABLE 334
|
#define ADD 334
|
||||||
#define ADD 335
|
#define SUB 335
|
||||||
#define SUB 336
|
#define MUL 336
|
||||||
#define MUL 337
|
#define DIV 337
|
||||||
#define DIV 338
|
#define UDIV 338
|
||||||
#define UDIV 339
|
#define SDIV 339
|
||||||
#define SDIV 340
|
#define FDIV 340
|
||||||
#define FDIV 341
|
#define REM 341
|
||||||
#define REM 342
|
#define UREM 342
|
||||||
#define UREM 343
|
#define SREM 343
|
||||||
#define SREM 344
|
#define FREM 344
|
||||||
#define FREM 345
|
#define AND 345
|
||||||
#define AND 346
|
#define OR 346
|
||||||
#define OR 347
|
#define XOR 347
|
||||||
#define XOR 348
|
#define SETLE 348
|
||||||
#define SETLE 349
|
#define SETGE 349
|
||||||
#define SETGE 350
|
#define SETLT 350
|
||||||
#define SETLT 351
|
#define SETGT 351
|
||||||
#define SETGT 352
|
#define SETEQ 352
|
||||||
#define SETEQ 353
|
#define SETNE 353
|
||||||
#define SETNE 354
|
#define ICMP 354
|
||||||
#define ICMP 355
|
#define FCMP 355
|
||||||
#define FCMP 356
|
#define EQ 356
|
||||||
#define EQ 357
|
#define NE 357
|
||||||
#define NE 358
|
#define SLT 358
|
||||||
#define SLT 359
|
#define SGT 359
|
||||||
#define SGT 360
|
#define SLE 360
|
||||||
#define SLE 361
|
#define SGE 361
|
||||||
#define SGE 362
|
#define OEQ 362
|
||||||
#define OEQ 363
|
#define ONE 363
|
||||||
#define ONE 364
|
#define OLT 364
|
||||||
#define OLT 365
|
#define OGT 365
|
||||||
#define OGT 366
|
#define OLE 366
|
||||||
#define OLE 367
|
#define OGE 367
|
||||||
#define OGE 368
|
#define ORD 368
|
||||||
#define ORD 369
|
#define UNO 369
|
||||||
#define UNO 370
|
#define UEQ 370
|
||||||
#define UEQ 371
|
#define UNE 371
|
||||||
#define UNE 372
|
#define ULT 372
|
||||||
#define ULT 373
|
#define UGT 373
|
||||||
#define UGT 374
|
#define ULE 374
|
||||||
#define ULE 375
|
#define UGE 375
|
||||||
#define UGE 376
|
#define MALLOC 376
|
||||||
#define MALLOC 377
|
#define ALLOCA 377
|
||||||
#define ALLOCA 378
|
#define FREE 378
|
||||||
#define FREE 379
|
#define LOAD 379
|
||||||
#define LOAD 380
|
#define STORE 380
|
||||||
#define STORE 381
|
#define GETELEMENTPTR 381
|
||||||
#define GETELEMENTPTR 382
|
#define PHI_TOK 382
|
||||||
#define PHI_TOK 383
|
#define SELECT 383
|
||||||
#define SELECT 384
|
#define SHL 384
|
||||||
#define SHL 385
|
#define SHR 385
|
||||||
#define SHR 386
|
#define ASHR 386
|
||||||
#define ASHR 387
|
#define LSHR 387
|
||||||
#define LSHR 388
|
#define VAARG 388
|
||||||
#define VAARG 389
|
#define EXTRACTELEMENT 389
|
||||||
#define EXTRACTELEMENT 390
|
#define INSERTELEMENT 390
|
||||||
#define INSERTELEMENT 391
|
#define SHUFFLEVECTOR 391
|
||||||
#define SHUFFLEVECTOR 392
|
#define CAST 392
|
||||||
#define CAST 393
|
#define TRUNC 393
|
||||||
#define TRUNC 394
|
#define ZEXT 394
|
||||||
#define ZEXT 395
|
#define SEXT 395
|
||||||
#define SEXT 396
|
#define FPTRUNC 396
|
||||||
#define FPTRUNC 397
|
#define FPEXT 397
|
||||||
#define FPEXT 398
|
#define FPTOUI 398
|
||||||
#define FPTOUI 399
|
#define FPTOSI 399
|
||||||
#define FPTOSI 400
|
#define UITOFP 400
|
||||||
#define UITOFP 401
|
#define SITOFP 401
|
||||||
#define SITOFP 402
|
#define PTRTOINT 402
|
||||||
#define PTRTOINT 403
|
#define INTTOPTR 403
|
||||||
#define INTTOPTR 404
|
#define BITCAST 404
|
||||||
#define BITCAST 405
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
|
#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
|
||||||
#line 802 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
|
#line 806 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
|
||||||
typedef union YYSTYPE {
|
typedef union YYSTYPE {
|
||||||
std::string* String;
|
std::string* String;
|
||||||
const TypeInfo* Type;
|
const TypeInfo* Type;
|
||||||
|
|
@ -343,7 +341,7 @@ typedef union YYSTYPE {
|
||||||
TypeList* TypeVec;
|
TypeList* TypeVec;
|
||||||
} YYSTYPE;
|
} YYSTYPE;
|
||||||
/* Line 1447 of yacc.c. */
|
/* Line 1447 of yacc.c. */
|
||||||
#line 347 "UpgradeParser.tab.h"
|
#line 345 "UpgradeParser.tab.h"
|
||||||
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
|
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
|
||||||
# define YYSTYPE_IS_DECLARED 1
|
# define YYSTYPE_IS_DECLARED 1
|
||||||
# define YYSTYPE_IS_TRIVIAL 1
|
# define YYSTYPE_IS_TRIVIAL 1
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,10 @@ static uint64_t unique = 1;
|
||||||
// definitions and calls.
|
// definitions and calls.
|
||||||
static bool AddAttributes = false;
|
static bool AddAttributes = false;
|
||||||
|
|
||||||
|
// This is set when a DECLARE keyword is recognized so that subsequent parsing
|
||||||
|
// of a function prototype can know if its a declaration or definition.
|
||||||
|
static bool isDeclare = false;
|
||||||
|
|
||||||
// This bool is used to communicate between the InstVal and Inst rules about
|
// 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
|
// 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
|
// determined that the cast is a candidate. However, it can only be deleted if
|
||||||
|
|
@ -817,7 +821,7 @@ std::string getGlobalName(const std::string* Name, const std::string Linkage,
|
||||||
%token <String> DECLARE GLOBAL CONSTANT SECTION VOLATILE
|
%token <String> DECLARE GLOBAL CONSTANT SECTION VOLATILE
|
||||||
%token <String> TO DOTDOTDOT CONST INTERNAL LINKONCE WEAK
|
%token <String> TO DOTDOTDOT CONST INTERNAL LINKONCE WEAK
|
||||||
%token <String> DLLIMPORT DLLEXPORT EXTERN_WEAK APPENDING
|
%token <String> DLLIMPORT DLLEXPORT EXTERN_WEAK APPENDING
|
||||||
%token <String> NOT EXTERNAL TARGET TRIPLE ENDIAN POINTERSIZE LITTLE BIG
|
%token <String> EXTERNAL TARGET TRIPLE ENDIAN POINTERSIZE LITTLE BIG
|
||||||
%token <String> ALIGN UNINITIALIZED
|
%token <String> ALIGN UNINITIALIZED
|
||||||
%token <String> DEPLIBS CALL TAIL ASM_TOK MODULE SIDEEFFECT
|
%token <String> DEPLIBS CALL TAIL ASM_TOK MODULE SIDEEFFECT
|
||||||
%token <String> CC_TOK CCC_TOK CSRETCC_TOK FASTCC_TOK COLDCC_TOK
|
%token <String> CC_TOK CCC_TOK CSRETCC_TOK FASTCC_TOK COLDCC_TOK
|
||||||
|
|
@ -1463,6 +1467,11 @@ ArgList : ArgListH {
|
||||||
|
|
||||||
FunctionHeaderH
|
FunctionHeaderH
|
||||||
: OptCallingConv TypesV Name '(' ArgList ')' OptSection OptAlign {
|
: OptCallingConv TypesV Name '(' ArgList ')' OptSection OptAlign {
|
||||||
|
if (*$3 == "%llvm.va_start" || *$3 == "%llvm.va_end") {
|
||||||
|
*$5 = "i8* ";
|
||||||
|
} else if (*$3 == "%llvm.va_copy") {
|
||||||
|
*$5 = "i8*, i8*";
|
||||||
|
}
|
||||||
if (!$1->empty()) {
|
if (!$1->empty()) {
|
||||||
*$1 += " ";
|
*$1 += " ";
|
||||||
}
|
}
|
||||||
|
|
@ -1513,13 +1522,14 @@ FnDeclareLinkage
|
||||||
;
|
;
|
||||||
|
|
||||||
FunctionProto
|
FunctionProto
|
||||||
: DECLARE FnDeclareLinkage FunctionHeaderH {
|
: DECLARE { isDeclare = true; } FnDeclareLinkage FunctionHeaderH {
|
||||||
if (!$2->empty())
|
if (!$3->empty())
|
||||||
*$1 += " " + *$2;
|
*$1 += " " + *$3;
|
||||||
*$1 += " " + *$3;
|
*$1 += " " + *$4;
|
||||||
delete $2;
|
|
||||||
delete $3;
|
delete $3;
|
||||||
|
delete $4;
|
||||||
$$ = $1;
|
$$ = $1;
|
||||||
|
isDeclare = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
//===----------------------------------------------------------------------===//
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
@ -1876,6 +1886,25 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef {
|
||||||
*$$.val += (*$6)[1].val->substr(pos+1);
|
*$$.val += (*$6)[1].val->substr(pos+1);
|
||||||
$$.type = TypeInfo::get("bool", BoolTy);
|
$$.type = TypeInfo::get("bool", BoolTy);
|
||||||
} else {
|
} else {
|
||||||
|
static unsigned upgradeCount = 1;
|
||||||
|
if (*$4.val == "%llvm.va_start" || *$4.val == "%llvm.va_end") {
|
||||||
|
std::string name("%va_upgrade");
|
||||||
|
name += llvm::utostr(upgradeCount++);
|
||||||
|
$1->insert(0, name + " = bitcast " + *(*$6)[0].val + " to i8*\n ");
|
||||||
|
*(*$6)[0].val = "i8* " + name;
|
||||||
|
(*$6)[0].type = TypeInfo::get("i8", UByteTy)->getPointerType();
|
||||||
|
} else if (*$4.val == "%llvm.va_copy") {
|
||||||
|
std::string name0("%va_upgrade");
|
||||||
|
name0 += llvm::utostr(upgradeCount++);
|
||||||
|
std::string name1("%va_upgrade");
|
||||||
|
name1 += llvm::utostr(upgradeCount++);
|
||||||
|
$1->insert(0, name0 + " = bitcast " + *(*$6)[0].val + " to i8*\n " +
|
||||||
|
name1 + " = bitcast " + *(*$6)[1].val + " to i8*\n ");
|
||||||
|
*(*$6)[0].val = "i8* " + name0;
|
||||||
|
(*$6)[0].type = TypeInfo::get("i8", UByteTy)->getPointerType();
|
||||||
|
*(*$6)[1].val = "i8* " + name1;
|
||||||
|
(*$6)[0].type = TypeInfo::get("i8", UByteTy)->getPointerType();
|
||||||
|
}
|
||||||
if (!$2->empty())
|
if (!$2->empty())
|
||||||
*$1 += " " + *$2;
|
*$1 += " " + *$2;
|
||||||
if (!$1->empty())
|
if (!$1->empty())
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue