[cfe-commits] r61431 - in /cfe/trunk: include/clang/Basic/TokenKinds.def lib/Lex/Preprocessor.cpp lib/Parse/ParseDecl.cpp test/Parser/MicrosoftExtensions.c

[Steve Naroff]

Author: snaroff
Date: Thu Dec 25 08:41:26 2008
New Revision: 61431

URL: http://llvm.org/viewvc/llvm-project?rev=61431&view=rev
Log:
Add parser support for __forceinline, __w64, __ptr64.

Modified:
    cfe/trunk/include/clang/Basic/TokenKinds.def
    cfe/trunk/lib/Lex/Preprocessor.cpp
    cfe/trunk/lib/Parse/ParseDecl.cpp
    cfe/trunk/test/Parser/MicrosoftExtensions.c

Modified: cfe/trunk/include/clang/Basic/TokenKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/TokenKinds.def?rev=61431&r1=61430&r2=61431&view=diff

==============================================================================
--- cfe/trunk/include/clang/Basic/TokenKinds.def (original)
+++ cfe/trunk/include/clang/Basic/TokenKinds.def Thu Dec 25 08:41:26 2008
@@ -312,6 +312,9 @@
 KEYWORD(__cdecl                     , EXTC90|EXTC99|EXTCPP|EXTCPP0x)
 KEYWORD(__stdcall                   , 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
 // languages, but should not be disabled in strict conformance mode.

Modified: cfe/trunk/lib/Lex/Preprocessor.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/Preprocessor.cpp?rev=61431&r1=61430&r2=61431&view=diff

==============================================================================
--- cfe/trunk/lib/Lex/Preprocessor.cpp (original)
+++ cfe/trunk/lib/Lex/Preprocessor.cpp Thu Dec 25 08:41:26 2008
@@ -484,9 +484,6 @@
   // mode. 
   if (PP.getLangOptions().Microsoft) {
     DefineBuiltinMacro(Buf, "_cdecl=__cdecl");
-    DefineBuiltinMacro(Buf, "__ptr64=");
-    DefineBuiltinMacro(Buf, "__w64=");
-    DefineBuiltinMacro(Buf, "__forceinline=");
     DefineBuiltinMacro(Buf, "__int8=char");
     DefineBuiltinMacro(Buf, "__int16=short");
     DefineBuiltinMacro(Buf, "__int32=int");

Modified: cfe/trunk/lib/Parse/ParseDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDecl.cpp?rev=61431&r1=61430&r2=61431&view=diff

==============================================================================
--- cfe/trunk/lib/Parse/ParseDecl.cpp (original)
+++ cfe/trunk/lib/Parse/ParseDecl.cpp Thu Dec 25 08:41:26 2008
@@ -561,6 +561,8 @@
       continue;
       
     // Microsoft single token adornments.
+    case tok::kw___forceinline:
+    case tok::kw___w64:
     case tok::kw___cdecl:
     case tok::kw___stdcall:
     case tok::kw___fastcall:
@@ -1322,6 +1324,7 @@
       isInvalid = DS.SetTypeQual(DeclSpec::TQ_restrict, Loc, PrevSpec,
                                  getLang())*2;
       break;
+    case tok::kw___ptr64:
     case tok::kw___cdecl:
     case tok::kw___stdcall:
     case tok::kw___fastcall:

Modified: cfe/trunk/test/Parser/MicrosoftExtensions.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/MicrosoftExtensions.c?rev=61431&r1=61430&r2=61431&view=diff

==============================================================================
--- cfe/trunk/test/Parser/MicrosoftExtensions.c (original)
+++ cfe/trunk/test/Parser/MicrosoftExtensions.c Thu Dec 25 08:41:26 2008
@@ -6,3 +6,18 @@
 extern __declspec(dllimport) void __stdcall VarR4FromDec();
 __declspec(deprecated) __declspec(deprecated) char * __cdecl ltoa( long _Val, char * _DstBuf, int _Radix);
 __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
+    };
+}
+