Author: marcel
Date: Sun Oct 16 22:18:08 2011
New Revision: 226452
URL: http://svn.freebsd.org/changeset/base/226452
Log:
Define dtrace_cmpset_long in terms of atomic_cmpset_long
and not by virtue of inline assembly. Now this file
compiles on all supported architectures.
Modified:
head/sys/cddl/dev/dtrace/dtrace_debug.c
Modified: head/sys/cddl/dev/dtrace/dtrace_debug.c
==============================================================================
--- head/sys/cddl/dev/dtrace/dtrace_debug.c Sun Oct 16 22:15:13 2011
(r226451)
+++ head/sys/cddl/dev/dtrace/dtrace_debug.c Sun Oct 16 22:18:08 2011
(r226452)
@@ -31,49 +31,9 @@
#ifdef DEBUG
-#if defined(__amd64__)
-static __inline int
-dtrace_cmpset_long(volatile u_long *dst, u_long exp, u_long src)
-{
- u_char res;
-
- __asm __volatile(
- " lock ; "
- " cmpxchgq %2,%1 ; "
- " sete %0 ; "
- "1: "
- "# dtrace_cmpset_long"
- : "=a" (res), /* 0 */
- "=m" (*dst) /* 1 */
- : "r" (src), /* 2 */
- "a" (exp), /* 3 */
- "m" (*dst) /* 4 */
- : "memory");
-
- return (res);
-}
-#elif defined(__i386__)
-static __inline int
-dtrace_cmpset_long(volatile u_long *dst, u_long exp, u_long src)
-{
- u_char res;
-
- __asm __volatile(
- " lock ; "
- " cmpxchgl %2,%1 ; "
- " sete %0 ; "
- "1: "
- "# dtrace_cmpset_long"
- : "=a" (res), /* 0 */
- "=m" (*dst) /* 1 */
- : "r" (src), /* 2 */
- "a" (exp), /* 3 */
- "m" (*dst) /* 4 */
- : "memory");
+#include <machine/atomic.h>
- return (res);
-}
-#endif
+#define dtrace_cmpset_long atomic_cmpset_long
#define DTRACE_DEBUG_BUFR_SIZE (32 * 1024)
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
