/hg/icedtea6: 2009-12-08 Gary Benson <gbenson at redhat.com>
gbenson at icedtea.classpath.org
gbenson at icedtea.classpath.org
Tue Dec 8 02:32:53 PST 2009
changeset 5dfa3c51f1e5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5dfa3c51f1e5
author: Gary Benson <gbenson at redhat.com>
date: Tue Dec 08 10:37:26 2009 +0000
2009-12-08 Gary Benson <gbenson at redhat.com>
* patches/zero/6896043.patch: New file.
* patches/icedtea-cc-interp-backedge.patch: Removed.
* patches/icedtea-cc-interp-jvmti.patch: Likewise.
* patches/icedtea-ia64-bugfix.patch: Likewise.
* patches/icedtea-s390-serialize.patch: Likewise.
* patches/icedtea-test-atomic-operations.patch: Likewise.
* Makefile.am (ICEDTEA_PATCHES): Updated.
diffstat:
8 files changed, 124 insertions(+), 104 deletions(-)
ChangeLog | 10 ++
Makefile.am | 6 -
patches/icedtea-cc-interp-backedge.patch | 30 ------
patches/icedtea-cc-interp-jvmti.patch | 13 --
patches/icedtea-ia64-bugfix.patch | 16 ---
patches/icedtea-s390-serialize.patch | 15 ---
patches/icedtea-test-atomic-operations.patch | 25 -----
patches/zero/6896043.patch | 113 ++++++++++++++++++++++++++
diffs (291 lines):
diff -r e7ca0bef8351 -r 5dfa3c51f1e5 ChangeLog
--- a/ChangeLog Tue Dec 08 09:42:47 2009 +0000
+++ b/ChangeLog Tue Dec 08 10:37:26 2009 +0000
@@ -1,3 +1,13 @@ 2009-12-08 Gary Benson <gbenson at redhat
+2009-12-08 Gary Benson <gbenson at redhat.com>
+
+ * patches/zero/6896043.patch: New file.
+ * patches/icedtea-cc-interp-backedge.patch: Removed.
+ * patches/icedtea-cc-interp-jvmti.patch: Likewise.
+ * patches/icedtea-ia64-bugfix.patch: Likewise.
+ * patches/icedtea-s390-serialize.patch: Likewise.
+ * patches/icedtea-test-atomic-operations.patch: Likewise.
+ * Makefile.am (ICEDTEA_PATCHES): Updated.
+
2009-12-08 Gary Benson <gbenson at redhat.com>
* Makefile.am
diff -r e7ca0bef8351 -r 5dfa3c51f1e5 Makefile.am
--- a/Makefile.am Tue Dec 08 09:42:47 2009 +0000
+++ b/Makefile.am Tue Dec 08 10:37:26 2009 +0000
@@ -509,9 +509,8 @@ ICEDTEA_PATCHES = \
ICEDTEA_PATCHES = \
patches/zero/6890308.patch \
patches/zero/6891677.patch \
+ patches/zero/6896043.patch \
patches/icedtea-notice-safepoints.patch \
- patches/icedtea-test-atomic-operations.patch \
- patches/icedtea-ia64-bugfix.patch \
patches/icedtea-parisc-opt.patch \
patches/icedtea-lucene-crash.patch \
patches/icedtea-version.patch \
@@ -566,7 +565,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-6761856-freetypescaler.patch \
patches/icedtea-testenv.patch \
patches/icedtea-samejvm-safe.patch \
- patches/icedtea-cc-interp-jvmti.patch \
patches/icedtea-pr261.patch \
patches/icedtea-doc-headers.patch \
patches/openjdk/bidi-tests.patch \
@@ -593,7 +591,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-demo-swingapplet.patch \
patches/icedtea-awt-window-size.patch \
patches/icedtea-java2d-dasher.patch \
- patches/icedtea-cc-interp-backedge.patch \
patches/icedtea-xml-encodinginfo.patch \
patches/icedtea-jtreg-6592792.patch \
patches/icedtea-s390-noinline.patch \
@@ -608,7 +605,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-explicit-target-arch.patch \
patches/openjdk/6432567-debugger-socket-overflow.patch \
patches/icedtea-gcc-stack-markings.patch \
- patches/icedtea-s390-serialize.patch \
patches/openjdk/6879689-hotspot_warning_fix.patch \
patches/icedtea-no-precompiled.patch \
patches/icedtea-6897844-xshm.patch
diff -r e7ca0bef8351 -r 5dfa3c51f1e5 patches/icedtea-cc-interp-backedge.patch
--- a/patches/icedtea-cc-interp-backedge.patch Tue Dec 08 09:42:47 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-diff -r e0f4330c215b openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
---- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Feb 20 16:46:08 2009 +0000
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Feb 20 17:12:20 2009 +0000
-@@ -281,7 +281,7 @@
-
- #define DO_BACKEDGE_CHECKS(skip, branch_pc) \
- if ((skip) <= 0) { \
-- if (UseCompiler && UseLoopCounter) { \
-+ if (UseLoopCounter) { \
- bool do_OSR = UseOnStackReplacement; \
- BACKEDGE_COUNT->increment(); \
- if (do_OSR) do_OSR = BACKEDGE_COUNT->reached_InvocationLimit(); \
-@@ -289,16 +289,12 @@
- nmethod* osr_nmethod; \
- OSR_REQUEST(osr_nmethod, branch_pc); \
- if (osr_nmethod != NULL && osr_nmethod->osr_entry_bci() != InvalidOSREntryBci) { \
-- intptr_t* buf; \
-- CALL_VM(buf=SharedRuntime::OSR_migration_begin(THREAD), handle_exception); \
-+ intptr_t* buf = SharedRuntime::OSR_migration_begin(THREAD); \
- istate->set_msg(do_osr); \
- istate->set_osr_buf((address)buf); \
- istate->set_osr_entry(osr_nmethod->osr_entry()); \
- return; \
- } \
-- } else { \
-- INCR_INVOCATION_COUNT; \
-- SAFEPOINT; \
- } \
- } /* UseCompiler ... */ \
- INCR_INVOCATION_COUNT; \
diff -r e7ca0bef8351 -r 5dfa3c51f1e5 patches/icedtea-cc-interp-jvmti.patch
--- a/patches/icedtea-cc-interp-jvmti.patch Tue Dec 08 09:42:47 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- openjdk/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp 2008-12-24 12:01:18.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp 2008-12-24 12:00:29.000000000 +0000
-@@ -115,8 +115,10 @@
- jvmtiCapabilities jc;
-
- memset(&jc, 0, sizeof(jc));
-+#ifndef CC_INTERP
- jc.can_pop_frame = 1;
- jc.can_force_early_return = 1;
-+#endif // !CC_INTERP
- jc.can_get_source_debug_extension = 1;
- jc.can_access_local_variables = 1;
- jc.can_maintain_original_method_order = 1;
diff -r e7ca0bef8351 -r 5dfa3c51f1e5 patches/icedtea-ia64-bugfix.patch
--- a/patches/icedtea-ia64-bugfix.patch Tue Dec 08 09:42:47 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-diff -r 114e54fc994e openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
---- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Apr 04 09:33:18 2008 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Apr 04 09:34:11 2008 +0100
-@@ -1281,12 +1281,7 @@ run:
- jfloat f;
- jdouble r;
- f = STACK_FLOAT(-1);
--#ifdef IA64
-- // IA64 gcc bug
-- r = ( f == 0.0f ) ? (jdouble) f : (jdouble) f + ia64_double_zero;
--#else
- r = (jdouble) f;
--#endif
- MORE_STACK(-1); // POP
- SET_STACK_DOUBLE(r, 1);
- UPDATE_PC_AND_TOS_AND_CONTINUE(1, 2);
diff -r e7ca0bef8351 -r 5dfa3c51f1e5 patches/icedtea-s390-serialize.patch
--- a/patches/icedtea-s390-serialize.patch Tue Dec 08 09:42:47 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-diff -r 54de806cda4f -r 16b4f99fe54e openjdk-ecj/hotspot/src/share/vm/runtime/os.hpp
---- openjdk/hotspot/src/share/vm/runtime/os.hpp Fri Oct 02 14:46:11 2009 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/os.hpp Fri Oct 02 15:28:00 2009 +0100
-@@ -300,6 +300,11 @@
- // of the form:
- // return ((_mem_serialize_page ^ addr) & -pagesize) == 0
- //
-+#ifdef S390
-+ // s390 is one of those "some platforms"
-+ if (addr == (address)_mem_serialize_page)
-+ return true;
-+#endif // S390
- thr_addr = (address)(((uintptr_t)thread >>
- get_serialize_page_shift_count()) &
- get_serialize_page_mask()) + (uintptr_t)_mem_serialize_page;
diff -r e7ca0bef8351 -r 5dfa3c51f1e5 patches/icedtea-test-atomic-operations.patch
--- a/patches/icedtea-test-atomic-operations.patch Tue Dec 08 09:42:47 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-diff -r d384f5a5bd0c hotspot/src/share/vm/prims/jni.cpp
---- openjdk/hotspot/src/share/vm/prims/jni.cpp Mon Aug 06 13:11:51 2007 +0100
-+++ openjdk/hotspot/src/share/vm/prims/jni.cpp Fri Sep 14 09:58:33 2007 +0100
-@@ -3209,6 +3209,21 @@ _JNI_IMPORT_OR_EXPORT_ jint JNICALL JNI_
- jint result = JNI_ERR;
- DT_RETURN_MARK(CreateJavaVM, jint, (const jint&)result);
-
-+ // We're about to use Atomic::xchg for locking. On Zero platforms
-+ // this is implemented using the GCC builtin __sync_lock_test_and_set
-+ // which is not guaranteed to do what we're using it for on all
-+ // platforms. So we check it works before doing anything else.
-+#if defined(ZERO) && defined(ASSERT)
-+ {
-+ jint a = 0xCAFEBABE;
-+ jint b = Atomic::xchg(0xC0FFEE, &a);
-+ void *c = &a;
-+ void *d = Atomic::xchg_ptr(&b, &c);
-+ assert(a == 0xC0FFEE && b == (jint) 0xCAFEBABE, "Atomic::xchg() works");
-+ assert(c == &b && d == &a, "Atomic::xchg_ptr() works");
-+ }
-+#endif // ZERO && ASSERT
-+
- // At the moment it's only possible to have one Java VM,
- // since some of the runtime state is in global variables.
-
diff -r e7ca0bef8351 -r 5dfa3c51f1e5 patches/zero/6896043.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/zero/6896043.patch Tue Dec 08 10:37:26 2009 +0000
@@ -0,0 +1,113 @@
+diff -r de44705e6b33 -r 8e7adf982378 src/share/vm/interpreter/bytecodeInterpreter.cpp
+--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Tue Nov 24 11:49:42 2009 -0800
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Nov 27 07:56:58 2009 -0800
+@@ -281,7 +281,7 @@
+
+ #define DO_BACKEDGE_CHECKS(skip, branch_pc) \
+ if ((skip) <= 0) { \
+- if (UseCompiler && UseLoopCounter) { \
++ if (UseLoopCounter) { \
+ bool do_OSR = UseOnStackReplacement; \
+ BACKEDGE_COUNT->increment(); \
+ if (do_OSR) do_OSR = BACKEDGE_COUNT->reached_InvocationLimit(); \
+@@ -289,16 +289,12 @@
+ nmethod* osr_nmethod; \
+ OSR_REQUEST(osr_nmethod, branch_pc); \
+ if (osr_nmethod != NULL && osr_nmethod->osr_entry_bci() != InvalidOSREntryBci) { \
+- intptr_t* buf; \
+- CALL_VM(buf=SharedRuntime::OSR_migration_begin(THREAD), handle_exception); \
++ intptr_t* buf = SharedRuntime::OSR_migration_begin(THREAD); \
+ istate->set_msg(do_osr); \
+ istate->set_osr_buf((address)buf); \
+ istate->set_osr_entry(osr_nmethod->osr_entry()); \
+ return; \
+ } \
+- } else { \
+- INCR_INVOCATION_COUNT; \
+- SAFEPOINT; \
+ } \
+ } /* UseCompiler ... */ \
+ INCR_INVOCATION_COUNT; \
+@@ -1281,12 +1277,7 @@
+ jfloat f;
+ jdouble r;
+ f = STACK_FLOAT(-1);
+-#ifdef IA64
+- // IA64 gcc bug
+- r = ( f == 0.0f ) ? (jdouble) f : (jdouble) f + ia64_double_zero;
+-#else
+ r = (jdouble) f;
+-#endif
+ MORE_STACK(-1); // POP
+ SET_STACK_DOUBLE(r, 1);
+ UPDATE_PC_AND_TOS_AND_CONTINUE(1, 2);
+diff -r de44705e6b33 -r 8e7adf982378 src/share/vm/prims/jni.cpp
+--- openjdk/hotspot/src/share/vm/prims/jni.cpp Tue Nov 24 11:49:42 2009 -0800
++++ openjdk/hotspot/src/share/vm/prims/jni.cpp Fri Nov 27 07:56:58 2009 -0800
+@@ -3231,6 +3231,21 @@
+ jint result = JNI_ERR;
+ DT_RETURN_MARK(CreateJavaVM, jint, (const jint&)result);
+
++ // We're about to use Atomic::xchg for synchronization. Some Zero
++ // platforms use the GCC builtin __sync_lock_test_and_set for this,
++ // but __sync_lock_test_and_set is not guaranteed to do what we want
++ // on all architectures. So we check it works before relying on it.
++#if defined(ZERO) && defined(ASSERT)
++ {
++ jint a = 0xcafebabe;
++ jint b = Atomic::xchg(0xdeadbeef, &a);
++ void *c = &a;
++ void *d = Atomic::xchg_ptr(&b, &c);
++ assert(a == 0xdeadbeef && b == (jint) 0xcafebabe, "Atomic::xchg() works");
++ assert(c == &b && d == &a, "Atomic::xchg_ptr() works");
++ }
++#endif // ZERO && ASSERT
++
+ // At the moment it's only possible to have one Java VM,
+ // since some of the runtime state is in global variables.
+
+diff -r de44705e6b33 -r 8e7adf982378 src/share/vm/prims/jvmtiManageCapabilities.cpp
+--- openjdk/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp Tue Nov 24 11:49:42 2009 -0800
++++ openjdk/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp Fri Nov 27 07:56:58 2009 -0800
+@@ -115,8 +115,10 @@
+ jvmtiCapabilities jc;
+
+ memset(&jc, 0, sizeof(jc));
++#ifndef CC_INTERP
+ jc.can_pop_frame = 1;
+ jc.can_force_early_return = 1;
++#endif // !CC_INTERP
+ jc.can_get_source_debug_extension = 1;
+ jc.can_access_local_variables = 1;
+ jc.can_maintain_original_method_order = 1;
+diff -r de44705e6b33 -r 8e7adf982378 src/share/vm/runtime/os.hpp
+--- openjdk/hotspot/src/share/vm/runtime/os.hpp Tue Nov 24 11:49:42 2009 -0800
++++ openjdk/hotspot/src/share/vm/runtime/os.hpp Fri Nov 27 07:56:58 2009 -0800
+@@ -294,19 +294,16 @@
+ }
+
+ static bool is_memory_serialize_page(JavaThread *thread, address addr) {
+- address thr_addr;
+ if (UseMembar) return false;
+- // Calculate thread specific address
++ // Previously this function calculated the exact address of this
++ // thread's serialize page, and checked if the faulting address
++ // was equal. However, some platforms mask off faulting addresses
++ // to the page size, so now we just check that the address is
++ // within the page. This makes the thread argument unnecessary,
++ // but we retain the NULL check to preserve existing behaviour.
+ if (thread == NULL) return false;
+- // TODO-FIXME: some platforms mask off faulting addresses to the base pagesize.
+- // Instead of using a test for equality we should probably use something
+- // of the form:
+- // return ((_mem_serialize_page ^ addr) & -pagesize) == 0
+- //
+- thr_addr = (address)(((uintptr_t)thread >>
+- get_serialize_page_shift_count()) &
+- get_serialize_page_mask()) + (uintptr_t)_mem_serialize_page;
+- return (thr_addr == addr);
++ address page = (address) _mem_serialize_page;
++ return addr >= page && addr < (page + os::vm_page_size());
+ }
+
+ static void block_on_serialize_page_trap();
More information about the distro-pkg-dev
mailing list