Changeset 48572 in vbox for trunk/include/iprt

Timestamp:

Sep 20, 2013 12:17:16 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

89127

Message:

asm-amd64-x86.h: Use writeeflags and readeflags with visual C++. Makes life simpler when building EFI.

Location:

trunk/include/iprt

Files:

• asm-amd64-x86.h (modified) (5 diffs)
• cdefs.h (modified) (1 diff)

trunk/include/iprt/asm-amd64-x86.h

@@ -69 +69 @@
 #  pragma intrinsic(__writecr8)
 # endif
+# if RT_INLINE_ASM_USES_INTRIN >= 15
+#  pragma intrinsic(__readeflags)
+#  pragma intrinsic(__writeeflags)
+# endif
 #endif
 
@@ -378 +382 @@
  * @returns [RE]FLAGS.
  */
-#if RT_INLINE_ASM_EXTERNAL
+#if RT_INLINE_ASM_EXTERNAL && RT_INLINE_ASM_USES_INTRIN < 15
 DECLASM(RTCCUINTREG) ASMGetFlags(void);
 #else
@@ -394 +398 @@
                          : "=r" (uFlags));
 #  endif
+# elif RT_INLINE_ASM_USES_INTRIN >= 15
+    uFlags = __readeflags();
 # else
     __asm
@@ -415 +421 @@
  * @param   uFlags      The new [RE]FLAGS value.
  */
-#if RT_INLINE_ASM_EXTERNAL
+#if RT_INLINE_ASM_EXTERNAL && RT_INLINE_ASM_USES_INTRIN < 15
 DECLASM(void) ASMSetFlags(RTCCUINTREG uFlags);
 #else
@@ -430 +436 @@
                          : : "g" (uFlags));
 #  endif
+# elif RT_INLINE_ASM_USES_INTRIN >= 15
+    __writeeflags(uFlags);
 # else
     __asm

trunk/include/iprt/cdefs.h

@@ -2655 +2655 @@
  * Otherwise it is 0. */
 #ifdef _MSC_VER
-# if   _MSC_VER >= 1700
+# if   _MSC_VER >= 1700 /* Visual C++ v11.0 / 2012 */
 #  define RT_INLINE_ASM_USES_INTRIN 17
-# elif _MSC_VER >= 1600
+# elif _MSC_VER >= 1600 /* Visual C++ v10.0 / 2010 */
 #  define RT_INLINE_ASM_USES_INTRIN 16
-# elif _MSC_VER >= 1500
+# elif _MSC_VER >= 1500 /* Visual C++ v9.0 / 2008 */
 #  define RT_INLINE_ASM_USES_INTRIN 15
-# elif _MSC_VER >= 1400
+# elif _MSC_VER >= 1400 /* Visual C++ v8.0 / 2005 */
 #  define RT_INLINE_ASM_USES_INTRIN 14
 # endif