changeset in /hg/icedtea6: 2008-09-12 Gary Benson <gbenson at red...
Gary Benson
gbenson at redhat.com
Fri Sep 12 07:20:14 PDT 2008
changeset 8306580ee906 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8306580ee906
description:
2008-09-12 Gary Benson <gbenson at redhat.com>
Xerxes R?nby <xerxes at zafena.se>
* ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
(__m68k_cmpxchg): New function.
(m68k_compare_and_swap): Likewise.
(m68k_add_and_fetch): Likewise.
(m68k_lock_test_and_set): Likewise.
(Atomic::add): Use the above on m68k.
(Atomic::add_ptr): Likewise.
(Atomic::xchg): Likewise.
(Atomic::xchg_ptr): Likewise.
(Atomic::cmpxchg): Likewise.
(Atomic::cmpxchg_ptr): Likewise.
diffstat:
2 files changed, 114 insertions(+)
ChangeLog | 15 +
ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 99 ++++++++++
diffs (184 lines):
diff -r 8b0e11483252 -r 8306580ee906 ChangeLog
--- a/ChangeLog Thu Sep 11 20:47:50 2008 +0200
+++ b/ChangeLog Fri Sep 12 15:20:06 2008 +0100
@@ -1,3 +1,18 @@ 2008-09-11 Mark Wielaard <mark at klomp.o
+2008-09-12 Gary Benson <gbenson at redhat.com>
+ Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
+ (__m68k_cmpxchg): New function.
+ (m68k_compare_and_swap): Likewise.
+ (m68k_add_and_fetch): Likewise.
+ (m68k_lock_test_and_set): Likewise.
+ (Atomic::add): Use the above on m68k.
+ (Atomic::add_ptr): Likewise.
+ (Atomic::xchg): Likewise.
+ (Atomic::xchg_ptr): Likewise.
+ (Atomic::cmpxchg): Likewise.
+ (Atomic::cmpxchg_ptr): Likewise.
+
2008-09-11 Mark Wielaard <mark at klomp.org>
* patches/icedtea-gervill.patch: Updated patch for old tests.
diff -r 8b0e11483252 -r 8306580ee906 ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp Thu Sep 11 20:47:50 2008 +0200
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp Fri Sep 12 15:20:06 2008 +0100
@@ -24,6 +24,81 @@
*/
// Implementation of class atomic
+
+#ifdef M68K
+
+/*
+ * __m68k_cmpxchg
+ *
+ * Atomically store newval in *ptr if *ptr is equal to oldval for user space.
+ * Returns newval on success and oldval if no exchange happened.
+ * This implementation is processor specific and works on
+ * 68020 68030 68040 and 68060.
+ *
+ * It will not work on ColdFire, 68000 and 68010 since they lack the CAS
+ * instruction.
+ * Using a kernelhelper would be better for arch complete implementation.
+ *
+ */
+
+static inline int __m68k_cmpxchg(int oldval, int newval, volatile int *ptr)
+{
+ int ret;
+ __asm __volatile ("cas%.l %0,%2,%1"
+ : "=d" (ret), "+m" (*(ptr))
+ : "d" (newval), "0" (oldval));
+ return ret;
+}
+
+/* Perform an atomic compare and swap: if the current value of `*PTR'
+ is OLDVAL, then write NEWVAL into `*PTR'. Return the contents of
+ `*PTR' before the operation.*/
+static inline int m68k_compare_and_swap(volatile int *ptr,
+ int oldval,
+ int newval)
+{
+ for (;;)
+ {
+ int prev = *ptr;
+ if (prev != oldval)
+ return prev;
+
+ if (__m68k_cmpxchg (prev, newval, ptr) == newval)
+ // Success.
+ return prev;
+
+ // We failed even though prev == oldval. Try again.
+ }
+}
+
+/* Atomically add an int to memory. */
+static inline int m68k_add_and_fetch(volatile int *ptr, int add_value)
+{
+ for (;;)
+ {
+ // Loop until success.
+
+ int prev = *ptr;
+
+ if (__m68k_cmpxchg (prev, prev + add_value, ptr) == prev + add_value)
+ return prev + add_value;
+ }
+}
+
+/* Atomically write VALUE into `*PTR' and returns the previous
+ contents of `*PTR'. */
+static inline int m68k_lock_test_and_set(volatile int *ptr, int newval)
+{
+ for (;;)
+ {
+ // Loop until success.
+ int prev = *ptr;
+
+ if (__m68k_cmpxchg (prev, newval, ptr) == prev)
+ return prev;
+ }
+}
+#endif // M68K
#ifdef ARM
@@ -107,7 +182,11 @@ inline jint Atomic::add(jint add_value,
#ifdef ARM
return arm_add_and_fetch(dest, add_value);
#else
+#ifdef M68K
+ return m68k_add_and_fetch(dest, add_value);
+#else
return __sync_add_and_fetch(dest, add_value);
+#endif // M68K
#endif // ARM
}
@@ -116,7 +195,11 @@ inline intptr_t Atomic::add_ptr(intptr_t
#ifdef ARM
return arm_add_and_fetch(dest, add_value);
#else
+#ifdef M68K
+ return m68k_add_and_fetch(dest, add_value);
+#else
return __sync_add_and_fetch(dest, add_value);
+#endif // M68K
#endif // ARM
}
@@ -159,12 +242,16 @@ inline jint Atomic::xchg(jint exchange_v
{
#ifdef ARM
return arm_lock_test_and_set(dest, exchange_value);
+#else
+#ifdef M68K
+ return m68k_lock_test_and_set(dest, exchange_value);
#else
// __sync_lock_test_and_set is a bizarrely named atomic exchange
// operation. Note that some platforms only support this with the
// limitation that the only valid value to store is the immediate
// constant 1. There is a test for this in JNI_CreateJavaVM().
return __sync_lock_test_and_set (dest, exchange_value);
+#endif // M68K
#endif // ARM
}
@@ -173,7 +260,11 @@ inline intptr_t Atomic::xchg_ptr(intptr_
#ifdef ARM
return arm_lock_test_and_set(dest, exchange_value);
#else
+#ifdef M68K
+ return m68k_lock_test_and_set(dest, exchange_value);
+#else
return __sync_lock_test_and_set (dest, exchange_value);
+#endif // M68K
#endif // ARM
}
@@ -189,7 +280,11 @@ inline jint Atomic::cmpxchg(jint exchang
#ifdef ARM
return arm_compare_and_swap(dest, compare_value, exchange_value);
#else
+#ifdef M68K
+ return m68k_compare_and_swap(dest, compare_value, exchange_value);
+#else
return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+#endif // M68K
#endif // ARM
}
@@ -206,7 +301,11 @@ inline intptr_t Atomic::cmpxchg_ptr(intp
#ifdef ARM
return arm_compare_and_swap(dest, compare_value, exchange_value);
#else
+#ifdef M68K
+ return m68k_compare_and_swap(dest, compare_value, exchange_value);
+#else
return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+#endif // M68K
#endif // ARM
}
More information about the distro-pkg-dev
mailing list