Author: ian
Date: Sun Oct 26 03:13:19 2014
New Revision: 273667
URL: https://svnweb.freebsd.org/changeset/base/273667
Log:
MFC r271310:
Rename new to newval in inline asm code, to avoid clashes with C++ new.
Modified:
stable/10/sys/arm/include/atomic.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/arm/include/atomic.h
==============================================================================
--- stable/10/sys/arm/include/atomic.h Sun Oct 26 03:03:41 2014
(r273666)
+++ stable/10/sys/arm/include/atomic.h Sun Oct 26 03:13:19 2014
(r273667)
@@ -268,12 +268,12 @@ atomic_cmpset_64(volatile uint64_t *p, u
__asm __volatile(
"1: \n"
" ldrexd %[tmp], [%[ptr]]\n"
- " teq %Q[tmp], %Q[cmp]\n"
+ " teq %Q[tmp], %Q[cmpval]\n"
" itee eq \n"
- " teqeq %R[tmp], %R[cmp]\n"
+ " teqeq %R[tmp], %R[cmpval]\n"
" movne %[ret], #0\n"
" bne 2f\n"
- " strexd %[ret], %[new], [%[ptr]]\n"
+ " strexd %[ret], %[newval], [%[ptr]]\n"
" teq %[ret], #0\n"
" it ne \n"
" bne 1b\n"
@@ -282,8 +282,8 @@ atomic_cmpset_64(volatile uint64_t *p, u
: [ret] "=&r" (ret),
[tmp] "=&r" (tmp)
: [ptr] "r" (p),
- [cmp] "r" (cmpval),
- [new] "r" (newval)
+ [cmpval] "r" (cmpval),
+ [newval] "r" (newval)
: "cc", "memory");
return (ret);
}
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
