|
@@ -18,16 +18,16 @@
|
|
|
static inline int
|
|
|
_test_and_set (int *p, int v) __THROW
|
|
|
{
|
|
|
- int result;
|
|
|
+ int result;
|
|
|
|
|
|
- __asm__ __volatile__(
|
|
|
- "/* Inline test and set */\n"
|
|
|
- " xchg %[old], %[mem], %[new]"
|
|
|
- : [old] "=&r"(result)
|
|
|
- : [mem] "r"(p), [new] "r"(v)
|
|
|
- : "memory");
|
|
|
+ __asm__ __volatile__(
|
|
|
+ "/* Inline test and set */\n"
|
|
|
+ " xchg %[old], %[mem], %[new]"
|
|
|
+ : [old] "=&r"(result)
|
|
|
+ : [mem] "r"(p), [new] "r"(v)
|
|
|
+ : "memory");
|
|
|
|
|
|
- return result;
|
|
|
+ return result;
|
|
|
}
|
|
|
|
|
|
extern long int testandset (int *spinlock);
|
|
@@ -37,7 +37,7 @@ extern int __compare_and_swap (long int *p, long int oldval, long int newval);
|
|
|
PT_EI long int
|
|
|
testandset (int *spinlock)
|
|
|
{
|
|
|
- return _test_and_set(spinlock, 1);
|
|
|
+ return _test_and_set(spinlock, 1);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -52,22 +52,22 @@ register char * stack_pointer __asm__ ("sp");
|
|
|
PT_EI int
|
|
|
__compare_and_swap(long int *p, long int oldval, long int newval)
|
|
|
{
|
|
|
- int result;
|
|
|
+ int result;
|
|
|
|
|
|
- __asm__ __volatile__(
|
|
|
- "/* Inline compare and swap */\n"
|
|
|
- "1: ssrf 5\n"
|
|
|
- " ld.w %[result], %[mem]\n"
|
|
|
- " eor %[result], %[old]\n"
|
|
|
- " brne 2f\n"
|
|
|
- " stcond %[mem], %[new]\n"
|
|
|
- " brne 1b\n"
|
|
|
- "2:"
|
|
|
- : [result] "=&r"(result), [mem] "=m"(*p)
|
|
|
- : "m"(*p), [new] "r"(newval), [old] "r"(oldval)
|
|
|
- : "cc", "memory");
|
|
|
+ __asm__ __volatile__(
|
|
|
+ "/* Inline compare and swap */\n"
|
|
|
+ "1: ssrf 5\n"
|
|
|
+ " ld.w %[result], %[mem]\n"
|
|
|
+ " eor %[result], %[old]\n"
|
|
|
+ " brne 2f\n"
|
|
|
+ " stcond %[mem], %[new]\n"
|
|
|
+ " brne 1b\n"
|
|
|
+ "2:"
|
|
|
+ : [result] "=&r"(result), [mem] "=m"(*p)
|
|
|
+ : "m"(*p), [new] "r"(newval), [old] "r"(oldval)
|
|
|
+ : "cc", "memory");
|
|
|
|
|
|
- return result == 0;
|
|
|
+ return result == 0;
|
|
|
}
|
|
|
|
|
|
#endif /* pt-machine.h */
|