Changeset 1876 for trunk/src/emx/include/386/builtin.h

Timestamp:

Mar 20, 2005, 1:16:43 AM (20 years ago)

Author:

bird

Message:

Fixed atomic inc/dec inline functions.

File:

• trunk/src/emx/include/386/builtin.h (modified) (10 diffs, 1 prop)

trunk/src/emx/include/386/builtin.h

@@ -126 +126 @@
  * @param   uAdd    The value to add to *pu.
  */
-static __inline__ void __atomic_add(__volatile__ unsigned *pu, unsigned uAdd)
+static __inline__ void __atomic_add(__volatile__ unsigned *pu, const unsigned uAdd)
 {
     __asm__ __volatile__("lock addl %1, %0"
                          : "=m" (*pu)
-                         : "r" (uAdd));
+                         : "nr" (uAdd), 
+                           "m"  (*pu));
 }
 
@@ -139 +140 @@
  * @param   uAdd    The value to subtract from *pu.
  */
-static __inline__ void __atomic_sub(__volatile__ unsigned *pu, unsigned uSub)
+static __inline__ void __atomic_sub(__volatile__ unsigned *pu, const unsigned uSub)
 {
     __asm__ __volatile__("lock subl %1, %0"
                          : "=m" (*pu)
-                         : "r" (uSub));
+                         : "nr" (uSub), 
+                           "m"  (*pu));
 }
 
@@ -155 +157 @@
 {
     __asm__ __volatile__("lock incl %0"
-                         : "=m" (*pu));
+                         : "=m" (*pu) 
+                         : "m"  (*pu));
 }
 
@@ -166 +169 @@
 {
     __asm__ __volatile__("lock decl %0"
-                         : "=m" (*pu));
+                         : "=m" (*pu) 
+                         : "m"  (*pu));
 }
 
@@ -177 +181 @@
  * @param   uMax    *pu must not be above this value.
  */
-static __inline__ int __atomic_increment_max(__volatile__ unsigned *pu, unsigned uMax)
+static __inline__ int __atomic_increment_max(__volatile__ unsigned *pu, const unsigned uMax)
 {
     unsigned rc;
-    __asm__ __volatile__("movl  (%1), %%eax\n\t"
+    __asm__ __volatile__("movl  %2, %%eax\n\t"
                          "1:\n\t"
-                         "lea   1(%%eax), %0\n\t"
-                         "cmpl  %2, %0\n\t"
-                         "jna   2f\n\t"
-                         "decl  %0\n\t"
+                         "movl  %%eax, %0\n\t"
+                         "cmpl  %3, %0\n\t"
+                         "jb    2f\n\t"
                          "jmp   4f\n"
                          "2:\n\t"
-                         "lock  cmpxchgl %0, (%1)\n\t"
+                         "incl  %0\n\t"
+                         "lock  cmpxchgl %0, %1\n\t"
                          "jz    3f\n\t"
                          "jmp   1b\n"
@@ -194 +198 @@
                          "xorl  %0, %0\n\t"
                          "4:"
-                         : "=b" (rc)
-                         : "c"  (pu),
-                           "d"  (uMax)
+                         : "=b" (rc),
+                           "=m" (*pu)
+                         : "m"  (*pu),
+                           "nd" (uMax),
+                           "0"  (rc)
                          : "%eax");
     return rc;
@@ -210 +216 @@
  * @param   u16Max  *pu16 must not be above this value after the incrementation.
  */
-static inline unsigned __atomic_increment_word_max(volatile uint16_t *pu16, uint16_t u16Max)
-{
-    unsigned rc;
-    __asm__ __volatile__("movw  (%1), %%ax\n\t"
-                         "xorl  %%ebx, %%ebx\n\t"
+static inline unsigned __atomic_increment_word_max(volatile uint16_t *pu16, const uint16_t u16Max)
+{
+    unsigned rc = 0;
+    __asm__ __volatile__("movw  %2, %%ax\n\t"
                          "1:\n\t"
-                         "movw  %%ax, %%bx\n\t"
-                         "cmpw  %%dx, %%ax\n\t"
+                         "movw  %%ax, %w0\n\t"
+                         "cmpw  %w3, %%ax\n\t"
                          "jb    2f\n\t"
-                         "orl   $0xffff0000, %%ebx\n\t"
+                         "orl   $0xffff0000, %0\n\t"
                          "jmp   3f\n"
                          "2:\n\t"
-                         "incw  %%bx\n\t"
-                         "lock  cmpxchgw %%bx, (%1)\n\t"
+                         "incw  %w0\n\t"
+                         "lock  cmpxchgw %w0, %2\n\t"
                          "jz    3f\n\t"
                          "jmp   1b\n\t"
                          "3:"
-                         : "=b" (rc)
-                         : "r"  (pu16),
-                           "d"  (u16Max)
+                         : "=r" (rc),
+                           "=m" (*pu16)
+                         : "m"  (*pu16),
+                           "nr"  (u16Max),
+                           "0"  (rc)
                          : "%eax");
     return rc;
@@ -243 +250 @@
  * @param   uMin    *pu must not be below this value.
  */
-static __inline__ int __atomic_decrement_min(__volatile__ unsigned *pu, unsigned uMin)
+static __inline__ int __atomic_decrement_min(__volatile__ unsigned *pu, const unsigned uMin)
 {
     unsigned rc;
-    __asm__ __volatile__("movl  (%1), %%eax\n"
+    __asm__ __volatile__("movl  %2, %%eax\n"
                          "1:\n\t"
-                         "lea   -1(%%eax), %0\n\t"
-                         "cmpl  %2, %0\n\t"
-                         "jnb   2f\n\t"
-                         "incl  %0\n\t"
+                         "movl  %%eax, %0\n\t"
+                         "cmpl  %3, %0\n\t"
+                         "ja    2f\n\t"
                          "jmp   4f\n"
                          "2:\n\t"
-                         "lock  cmpxchgl %0, (%1)\n\t"
+                         "decl  %0\n\t"
+                         "lock  cmpxchgl %0, %1\n\t"
                          "jz    3f\n\t"
                          "jmp   1b\n"
@@ -260 +267 @@
                          "xorl  %0, %0\n\t"
                          "4:"
-                         : "=b" (rc)
-                         : "c"  (pu),
-                           "d"  (uMin)
+                         : "=b" (rc),
+                           "=m" (*pu)
+                         : "m"  (*pu),
+                           "nr" (uMin),
+                           "0"  (rc)
                          : "%eax");
     return rc;
@@ -276 +285 @@
  * @param   u16Min  *pu16 must not be below this value after the decrementation.
  */
-static inline unsigned __atomic_decrement_word_min(volatile uint16_t *pu16, uint16_t u16Min)
-{
-    unsigned rc;
-    __asm__ __volatile__("movw  (%1), %%ax\n\t"
-                         "xorl  %%ebx, %%ebx\n\t"
+static inline unsigned __atomic_decrement_word_min(volatile uint16_t *pu16, const uint16_t u16Min)
+{
+    unsigned rc = 0;
+    __asm__ __volatile__("movw  %2, %%ax\n\t"
                          "1:\n\t"
-                         "movw  %%ax, %%bx\n\t"
-                         "cmpw  %%dx, %%ax\n\t"
+                         "movw  %%ax, %w0\n\t"
+                         "cmpw  %w3, %%ax\n\t"
                          "ja    2f\n\t"
-                         "orl   $0xffff0000, %%ebx\n\t"
+                         "orl   $0xffff0000, %0\n\t"
                          "jmp   3f\n"
                          "2:\n\t"
                          "decw  %%bx\n\t"
-                         "lock  cmpxchgw %%bx, (%1)\n\t"
+                         "lock  cmpxchgw %w0, %1\n\t"
                          "jz    3f\n\t"
                          "jmp   1b\n"
                          "3:"
-                         : "=b" (rc)
-                         : "r"  (pu16),
-                           "d"  (u16Min)
+                         : "=b" (rc),
+                           "=m" (*pu16)
+                         : "m"  (*pu16),
+                           "nr" (u16Min),
+                           "0"  (rc)
                          : "%eax");
     return rc;