replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Forgot to revert r61031 when I reverted r61019, r61030, and r61040. 

llvm-svn: 61150
This commit is contained in:
Bill Wendling 2008-12-17 20:59:57 +00:00
parent 300c9cc8c6
commit 6d974bb4d2
3 changed files with 1367 additions and 1379 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2686
llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
View File

File diff suppressed because it is too large Load Diff

28
llvm/lib/AsmParser/llvmAsmParser.h.cvs
View File

@ -184,8 +184,8 @@
SRET = 400,
NOUNWIND = 401,
NOALIAS = 402,
NOCAPTURE = 403,
BYVAL = 404,
BYVAL = 403,
NEST = 404,
READNONE = 405,
READONLY = 406,
GC = 407,
@ -194,10 +194,9 @@
ALWAYSINLINE = 410,
SSP = 411,
SSPREQ = 412,
NEST = 413,
DEFAULT = 414,
HIDDEN = 415,
PROTECTED = 416
DEFAULT = 413,
HIDDEN = 414,
PROTECTED = 415
};
#endif
/* Tokens. */
@ -346,8 +345,8 @@
#define SRET 400
#define NOUNWIND 401
#define NOALIAS 402
#define NOCAPTURE 403
#define BYVAL 404
#define BYVAL 403
#define NEST 404
#define READNONE 405
#define READONLY 406
#define GC 407
@ -356,17 +355,16 @@
#define ALWAYSINLINE 410
#define SSP 411
#define SSPREQ 412
#define NEST 413
#define DEFAULT 414
#define HIDDEN 415
#define PROTECTED 416
#define DEFAULT 413
#define HIDDEN 414
#define PROTECTED 415
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
#line 986 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
#line 986 "/Volumes/Gir/devel/llvm/llvm.src/lib/AsmParser/llvmAsmParser.y"
{
llvm::Module *ModuleVal;
llvm::Function *FunctionVal;
@ -414,8 +412,8 @@ typedef union YYSTYPE
llvm::ICmpInst::Predicate IPredicate;
llvm::FCmpInst::Predicate FPredicate;
}
/* Line 1489 of yacc.c. */
#line 419 "llvmAsmParser.tab.h"
/* Line 1529 of yacc.c. */
#line 417 "llvmAsmParser.tab.h"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1

32
llvm/lib/AsmParser/llvmAsmParser.y.cvs
View File

@ -1136,8 +1136,8 @@ Module *llvm::RunVMAsmParser(llvm::MemoryBuffer *MB) {
%token <OtherOpVal> EXTRACTVALUE INSERTVALUE
// Function Attributes
%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS NOCAPTURE BYVAL
%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ NEST
%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST
%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ
// Visibility Styles
%token DEFAULT HIDDEN PROTECTED
@ -1265,16 +1265,15 @@ OptCallingConv : /*empty*/ { $$ = CallingConv::C; } |
CHECK_FOR_ERROR
};
Attribute : ZEROEXT { $$ = Attribute::ZExt; }
| ZEXT { $$ = Attribute::ZExt; }
| SIGNEXT { $$ = Attribute::SExt; }
| SEXT { $$ = Attribute::SExt; }
| INREG { $$ = Attribute::InReg; }
| SRET { $$ = Attribute::StructRet; }
| NOALIAS { $$ = Attribute::NoAlias; }
| NOCAPTURE { $$ = Attribute::NoCapture; }
| BYVAL { $$ = Attribute::ByVal; }
| NEST { $$ = Attribute::Nest; }
Attribute : ZEROEXT { $$ = Attribute::ZExt; }
| ZEXT { $$ = Attribute::ZExt; }
| SIGNEXT { $$ = Attribute::SExt; }
| SEXT { $$ = Attribute::SExt; }
| INREG { $$ = Attribute::InReg; }
| SRET { $$ = Attribute::StructRet; }
| NOALIAS { $$ = Attribute::NoAlias; }
| BYVAL { $$ = Attribute::ByVal; }
| NEST { $$ = Attribute::Nest; }
| ALIGN EUINT64VAL { $$ =
Attribute::constructAlignmentFromInt($2); }
;
@ -1285,10 +1284,9 @@ OptAttributes : /* empty */ { $$ = Attribute::None; }
}
;
RetAttr : INREG { $$ = Attribute::InReg; }
RetAttr : INREG { $$ = Attribute::InReg; }
| ZEROEXT { $$ = Attribute::ZExt; }
| SIGNEXT { $$ = Attribute::SExt; }
| NOALIAS { $$ = Attribute::NoAlias; }
;
OptRetAttrs : /* empty */ { $$ = Attribute::None; }
@ -1332,8 +1330,6 @@ OptAlign : /*empty*/ { $$ = 0; } |
$$ = $2;
if ($$ != 0 && !isPowerOf2_32($$))
GEN_ERROR("Alignment must be a power of two");
if ($$ > 0x40000000)
GEN_ERROR("Alignment too large");
CHECK_FOR_ERROR
};
OptCAlign : /*empty*/ { $$ = 0; } |
@ -1341,8 +1337,6 @@ OptCAlign : /*empty*/ { $$ = 0; } |
$$ = $3;
if ($$ != 0 && !isPowerOf2_32($$))
GEN_ERROR("Alignment must be a power of two");
if ($$ > 0x40000000)
GEN_ERROR("Alignment too large");
CHECK_FOR_ERROR
};
@ -1372,8 +1366,6 @@ GlobalVarAttribute : SectionString {
| ALIGN EUINT64VAL {
if ($2 != 0 && !isPowerOf2_32($2))
GEN_ERROR("Alignment must be a power of two");
if ($2 > 0x40000000)
GEN_ERROR("Alignment too large");
CurGV->setAlignment($2);
CHECK_FOR_ERROR
};