d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename new to newval in inline asm code, to avoid clashes with C++ new.

Browse Source 
Also rename cmp to cmpval just to keep the asm variable names similar to
the C variable names.
This commit is contained in:
ian 2014-09-09 13:50:21 +00:00
parent 57ec24a023
commit b62cc0fb26
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/arm/include/atomic.h
View File

@ -268,12 +268,12 @@ atomic_cmpset_64(volatile uint64_t *p, uint64_t cmpval, uint64_t newval)
__asm __volatile( __asm __volatile(
"1: \n" "1: \n"
" ldrexd %[tmp], [%[ptr]]\n" " ldrexd %[tmp], [%[ptr]]\n"
" teq %Q[tmp], %Q[cmp]\n" " teq %Q[tmp], %Q[cmpval]\n"
" itee eq \n" " itee eq \n"
" teqeq %R[tmp], %R[cmp]\n" " teqeq %R[tmp], %R[cmpval]\n"
" movne %[ret], #0\n" " movne %[ret], #0\n"
" bne 2f\n" " bne 2f\n"
" strexd %[ret], %[new], [%[ptr]]\n" " strexd %[ret], %[newval], [%[ptr]]\n"
" teq %[ret], #0\n" " teq %[ret], #0\n"
" it ne \n" " it ne \n"
" bne 1b\n" " bne 1b\n"
@ -282,8 +282,8 @@ atomic_cmpset_64(volatile uint64_t *p, uint64_t cmpval, uint64_t newval)
: [ret] "=&r" (ret), : [ret] "=&r" (ret),
[tmp] "=&r" (tmp) [tmp] "=&r" (tmp)
: [ptr] "r" (p), : [ptr] "r" (p),
[cmp] "r" (cmpval), [cmpval] "r" (cmpval),
[new] "r" (newval) [newval] "r" (newval)
: "cc", "memory"); : "cc", "memory");
return (ret); return (ret);
} }