Changeset 1382

Timestamp:

Apr 26, 2004, 2:09:44 AM (21 years ago)

Author:

bird

Message:

Fixed a bunch of errors in atomic stuff.

File:

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

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

@@ -49 +49 @@
 static __inline__ int __atomic_set_bit(__volatile__ void *pv, unsigned uBit)
 {
-    int rc;
     __asm__ __volatile__("lock btsl %2, %1\n\t"
                          "sbbl %0,%0"
-                         : "=r" (rc),
+                         : "=r" (uBit),
                            "=m" (*(__volatile__ unsigned *)pv)
-                         : "r" (uBit)
+                         : "0"  (uBit)
                          : "memory");
-    return rc;
+    return uBit;
 }
 
@@ -87 +86 @@
                          "sbbl %0, %0\t\n"
                          : "=r" (uBit)
-                         : "m"  (*(const __volatile__ unsigned *)pv));
+                         : "m"  (*(const __volatile__ unsigned *)pv),
+                           "0"  (uBit));
     return uBit;
 }
@@ -118 +118 @@
  *
  * @returns 0 if incremented.
- * @returns *pu + 1 when not updated.
+ * @returns uMax when not updated.
  * @param   pu      Pointer to the value to increment.
  * @param   uMax    *pu must not be above this value.
@@ -125 +125 @@
 {
     unsigned rc;
-    __asm__ __volatile__("movl  %1, %%eax\n"
+    __asm__ __volatile__("movl  (%1), %%eax\n\t"
                          "1:\n\t"
                          "lea   1(%%eax), %0\n\t"
-                         "cmpl  %0, %2\n\t"
+                         "cmpl  %2, %0\n\t"
                          "jna   2f\n\t"
+                         "decl  %0\n\t"
                          "jmp   4f\n"
                          "2:\n\t"
-                         "lock  cmpxchgl %0, %1\n\t"
+                         "lock  cmpxchgl %0, (%1)\n\t"
                          "jz    3f\n\t"
                          "jmp   1b\n"
@@ -138 +139 @@
                          "xorl  %0, %0\n\t"
                          "4:"
-                         : "=r" (rc),
-                           "=m" (pu)
-                         : "r"  (uMax)
+                         : "=b" (rc)
+                         : "c"  (pu),
+                           "d"  (uMax)
                          : "%eax");
     return rc;
@@ -149 +150 @@
  * Atomically decrements a 32-bit unsigned value if greater than a min.
  *
- * @returns 0 if incremented.
- * @returns *pu + 1 when not updated.
- * @param   pu      Pointer to the value to decrement.
+ * @returns 0 if decremented.
+ * @returns uMin when not updated.
+ * @param   pu      Pointer to the   value to decrement.
  * @param   uMin    *pu must not be below this value.
  */
-static __inline__ int __atomic_increment_min(__volatile__ unsigned *pu, unsigned uMin)
+static __inline__ int __atomic_decrement_min(__volatile__ unsigned *pu, unsigned uMin)
 {
     unsigned rc;
-    __asm__ __volatile__("movl  %1, %%eax\n"
+    __asm__ __volatile__("movl  (%1), %%eax\n"
                          "1:\n\t"
                          "lea   -1(%%eax), %0\n\t"
-                         "cmpl  %0, %2\n\t"
+                         "cmpl  %2, %0\n\t"
                          "jnb   2f\n\t"
+                         "incl  %0\n\t"
                          "jmp   4f\n"
                          "2:\n\t"
-                         "lock  cmpxchgl %0, %1\n\t"
+                         "lock  cmpxchgl %0, (%1)\n\t"
                          "jz    3f\n\t"
                          "jmp   1b\n"
@@ -170 +172 @@
                          "xorl  %0, %0\n\t"
                          "4:"
-                         : "=r" (rc),
-                           "=m" (*pu)
-                         : "r"  (uMin)
+                         : "=b" (rc)
+                         : "c"  (pu),
+                           "d"  (uMin)
                          : "%eax");
     return rc;