Module Name: src Committed By: matt Date: Mon Jul 23 12:36:41 UTC 2012
Modified Files: src/sys/arch/arm/include: lock.h Log Message: Change cmpeq to cmp and add "cc" to clobber in the ldrex/strex asm. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/include/lock.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/include/lock.h diff -u src/sys/arch/arm/include/lock.h:1.18 src/sys/arch/arm/include/lock.h:1.19 --- src/sys/arch/arm/include/lock.h:1.18 Sun Jul 15 08:26:21 2012 +++ src/sys/arch/arm/include/lock.h Mon Jul 23 12:36:41 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: lock.h,v 1.18 2012/07/15 08:26:21 matt Exp $ */ +/* $NetBSD: lock.h,v 1.19 2012/07/23 12:36:41 matt Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -83,10 +83,10 @@ __swp(int __val, volatile unsigned char "1:\t" "ldrexb\t%[__rv], [%[__ptr]]" "\n\t" "strexb\t%[__tmp], %[__val], [%[__ptr]]" "\n\t" - "cmpeq\t%[__tmp], #0" "\n\t" + "cmp\t%[__tmp], #0" "\n\t" "bne 1b" : [__rv] "=&r" (__rv), [__tmp] "=&r"(__tmp) - : [__val] "r" (__val), [__ptr] "r" (__ptr) : "memory"); + : [__val] "r" (__val), [__ptr] "r" (__ptr) : "cc", "memory"); return __rv; #else __asm volatile("swpb %0, %1, [%2]"