spelling fixes

[dpdk.git] / lib / librte_eal / common / include / i686 / arch / rte_atomic.h

diff --git a/lib/librte_eal/common/include/i686/arch/rte_atomic.h b/lib/librte_eal/common/include/i686/arch/rte_atomic.h
index 12a9d16..e5e7d0c 100644 (file)
--- a/lib/librte_eal/common/include/i686/arch/rte_atomic.h
+++ b/lib/librte_eal/common/include/i686/arch/rte_atomic.h
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
  *   Redistribution and use in source and binary forms, with or without
@@ -83,17 +83,33 @@ rte_atomic64_cmpset(volatile uint64_t *dst, uint64_t exp, uint64_t src)
        _exp.u64 = exp;
        _src.u64 = src;
 
+#ifndef __PIC__
+    asm volatile (
+            MPLOCKED
+            "cmpxchg8b (%[dst]);"
+            "setz %[res];"
+            : [res] "=a" (res)      /* result in eax */
+            : [dst] "S" (dst),      /* esi */
+             "b" (_src.l32),       /* ebx */
+             "c" (_src.h32),       /* ecx */
+             "a" (_exp.l32),       /* eax */
+             "d" (_exp.h32)        /* edx */
+                       : "memory" );           /* no-clobber list */
+#else
        asm volatile (
+            "mov %%ebx, %%edi\n"
                        MPLOCKED
                        "cmpxchg8b (%[dst]);"
                        "setz %[res];"
+            "xchgl %%ebx, %%edi;\n"
                        : [res] "=a" (res)      /* result in eax */
                        : [dst] "S" (dst),      /* esi */
-                         "b" (_src.l32),       /* ebx */
+                         "D" (_src.l32),       /* ebx */
                          "c" (_src.h32),       /* ecx */
                          "a" (_exp.l32),       /* eax */
                          "d" (_exp.h32)        /* edx */
                        : "memory" );           /* no-clobber list */
+#endif
 
        return res;
 }
@@ -200,7 +216,7 @@ rte_atomic64_add(rte_atomic64_t *v, int64_t inc)
  * @param v
  *   A pointer to the atomic counter.
  * @param dec
- *   The value to be substracted from the counter.
+ *   The value to be subtracted from the counter.
  */
 static inline void
 rte_atomic64_sub(rte_atomic64_t *v, int64_t dec)
@@ -271,14 +287,14 @@ rte_atomic64_add_return(rte_atomic64_t *v, int64_t inc)
  * Subtract a 64-bit value from an atomic counter and return the result.
  *
  * Atomically subtracts the 64-bit value (dec) from the atomic counter (v)
- * and returns the value of v after the substraction.
+ * and returns the value of v after the subtraction.
  *
  * @param v
  *   A pointer to the atomic counter.
  * @param dec
- *   The value to be substracted from the counter.
+ *   The value to be subtracted from the counter.
  * @return
- *   The value of v after the substraction.
+ *   The value of v after the subtraction.
  */
 static inline int64_t
 rte_atomic64_sub_return(rte_atomic64_t *v, int64_t dec)
@@ -320,7 +336,7 @@ static inline int rte_atomic64_inc_and_test(rte_atomic64_t *v)
  * @param v
  *   A pointer to the atomic counter.
  * @return
- *   True if the result after substraction is 0; false otherwise.
+ *   True if the result after subtraction is 0; false otherwise.
  */
 static inline int rte_atomic64_dec_and_test(rte_atomic64_t *v)
 {