Changes to common header files not directly applicable to open-vm-tools

diff --git a/open-vm-tools/lib/include/vm_atomic.h b/open-vm-tools/lib/include/vm_atomic.h
index f8b8bdda7d2632179d29e5a26081d4959008712c..8bcb774048c278fcfa51381203005ca47f9f797f 100644 (file)
--- a/open-vm-tools/lib/include/vm_atomic.h
+++ b/open-vm-tools/lib/include/vm_atomic.h
@@ -1317,7 +1317,7 @@ Atomic_And32(Atomic_uint32 *var, // IN/OUT
 #else
    __asm mov eax, val
    __asm mov ebx, var
-   __asm lock and [ebx]Atomic_uint32.value, eax
+   __asm lock And [ebx]Atomic_uint32.value, eax
 #endif
 #else
 #error No compiler defined for Atomic_And
@@ -1382,7 +1382,7 @@ Atomic_Or32(Atomic_uint32 *var, // IN/OUT
 #else
    __asm mov eax, val
    __asm mov ebx, var
-   __asm lock or [ebx]Atomic_uint32.value, eax
+   __asm lock Or [ebx]Atomic_uint32.value, eax
 #endif
 #else
 #error No compiler defined for Atomic_Or
@@ -1447,7 +1447,7 @@ Atomic_Xor32(Atomic_uint32 *var, // IN/OUT
 #else
    __asm mov eax, val
    __asm mov ebx, var
-   __asm lock xor [ebx]Atomic_uint32.value, eax
+   __asm lock Xor [ebx]Atomic_uint32.value, eax
 #endif
 #else
 #error No compiler defined for Atomic_Xor

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 836ab80264564fe13c18111905c503631ddb0934..f88fac3296c1f7ba7f53d06a51e08b5bbae6cf4a 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_asm_x86.h
+++ b/open-vm-tools/lib/include/vm_basic_asm_x86.h
@@ -429,7 +429,7 @@ Mul64x3264(uint64 multiplicand, uint32 multiplier, uint32 shift)
       shr  edx, cl
       jmp  SHORT l3
    l2:
-      xor  esi, esi
+      Xor  esi, esi
       shrd eax, edx, cl                     // result = hi(p2):hi(p1):lo(p1) >> shift
       adc  esi, 0                           // Get highest order bit shifted out, from CF
       shrd edx, ebx, cl
@@ -550,7 +550,7 @@ Muls64x32s64(int64 multiplicand, uint32 multiplier, uint32 shift)
       sar  edx, cl
       jmp  SHORT l3
    l2:
-      xor  esi, esi
+      Xor  esi, esi
       shrd eax, edx, cl                     // result = hi(p2):hi(p1):lo(p1) << shift
       adc  esi, 0                           // Get highest order bit shifted out, from CF
       shrd edx, ebx, cl