This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[Patch] Make MIPS64 libgcj fully functional.
- From: David Daney <ddaney at avtrex dot com>
- To: java-patches at gcc dot gnu dot org
- Cc: Richard Sandiford <richard at codesourcery dot com>
- Date: Mon, 10 Sep 2007 00:37:34 -0700
- Subject: [Patch] Make MIPS64 libgcj fully functional.
This patch makes mips64 a full fledged citizen in libgcj.
With the n32 ABI my last test run showed vary few FAILs, I will re-run
after my atomic memory changes go in. The n64 ABI has a few more
failures, but Works somewhat. I will probably fix up any n64 problems
later.
OK to commit?
2007-09-10 David Daney <ddaney@avtrex.com>
* configure.host: Enable interpreter for mips64. Enable hash
synchronization for all mips*-*-linux* targets.
* sysdep/mips/locks.h (compare_and_swap, compare_and_swap_release) Use
__sync_bool_compare_and_swap instead of in-line asm.
(release_set, read_barrier, write_barrier): Use __sync_synchronize
instead of in-line asm.
Index: configure.host
===================================================================
--- configure.host (revision 128245)
+++ configure.host (working copy)
@@ -98,7 +98,7 @@ case "${host}" in
enable_java_net_default=no
enable_getenv_properties_default=no
;;
- mipsel-*|mips-*)
+ mips*-*)
libgcj_interpreter=yes
;;
i686-*|i586-*|i486-*|i386-*)
@@ -283,11 +283,7 @@ EOF
sysdeps_dir=mips
can_unwind_signal=yes
DIVIDESPEC=-fno-use-divide-subroutine
- case "${host}" in
- mipsel*-linux* | mipsisa32el*-linux*)
- enable_hash_synchronization_default=yes
- ;;
- esac
+ enable_hash_synchronization_default=yes
;;
powerpc*-*-darwin*)
enable_hash_synchronization_default=yes
Index: sysdep/mips/locks.h
===================================================================
--- sysdep/mips/locks.h (revision 128245)
+++ sysdep/mips/locks.h (working copy)
@@ -22,29 +22,9 @@ typedef unsigned obj_addr_t __attribute_
inline static bool
compare_and_swap(volatile obj_addr_t *addr,
obj_addr_t old,
- obj_addr_t new_val)
+ obj_addr_t new_val)
{
- long result;
- __asm__ __volatile__(".set\tpush\n\t"
- ".set\tnoreorder\n\t"
- ".set\tnomacro\n\t"
- "1:\n\t"
-#if _MIPS_SIM == _ABIO32
- ".set\tmips2\n\t"
-#endif
- "ll\t%[result],0(%[addr])\n\t"
- "bne\t%[result],%[old],2f\n\t"
- "move\t%[result],$0\n\t" // delay slot
- "move\t%[result],%[new_val]\n\t"
- "sc\t%[result],0(%[addr])\n\t"
- "beq\t%[result],$0,1b\n\t"
- "nop\n\t" // delay slot
- "2:\n\t"
- ".set\tpop"
- : [result] "=&r" (result)
- : [addr] "r" (addr), [new_val] "r" (new_val), [old] "r"(old)
- : "memory");
- return (bool) result;
+ return __sync_bool_compare_and_swap(addr, old, new_val);
}
// Set *addr to new_val with release semantics, i.e. making sure
@@ -53,12 +33,7 @@ compare_and_swap(volatile obj_addr_t *ad
inline static void
release_set(volatile obj_addr_t *addr, obj_addr_t new_val)
{
- __asm__ __volatile__(".set\tpush\n\t"
-#if _MIPS_SIM == _ABIO32
- ".set\tmips2\n\t"
-#endif
- "sync\n\t"
- ".set\tpop" : : : "memory");
+ __sync_synchronize();
*(addr) = new_val;
}
@@ -67,16 +42,10 @@ release_set(volatile obj_addr_t *addr, o
// implementation can be the same.
inline static bool
compare_and_swap_release(volatile obj_addr_t *addr,
- obj_addr_t old,
- obj_addr_t new_val)
+ obj_addr_t old,
+ obj_addr_t new_val)
{
- __asm__ __volatile__(".set\tpush\n\t"
-#if _MIPS_SIM == _ABIO32
- ".set\tmips2\n\t"
-#endif
- "sync\n\t"
- ".set\tpop" : : : "memory");
- return compare_and_swap(addr, old, new_val);
+ return __sync_bool_compare_and_swap(addr, old, new_val);
}
// Ensure that subsequent instructions do not execute on stale
@@ -85,12 +54,7 @@ compare_and_swap_release(volatile obj_ad
inline static void
read_barrier()
{
- __asm__ __volatile__(".set\tpush\n\t"
-#if _MIPS_SIM == _ABIO32
- ".set\tmips2\n\t"
-#endif
- "sync\n\t"
- ".set\tpop" : : : "memory");
+ __sync_synchronize();
}
// Ensure that prior stores to memory are completed with respect to other
@@ -98,12 +62,7 @@ read_barrier()
inline static void
write_barrier()
{
- __asm__ __volatile__(".set\tpush\n\t"
-#if _MIPS_SIM == _ABIO32
- ".set\tmips2\n\t"
-#endif
- "sync\n\t"
- ".set\tpop" : : : "memory");
+ __sync_synchronize();
}
#endif // __SYSDEP_LOCKS_H__