Update.

2003-05-28  Kaz Kojima  <kkojima@rr.iij4u.or.jp>

	* sysdeps/sh/tcb-offsets.sym: Define MUTEX_FUTEX.
	* sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h (pthread_cond_t):
        Add __mutex field.
	* sysdeps/unix/sysv/linux/sh/lowlevellock.h (SYSCALL_WITH_INST_PAD):
	Define.
	(lll_futex_wait, lll_futex_wake): Define.
	* sysdeps/unix/sysv/linux/sh/sh4/lowlevellock.h: New file.
	* sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S: Try using
	FUTEX_REQUEUE instead of FUTEX_WAIT.
	* sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S: Likewise.
	* sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S: Remember
	mutex which was used in condvar structure.  Call
	__pthread_mutex_cond_lock instead of __pthread_mutex_lock_internal.
	* sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S: Likewise.

	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_rdlock.S: Don't
	include tcb-offsets.h.  Read wakeup value in locked region.
	Use the value of gbr register as THREAD_ID.
	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_wrlock.S: Likewise.
	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedrdlock.S: Likewise.
	* sysdeps/unix/sysv/linux/sh/pthread_rwlock_timedwrlock.S: Likewise.

	* sysdeps/unix/sysv/linux/sh/sem_trywait.S: Remove futex related
	macros.

1 files changed, 58 insertions, 0 deletions

diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
index 7e00fd01da..8ac8416011 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
+++ b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
@@ -73,6 +73,24 @@ extern int __lll_mutex_unlock_wake (int *__futex) attribute_hidden;
 	    if (__result) \
 	      __lll_mutex_lock_wait (__result, __futex); })
 
+/* Special version of lll_mutex_lock which causes the unlock function to
+   always wakeup waiters.  */
+#define lll_mutex_cond_lock(futex) \
+  (void) ({ int __result, val, *__futex = &(futex); \
+	    __asm __volatile ("\
+		.align 2\n\
+		mova 1f,r0\n\
+		mov r15,r1\n\
+		mov #-6,r15\n\
+	     0: mov.l @%2,%0\n\
+		add %0,%1\n\
+		mov.l %1,@%2\n\
+	     1: mov r1,r15"\
+		: "=&r" (__result), "=&r" (val) : "r" (__futex), "1" (2) \
+		: "r0", "r1", "memory"); \
+	    if (__result) \
+	      __lll_mutex_lock_wait (__result, __futex); })
+
 #define lll_mutex_timedlock(futex, timeout) \
   ({ int __result, val, *__futex = &(futex); \
      __asm __volatile ("\
@@ -121,6 +139,46 @@ typedef int lll_lock_t;
 #define LLL_LOCK_INITIALIZER_LOCKED	(0)
 
 
+# ifdef NEED_SYSCALL_INST_PAD
+#  define SYSCALL_WITH_INST_PAD "\
+	trapa #0x14; or r0,r0; or r0,r0; or r0,r0; or r0,r0; or r0,r0"
+# else
+#  define SYSCALL_WITH_INST_PAD "\
+	trapa #0x14"
+# endif
+
+#define lll_futex_wait(futex, val) \
+  do { \
+    int __ignore; \
+    register unsigned long __r3 asm ("r3") = SYS_futex; \
+    register unsigned long __r4 asm ("r4") = (unsigned long) (futex); \
+    register unsigned long __r5 asm ("r5") = FUTEX_WAIT; \
+    register unsigned long __r6 asm ("r6") = (unsigned long) (val); \
+    register unsigned long __r7 asm ("r7") = 0; \
+    __asm __volatile (SYSCALL_WITH_INST_PAD \
+		      : "=z" (__ignore) \
+		      : "r" (__r3), "r" (__r4), "r" (__r5), \
+			"r" (__r6), "r" (__r7) \
+		      : "memory", "t"); \
+  } while (0)
+
+
+#define lll_futex_wake(futex, nr) \
+  do { \
+    int __ignore; \
+    register unsigned long __r3 asm ("r3") = SYS_futex; \
+    register unsigned long __r4 asm ("r4") = (unsigned long) (futex); \
+    register unsigned long __r5 asm ("r5") = FUTEX_WAKE; \
+    register unsigned long __r6 asm ("r6") = (unsigned long) (nr); \
+    register unsigned long __r7 asm ("r7") = 0; \
+    __asm __volatile (SYSCALL_WITH_INST_PAD \
+		      : "=z" (__ignore) \
+		      : "r" (__r3), "r" (__r4), "r" (__r5), \
+			"r" (__r6), "r" (__r7) \
+		      : "memory", "t"); \
+  } while (0)
+
+
 extern int __lll_lock_wait (int val, int *__futex) attribute_hidden;
 extern int __lll_unlock_wake (int *__futex) attribute_hidden;
 extern int lll_unlock_wake_cb (int *__futex) attribute_hidden;