Add parser support for __forceinline, __w64, __ptr64.
llvm-svn: 61431
This commit is contained in:
parent
44ac777741
commit
f9c29d4200
|
@ -312,6 +312,9 @@ KEYWORD(__declspec , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
|
||||||
KEYWORD(__cdecl , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
|
KEYWORD(__cdecl , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
|
||||||
KEYWORD(__stdcall , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
|
KEYWORD(__stdcall , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
|
||||||
KEYWORD(__fastcall , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
|
KEYWORD(__fastcall , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
|
||||||
|
KEYWORD(__ptr64 , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
|
||||||
|
KEYWORD(__w64 , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
|
||||||
|
KEYWORD(__forceinline , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
|
||||||
|
|
||||||
// Alternate spelling for various tokens. There are GCC extensions in all
|
// Alternate spelling for various tokens. There are GCC extensions in all
|
||||||
// languages, but should not be disabled in strict conformance mode.
|
// languages, but should not be disabled in strict conformance mode.
|
||||||
|
|
|
@ -484,9 +484,6 @@ static void InitializePredefinedMacros(Preprocessor &PP,
|
||||||
// mode.
|
// mode.
|
||||||
if (PP.getLangOptions().Microsoft) {
|
if (PP.getLangOptions().Microsoft) {
|
||||||
DefineBuiltinMacro(Buf, "_cdecl=__cdecl");
|
DefineBuiltinMacro(Buf, "_cdecl=__cdecl");
|
||||||
DefineBuiltinMacro(Buf, "__ptr64=");
|
|
||||||
DefineBuiltinMacro(Buf, "__w64=");
|
|
||||||
DefineBuiltinMacro(Buf, "__forceinline=");
|
|
||||||
DefineBuiltinMacro(Buf, "__int8=char");
|
DefineBuiltinMacro(Buf, "__int8=char");
|
||||||
DefineBuiltinMacro(Buf, "__int16=short");
|
DefineBuiltinMacro(Buf, "__int16=short");
|
||||||
DefineBuiltinMacro(Buf, "__int32=int");
|
DefineBuiltinMacro(Buf, "__int32=int");
|
||||||
|
|
|
@ -561,6 +561,8 @@ void Parser::ParseDeclarationSpecifiers(DeclSpec &DS,
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// Microsoft single token adornments.
|
// Microsoft single token adornments.
|
||||||
|
case tok::kw___forceinline:
|
||||||
|
case tok::kw___w64:
|
||||||
case tok::kw___cdecl:
|
case tok::kw___cdecl:
|
||||||
case tok::kw___stdcall:
|
case tok::kw___stdcall:
|
||||||
case tok::kw___fastcall:
|
case tok::kw___fastcall:
|
||||||
|
@ -1322,6 +1324,7 @@ void Parser::ParseTypeQualifierListOpt(DeclSpec &DS, bool AttributesAllowed) {
|
||||||
isInvalid = DS.SetTypeQual(DeclSpec::TQ_restrict, Loc, PrevSpec,
|
isInvalid = DS.SetTypeQual(DeclSpec::TQ_restrict, Loc, PrevSpec,
|
||||||
getLang())*2;
|
getLang())*2;
|
||||||
break;
|
break;
|
||||||
|
case tok::kw___ptr64:
|
||||||
case tok::kw___cdecl:
|
case tok::kw___cdecl:
|
||||||
case tok::kw___stdcall:
|
case tok::kw___stdcall:
|
||||||
case tok::kw___fastcall:
|
case tok::kw___fastcall:
|
||||||
|
|
|
@ -6,3 +6,18 @@ void (*__fastcall fastpfunc)();
|
||||||
extern __declspec(dllimport) void __stdcall VarR4FromDec();
|
extern __declspec(dllimport) void __stdcall VarR4FromDec();
|
||||||
__declspec(deprecated) __declspec(deprecated) char * __cdecl ltoa( long _Val, char * _DstBuf, int _Radix);
|
__declspec(deprecated) __declspec(deprecated) char * __cdecl ltoa( long _Val, char * _DstBuf, int _Radix);
|
||||||
__declspec(noalias) __declspec(restrict) void * __cdecl xxx( void * _Memory );
|
__declspec(noalias) __declspec(restrict) void * __cdecl xxx( void * _Memory );
|
||||||
|
typedef __w64 unsigned long ULONG_PTR, *PULONG_PTR;
|
||||||
|
void * __ptr64 PtrToPtr64(const void *p)
|
||||||
|
{
|
||||||
|
return((void * __ptr64) (unsigned __int64) (ULONG_PTR)p );
|
||||||
|
}
|
||||||
|
__forceinline InterlockedBitTestAndSet (long *Base, long Bit)
|
||||||
|
{
|
||||||
|
__asm {
|
||||||
|
mov eax, Bit
|
||||||
|
mov ecx, Base
|
||||||
|
lock bts [ecx], eax
|
||||||
|
setc al
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue