* configure.host: Enable hash synchronization for alpha*-*.

* include/posix-threads.h (_Jv_ThreadSelf): Added inline function for alpha.
* java/lang/natObject.cc (compare_and_swap, release_set,
compare_and_swap_release): Added inline functions for alpha.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44251 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 914f698..173a689 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-22  Jeff Sturm  <jsturm@one-point.com>
+
+       * configure.host: Enable hash synchronization for alpha*-*.
+       * include/posix-threads.h (_Jv_ThreadSelf): Added inline
+       function for alpha.
+       * java/lang/natObject.cc (compare_and_swap, release_set,
+       compare_and_swap_release): Added inline functions for alpha.
+
 2001-07-18  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
        * java/net/natPlainDatagramSocketImpl.cc (mcastGrp): Use new RFC

diff --git a/libjava/configure.host b/libjava/configure.host
index 079ccce..7ad3c3b 100644 (file)
--- a/libjava/configure.host
+++ b/libjava/configure.host
@@ -70,6 +70,7 @@ case "${host}" in
   alpha*-*)
        libgcj_flags="${libgcj_flags} -mieee"
        libgcj_interpreter=yes
+       enable_hash_synchronization_default=yes
        ;;
   powerpc*-*)
        libgcj_interpreter=yes

diff --git a/libjava/include/posix-threads.h b/libjava/include/posix-threads.h
index e033209..a268f1d 100644 (file)
--- a/libjava/include/posix-threads.h
+++ b/libjava/include/posix-threads.h
@@ -250,6 +250,24 @@ _Jv_ThreadSelf (void)
 
 #endif /* __ia64__ */
 
+#ifdef __alpha__
+
+#include <asm/pal.h>
+
+typedef unsigned long _Jv_ThreadId_t;
+
+inline _Jv_ThreadId_t
+_Jv_ThreadSelf (void)
+{
+  unsigned long id;
+  __asm__ ("call_pal %1\n\tmov $0, %0" : "=r"(id) : "i"(PAL_rduniq) : "$0");
+  return id;
+}
+
+#define JV_SELF_DEFINED
+
+#endif /* __alpha__ */
+
 #if defined(SLOW_PTHREAD_SELF)
 
 typedef pthread_t _Jv_ThreadId_t;

diff --git a/libjava/java/lang/natObject.cc b/libjava/java/lang/natObject.cc
index 956b944..adb487a 100644 (file)
--- a/libjava/java/lang/natObject.cc
+++ b/libjava/java/lang/natObject.cc
@@ -391,6 +391,44 @@ typedef size_t obj_addr_t; /* Integer type big enough for object   */
   }
 #endif
 
+#if defined(__GNUC__) && defined(__alpha__)
+  inline static bool
+  compare_and_swap(volatile obj_addr_t *addr,
+                                               obj_addr_t old,
+                                               obj_addr_t new_val) 
+  {
+    unsigned long oldval;
+    char result;
+    __asm__ __volatile__(
+       "1:ldq_l %0, %1\n\t" \
+       "cmpeq %0, %5, %2\n\t" \
+       "beq %2, 2f\n\t" \
+       "mov %3, %0\n\t" \
+       "stq_c %0, %1\n\t" \
+       "bne %0, 2f\n\t" \
+       "br 1b\n\t" \
+       "2:mb"
+               : "=&r"(oldval), "=m"(*addr), "=&r"(result)
+               : "r" (new_val), "m"(*addr), "r"(old) : "memory");
+    return (bool) result;
+  }
+
+  inline static void
+  release_set(volatile obj_addr_t *addr, obj_addr_t new_val)
+  {
+    __asm__ __volatile__("mb" : : : "memory");
+    *(addr) = new_val;
+  }
+
+  inline static bool
+  compare_and_swap_release(volatile obj_addr_t *addr,
+                                                      obj_addr_t old,
+                                                      obj_addr_t new_val)
+  {
+    return compare_and_swap(addr, old, new_val);
+  }
+#endif
+
 // Try to determine whether we are on a multiprocessor, i.e. whether
 // spinning may be profitable.
 // This should really use a suitable autoconf macro.