[patch committed libjava] Update sysdep/sh/locks.h with atomic builtins

Kaz Kojima kkojima@rr.iij4u.or.jp
Thu Jun 14 22:59:00 GMT 2012


Hi,

I've applied the attached patch which updates libjava/sysdep/sh/locks.h
with new atomic builtins.  Tested on sh4-unknown-linux-gnu with no new
failures.

Regards,
	kaz
--
2012-06-14  Kaz Kojima  <kkojima@gcc.gnu.org>

	* sysdep/sh/locks.h (__cas_lock): Remove.
	(__cas_start_atomic, __cas_end_atomic): Likewise.
	(compare_and_swap): Call __sync_bool_compare_and_swap.

--- ORIG/trunk/libjava/sysdep/sh/locks.h	2007-01-13 09:53:55.000000000 +0900
+++ trunk/libjava/sysdep/sh/locks.h	2012-06-14 19:18:34.000000000 +0900
@@ -14,45 +14,11 @@ details.  */
 typedef size_t obj_addr_t;	/* Integer type big enough for object	*/
 				/* address.				*/
 
-static unsigned char __cas_lock = 0;
-
-inline static void
-__cas_start_atomic (void)
-{
-  unsigned int val;
-
-  do
-    __asm__ __volatile__ ("tas.b @%1; movt %0"
-			  : "=r" (val)
-			  : "r" (&__cas_lock)
-			  : "memory");
-  while (val == 0);
-}
-
-inline static void
-__cas_end_atomic (void)
-{
-  __asm__ __volatile__ (" " : : : "memory");
-  __cas_lock = 0;
-}
-
 inline static bool
 compare_and_swap (volatile obj_addr_t *addr, obj_addr_t old,
 		  obj_addr_t new_val)
 {
-  bool ret;
-
-  __cas_start_atomic ();
-  if (*addr != old)
-    ret = false;
-  else
-    {
-      *addr = new_val;
-      ret = true;
-    }
-  __cas_end_atomic ();
-
-  return ret;
+  return __sync_bool_compare_and_swap (addr, old, new_val);
 }
 
 inline static void



More information about the Java-patches mailing list