changeset in /hg/icedtea6: 2008-11-11 Gary Benson <gbenson at red...
Gary Benson
gbenson at redhat.com
Tue Nov 11 01:38:08 PST 2008
changeset 89e71b641b8e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=89e71b641b8e
description:
2008-11-11 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
(os::atomic_copy64): New method.
* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
(_Copy_conjoint_jlongs_atomic): Use the above.
* ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp
(OrderAccess::load_acquire): Likewise.
(OrderAccess::release_store): Likewise.
(OrderAccess::store_fence): Likewise.
(OrderAccess::release_store_fence): Likewise.
diffstat:
4 files changed, 63 insertions(+), 23 deletions(-)
ChangeLog | 12 ++
ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp | 57 ++++++----
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 4
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 13 ++
diffs (154 lines):
diff -r 28203509220a -r 89e71b641b8e ChangeLog
--- a/ChangeLog Tue Nov 11 08:45:14 2008 +0100
+++ b/ChangeLog Tue Nov 11 04:38:04 2008 -0500
@@ -1,3 +1,15 @@ 2008-11-11 Matthias Klose <doko at ubuntu
+2008-11-11 Gary Benson <gbenson at redhat.com>
+
+ * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
+ (os::atomic_copy64): New method.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+ (_Copy_conjoint_jlongs_atomic): Use the above.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp
+ (OrderAccess::load_acquire): Likewise.
+ (OrderAccess::release_store): Likewise.
+ (OrderAccess::store_fence): Likewise.
+ (OrderAccess::release_store_fence): Likewise.
+
2008-11-11 Matthias Klose <doko at ubuntu.com>
* patches/icedtea-uname.patch: Fix ARCH on powerpc-linux-gnu.
diff -r 28203509220a -r 89e71b641b8e ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp Tue Nov 11 08:45:14 2008 +0100
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp Tue Nov 11 04:38:04 2008 -0500
@@ -46,13 +46,28 @@ inline jbyte OrderAccess::load_acquir
inline jbyte OrderAccess::load_acquire(volatile jbyte* p) { return *p; }
inline jshort OrderAccess::load_acquire(volatile jshort* p) { return *p; }
inline jint OrderAccess::load_acquire(volatile jint* p) { return *p; }
-inline jlong OrderAccess::load_acquire(volatile jlong* p) { return *p; }
+inline jlong OrderAccess::load_acquire(volatile jlong* p)
+{
+ jlong tmp;
+ os::atomic_copy64(p, &tmp);
+ return tmp;
+}
inline jubyte OrderAccess::load_acquire(volatile jubyte* p) { return *p; }
inline jushort OrderAccess::load_acquire(volatile jushort* p) { return *p; }
inline juint OrderAccess::load_acquire(volatile juint* p) { return *p; }
-inline julong OrderAccess::load_acquire(volatile julong* p) { return *p; }
+inline julong OrderAccess::load_acquire(volatile julong* p)
+{
+ julong tmp;
+ os::atomic_copy64(p, &tmp);
+ return tmp;
+}
inline jfloat OrderAccess::load_acquire(volatile jfloat* p) { return *p; }
-inline jdouble OrderAccess::load_acquire(volatile jdouble* p) { return *p; }
+inline jdouble OrderAccess::load_acquire(volatile jdouble* p)
+{
+ jdouble tmp;
+ os::atomic_copy64(p, &tmp);
+ return tmp;
+}
inline intptr_t OrderAccess::load_ptr_acquire(volatile intptr_t* p) { return *p; }
inline void* OrderAccess::load_ptr_acquire(volatile void* p) { return *(void* volatile *)p; }
@@ -61,13 +76,13 @@ inline void OrderAccess::release_sto
inline void OrderAccess::release_store(volatile jbyte* p, jbyte v) { *p = v; }
inline void OrderAccess::release_store(volatile jshort* p, jshort v) { *p = v; }
inline void OrderAccess::release_store(volatile jint* p, jint v) { *p = v; }
-inline void OrderAccess::release_store(volatile jlong* p, jlong v) { *p = v; }
+inline void OrderAccess::release_store(volatile jlong* p, jlong v) { os::atomic_copy64(&v, p); }
inline void OrderAccess::release_store(volatile jubyte* p, jubyte v) { *p = v; }
inline void OrderAccess::release_store(volatile jushort* p, jushort v) { *p = v; }
inline void OrderAccess::release_store(volatile juint* p, juint v) { *p = v; }
-inline void OrderAccess::release_store(volatile julong* p, julong v) { *p = v; }
+inline void OrderAccess::release_store(volatile julong* p, julong v) { os::atomic_copy64(&v, p); }
inline void OrderAccess::release_store(volatile jfloat* p, jfloat v) { *p = v; }
-inline void OrderAccess::release_store(volatile jdouble* p, jdouble v) { *p = v; }
+inline void OrderAccess::release_store(volatile jdouble* p, jdouble v) { os::atomic_copy64(&v, p); }
inline void OrderAccess::release_store_ptr(volatile intptr_t* p, intptr_t v) { *p = v; }
inline void OrderAccess::release_store_ptr(volatile void* p, void* v) { *(void* volatile *)p = v; }
@@ -75,27 +90,27 @@ inline void OrderAccess::store_fence
inline void OrderAccess::store_fence(jbyte* p, jbyte v) { *p = v; fence(); }
inline void OrderAccess::store_fence(jshort* p, jshort v) { *p = v; fence(); }
inline void OrderAccess::store_fence(jint* p, jint v) { *p = v; fence(); }
-inline void OrderAccess::store_fence(jlong* p, jlong v) { *p = v; fence(); }
+inline void OrderAccess::store_fence(jlong* p, jlong v) { os::atomic_copy64(&v, p); fence(); }
inline void OrderAccess::store_fence(jubyte* p, jubyte v) { *p = v; fence(); }
inline void OrderAccess::store_fence(jushort* p, jushort v) { *p = v; fence(); }
inline void OrderAccess::store_fence(juint* p, juint v) { *p = v; fence(); }
-inline void OrderAccess::store_fence(julong* p, julong v) { *p = v; fence(); }
+inline void OrderAccess::store_fence(julong* p, julong v) { os::atomic_copy64(&v, p); fence(); }
inline void OrderAccess::store_fence(jfloat* p, jfloat v) { *p = v; fence(); }
-inline void OrderAccess::store_fence(jdouble* p, jdouble v) { *p = v; fence(); }
+inline void OrderAccess::store_fence(jdouble* p, jdouble v) { os::atomic_copy64(&v, p); fence(); }
inline void OrderAccess::store_ptr_fence(intptr_t* p, intptr_t v) { *p = v; fence(); }
inline void OrderAccess::store_ptr_fence(void** p, void* v) { *p = v; fence(); }
-inline void OrderAccess::release_store_fence(volatile jbyte* p, jbyte v) { *p = v; fence(); }
-inline void OrderAccess::release_store_fence(volatile jshort* p, jshort v) { *p = v; fence(); }
-inline void OrderAccess::release_store_fence(volatile jint* p, jint v) { *p = v; fence(); }
-inline void OrderAccess::release_store_fence(volatile jlong* p, jlong v) { *p = v; fence(); }
-inline void OrderAccess::release_store_fence(volatile jubyte* p, jubyte v) { *p = v; fence(); }
-inline void OrderAccess::release_store_fence(volatile jushort* p, jushort v) { *p = v; fence(); }
-inline void OrderAccess::release_store_fence(volatile juint* p, juint v) { *p = v; fence(); }
-inline void OrderAccess::release_store_fence(volatile julong* p, julong v) { *p = v; fence(); }
-inline void OrderAccess::release_store_fence(volatile jfloat* p, jfloat v) { *p = v; fence(); }
-inline void OrderAccess::release_store_fence(volatile jdouble* p, jdouble v) { *p = v; fence(); }
+inline void OrderAccess::release_store_fence(volatile jbyte* p, jbyte v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile jshort* p, jshort v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile jint* p, jint v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile jlong* p, jlong v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile jubyte* p, jubyte v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile jushort* p, jushort v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile juint* p, juint v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile julong* p, julong v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile jfloat* p, jfloat v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile jdouble* p, jdouble v) { release_store(p, v); fence(); }
-inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { *p = v; fence(); }
-inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { *(void* volatile *)p = v; fence(); }
+inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { release_store_ptr(p, v); fence(); }
+inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { release_store_ptr(p, v); fence(); }
diff -r 28203509220a -r 89e71b641b8e ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Tue Nov 11 08:45:14 2008 +0100
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Tue Nov 11 04:38:04 2008 -0500
@@ -410,14 +410,14 @@ extern "C" {
if (from > to) {
jlong *end = from + count;
while (from < end)
- *(to++) = *(from++);
+ os::atomic_copy64(from++, to++);
}
else if (from < to) {
jlong *end = from;
from += count - 1;
to += count - 1;
while (from >= end)
- *(to--) = *(from--);
+ os::atomic_copy64(from--, to--);
}
}
diff -r 28203509220a -r 89e71b641b8e ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp Tue Nov 11 08:45:14 2008 +0100
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp Tue Nov 11 04:38:04 2008 -0500
@@ -29,3 +29,16 @@
// Note: Currently only used in 64 bit Windows implementations
static bool register_code_area(char *low, char *high) { return true; }
+ // Atomically copy 64 bits of data
+ static void atomic_copy64(volatile void *src, volatile void *dst)
+ {
+#if defined(PPC) && !defined(_LP64)
+ double tmp;
+ asm volatile ("lfd %0, 0(%1)\n"
+ "stfd %0, 0(%2)\n"
+ : "=f"(tmp)
+ : "b"(src), "b"(dst));
+#else
+ *(jlong *) dst = *(jlong *) src;
+#endif // PPC && !_LP64
+ }
More information about the distro-pkg-dev
mailing list