/hg/icedtea6: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Oct 27 12:34:02 PDT 2009
changeset b80f4a839fbb in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b80f4a839fbb
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Oct 27 18:43:18 2009 +0000
Make Zero build on HotSpot 16.
2009-10-27 Andrew John Hughes <ahughes at redhat.com>
* ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp:
Empty class required by invokedynamic support.
* Makefile.am: Apply patches/hotspot/$(HSBUILD)/zero.patch
when building with an alternate HotSpot. This adds
the following changeset from IcedTea7:
2009-05-21 Andrew John Hughes <ahughes at redhat.com>
* ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp:
(delayed_value_impl(intptr_t,Register,int)): Add stub.
* ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp:
(delayed_value_impl(intptr_t,Register,int)): Declared.
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:
Handle Interpreter::method_handle.
* ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp:
(delayed_value_impl(intptr_t,Register,int)): Add stub.
* ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp:
(generate_method_handle_entry()): Declared.
* ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp:
(generate_method_handle_entry()): Add stub.
* ports/hotspot/src/cpu/zero/vm/jni_zero.h: Define jlong
depending on whether _LP64 is defined, as with format
specifier in globalDefinitions.
* ports/hotspot/src/cpu/zero/vm/register_zero.hpp: Declare
noreg.
* ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp:
Define HeapBaseMinAddress as 2G (copied from x86_64).
changeset 783dd78750b3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=783dd78750b3
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Oct 27 18:48:46 2009 +0000
Merge
changeset 567bc0385c86 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=567bc0385c86
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Oct 27 19:32:47 2009 +0000
Rename the 'default' alternate HotSpot build to be 'hs16'.
2009-10-27 Andrew John Hughes <ahughes at redhat.com>
* INSTALL: Replace references to default with hs16.
* patches/hotspot/default/icedtea-params-cast-size_t.patch,
* patches/hotspot/default/openjdk-6886353-ignore_deoptimizealot.patch,
* patches/hotspot/default/zero.patch: Moved to...
* acinclude.m4: Make hs16 the default build.
* hotspot.map: Rename 'default' as 'hs16'.
* patches/hotspot/hs16/icedtea-params-cast-size_t.patch,
* patches/hotspot/hs16/openjdk-6886353-ignore_deoptimizealot.patch,
* patches/hotspot/hs16/zero.patch: ...here.
changeset 02eb9a9ec088 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=02eb9a9ec088
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Oct 27 19:37:21 2009 +0000
Update NEWS with latest updates.
2009-10-27 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Mention b17, HotSpot 16 and libjpeg7 support
for 1.7.
diffstat:
12 files changed, 494 insertions(+), 321 deletions(-)
ChangeLog | 53 ++
INSTALL | 4
Makefile.am | 37 -
NEWS | 11
acinclude.m4 | 4
hotspot.map | 2
patches/hotspot/default/icedtea-params-cast-size_t.patch | 252 ----------
patches/hotspot/default/openjdk-6886353-ignore_deoptimizealot.patch | 33 -
patches/hotspot/hs16/icedtea-params-cast-size_t.patch | 252 ++++++++++
patches/hotspot/hs16/openjdk-6886353-ignore_deoptimizealot.patch | 33 +
patches/hotspot/hs16/zero.patch | 107 ++++
ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp | 27 +
diffs (truncated from 938 to 500 lines):
diff -r 7d2ae1d67c95 -r 02eb9a9ec088 ChangeLog
--- a/ChangeLog Mon Oct 26 23:26:33 2009 +0000
+++ b/ChangeLog Tue Oct 27 19:37:21 2009 +0000
@@ -1,3 +1,56 @@ 2009-10-22 Andrew John Hughes <ahughes
+2009-10-27 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS:
+ Mention b17, HotSpot 16 and libjpeg7 support
+ for 1.7.
+
+2009-10-27 Andrew John Hughes <ahughes at redhat.com>
+
+ * INSTALL: Replace references to default with hs16.
+ * patches/hotspot/default/icedtea-params-cast-size_t.patch,
+ * patches/hotspot/default/openjdk-6886353-ignore_deoptimizealot.patch,
+ * patches/hotspot/default/zero.patch: Moved to...
+ * acinclude.m4: Make hs16 the default build.
+ * hotspot.map: Rename 'default' as 'hs16'.
+ * patches/hotspot/hs16/icedtea-params-cast-size_t.patch,
+ * patches/hotspot/hs16/openjdk-6886353-ignore_deoptimizealot.patch,
+ * patches/hotspot/hs16/zero.patch: ...here.
+
+2009-10-27 Andrew John Hughes <ahughes at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp:
+ Empty class required by invokedynamic support.
+ * Makefile.am:
+ Copy files from ports rather than linking them,
+ allowing them to be patched. Remove duplicate
+ ports-ecj target. Apply
+ patches/hotspot/$(HSBUILD)/zero.patch when
+ building with an alternate HotSpot. This adds
+ the following changeset from IcedTea7 to the
+ copy of the Zero port in the openjdk directory:
+
+ 2009-05-21 Andrew John Hughes <ahughes at redhat.com>
+
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp:
+ (delayed_value_impl(intptr_t,Register,int)): Add stub.
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp:
+ (delayed_value_impl(intptr_t,Register,int)): Declared.
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp:
+ Handle Interpreter::method_handle.
+ * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp:
+ (delayed_value_impl(intptr_t,Register,int)): Add stub.
+ * ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp:
+ (generate_method_handle_entry()): Declared.
+ * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp:
+ (generate_method_handle_entry()): Add stub.
+ * ports/hotspot/src/cpu/zero/vm/jni_zero.h:
+ Define jlong depending on whether _LP64 is defined,
+ as with format specifier in globalDefinitions.
+ * ports/hotspot/src/cpu/zero/vm/register_zero.hpp:
+ Declare noreg.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp:
+ Define HeapBaseMinAddress as 2G (copied from x86_64).
+
2009-10-22 Andrew John Hughes <ahughes at redhat.com>
* INSTALL:
diff -r 7d2ae1d67c95 -r 02eb9a9ec088 INSTALL
--- a/INSTALL Mon Oct 26 23:26:33 2009 +0000
+++ b/INSTALL Tue Oct 27 19:37:21 2009 +0000
@@ -167,9 +167,9 @@ of the requested build.
At present, two versions of HotSpot are officially supported. These
are HotSpot 14 ('original') which is provided by the upstream OpenJDK
-tarball, and 'default', which is used in hotspot.map to provide the
+tarball, and 'hs16', which is used in hotspot.map to provide the
latest version of HotSpot 16. Thus, either --with-hotspot-build
-without an argument or --with-hotspot-build=default provides the
+without an argument or --with-hotspot-build=hs16 provides the
latest supported hs16, while no HotSpot build argument,
--without-hotspot-build or --with-hotspot-build=original uses the
upstream HotSpot.
diff -r 7d2ae1d67c95 -r 02eb9a9ec088 Makefile.am
--- a/Makefile.am Mon Oct 26 23:26:33 2009 +0000
+++ b/Makefile.am Tue Oct 27 19:37:21 2009 +0000
@@ -516,13 +516,13 @@ endif
endif
-# Link ports sources into tree
+# Copy ports sources into tree
stamps/ports.stamp: stamps/replace-hotspot.stamp
for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
$(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
$(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk/'|sed "s#hotspot/build#hotspot/$(HOTSPOT_MAKE_DIR)#"); \
- ln -sfv $$target $$link; \
+ cp -rv $$target $$link; \
done
ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/$(HOTSPOT_MAKE_DIR)/linux
if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" \
@@ -659,7 +659,8 @@ endif
endif
if WITH_ALT_HSBUILD
-ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch
+ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \
+ patches/hotspot/$(HSBUILD)/zero.patch
else
ICEDTEA_PATCHES += patches/hotspot/original/icedtea-6778662-lib64.patch \
patches/hotspot/original/icedtea-6778657-f2i-overflow.patch \
@@ -843,7 +844,7 @@ clean-patch:
rm -f openjdk/jdk/src/share/classes/sun/applet/`basename $file` ; \
done ;
-stamps/patch-fsg.stamp: stamps/replace-hotspot.stamp
+stamps/patch-fsg.stamp: stamps/ports.stamp
mkdir -p stamps ; \
rm -f stamps/patch-fsg.stamp.tmp ; \
touch stamps/patch-fsg.stamp.tmp ; \
@@ -913,28 +914,6 @@ clean-extract-ecj:
clean-extract-ecj:
rm -f stamps/extract-ecj.stamp
rm -rf openjdk-ecj
-
-# Link ports sources into tree
-stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
- for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
- $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
- $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
- link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'|sed "s#hotspot/build#hotspot/$(HOTSPOT_MAKE_DIR)#"); \
- ln -sfv $$target $$link; \
- done
- ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/$(HOTSPOT_MAKE_DIR)/linux
- if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" \
- = "xno"; then \
- mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
- ln -sf $(abs_top_builddir)/jvm.cfg \
- openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
- fi
- if ! test "x$(ICEDTEA_ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
- ln -sf $(abs_top_builddir)/ergo.c \
- openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
- fi
- mkdir -p stamps
- touch stamps/ports-ecj.stamp
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea-ant.patch \
@@ -1346,7 +1325,7 @@ stamps/native-ecj.stamp:
stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
- stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp \
+ stamps/patch-ecj.stamp stamps/cacao.stamp \
$(ZERO_ASM_BC_ASM_COND)
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
@@ -1371,7 +1350,7 @@ hotspot:
hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
- stamps/ports-ecj.stamp stamps/patch-ecj.stamp
+ stamps/patch-ecj.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
-C openjdk-ecj/ hotspot
@@ -2144,8 +2123,6 @@ hotspot-tools: stamps/hotspot-tools.stam
hotspot-ports: stamps/ports.stamp
-hotspot-ports-ecj: stamps/ports-ecj.stamp
-
clean: distclean-local
jtreg: stamps/jtreg.stamp
diff -r 7d2ae1d67c95 -r 02eb9a9ec088 NEWS
--- a/NEWS Mon Oct 26 23:26:33 2009 +0000
+++ b/NEWS Tue Oct 27 19:37:21 2009 +0000
@@ -1,4 +1,13 @@ New in release 1.6:
-New in release 1.6:
+New in release 1.7 (XXXX-XX-XX):
+
+- Updated to OpenJDK6 b17.
+- Support added for building with HotSpot 16 using
+ --with-hotspot-build=hs16.
+- Zero port updated to match the version submitted to OpenJDK
+ as closely as possible.
+- libjpeg7 supported.
+
+New in release 1.6 (2009-09-10):
- Added java method tracing using systemtap version 0.9.9+.
- Security fixes for:
diff -r 7d2ae1d67c95 -r 02eb9a9ec088 acinclude.m4
--- a/acinclude.m4 Mon Oct 26 23:26:33 2009 +0000
+++ b/acinclude.m4 Tue Oct 27 19:37:21 2009 +0000
@@ -894,10 +894,10 @@ AC_DEFUN([AC_CHECK_WITH_GCJ],
AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
[
- DEFAULT_BUILD="default"
+ DEFAULT_BUILD="hs16"
AC_MSG_CHECKING([which HotSpot build to use])
AC_ARG_WITH([hotspot-build],
- [AS_HELP_STRING(--with-hotspot-build,the HotSpot build to use)],
+ [AS_HELP_STRING(--with-hotspot-build,the HotSpot build to use (see hotspot.map))],
[
HSBUILD="${withval}"
],
diff -r 7d2ae1d67c95 -r 02eb9a9ec088 hotspot.map
--- a/hotspot.map Mon Oct 26 23:26:33 2009 +0000
+++ b/hotspot.map Tue Oct 27 19:37:21 2009 +0000
@@ -1,2 +1,2 @@
# version url changeset md5sum
-default http://hg.openjdk.java.net/hsx/hsx16/master 6bdfda9a7120 e194a7baefb2f55e21a280276a11b49a
+hs16 http://hg.openjdk.java.net/hsx/hsx16/master 6bdfda9a7120 e194a7baefb2f55e21a280276a11b49a
diff -r 7d2ae1d67c95 -r 02eb9a9ec088 patches/hotspot/default/icedtea-params-cast-size_t.patch
--- a/patches/hotspot/default/icedtea-params-cast-size_t.patch Mon Oct 26 23:26:33 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,252 +0,0 @@
-diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
---- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2009-10-02 22:16:39.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2009-10-20 22:59:56.000000000 +0100
-@@ -940,7 +940,7 @@
- if (free_percentage < desired_free_percentage) {
- size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));
- assert(desired_capacity >= capacity(), "invalid expansion size");
-- expand_bytes = MAX2(desired_capacity - capacity(), MinHeapDeltaBytes);
-+ expand_bytes = MAX2((long unsigned int) (desired_capacity - capacity()), (long unsigned int) MinHeapDeltaBytes);
- }
- if (expand_bytes > 0) {
- if (PrintGCDetails && Verbose) {
-@@ -6094,7 +6094,7 @@
- HeapWord* curAddr = _markBitMap.startWord();
- while (curAddr < _markBitMap.endWord()) {
- size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr);
-- MemRegion chunk(curAddr, MIN2(CMSBitMapYieldQuantum, remaining));
-+ MemRegion chunk(curAddr, MIN2((size_t) CMSBitMapYieldQuantum, remaining));
- _markBitMap.clear_large_range(chunk);
- if (ConcurrentMarkSweepThread::should_yield() &&
- !foregroundGCIsActive() &&
-@@ -6382,7 +6382,7 @@
- return;
- }
- // Double capacity if possible
-- size_t new_capacity = MIN2(_capacity*2, CMSMarkStackSizeMax);
-+ size_t new_capacity = MIN2((size_t) (_capacity*2), (size_t) CMSMarkStackSizeMax);
- // Do not give up existing stack until we have managed to
- // get the double capacity that we desired.
- ReservedSpace rs(ReservedSpace::allocation_align_size_up(
-diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
---- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2009-10-20 22:57:45.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2009-10-20 22:59:56.000000000 +0100
-@@ -412,7 +412,7 @@
- _regionStack(),
- // _finger set in set_non_marking_state
-
-- _max_task_num(MAX2(ParallelGCThreads, (size_t)1)),
-+ _max_task_num(MAX2((size_t)ParallelGCThreads, (size_t)1)),
- // _active_tasks set in set_non_marking_state
- // _tasks set inside the constructor
- _task_queues(new CMTaskQueueSet((int) _max_task_num)),
-@@ -463,7 +463,7 @@
- SATBMarkQueueSet& satb_qs = JavaThread::satb_mark_queue_set();
- satb_qs.set_buffer_size(G1SATBLogBufferSize);
-
-- int size = (int) MAX2(ParallelGCThreads, (size_t)1);
-+ int size = (int) MAX2((size_t)ParallelGCThreads, (size_t)1);
- _par_cleanup_thread_state = NEW_C_HEAP_ARRAY(ParCleanupThreadState*, size);
- for (int i = 0 ; i < size; i++) {
- _par_cleanup_thread_state[i] = new ParCleanupThreadState;
-@@ -522,7 +522,7 @@
- _sleep_factor = sleep_factor;
- _marking_task_overhead = marking_task_overhead;
- } else {
-- _parallel_marking_threads = MAX2((ParallelGCThreads + 2) / 4, (size_t)1);
-+ _parallel_marking_threads = MAX2((size_t)((ParallelGCThreads + 2) / 4), (size_t)1);
- _sleep_factor = 0.0;
- _marking_task_overhead = 1.0;
- }
-@@ -649,7 +649,7 @@
- }
-
- ConcurrentMark::~ConcurrentMark() {
-- int size = (int) MAX2(ParallelGCThreads, (size_t)1);
-+ int size = (int) MAX2((size_t)ParallelGCThreads, (size_t)1);
- for (int i = 0; i < size; i++) delete _par_cleanup_thread_state[i];
- FREE_C_HEAP_ARRAY(ParCleanupThreadState*,
- _par_cleanup_thread_state);
-@@ -1761,7 +1761,7 @@
- if (has_aborted()) return;
-
- int first = 0;
-- int last = (int)MAX2(ParallelGCThreads, (size_t)1);
-+ int last = (int)MAX2((size_t)ParallelGCThreads, (size_t)1);
- for (int t = 0; t < last; t++) {
- UncleanRegionList* list = &_par_cleanup_thread_state[t]->list;
- assert(list->well_formed(), "Inv");
-@@ -3197,7 +3197,7 @@
- // of things to do) or totally (at the very end).
- size_t target_size;
- if (partially)
-- target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
-+ target_size = MIN2((size_t)_task_queue->max_elems()/3, (size_t)GCDrainStackTargetSize);
- else
- target_size = 0;
-
-diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
---- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2009-10-02 22:16:39.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2009-10-20 23:01:31.000000000 +0100
-@@ -1058,7 +1058,7 @@
- // This can be done by either mutator threads together with the
- // concurrent refinement threads or GC threads.
- int HeapRegionRemSet::num_par_rem_sets() {
-- return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), ParallelGCThreads);
-+ return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), (size_t)ParallelGCThreads);
- }
-
- HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,
-diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2009-10-02 22:16:39.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2009-10-20 22:59:56.000000000 +0100
-@@ -863,8 +863,8 @@
- void PSParallelCompact::initialize_dead_wood_limiter()
- {
- const size_t max = 100;
-- _dwl_mean = double(MIN2(ParallelOldDeadWoodLimiterMean, max)) / 100.0;
-- _dwl_std_dev = double(MIN2(ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
-+ _dwl_mean = double(MIN2((size_t) ParallelOldDeadWoodLimiterMean, max)) / 100.0;
-+ _dwl_std_dev = double(MIN2((size_t) ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
- _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
- DEBUG_ONLY(_dwl_initialized = true;)
- _dwl_adjustment = normal_distribution(1.0);
-diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp
---- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2009-10-02 22:16:39.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2009-10-20 22:59:56.000000000 +0100
-@@ -63,7 +63,7 @@
- _last_used = current_live;
-
- // We have different alignment constraints than the rest of the heap.
-- const size_t alignment = MAX2(MinPermHeapExpansion,
-+ const size_t alignment = MAX2((size_t) MinPermHeapExpansion,
- virtual_space()->alignment());
-
- // Compute the desired size:
-diff -Nru openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
---- openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp 2009-10-02 22:16:39.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp 2009-10-20 22:59:56.000000000 +0100
-@@ -281,7 +281,7 @@
- // yield a size that is too small) and bound it by MaxNewSize above.
- // Ergonomics plays here by previously calculating the desired
- // NewSize and MaxNewSize.
-- max_new_size = MIN2(MAX2(max_new_size, NewSize), MaxNewSize);
-+ max_new_size = MIN2(MAX2(max_new_size, (size_t)NewSize), (size_t)MaxNewSize);
- }
- assert(max_new_size > 0, "All paths should set max_new_size");
-
-@@ -308,7 +308,7 @@
- // generally small compared to the NewRatio calculation.
- _min_gen0_size = NewSize;
- desired_new_size = NewSize;
-- max_new_size = MAX2(max_new_size, NewSize);
-+ max_new_size = MAX2(max_new_size, (size_t) NewSize);
- } else {
- // For the case where NewSize is the default, use NewRatio
- // to size the minimum and initial generation sizes.
-@@ -316,10 +316,10 @@
- // NewRatio is overly large, the resulting sizes can be too
- // small.
- _min_gen0_size = MAX2(scale_by_NewRatio_aligned(min_heap_byte_size()),
-- NewSize);
-+ (size_t) NewSize);
- desired_new_size =
- MAX2(scale_by_NewRatio_aligned(initial_heap_byte_size()),
-- NewSize);
-+ (size_t) NewSize);
- }
-
- assert(_min_gen0_size > 0, "Sanity check");
-@@ -374,14 +374,14 @@
- // Adjust gen0 down to accomodate OldSize
- *gen0_size_ptr = heap_size - min_gen0_size;
- *gen0_size_ptr =
-- MAX2((uintx)align_size_down(*gen0_size_ptr, min_alignment()),
-+ MAX2((size_t)align_size_down(*gen0_size_ptr, min_alignment()),
- min_alignment());
- assert(*gen0_size_ptr > 0, "Min gen0 is too large");
- result = true;
- } else {
- *gen1_size_ptr = heap_size - *gen0_size_ptr;
- *gen1_size_ptr =
-- MAX2((uintx)align_size_down(*gen1_size_ptr, min_alignment()),
-+ MAX2((size_t)align_size_down(*gen1_size_ptr, min_alignment()),
- min_alignment());
- }
- }
-@@ -405,7 +405,7 @@
- // for setting the gen1 maximum.
- _max_gen1_size = max_heap_byte_size() - _max_gen0_size;
- _max_gen1_size =
-- MAX2((uintx)align_size_down(_max_gen1_size, min_alignment()),
-+ MAX2((size_t)align_size_down(_max_gen1_size, min_alignment()),
- min_alignment());
- // If no explicit command line flag has been set for the
- // gen1 size, use what is left for gen1.
-@@ -419,11 +419,11 @@
- "gen0 has an unexpected minimum size");
- set_min_gen1_size(min_heap_byte_size() - min_gen0_size());
- set_min_gen1_size(
-- MAX2((uintx)align_size_down(_min_gen1_size, min_alignment()),
-+ MAX2((size_t)align_size_down(_min_gen1_size, min_alignment()),
- min_alignment()));
- set_initial_gen1_size(initial_heap_byte_size() - initial_gen0_size());
- set_initial_gen1_size(
-- MAX2((uintx)align_size_down(_initial_gen1_size, min_alignment()),
-+ MAX2((size_t)align_size_down(_initial_gen1_size, min_alignment()),
- min_alignment()));
-
- } else {
-diff -Nru openjdk.orig/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
---- openjdk.orig/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2009-10-02 22:16:39.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2009-10-20 22:59:56.000000000 +0100
-@@ -221,7 +221,7 @@
- size_t init_sz;
-
- if (TLABSize > 0) {
-- init_sz = MIN2(TLABSize / HeapWordSize, max_size());
-+ init_sz = MIN2((size_t) (TLABSize / HeapWordSize), max_size());
- } else if (global_stats() == NULL) {
- // Startup issue - main thread initialized before heap initialized.
- init_sz = min_size();
-diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp 2009-10-20 22:57:44.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2009-10-20 23:02:17.000000000 +0100
-@@ -1064,7 +1064,7 @@
- // NewSize was set on the command line and it is larger than
- // preferred_max_new_size.
- if (!FLAG_IS_DEFAULT(NewSize)) { // NewSize explicitly set at command-line
-- FLAG_SET_ERGO(uintx, MaxNewSize, MAX2(NewSize, preferred_max_new_size));
-+ FLAG_SET_ERGO(uintx, MaxNewSize, MAX2((size_t) NewSize, preferred_max_new_size));
- } else {
- FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size);
- }
-@@ -1083,7 +1083,7 @@
- // there was no obvious reason. Also limit to the case where
- // MaxNewSize has not been set.
-
-- FLAG_SET_ERGO(intx, NewRatio, MAX2(NewRatio, new_ratio));
-+ FLAG_SET_ERGO(intx, NewRatio, MAX2((intx) NewRatio, new_ratio));
-
- // Code along this path potentially sets NewSize and OldSize
-
-@@ -1125,8 +1125,8 @@
- // Unless explicitly requested otherwise, make young gen
- // at least min_new, and at most preferred_max_new_size.
- if (FLAG_IS_DEFAULT(NewSize)) {
-- FLAG_SET_ERGO(uintx, NewSize, MAX2(NewSize, min_new));
-- FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, NewSize));
-+ FLAG_SET_ERGO(uintx, NewSize, MAX2((size_t) NewSize, min_new));
-+ FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, (size_t) NewSize));
- if(PrintGCDetails && Verbose) {
- // Too early to use gclog_or_tty
- tty->print_cr("Ergo set NewSize: " SIZE_FORMAT, NewSize);
-@@ -1137,7 +1137,7 @@
- // later NewRatio will decide how it grows; see above.
- if (FLAG_IS_DEFAULT(OldSize)) {
- if (max_heap > NewSize) {
-- FLAG_SET_ERGO(uintx, OldSize, MIN2(3*NewSize, max_heap - NewSize));
-+ FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t) (3*NewSize), max_heap - (size_t) NewSize));
- if(PrintGCDetails && Verbose) {
- // Too early to use gclog_or_tty
- tty->print_cr("Ergo set OldSize: " SIZE_FORMAT, OldSize);
diff -r 7d2ae1d67c95 -r 02eb9a9ec088 patches/hotspot/default/openjdk-6886353-ignore_deoptimizealot.patch
--- a/patches/hotspot/default/openjdk-6886353-ignore_deoptimizealot.patch Mon Oct 26 23:26:33 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1254183265 25200
-# Node ID d6b9fd78f38951b6c8b2912701f52aa9fbc08a63
-# Parent ddd6f1182ae3c0014cbc139952ba8d9d14bfb3d1
-6886353: For DeoptimizeALot, JTreg tests should "IgnoreUnrecognizedVMOptions on a product build
-Summary: Add IgnoreUnrecognizedVMOptions for JTreg tests (on a product build) to pass with DeoptimizeALot
-Reviewed-by: kvn
-
-diff -r ddd6f1182ae3 -r d6b9fd78f389 test/compiler/6823453/Test.java
---- openjdk/hotspot/test/compiler/6823453/Test.java Fri Sep 25 13:26:02 2009 -0700
-+++ openjdk/hotspot/test/compiler/6823453/Test.java Mon Sep 28 17:14:25 2009 -0700
-@@ -26,7 +26,7 @@
- * @test
- * @bug 6823453
- * @summary DeoptimizeALot causes fastdebug server jvm to fail with assert(false,"unscheduable graph")
-- * @run main/othervm -Xcomp -XX:CompileOnly=Test -XX:+DeoptimizeALot Test
-+ * @run main/othervm -Xcomp -XX:+IgnoreUnrecognizedVMOptions -XX:CompileOnly=Test -XX:+DeoptimizeALot Test
- */
-
- public class Test {
-diff -r ddd6f1182ae3 -r d6b9fd78f389 test/compiler/6833129/Test.java
---- openjdk/hotspot/test/compiler/6833129/Test.java Fri Sep 25 13:26:02 2009 -0700
-+++ openjdk/hotspot/test/compiler/6833129/Test.java Mon Sep 28 17:14:25 2009 -0700
-@@ -25,7 +25,7 @@
- * @test
- * @bug 6833129
- * @summary Object.clone() and Arrays.copyOf ignore coping with -XX:+DeoptimizeALot
-- * @run main/othervm -Xbatch -XX:+DeoptimizeALot Test
-+ * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+DeoptimizeALot Test
More information about the distro-pkg-dev
mailing list