From: VMware, Inc <>
Date: Wed, 26 Jan 2011 01:33:25 +0000 (-0800)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: stable-8.8.0~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a22e8cf804a2b698f433fd28f32256343b67ebb;p=thirdparty%2Fopen-vm-tools.git

Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/include/vm_basic_asm_x86.h b/open-vm-tools/lib/include/vm_basic_asm_x86.h
index 180d865a3..cf6abc388 100644
--- a/open-vm-tools/lib/include/vm_basic_asm_x86.h
+++ b/open-vm-tools/lib/include/vm_basic_asm_x86.h
@@ -82,22 +82,23 @@
  */
 #if defined(__GNUC__)
 static INLINE void 
-FXSAVE_ES1(uint8 *save)
+FXSAVE_ES1(void *save)
 {
-   __asm__ __volatile__ ("fxsave %0\n" : "=m" (*save) : : "memory");
+   __asm__ __volatile__ ("fxsave %0\n" : "=m" (*(uint8 *)save) : : "memory");
 }
 
 static INLINE void 
-FXRSTOR_ES1(const uint8 *load)
+FXRSTOR_ES1(const void *load)
 {
-   __asm__ __volatile__ ("fxrstor %0\n" : : "m" (*load) : "memory");
+   __asm__ __volatile__ ("fxrstor %0\n"
+                         : : "m" (*(const uint8 *)load) : "memory");
 }
 
 static INLINE void 
-FXRSTOR_AMD_ES0(const uint8 *load)
+FXRSTOR_AMD_ES0(const void *load)
 {
    uint64 dummy = 0;
-      
+
    __asm__ __volatile__ 
        ("fnstsw  %%ax    \n"     // Grab x87 ES bit
         "bt      $7,%%ax \n"     // Test ES bit
@@ -109,7 +110,7 @@ FXRSTOR_AMD_ES0(const uint8 *load)
                                  // x87 exception pointers.
         "fxrstor %1      \n"
         :  
-        : "m" (dummy), "m" (*load)
+        : "m" (dummy), "m" (*(const uint8 *)load)
         : "ax", "memory");
 }
 #endif /* __GNUC__ */
@@ -124,46 +125,58 @@ FXRSTOR_AMD_ES0(const uint8 *load)
 #if defined(__GNUC__) && (defined(VMM) || defined(VMKERNEL) || defined(FROBOS))
 
 static INLINE void 
-XSAVE_ES1(uint8 *save, uint64 mask)
+XSAVE_ES1(void *save, uint64 mask)
 {
 #if __GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ == 1
    __asm__ __volatile__ (
         ".byte 0x0f, 0xae, 0x21 \n"
         :
-        : "c" (save), "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
+        : "c" ((uint8 *)save), "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
         : "memory");
 #else
    __asm__ __volatile__ (
         "xsave %0 \n"
-        : "=m" (*save)
+        : "=m" (*(uint8 *)save)
         : "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
         : "memory");
 #endif
 }
 
 static INLINE void 
-XRSTOR_ES1(const uint8 *load, uint64 mask)
+XSAVEOPT_ES1(void *save, uint64 mask)
+{
+   __asm__ __volatile__ (
+        ".byte 0x0f, 0xae, 0x31 \n"
+        :
+        : "c" ((uint8 *)save), "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
+        : "memory");
+}
+
+static INLINE void 
+XRSTOR_ES1(const void *load, uint64 mask)
 {
 #if __GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ == 1
    __asm__ __volatile__ (
         ".byte 0x0f, 0xae, 0x29 \n"
         :
-        : "c" (load), "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
+        : "c" ((const uint8 *)load),
+          "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
         : "memory");
 #else
    __asm__ __volatile__ (
         "xrstor %0 \n"
         :
-        : "m" (*load), "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
+        : "m" (*(const uint8 *)load),
+          "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
         : "memory");
 #endif
 }
 
 static INLINE void 
-XRSTOR_AMD_ES0(const uint8 *load, uint64 mask)
+XRSTOR_AMD_ES0(const void *load, uint64 mask)
 {
    uint64 dummy = 0;
-      
+
    __asm__ __volatile__ 
        ("fnstsw  %%ax    \n"     // Grab x87 ES bit
         "bt      $7,%%ax \n"     // Test ES bit
@@ -177,12 +190,13 @@ XRSTOR_AMD_ES0(const uint8 *load, uint64 mask)
 #if __GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ == 1
         ".byte 0x0f, 0xae, 0x29 \n"
         :
-        : "m" (dummy),
-          "c" (load), "b" ((uint32)mask), "d" ((uint32)(mask >> 32))
+        : "m" (dummy), "c" ((const uint8 *)load),
+          "b" ((uint32)mask), "d" ((uint32)(mask >> 32))
 #else
         "xrstor %1 \n"
         :
-        : "m" (dummy), "m" (*load), "b" ((uint32)mask), "d" ((uint32)(mask >> 32))
+        : "m" (dummy), "m" (*(const uint8 *)load),
+          "b" ((uint32)mask), "d" ((uint32)(mask >> 32))
 #endif
         : "eax", "memory");
 }
diff --git a/open-vm-tools/lib/include/vm_basic_asm_x86_64.h b/open-vm-tools/lib/include/vm_basic_asm_x86_64.h
index c42f3f2aa..8ea5789df 100644
--- a/open-vm-tools/lib/include/vm_basic_asm_x86_64.h
+++ b/open-vm-tools/lib/include/vm_basic_asm_x86_64.h
@@ -95,34 +95,36 @@ uint64 __shiftright128(uint64 lowPart, uint64 highPart, uint8 shift);
 #if defined(__GNUC__)
 
 static INLINE void 
-FXSAVE_ES1(uint8 *save)
+FXSAVE_ES1(void *save)
 {
-   __asm__ __volatile__ ("fxsaveq %0  \n" : "=m" (*save) : : "memory");
+   __asm__ __volatile__ ("fxsaveq %0  \n" : "=m" (*(uint8 *)save) : : "memory");
 }
 
 static INLINE void 
-FXSAVE_COMPAT_ES1(uint8 *save)
+FXSAVE_COMPAT_ES1(void *save)
 {
-   __asm__ __volatile__ ("fxsave %0  \n" : "=m" (*save) : : "memory");
+   __asm__ __volatile__ ("fxsave %0  \n" : "=m" (*(uint8 *)save) : : "memory");
 }
 
 static INLINE void 
-FXRSTOR_ES1(const uint8 *load)
+FXRSTOR_ES1(const void *load)
 {
-   __asm__ __volatile__ ("fxrstorq %0 \n" : : "m" (*load) : "memory");
+   __asm__ __volatile__ ("fxrstorq %0 \n"
+                         : : "m" (*(const uint8 *)load) : "memory");
 }
 
 static INLINE void 
-FXRSTOR_COMPAT_ES1(const uint8 *load)
+FXRSTOR_COMPAT_ES1(const void *load)
 {
-   __asm__ __volatile__ ("fxrstor %0 \n" : : "m" (*load) : "memory");
+   __asm__ __volatile__ ("fxrstor %0 \n"
+                         : : "m" (*(const uint8 *)load) : "memory");
 }
 
 static INLINE void 
-FXRSTOR_AMD_ES0(const uint8 *load)
+FXRSTOR_AMD_ES0(const void *load)
 {
    uint64 dummy = 0;
-      
+
    __asm__ __volatile__ 
        ("fnstsw  %%ax    \n"     // Grab x87 ES bit
         "bt      $7,%%ax \n"     // Test ES bit
@@ -134,7 +136,7 @@ FXRSTOR_AMD_ES0(const uint8 *load)
                                  // x87 exception pointers.
         "fxrstorq %1 \n"
         :
-        : "m" (dummy), "m" (*load)
+        : "m" (dummy), "m" (*(const uint8 *)load)
         : "ax", "memory");
 }
 
@@ -150,82 +152,96 @@ FXRSTOR_AMD_ES0(const uint8 *load)
 #if defined(__GNUC__) && (defined(VMM) || defined(VMKERNEL) || defined(FROBOS))
 
 static INLINE void 
-XSAVE_ES1(uint8 *save, uint64 mask)
+XSAVE_ES1(void *save, uint64 mask)
 {
 #if __GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ == 1
    __asm__ __volatile__ (
         ".byte 0x48, 0x0f, 0xae, 0x21 \n"
         :
-        : "c" (save), "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
+        : "c" ((uint8 *)save), "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
         : "memory");
 #else
    __asm__ __volatile__ (
         "xsaveq %0 \n"
-        : "=m" (*save)
+        : "=m" (*(uint8 *)save)
         : "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
         : "memory");
 #endif
 }
 
 static INLINE void 
-XSAVE_COMPAT_ES1(uint8 *save, uint64 mask)
+XSAVE_COMPAT_ES1(void *save, uint64 mask)
 {
 #if __GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ == 1
    __asm__ __volatile__ (
         ".byte 0x0f, 0xae, 0x21 \n"
         :
-        : "c" (save), "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
+        : "c" ((uint8 *)save), "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
         : "memory");
 #else
    __asm__ __volatile__ (
         "xsave %0 \n"
-        : "=m" (*save)
+        : "=m" (*(uint8 *)save)
         : "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
         : "memory");
 #endif
 }
 
 static INLINE void 
-XRSTOR_ES1(const uint8 *load, uint64 mask)
+XSAVEOPT_ES1(void *save, uint64 mask)
+{
+   __asm__ __volatile__ (
+        ".byte 0x48, 0x0f, 0xae, 0x31 \n"
+        :
+        : "c" ((uint8 *)save), "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
+        : "memory");
+}
+
+static INLINE void 
+XRSTOR_ES1(const void *load, uint64 mask)
 {
 #if __GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ == 1
    __asm__ __volatile__ (
         ".byte 0x48, 0x0f, 0xae, 0x29 \n"
         :
-        : "c" (load), "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
+        : "c" ((const uint8 *)load),
+          "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
         : "memory");
 #else
    __asm__ __volatile__ (
         "xrstorq %0 \n"
         :
-        : "m" (*load), "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
+        : "m" (*(const uint8 *)load),
+          "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
         : "memory");
 #endif
 }
 
 static INLINE void 
-XRSTOR_COMPAT_ES1(const uint8 *load, uint64 mask)
+XRSTOR_COMPAT_ES1(const void *load, uint64 mask)
 {
 #if __GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ == 1
    __asm__ __volatile__ (
         ".byte 0x0f, 0xae, 0x29 \n"
         :
-        : "c" (load), "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
+        : "c" ((const uint8 *)load),
+          "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
         : "memory");
 #else
    __asm__ __volatile__ (
         "xrstor %0 \n"
         :
-        : "m" (*load), "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
+        : "m" (*(const uint8 *)load),
+          "a" ((uint32)mask), "d" ((uint32)(mask >> 32))
         : "memory");
 #endif
 }
 
 static INLINE void 
-XRSTOR_AMD_ES0(const uint8 *load, uint64 mask)
+XRSTOR_AMD_ES0(const void *load, uint64 mask)
 {
    uint64 dummy = 0;
-      
+
    __asm__ __volatile__ 
        ("fnstsw  %%ax    \n"     // Grab x87 ES bit
         "bt      $7,%%ax \n"     // Test ES bit
@@ -239,12 +255,13 @@ XRSTOR_AMD_ES0(const uint8 *load, uint64 mask)
 #if __GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ == 1
         ".byte 0x48, 0x0f, 0xae, 0x29 \n"
         :
-        : "m" (dummy),
-          "c" (load), "b" ((uint32)mask), "d" ((uint32)(mask >> 32))
+        : "m" (dummy), "c" ((const uint8 *)load),
+          "b" ((uint32)mask), "d" ((uint32)(mask >> 32))
 #else
         "xrstorq %1 \n"
         :
-        : "m" (dummy), "m" (*load), "b" ((uint32)mask), "d" ((uint32)(mask >> 32))
+        : "m" (dummy), "m" (*(const uint8 *)load),
+          "b" ((uint32)mask), "d" ((uint32)(mask >> 32))
 #endif
         : "eax", "memory");
 }