Module Name: src
Committed By: uwe
Date: Tue Oct 13 12:55:53 UTC 2009
Modified Files:
src/sys/arch/sh3/include: lock.h
Log Message:
Fix inline asm for tas.b. "=m" is not restrictive enough and gcc may
decide to use addressing modes that tas.b does not support. 'V' is
advertised to be "non-offsettable" subset of 'm' but there's a bug in
gcc that prevents "=V" from working.
When in doubt use brute force, so pass lock pointer as "r" input and
declare "memory" as clobbered.
Landisk kernel diff is 5 instructions (register choice for lock
address in __cpu_simple_lock_try).
sys/dev/raidframe/rf_copyback.c - where old __asm triggered incorrect code
- successfully compiles (as part of sys/rump/dev/lib/libraidframe).
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sh3/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/sh3/include/lock.h
diff -u src/sys/arch/sh3/include/lock.h:1.15 src/sys/arch/sh3/include/lock.h:1.16
--- src/sys/arch/sh3/include/lock.h:1.15 Mon Apr 28 20:23:35 2008
+++ src/sys/arch/sh3/include/lock.h Tue Oct 13 12:55:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.15 2008/04/28 20:23:35 martin Exp $ */
+/* $NetBSD: lock.h,v 1.16 2009/10/13 12:55:53 uwe Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -81,11 +81,11 @@
{
__asm volatile(
- "1: tas.b %0 \n"
+ "1: tas.b @%0 \n"
" bf 1b \n"
- : "=m" (*alp)
- : /* no inputs */
- : "cc");
+ : /* no outputs */
+ : "r" (alp)
+ : "cc", "memory");
}
static __inline int
@@ -94,11 +94,11 @@
int __rv;
__asm volatile(
- " tas.b %0 \n"
- " movt %1 \n"
- : "=m" (*alp), "=r" (__rv)
- : /* no inputs */
- : "cc");
+ " tas.b @%1 \n"
+ " movt %0 \n"
+ : "=r" (__rv)
+ : "r" (alp)
+ : "cc", "memory");
return (__rv);
}
