summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErkka Kääriä <erkka.kaaria@intel.com>2016-08-09 10:32:17 +0300
committerMaxin B. John <maxin.john@intel.com>2016-08-24 13:49:01 +0300
commit0eeeb059751c00042bd0341d17f5cceddef3c502 (patch)
treed3e337cca462ec96e6ee3730b611565c755db983
parent0d58a4fb4236edeeeb3f23a66c0c14279066c8bb (diff)
downloadmeta-java-0eeeb059751c00042bd0341d17f5cceddef3c502.tar.gz
openjdk-8: Upgrade from u72 to u102
Openjdk is upgraded from u72 to u102. Two patches are dropped, as these were backports and the fixes are present in the current version. One patch was refreshed. One patch was backported from the upcoming u112 to fix a zero mode crash. Signed-off-by: Erkka Kääriä <erkka.kaaria@intel.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat
-rw-r--r--recipes-core/openjdk/openjdk-8-native_102b14.bb2
-rw-r--r--recipes-core/openjdk/openjdk-8-native_72b05.bb2
-rw-r--r--recipes-core/openjdk/openjdk-8-release-102b14.inc (renamed from recipes-core/openjdk/openjdk-8-release-72b05.inc)51
-rw-r--r--recipes-core/openjdk/openjdk-8_102b14.bb (renamed from recipes-core/openjdk/openjdk-8_72b05.bb)4
-rw-r--r--recipes-core/openjdk/openjre-8_102b14.bb (renamed from recipes-core/openjdk/openjre-8_72b05.bb)4
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch53
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-stdc++11.patch2347
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-zero-mode-crash.patch49
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch23
9 files changed, 1308 insertions, 1227 deletions
diff --git a/recipes-core/openjdk/openjdk-8-native_102b14.bb b/recipes-core/openjdk/openjdk-8-native_102b14.bb
new file mode 100644
index 0000000..e33f84a
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-8-native_102b14.bb
@@ -0,0 +1,2 @@
1require openjdk-8-release-102b14.inc
2require openjdk-8-native.inc
diff --git a/recipes-core/openjdk/openjdk-8-native_72b05.bb b/recipes-core/openjdk/openjdk-8-native_72b05.bb
deleted file mode 100644
index 7b20248..0000000
--- a/recipes-core/openjdk/openjdk-8-native_72b05.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1require openjdk-8-release-72b05.inc
2require openjdk-8-native.inc
diff --git a/recipes-core/openjdk/openjdk-8-release-72b05.inc b/recipes-core/openjdk/openjdk-8-release-102b14.inc
index ce31f3d..c9f62ff 100644
--- a/recipes-core/openjdk/openjdk-8-release-72b05.inc
+++ b/recipes-core/openjdk/openjdk-8-release-102b14.inc
@@ -4,7 +4,6 @@ PATCHES_URI="\
4 file://dont-expect-fqpn-for-make.patch;striplevel=0 \ 4 file://dont-expect-fqpn-for-make.patch;striplevel=0 \
5 file://openjdk8-no-genx11-in-headless.patch;apply=no \ 5 file://openjdk8-no-genx11-in-headless.patch;apply=no \
6 file://openjdk8-no-unused-deps.patch;apply=no \ 6 file://openjdk8-no-unused-deps.patch;apply=no \
7 file://openjdk8-avoid-early-ldflags-expansion.patch;apply=no \
8 file://openjdk8-find-compiler-fix-env-respect.patch;apply=no \ 7 file://openjdk8-find-compiler-fix-env-respect.patch;apply=no \
9 file://openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch;apply=no \ 8 file://openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch;apply=no \
10" 9"
@@ -16,40 +15,40 @@ BUILD_DIR_ECJ = "openjdk.build-ecj"
16# Force arm mode for now 15# Force arm mode for now
17ARM_INSTRUCTION_SET_armv4t = "ARM" 16ARM_INSTRUCTION_SET_armv4t = "ARM"
18 17
19# Enable zero mode for arm based builds, as normal hotspot fails to build 18# Enable zero mode for arm based builds, as normal hotspot fails to build
20PACKAGECONFIG_append_arm = " zero" 19PACKAGECONFIG_append_arm = " zero"
21 20
22CORBA_CHANGESET = "7deeb4f70404" 21CORBA_CHANGESET = "56b133772ec1"
23SRC_URI[corba.md5sum] = "544b4963d14fb7155b12dbc56d058649" 22SRC_URI[corba.md5sum] = "b67bd442400e6805ddb986e78adc2834"
24SRC_URI[corba.sha256sum] = "a75c31706f634585baf0d0a0b20e321ac634d41d6afb62bd6ffb1f9c0b766d09" 23SRC_URI[corba.sha256sum] = "d5aabb9b3681b0593dde1b9eee4ff9b4cbabe7568b041f9e63e6fa73ba11bb86"
25 24
26HOTSPOT_CHANGESET = "d7b01fb81aa8" 25HOTSPOT_CHANGESET = "ac29c9c1193a"
27SRC_URI[hotspot.md5sum] = "9a94802c1179faedf06d65d2f6fcc6c7" 26SRC_URI[hotspot.md5sum] = "4383d833de07fc617595a01a78efd0fc"
28SRC_URI[hotspot.sha256sum] = "5dacf0b9c86aa78061ca87c9ade1708b56deba35e2e559dcf9dbc50d85ba3ace" 27SRC_URI[hotspot.sha256sum] = "1e36c6d207ac1a7d6d08f28a61bf061188df0562d89baf606138d8245d690982"
29 28
30JAXP_CHANGESET = "acbcb6682c9b" 29JAXP_CHANGESET = "1f032000ff4b"
31SRC_URI[jaxp.md5sum] = "34b6700d03a0e2f13a272b4121536544" 30SRC_URI[jaxp.md5sum] = "a4a46860d00f8b513a690166b9ae0b56"
32SRC_URI[jaxp.sha256sum] = "b6b60e174c3d980773dd56e0a2e7cacc26b05e401f6a08a1ffef594b6166865a" 31SRC_URI[jaxp.sha256sum] = "dfa0098ca9b9f99cb9de4ee9f3c61b0ad28f968ecda770f09e603c6dd8f78df3"
33 32
34JAXWS_CHANGESET = "6aba0f814a15" 33JAXWS_CHANGESET = "81f2d81a48d7"
35SRC_URI[jaxws.md5sum] = "bad8a6e540dca0889d5c0edef47fe6ca" 34SRC_URI[jaxws.md5sum] = "0077cb7f1d1b31ba882f910bd3c30050"
36SRC_URI[jaxws.sha256sum] = "ae57bb090ec2c5338c6f740dbfd20a92f52e60379b764c4bc874464c5955b375" 35SRC_URI[jaxws.sha256sum] = "c28322d7a9805d06b6f3a49d316aa4746076dfc106431a952fe0d12b6690cbdc"
37 36
38JDK_CHANGESET = "39baa472e20c" 37JDK_CHANGESET = "48c99b423839"
39SRC_URI[jdk.md5sum] = "746e4d38fa3d31a22239d160688ed447" 38SRC_URI[jdk.md5sum] = "316fc871a823ff8f1db39a2fca51bd12"
40SRC_URI[jdk.sha256sum] = "e3587fa57eec72c561f0695723649a745966bb2a74803ff8a451b80fd2079f99" 39SRC_URI[jdk.sha256sum] = "bca18458ba0a0b8d79639829b8a71cdf65dd788b5c28658102b6b4691a47a420"
41 40
42LANGTOOLS_CHANGESET = "10ffafaf5340" 41LANGTOOLS_CHANGESET = "0549bf2f507d"
43SRC_URI[langtools.md5sum] = "4562acae958cc9b9f68300d5c2e6feb3" 42SRC_URI[langtools.md5sum] = "bff92b915d26afd0c9b7c4b9013ee424"
44SRC_URI[langtools.sha256sum] = "5d14b666fbc6ee93d60c6a135eb8163a95ca5de96d390894e0c0b59719cf7fe4" 43SRC_URI[langtools.sha256sum] = "4a918bab7a8f13b6705085be0d043b03e24afb4ff3c67ad98000c6b9fe577cb8"
45 44
46NASHORN_CHANGESET = "9ff5c2181333" 45NASHORN_CHANGESET = "0948e61a3722"
47SRC_URI[nashorn.md5sum] = "c6d234d73ab4d95072b7600b731bbfff" 46SRC_URI[nashorn.md5sum] = "19e79a31ad20b55b47d6b9f1b20eaac0"
48SRC_URI[nashorn.sha256sum] = "f56ee0bc65c8f4954bbec0e777c0158a44dc4b744407991a96f6627be433807d" 47SRC_URI[nashorn.sha256sum] = "caa1f648cfbe45c081460bc9c2d9a7b83910bb468c325d8acc2ee4417460915e"
49 48
50OPENJDK_CHANGESET = "e8bed1496ff2" 49OPENJDK_CHANGESET = "bf0932d3e0f8"
51SRC_URI[openjdk.md5sum] = "182992a90cbe209b34142f934319704b" 50SRC_URI[openjdk.md5sum] = "2b52cc3d439fe0da2ecbb28671fbe5aa"
52SRC_URI[openjdk.sha256sum] = "d835a9adcf766e68d5a73fb36040d9e35b36c0363c883b8f05560c49bb22bf0c" 51SRC_URI[openjdk.sha256sum] = "66fa6ecf3047b7d8a216c1372616babe96f0fb40e89cb51575b80bf602d9ba59"
53 52
54OPENJDK_HG_U = "jdk8u" 53OPENJDK_HG_U = "jdk8u"
55OPENJDK_HG_URL = "http://hg.openjdk.java.net/jdk8u/${OPENJDK_HG_U}" 54OPENJDK_HG_URL = "http://hg.openjdk.java.net/jdk8u/${OPENJDK_HG_U}"
diff --git a/recipes-core/openjdk/openjdk-8_72b05.bb b/recipes-core/openjdk/openjdk-8_102b14.bb
index bafc6cd..79c4cda 100644
--- a/recipes-core/openjdk/openjdk-8_72b05.bb
+++ b/recipes-core/openjdk/openjdk-8_102b14.bb
@@ -1,4 +1,4 @@
1require openjdk-8-release-72b05.inc 1require openjdk-8-release-102b14.inc
2require openjdk-8-cross.inc 2require openjdk-8-cross.inc
3 3
4# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch 4# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch
@@ -8,10 +8,10 @@ PATCHES_URI_append = "\
8 file://openjdk8-restrict-to-staging-dir.patch;apply=no \ 8 file://openjdk8-restrict-to-staging-dir.patch;apply=no \
9 file://openjdk8-fix-shark-build.patch;apply=no \ 9 file://openjdk8-fix-shark-build.patch;apply=no \
10 file://openjdk8-fix-shark-stdc++11.patch;apply=no \ 10 file://openjdk8-fix-shark-stdc++11.patch;apply=no \
11 file://openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch;apply=no \
12 file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \ 11 file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \
13 file://openjdk8-fix-adlc-flags.patch;apply=no \ 12 file://openjdk8-fix-adlc-flags.patch;apply=no \
14 file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \ 13 file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \
14 file://openjdk8-fix-zero-mode-crash.patch;apply=no \
15" 15"
16 16
17do_install() { 17do_install() {
diff --git a/recipes-core/openjdk/openjre-8_72b05.bb b/recipes-core/openjdk/openjre-8_102b14.bb
index 55b2ac5..736269d 100644
--- a/recipes-core/openjdk/openjre-8_72b05.bb
+++ b/recipes-core/openjdk/openjre-8_102b14.bb
@@ -1,4 +1,4 @@
1require openjdk-8-release-72b05.inc 1require openjdk-8-release-102b14.inc
2require openjdk-8-cross.inc 2require openjdk-8-cross.inc
3 3
4# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch 4# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch
@@ -8,10 +8,10 @@ PATCHES_URI_append = "\
8 file://openjdk8-restrict-to-staging-dir.patch;apply=no \ 8 file://openjdk8-restrict-to-staging-dir.patch;apply=no \
9 file://openjdk8-fix-shark-build.patch;apply=no \ 9 file://openjdk8-fix-shark-build.patch;apply=no \
10 file://openjdk8-fix-shark-stdc++11.patch;apply=no \ 10 file://openjdk8-fix-shark-stdc++11.patch;apply=no \
11 file://openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch;apply=no \
12 file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \ 11 file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \
13 file://openjdk8-fix-adlc-flags.patch;apply=no \ 12 file://openjdk8-fix-adlc-flags.patch;apply=no \
14 file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \ 13 file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \
14 file://openjdk8-fix-zero-mode-crash.patch;apply=no \
15" 15"
16 16
17do_install() { 17do_install() {
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch
deleted file mode 100644
index 528560c..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1# HG changeset patch
2# User andrew
3# Date 1452261185 0
4# Fri Jan 08 13:53:05 2016 +0000
5# Node ID 92c6a16b6daccda4b7c7f9612e4057df006b9f22
6# Parent b95e325137b439b33a7bb013be21475df5da3a03
78146566: OpenJDK build can't handle commas in LDFLAGS
8Summary: Backport part of 8142907 to avoid early LDFLAGS expansion
9Reviewed-by: erikj
10
11diff --git jdk/make/CompileDemos.gmk jdk/make/CompileDemos.gmk
12--- jdk/make/CompileDemos.gmk
13+++ jdk/make/CompileDemos.gmk
14@@ -224,17 +224,17 @@ define SetupJVMTIDemo
15 $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2)/README.txt) \
16 $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2)/sample.makefile.txt)
17 BUILD_DEMO_JVMTI_$1_EXTRA_INC := $$(addprefix -I, $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC))
18 BUILD_DEMO_JVMTI_$1_LANG := C
19 ifneq (, $4)
20 BUILD_DEMO_JVMTI_$1_LANG := $4
21 endif
22 ifeq (C++, $4)
23- $1_EXTRA_CXX := $(LDFLAGS_CXX_JDK) $(LIBCXX)
24+ $1_EXTRA_CXX := $$(LDFLAGS_CXX_JDK) $(LIBCXX)
25 endif
26
27 $1_CXXFLAGS := $(CXXFLAGS_JDKLIB) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 \
28 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 \
29 $(CXXFLAGS_DEBUG_SYMBOLS)
30 ifeq ($1-$(OPENJDK_TARGET_CPU_ARCH), waiters-sparc)
31 $1_FILTER := -xregs=no%appl
32 $1_CXXFLAGS := $$(filter-out $$($1_FILTER), $$($1_CXXFLAGS))
33@@ -246,18 +246,18 @@ define SetupJVMTIDemo
34 -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3
35
36 # Remove the -incremental:no setting to get .ilk-files like in the old build.
37 $$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \
38 SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
39 LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
40 OPTIMIZATION := LOW, \
41 CXXFLAGS := $$($1_CXXFLAGS), \
42- LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
43- LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
44+ LDFLAGS := $(filter-out -incremental:no -opt:ref, $$(LDFLAGS_JDKLIB)), \
45+ LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN), \
46 LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
47 LDFLAGS_SUFFIX_posix := $5, \
48 LDFLAGS_SUFFIX_windows := $6, \
49 LDFLAGS_SUFFIX_solaris := $7 -lc, \
50 LDFLAGS_SUFFIX_linux := $8, \
51 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
52 RC_FLAGS := $$(RC_FLAGS) \
53 -D "JDK_FNAME=$1.dll" \
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-stdc++11.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-stdc++11.patch
index a35a1be..a1900b3 100644
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-stdc++11.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-stdc++11.patch
@@ -1,215 +1,341 @@
1--- hotspot/src/share/vm/memory/cardTableModRefBS.hpp.orig 2015-09-02 09:45:31.000000000 +0200 1diff --git hotspot/src/os/posix/vm/os_posix.cpp hotspot/src/os/posix/vm/os_posix.cpp
2+++ hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2015-09-02 09:46:59.000000000 +0200 2index d1bf84f..a88417c 100644
3@@ -158,8 +158,8 @@ 3--- hotspot/src/os/posix/vm/os_posix.cpp
4 // Mapping from address to card marking array entry 4+++ hotspot/src/os/posix/vm/os_posix.cpp
5 jbyte* byte_for(const void* p) const { 5@@ -594,7 +594,7 @@ const char* os::Posix::describe_sa_flags(int flags, char* buffer, size_t size) {
6 assert(_whole_heap.contains(p), 6 strncpy(buffer, "none", size);
7- err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of "
8- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
9+ err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of "
10+ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
11 p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
12 jbyte* result = &byte_map_base[uintptr_t(p) >> card_shift];
13 assert(result >= _byte_map && result < _byte_map + _byte_map_size,
14@@ -436,8 +436,8 @@
15 size_t delta = pointer_delta(p, byte_map_base, sizeof(jbyte));
16 HeapWord* result = (HeapWord*) (delta << card_shift);
17 assert(_whole_heap.contains(result),
18- err_msg("Returning result = "PTR_FORMAT" out of bounds of "
19- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
20+ err_msg("Returning result = " PTR_FORMAT " out of bounds of "
21+ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
22 p2i(result), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
23 return result;
24 }
25@@ -445,8 +445,8 @@
26 // Mapping from address to card marking array index.
27 size_t index_for(void* p) {
28 assert(_whole_heap.contains(p),
29- err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of "
30- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
31+ err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of "
32+ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
33 p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
34 return byte_for(p) - _byte_map;
35 }
36--- hotspot/src/share/vm/memory/generation.hpp.orig 2015-09-02 09:45:31.000000000 +0200
37+++ hotspot/src/share/vm/memory/generation.hpp 2015-09-02 09:47:36.000000000 +0200
38@@ -422,7 +422,7 @@
39 // have to guard against non-monotonicity.
40 NOT_PRODUCT(
41 if (now < _time_of_last_gc) {
42- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now);
43+ warning("time warp: " INT64_FORMAT " to " INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now);
44 }
45 )
46 return _time_of_last_gc;
47--- hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp.orig 2015-09-02 09:45:31.000000000 +0200
48+++ hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp 2015-09-02 09:48:07.000000000 +0200
49@@ -94,10 +94,10 @@
50 7
51 if (PrintTLAB && Verbose) { 8 const struct {
52 Thread* thrd = myThread(); 9- int i;
53- gclog_or_tty->print("TLAB: %s thread: "INTPTR_FORMAT" [id: %2d]" 10+ unsigned i;
54- " obj: "SIZE_FORMAT 11 const char* s;
55- " free: "SIZE_FORMAT 12 } flaginfo [] = {
56- " waste: "SIZE_FORMAT"\n", 13 { SA_NOCLDSTOP, "SA_NOCLDSTOP" },
57+ gclog_or_tty->print("TLAB: %s thread: " INTPTR_FORMAT " [id: %2d]" 14diff --git hotspot/src/share/vm/classfile/dictionary.hpp hotspot/src/share/vm/classfile/dictionary.hpp
58+ " obj: " SIZE_FORMAT 15index 504e735..9ed0def 100644
59+ " free: " SIZE_FORMAT 16--- hotspot/src/share/vm/classfile/dictionary.hpp
60+ " waste: " SIZE_FORMAT "\n", 17+++ hotspot/src/share/vm/classfile/dictionary.hpp
61 "slow", p2i(thrd), thrd->osthread()->thread_id(), 18@@ -373,7 +373,7 @@ class SymbolPropertyEntry : public HashtableEntry<Symbol*, mtSymbol> {
62 obj_size, free(), refill_waste_limit());
63 }
64--- hotspot/src/share/vm/trace/traceStream.hpp.orig 2015-09-02 09:45:31.000000000 +0200
65+++ hotspot/src/share/vm/trace/traceStream.hpp 2015-09-02 09:49:16.000000000 +0200
66@@ -40,31 +40,31 @@
67 TraceStream(outputStream& stream): _st(stream) {}
68 19
69 void print_val(const char* label, u1 val) { 20 void print_on(outputStream* st) const {
70- _st.print("%s = "UINT32_FORMAT, label, val); 21 symbol()->print_value_on(st);
71+ _st.print("%s = " UINT32_FORMAT, label, val); 22- st->print("/mode="INTX_FORMAT, symbol_mode());
72 } 23+ st->print("/mode=" INTX_FORMAT, symbol_mode());
24 st->print(" -> ");
25 bool printed = false;
26 if (method() != NULL) {
27diff --git hotspot/src/share/vm/code/exceptionHandlerTable.cpp hotspot/src/share/vm/code/exceptionHandlerTable.cpp
28index 511b84d..224e164 100644
29--- hotspot/src/share/vm/code/exceptionHandlerTable.cpp
30+++ hotspot/src/share/vm/code/exceptionHandlerTable.cpp
31@@ -186,7 +186,7 @@ uint ImplicitExceptionTable::at( uint exec_off ) const {
32 void ImplicitExceptionTable::print(address base) const {
33 tty->print("{");
34 for( uint i=0; i<len(); i++ )
35- tty->print("< "INTPTR_FORMAT", "INTPTR_FORMAT" > ",base + *adr(i), base + *(adr(i)+1));
36+ tty->print("< " INTPTR_FORMAT ", " INTPTR_FORMAT " > ",base + *adr(i), base + *(adr(i)+1));
37 tty->print_cr("}");
38 }
73 39
74 void print_val(const char* label, u2 val) { 40diff --git hotspot/src/share/vm/code/nmethod.cpp hotspot/src/share/vm/code/nmethod.cpp
75- _st.print("%s = "UINT32_FORMAT, label, val); 41index 6ea39ae..94a7eef 100644
76+ _st.print("%s = " UINT32_FORMAT, label, val); 42--- hotspot/src/share/vm/code/nmethod.cpp
43+++ hotspot/src/share/vm/code/nmethod.cpp
44@@ -2319,7 +2319,7 @@ public:
45 void maybe_print(oop* p) {
46 if (_print_nm == NULL) return;
47 if (!_detected_scavenge_root) _print_nm->print_on(tty, "new scavenge root");
48- tty->print_cr(""PTR_FORMAT"[offset=%d] detected scavengable oop "PTR_FORMAT" (found at "PTR_FORMAT")",
49+ tty->print_cr("" PTR_FORMAT "[offset=%d] detected scavengable oop " PTR_FORMAT " (found at " PTR_FORMAT ")",
50 _print_nm, (int)((intptr_t)p - (intptr_t)_print_nm),
51 (void *)(*p), (intptr_t)p);
52 (*p)->print();
53@@ -2700,7 +2700,7 @@ public:
54 _nm->print_nmethod(true);
55 _ok = false;
56 }
57- tty->print_cr("*** non-oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)",
58+ tty->print_cr("*** non-oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)",
59 (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
77 } 60 }
78 61 virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
79 void print_val(const char* label, s2 val) { 62@@ -2824,7 +2824,7 @@ public:
80- _st.print("%s = "INT32_FORMAT, label, val); 63 _nm->print_nmethod(true);
81+ _st.print("%s = " INT32_FORMAT, label, val); 64 _ok = false;
65 }
66- tty->print_cr("*** scavengable oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)",
67+ tty->print_cr("*** scavengable oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)",
68 (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
69 (*p)->print();
82 } 70 }
71@@ -2869,7 +2869,7 @@ void nmethod::print() const {
72 print_on(tty, NULL);
83 73
84 void print_val(const char* label, u4 val) { 74 if (WizardMode) {
85- _st.print("%s = "UINT32_FORMAT, label, val); 75- tty->print("((nmethod*) "INTPTR_FORMAT ") ", this);
86+ _st.print("%s = " UINT32_FORMAT, label, val); 76+ tty->print("((nmethod*) " INTPTR_FORMAT ") ", this);
77 tty->print(" for method " INTPTR_FORMAT , (address)method());
78 tty->print(" { ");
79 if (is_in_use()) tty->print("in_use ");
80diff --git hotspot/src/share/vm/compiler/compileBroker.cpp hotspot/src/share/vm/compiler/compileBroker.cpp
81index dad99ec..81429cc 100644
82--- hotspot/src/share/vm/compiler/compileBroker.cpp
83+++ hotspot/src/share/vm/compiler/compileBroker.cpp
84@@ -203,7 +203,7 @@ class CompilationLog : public StringEventLog {
87 } 85 }
88 86
89 void print_val(const char* label, s4 val) { 87 void log_nmethod(JavaThread* thread, nmethod* nm) {
90- _st.print("%s = "INT32_FORMAT, label, val); 88- log(thread, "nmethod %d%s " INTPTR_FORMAT " code ["INTPTR_FORMAT ", " INTPTR_FORMAT "]",
91+ _st.print("%s = " INT32_FORMAT, label, val); 89+ log(thread, "nmethod %d%s " INTPTR_FORMAT " code [" INTPTR_FORMAT ", " INTPTR_FORMAT "]",
90 nm->compile_id(), nm->is_osr_method() ? "%" : "",
91 p2i(nm), p2i(nm->code_begin()), p2i(nm->code_end()));
92 } 92 }
93diff --git hotspot/src/share/vm/compiler/disassembler.cpp hotspot/src/share/vm/compiler/disassembler.cpp
94index 3291360..93cd9e8 100644
95--- hotspot/src/share/vm/compiler/disassembler.cpp
96+++ hotspot/src/share/vm/compiler/disassembler.cpp
97@@ -60,7 +60,7 @@ bool Disassembler::_tried_to_load_library = false;
98 Disassembler::decode_func_virtual Disassembler::_decode_instructions_virtual = NULL;
99 Disassembler::decode_func Disassembler::_decode_instructions = NULL;
93 100
94 void print_val(const char* label, u8 val) { 101-static const char hsdis_library_name[] = "hsdis-"HOTSPOT_LIB_ARCH;
95- _st.print("%s = "UINT64_FORMAT, label, val); 102+static const char hsdis_library_name[] = "hsdis-" HOTSPOT_LIB_ARCH;
96+ _st.print("%s = " UINT64_FORMAT, label, val); 103 static const char decode_instructions_virtual_name[] = "decode_instructions_virtual";
104 static const char decode_instructions_name[] = "decode_instructions";
105 static bool use_new_version = true;
106diff --git hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
107index 14f09d1..7427120 100644
108--- hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
109+++ hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
110@@ -838,18 +838,18 @@ void ConcurrentMarkSweepGeneration::printOccupancy(const char *s) {
111 GenCollectedHeap* gch = GenCollectedHeap::heap();
112 if (PrintGCDetails) {
113 if (Verbose) {
114- gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"("SIZE_FORMAT")]",
115+ gclog_or_tty->print("[%d %s-%s: " SIZE_FORMAT "(" SIZE_FORMAT ")]",
116 level(), short_name(), s, used(), capacity());
117 } else {
118- gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"K("SIZE_FORMAT"K)]",
119+ gclog_or_tty->print("[%d %s-%s: " SIZE_FORMAT "K(" SIZE_FORMAT "K)]",
120 level(), short_name(), s, used() / K, capacity() / K);
121 }
97 } 122 }
98 123 if (Verbose) {
99 void print_val(const char* label, s8 val) { 124- gclog_or_tty->print(" "SIZE_FORMAT"("SIZE_FORMAT")",
100- _st.print("%s = "INT64_FORMAT, label, (int64_t) val); 125+ gclog_or_tty->print(" " SIZE_FORMAT "(" SIZE_FORMAT ")",
101+ _st.print("%s = " INT64_FORMAT, label, (int64_t) val); 126 gch->used(), gch->capacity());
127 } else {
128- gclog_or_tty->print(" "SIZE_FORMAT"K("SIZE_FORMAT"K)",
129+ gclog_or_tty->print(" " SIZE_FORMAT "K(" SIZE_FORMAT "K)",
130 gch->used() / K, gch->capacity() / K);
102 } 131 }
103
104 void print_val(const char* label, bool val) {
105--- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp.orig 2015-09-02 09:59:23.000000000 +0200
106+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp 2015-09-02 10:04:07.000000000 +0200
107@@ -31,9 +31,9 @@
108
109 inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const {
110 assert(addr < heap_end(),
111- err_msg("addr: "PTR_FORMAT" end: "PTR_FORMAT, p2i(addr), p2i(heap_end())));
112+ err_msg("addr: " PTR_FORMAT " end: " PTR_FORMAT, p2i(addr), p2i(heap_end())));
113 assert(addr >= heap_bottom(),
114- err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT, p2i(addr), p2i(heap_bottom())));
115+ err_msg("addr: " PTR_FORMAT " bottom: " PTR_FORMAT, p2i(addr), p2i(heap_bottom())));
116
117 HeapRegion* hr = _regions.get_by_address(addr);
118 return hr;
119--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp.orig 2015-09-02 09:59:23.000000000 +0200
120+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp 2015-09-02 10:03:44.000000000 +0200
121@@ -112,7 +112,7 @@
122
123 assert(ClassUnloadingWithConcurrentMark,
124 err_msg("All blocks should be objects if G1 Class Unloading isn't used. "
125- "HR: ["PTR_FORMAT", "PTR_FORMAT", "PTR_FORMAT") "
126+ "HR: [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ") "
127 "addr: " PTR_FORMAT,
128 p2i(bottom()), p2i(top()), p2i(end()), p2i(addr)));
129
130--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp.orig 2015-09-02 09:59:23.000000000 +0200
131+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp 2015-09-02 10:03:17.000000000 +0200
132@@ -52,7 +52,7 @@
133 class HeapRegionSetBase;
134 class nmethod;
135
136-#define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]"
137+#define HR_FORMAT "%u:(%s)[" PTR_FORMAT "," PTR_FORMAT "," PTR_FORMAT "]"
138 #define HR_FORMAT_PARAMS(_hr_) \
139 (_hr_)->hrm_index(), \
140 (_hr_)->get_short_type_str(), \
141@@ -542,8 +542,8 @@
142 void set_containing_set(HeapRegionSetBase* containing_set) {
143 assert((containing_set == NULL && _containing_set != NULL) ||
144 (containing_set != NULL && _containing_set == NULL),
145- err_msg("containing_set: "PTR_FORMAT" "
146- "_containing_set: "PTR_FORMAT,
147+ err_msg("containing_set: " PTR_FORMAT " "
148+ "_containing_set: " PTR_FORMAT,
149 p2i(containing_set), p2i(_containing_set)));
150
151 _containing_set = containing_set;
152--- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp.orig 2015-09-02 09:59:23.000000000 +0200
153+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp 2015-09-02 10:02:55.000000000 +0200
154@@ -46,7 +46,7 @@
155
156 inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const {
157 assert(is_in_reserved(addr),
158- err_msg("Cannot calculate region index for address "PTR_FORMAT" that is outside of the heap ["PTR_FORMAT", "PTR_FORMAT")",
159+ err_msg("Cannot calculate region index for address " PTR_FORMAT " that is outside of the heap [" PTR_FORMAT ", " PTR_FORMAT ")",
160 p2i(addr), p2i(_reserved.start()), p2i(_reserved.end())));
161 return (uint)(pointer_delta(addr, _reserved.start(), sizeof(uint8_t)) >> HeapRegion::LogOfHRGrainBytes);
162 } 132 }
163@@ -59,7 +59,7 @@ 133@@ -879,8 +879,8 @@ bool ConcurrentMarkSweepGeneration::promotion_attempt_is_safe(size_t max_promoti
164 inline HeapRegion* G1CollectedHeap::heap_region_containing_raw(const T addr) const { 134 bool res = (available >= av_promo) || (available >= max_promotion_in_bytes);
165 assert(addr != NULL, "invariant"); 135 if (Verbose && PrintGCDetails) {
166 assert(is_in_g1_reserved((const void*) addr), 136 gclog_or_tty->print_cr(
167- err_msg("Address "PTR_FORMAT" is outside of the heap ranging from ["PTR_FORMAT" to "PTR_FORMAT")", 137- "CMS: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT"),"
168+ err_msg("Address " PTR_FORMAT " is outside of the heap ranging from [" PTR_FORMAT " to " PTR_FORMAT ")", 138- "max_promo("SIZE_FORMAT")",
169 p2i((void*)addr), p2i(g1_reserved().start()), p2i(g1_reserved().end()))); 139+ "CMS: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT "),"
170 return _hrm.addr_to_region((HeapWord*) addr); 140+ "max_promo(" SIZE_FORMAT ")",
171 } 141 res? "":" not", available, res? ">=":"<",
172--- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp.orig 2015-09-02 09:59:22.000000000 +0200 142 av_promo, max_promotion_in_bytes);
173+++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp 2015-09-02 10:01:43.000000000 +0200 143 }
174@@ -47,15 +47,15 @@ 144@@ -966,8 +966,8 @@ void ConcurrentMarkSweepGeneration::compute_new_size_free_list() {
145 desired_free_percentage);
146 gclog_or_tty->print_cr(" Maximum free fraction %f",
147 maximum_free_percentage);
148- gclog_or_tty->print_cr(" Capactiy "SIZE_FORMAT, capacity()/1000);
149- gclog_or_tty->print_cr(" Desired capacity "SIZE_FORMAT,
150+ gclog_or_tty->print_cr(" Capactiy " SIZE_FORMAT, capacity()/1000);
151+ gclog_or_tty->print_cr(" Desired capacity " SIZE_FORMAT,
152 desired_capacity/1000);
153 int prev_level = level() - 1;
154 if (prev_level >= 0) {
155@@ -975,14 +975,14 @@ void ConcurrentMarkSweepGeneration::compute_new_size_free_list() {
156 GenCollectedHeap* gch = GenCollectedHeap::heap();
157 Generation* prev_gen = gch->_gens[prev_level];
158 prev_size = prev_gen->capacity();
159- gclog_or_tty->print_cr(" Younger gen size "SIZE_FORMAT,
160+ gclog_or_tty->print_cr(" Younger gen size " SIZE_FORMAT,
161 prev_size/1000);
162 }
163- gclog_or_tty->print_cr(" unsafe_max_alloc_nogc "SIZE_FORMAT,
164+ gclog_or_tty->print_cr(" unsafe_max_alloc_nogc " SIZE_FORMAT,
165 unsafe_max_alloc_nogc()/1000);
166- gclog_or_tty->print_cr(" contiguous available "SIZE_FORMAT,
167+ gclog_or_tty->print_cr(" contiguous available " SIZE_FORMAT,
168 contiguous_available()/1000);
169- gclog_or_tty->print_cr(" Expand by "SIZE_FORMAT" (bytes)",
170+ gclog_or_tty->print_cr(" Expand by " SIZE_FORMAT " (bytes)",
171 expand_bytes);
172 }
173 // safe if expansion fails
174@@ -1513,8 +1513,8 @@ bool CMSCollector::shouldConcurrentCollect() {
175 stats().print_on(gclog_or_tty);
176 gclog_or_tty->print_cr("time_until_cms_gen_full %3.7f",
177 stats().time_until_cms_gen_full());
178- gclog_or_tty->print_cr("free="SIZE_FORMAT, _cmsGen->free());
179- gclog_or_tty->print_cr("contiguous_available="SIZE_FORMAT,
180+ gclog_or_tty->print_cr("free=" SIZE_FORMAT, _cmsGen->free());
181+ gclog_or_tty->print_cr("contiguous_available=" SIZE_FORMAT,
182 _cmsGen->contiguous_available());
183 gclog_or_tty->print_cr("promotion_rate=%g", stats().promotion_rate());
184 gclog_or_tty->print_cr("cms_allocation_rate=%g", stats().cms_allocation_rate());
185@@ -2792,7 +2792,7 @@ void ConcurrentMarkSweepGeneration::gc_prologue_work(bool full,
186 assert(_numObjectsPromoted == 0, "check");
187 assert(_numWordsPromoted == 0, "check");
188 if (Verbose && PrintGC) {
189- gclog_or_tty->print("Allocated "SIZE_FORMAT" objects, "
190+ gclog_or_tty->print("Allocated " SIZE_FORMAT " objects, "
191 SIZE_FORMAT" bytes concurrently",
192 _numObjectsAllocated, _numWordsAllocated*sizeof(HeapWord));
193 }
194@@ -2879,7 +2879,7 @@ void ConcurrentMarkSweepGeneration::gc_epilogue_work(bool full) {
195 assert(_numObjectsAllocated == 0, "check");
196 assert(_numWordsAllocated == 0, "check");
197 if (Verbose && PrintGC) {
198- gclog_or_tty->print("Promoted "SIZE_FORMAT" objects, "
199+ gclog_or_tty->print("Promoted " SIZE_FORMAT " objects, "
200 SIZE_FORMAT" bytes",
201 _numObjectsPromoted, _numWordsPromoted*sizeof(HeapWord));
202 }
203@@ -2890,7 +2890,7 @@ void ConcurrentMarkSweepGeneration::gc_epilogue_work(bool full) {
204 if (PrintGC && Verbose) {
205 // Call down the chain in contiguous_available needs the freelistLock
206 // so print this out before releasing the freeListLock.
207- gclog_or_tty->print(" Contiguous available "SIZE_FORMAT" bytes ",
208+ gclog_or_tty->print(" Contiguous available " SIZE_FORMAT " bytes ",
209 contiguous_available());
175 } 210 }
176 } 211 }
212@@ -2978,7 +2978,7 @@ class VerifyMarkedClosure: public BitMapClosure {
213 HeapWord* addr = _marks->offsetToHeapWord(offset);
214 if (!_marks->isMarked(addr)) {
215 oop(addr)->print_on(gclog_or_tty);
216- gclog_or_tty->print_cr(" ("INTPTR_FORMAT" should have been marked)", addr);
217+ gclog_or_tty->print_cr(" (" INTPTR_FORMAT " should have been marked)", addr);
218 _failed = true;
219 }
220 return true;
221@@ -5039,7 +5039,7 @@ void CMSCollector::checkpointRootsFinal(bool asynch,
177 222
178-#define check_index(index, msg) \ 223 SpecializationStats::clear();
179- assert((index) < (_reserved.word_size() >> LogN_words), \ 224 if (PrintGCDetails) {
180- err_msg("%s - index: "SIZE_FORMAT", _vs.committed_size: "SIZE_FORMAT, \ 225- gclog_or_tty->print("[YG occupancy: "SIZE_FORMAT" K ("SIZE_FORMAT" K)]",
181- msg, (index), (_reserved.word_size() >> LogN_words))); \ 226+ gclog_or_tty->print("[YG occupancy: " SIZE_FORMAT " K (" SIZE_FORMAT " K)]",
182- assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \ 227 _young_gen->used() / K,
183- err_msg("Index "SIZE_FORMAT" corresponding to "PTR_FORMAT \ 228 _young_gen->capacity() / K);
184- " (%u) is not in committed area.", \ 229 }
185- (index), \ 230@@ -5172,8 +5172,8 @@ void CMSCollector::checkpointRootsFinalWork(bool asynch,
186- p2i(address_for_index_raw(index)), \ 231 if (ser_ovflw > 0) {
187+#define check_index(index, msg) \ 232 if (PrintCMSStatistics != 0) {
188+ assert((index) < (_reserved.word_size() >> LogN_words), \ 233 gclog_or_tty->print_cr("Marking stack overflow (benign) "
189+ err_msg("%s - index: " SIZE_FORMAT ", _vs.committed_size: " SIZE_FORMAT, \ 234- "(pmc_pc="SIZE_FORMAT", pmc_rm="SIZE_FORMAT", kac="SIZE_FORMAT
190+ msg, (index), (_reserved.word_size() >> LogN_words))); \ 235- ", kac_preclean="SIZE_FORMAT")",
191+ assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \ 236+ "(pmc_pc=" SIZE_FORMAT ", pmc_rm=" SIZE_FORMAT ", kac=" SIZE_FORMAT
192+ err_msg("Index " SIZE_FORMAT " corresponding to " PTR_FORMAT \ 237+ ", kac_preclean=" SIZE_FORMAT ")",
193+ " (%u) is not in committed area.", \ 238 _ser_pmc_preclean_ovflw, _ser_pmc_remark_ovflw,
194+ (index), \ 239 _ser_kac_ovflw, _ser_kac_preclean_ovflw);
195+ p2i(address_for_index_raw(index)), \ 240 }
196 G1CollectedHeap::heap()->addr_to_region(address_for_index_raw(index)))); 241@@ -5186,7 +5186,7 @@ void CMSCollector::checkpointRootsFinalWork(bool asynch,
197 242 if (_par_pmc_remark_ovflw > 0 || _par_kac_ovflw > 0) {
198 u_char G1BlockOffsetSharedArray::offset_array(size_t index) const { 243 if (PrintCMSStatistics != 0) {
199--- hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp.orig 2015-09-02 09:59:22.000000000 +0200 244 gclog_or_tty->print_cr("Work queue overflow (benign) "
200+++ hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp 2015-09-02 10:00:36.000000000 +0200 245- "(pmc_rm="SIZE_FORMAT", kac="SIZE_FORMAT")",
201@@ -78,7 +78,7 @@ 246+ "(pmc_rm=" SIZE_FORMAT ", kac=" SIZE_FORMAT ")",
247 _par_pmc_remark_ovflw, _par_kac_ovflw);
248 }
249 _par_pmc_remark_ovflw = 0;
250@@ -5194,12 +5194,12 @@ void CMSCollector::checkpointRootsFinalWork(bool asynch,
251 }
252 if (PrintCMSStatistics != 0) {
253 if (_markStack._hit_limit > 0) {
254- gclog_or_tty->print_cr(" (benign) Hit max stack size limit ("SIZE_FORMAT")",
255+ gclog_or_tty->print_cr(" (benign) Hit max stack size limit (" SIZE_FORMAT ")",
256 _markStack._hit_limit);
257 }
258 if (_markStack._failed_double > 0) {
259- gclog_or_tty->print_cr(" (benign) Failed stack doubling ("SIZE_FORMAT"),"
260- " current capacity "SIZE_FORMAT,
261+ gclog_or_tty->print_cr(" (benign) Failed stack doubling (" SIZE_FORMAT "),"
262+ " current capacity " SIZE_FORMAT,
263 _markStack._failed_double,
264 _markStack.capacity());
265 }
266@@ -5963,7 +5963,7 @@ void CMSCollector::do_remark_non_parallel() {
267 &markFromDirtyCardsClosure);
268 verify_work_stacks_empty();
269 if (PrintCMSStatistics != 0) {
270- gclog_or_tty->print(" (re-scanned "SIZE_FORMAT" dirty cards in cms gen) ",
271+ gclog_or_tty->print(" (re-scanned " SIZE_FORMAT " dirty cards in cms gen) ",
272 markFromDirtyCardsClosure.num_dirty_cards());
273 }
274 }
275@@ -6893,7 +6893,7 @@ void CMSMarkStack::expand() {
276 } else if (_failed_double++ == 0 && !CMSConcurrentMTEnabled && PrintGCDetails) {
277 // Failed to double capacity, continue;
278 // we print a detail message only once per CMS cycle.
279- gclog_or_tty->print(" (benign) Failed to expand marking stack from "SIZE_FORMAT"K to "
280+ gclog_or_tty->print(" (benign) Failed to expand marking stack from " SIZE_FORMAT "K to "
281 SIZE_FORMAT"K",
282 _capacity / K, new_capacity / K);
283 }
284@@ -8216,25 +8216,25 @@ SweepClosure::~SweepClosure() {
285 ShouldNotReachHere();
286 }
287 if (Verbose && PrintGC) {
288- gclog_or_tty->print("Collected "SIZE_FORMAT" objects, " SIZE_FORMAT " bytes",
289+ gclog_or_tty->print("Collected " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes",
290 _numObjectsFreed, _numWordsFreed*sizeof(HeapWord));
291- gclog_or_tty->print_cr("\nLive "SIZE_FORMAT" objects, "
292+ gclog_or_tty->print_cr("\nLive " SIZE_FORMAT " objects, "
293 SIZE_FORMAT" bytes "
294- "Already free "SIZE_FORMAT" objects, "SIZE_FORMAT" bytes",
295+ "Already free " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes",
296 _numObjectsLive, _numWordsLive*sizeof(HeapWord),
297 _numObjectsAlreadyFree, _numWordsAlreadyFree*sizeof(HeapWord));
298 size_t totalBytes = (_numWordsFreed + _numWordsLive + _numWordsAlreadyFree)
299 * sizeof(HeapWord);
300- gclog_or_tty->print_cr("Total sweep: "SIZE_FORMAT" bytes", totalBytes);
301+ gclog_or_tty->print_cr("Total sweep: " SIZE_FORMAT " bytes", totalBytes);
202 302
203 void decrease_used(size_t bytes) { 303 if (PrintCMSStatistics && CMSVerifyReturnedBytes) {
204 assert(_summary_bytes_used >= bytes, 304 size_t indexListReturnedBytes = _sp->sumIndexedFreeListArrayReturnedBytes();
205- err_msg("invariant: _summary_bytes_used: "SIZE_FORMAT" should be >= bytes: "SIZE_FORMAT, 305 size_t dict_returned_bytes = _sp->dictionary()->sum_dict_returned_bytes();
206+ err_msg("invariant: _summary_bytes_used: " SIZE_FORMAT " should be >= bytes: " SIZE_FORMAT, 306 size_t returned_bytes = indexListReturnedBytes + dict_returned_bytes;
207 _summary_bytes_used, bytes)); 307- gclog_or_tty->print("Returned "SIZE_FORMAT" bytes", returned_bytes);
208 _summary_bytes_used -= bytes; 308- gclog_or_tty->print(" Indexed List Returned "SIZE_FORMAT" bytes",
209 } 309+ gclog_or_tty->print("Returned " SIZE_FORMAT " bytes", returned_bytes);
210--- hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp.orig 2015-09-02 09:59:22.000000000 +0200 310+ gclog_or_tty->print(" Indexed List Returned " SIZE_FORMAT " bytes",
211+++ hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp 2015-09-02 10:00:20.000000000 +0200 311 indexListReturnedBytes);
212@@ -92,7 +92,7 @@ 312- gclog_or_tty->print_cr(" Dictionary Returned "SIZE_FORMAT" bytes",
313+ gclog_or_tty->print_cr(" Dictionary Returned " SIZE_FORMAT " bytes",
314 dict_returned_bytes);
315 }
316 }
317@@ -8313,13 +8313,13 @@ size_t SweepClosure::do_blk_careful(HeapWord* addr) {
318 // coalesced chunk to the appropriate free list.
319 if (inFreeRange()) {
320 assert(freeFinger() >= _sp->bottom() && freeFinger() < _limit,
321- err_msg("freeFinger() " PTR_FORMAT" is out-of-bounds", freeFinger()));
322+ err_msg("freeFinger() " PTR_FORMAT " is out-of-bounds", freeFinger()));
323 flush_cur_free_chunk(freeFinger(),
324 pointer_delta(addr, freeFinger()));
325 if (CMSTraceSweeper) {
326 gclog_or_tty->print("Sweep: last chunk: ");
327- gclog_or_tty->print("put_free_blk 0x%x ("SIZE_FORMAT") "
328- "[coalesced:"SIZE_FORMAT"]\n",
329+ gclog_or_tty->print("put_free_blk 0x%x (" SIZE_FORMAT ") "
330+ "[coalesced:" SIZE_FORMAT "]\n",
331 freeFinger(), pointer_delta(addr, freeFinger()),
332 lastFreeRangeCoalesced());
333 }
334diff --git hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
335index e177fd1..c36852e 100644
336--- hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
337+++ hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
338@@ -92,7 +92,7 @@ public:
213 regions_at_put(_curr_index, NULL); 339 regions_at_put(_curr_index, NULL);
214 assert(hr->reclaimable_bytes() <= _remaining_reclaimable_bytes, 340 assert(hr->reclaimable_bytes() <= _remaining_reclaimable_bytes,
215 err_msg("remaining reclaimable bytes inconsistent " 341 err_msg("remaining reclaimable bytes inconsistent "
@@ -218,94 +344,11 @@
218 hr->reclaimable_bytes(), _remaining_reclaimable_bytes)); 344 hr->reclaimable_bytes(), _remaining_reclaimable_bytes));
219 _remaining_reclaimable_bytes -= hr->reclaimable_bytes(); 345 _remaining_reclaimable_bytes -= hr->reclaimable_bytes();
220 _curr_index += 1; 346 _curr_index += 1;
221--- hotspot/src/share/vm/compiler/compileBroker.cpp.orig 2015-09-02 10:08:43.000000000 +0200 347diff --git hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
222+++ hotspot/src/share/vm/compiler/compileBroker.cpp 2015-09-02 10:09:37.000000000 +0200 348index 9226191..29b4899 100644
223@@ -203,7 +203,7 @@ 349--- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
224 } 350+++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
225 351@@ -284,7 +284,7 @@ void CMMarkStack::expand() {
226 void log_nmethod(JavaThread* thread, nmethod* nm) {
227- log(thread, "nmethod %d%s " INTPTR_FORMAT " code ["INTPTR_FORMAT ", " INTPTR_FORMAT "]",
228+ log(thread, "nmethod %d%s " INTPTR_FORMAT " code [" INTPTR_FORMAT ", " INTPTR_FORMAT "]",
229 nm->compile_id(), nm->is_osr_method() ? "%" : "",
230 p2i(nm), p2i(nm->code_begin()), p2i(nm->code_end()));
231 }
232--- hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp.orig 2015-09-02 10:08:44.000000000 +0200
233+++ hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp 2015-09-02 10:09:56.000000000 +0200
234@@ -121,15 +121,15 @@
235 // Single parameter format strings
236 #define ergo_format_str(_name_) ", " _name_ ": %s"
237 #define ergo_format_region(_name_) ", " _name_ ": %u regions"
238-#define ergo_format_byte(_name_) ", " _name_ ": "SIZE_FORMAT" bytes"
239+#define ergo_format_byte(_name_) ", " _name_ ": " SIZE_FORMAT " bytes"
240 #define ergo_format_double(_name_) ", " _name_ ": %1.2f"
241 #define ergo_format_perc(_name_) ", " _name_ ": %1.2f %%"
242 #define ergo_format_ms(_name_) ", " _name_ ": %1.2f ms"
243-#define ergo_format_size(_name_) ", " _name_ ": "SIZE_FORMAT
244+#define ergo_format_size(_name_) ", " _name_ ": " SIZE_FORMAT
245
246 // Double parameter format strings
247 #define ergo_format_byte_perc(_name_) \
248- ", " _name_ ": "SIZE_FORMAT" bytes (%1.2f %%)"
249+ ", " _name_ ": " SIZE_FORMAT " bytes (%1.2f %%)"
250
251 // Generates the format string
252 #define ergo_format(_extra_format_) \
253--- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp.orig 2015-09-02 10:12:49.000000000 +0200
254+++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp 2015-09-02 10:21:24.000000000 +0200
255@@ -196,8 +196,8 @@
256 assert(_bmStartWord <= (addr) && (addr) < (_bmStartWord + _bmWordSize), \
257 "outside underlying space?"); \
258 assert(G1CollectedHeap::heap()->is_in_exact(addr), \
259- err_msg("Trying to access not available bitmap "PTR_FORMAT \
260- " corresponding to "PTR_FORMAT" (%u)", \
261+ err_msg("Trying to access not available bitmap " PTR_FORMAT \
262+ " corresponding to " PTR_FORMAT " (%u)", \
263 p2i(this), p2i(addr), G1CollectedHeap::heap()->addr_to_region(addr)));
264
265 inline void CMBitMap::mark(HeapWord* addr) {
266@@ -270,7 +270,7 @@
267
268 inline void CMTask::deal_with_reference(oop obj) {
269 if (_cm->verbose_high()) {
270- gclog_or_tty->print_cr("[%u] we're dealing with reference = "PTR_FORMAT,
271+ gclog_or_tty->print_cr("[%u] we're dealing with reference = " PTR_FORMAT,
272 _worker_id, p2i((void*) obj));
273 }
274
275@@ -374,7 +374,7 @@
276 // assert that word_size is under an upper bound which is its
277 // containing region's capacity.
278 assert(word_size * HeapWordSize <= hr->capacity(),
279- err_msg("size: "SIZE_FORMAT" capacity: "SIZE_FORMAT" "HR_FORMAT,
280+ err_msg("size: " SIZE_FORMAT " capacity: " SIZE_FORMAT " " HR_FORMAT,
281 word_size * HeapWordSize, hr->capacity(),
282 HR_FORMAT_PARAMS(hr)));
283
284--- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp.orig 2015-09-02 10:12:49.000000000 +0200
285+++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp 2015-09-02 10:21:38.000000000 +0200
286@@ -91,7 +91,7 @@
287
288 jbyte* card_num_2_ptr(size_t card_num) {
289 assert(card_num >= 0 && card_num < _reserved_max_card_num,
290- err_msg("card num out of range: "SIZE_FORMAT, card_num));
291+ err_msg("card num out of range: " SIZE_FORMAT, card_num));
292 return (jbyte*) (_ct_bot + card_num);
293 }
294
295--- hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp.orig 2015-09-02 10:24:04.000000000 +0200
296+++ hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp 2015-09-02 10:24:14.000000000 +0200
297@@ -118,7 +118,7 @@
298 oop obj = oopDesc::load_decode_heap_oop(p);
299 if (_cm->verbose_high()) {
300 gclog_or_tty->print_cr("[%u] we're looking at location "
301- "*"PTR_FORMAT" = "PTR_FORMAT,
302+ "*" PTR_FORMAT " = " PTR_FORMAT,
303 _task->worker_id(), p2i(p), p2i((void*) obj));
304 }
305 _task->deal_with_reference(obj);
306--- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.orig 2015-09-06 14:02:06.000000000 +0200
307+++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2015-09-10 12:03:16.130020385 +0200
308@@ -284,7 +284,7 @@
309 if (PrintGCDetails && Verbose) { 352 if (PrintGCDetails && Verbose) {
310 // Failed to double capacity, continue; 353 // Failed to double capacity, continue;
311 gclog_or_tty->print(" (benign) Failed to expand marking stack capacity from " 354 gclog_or_tty->print(" (benign) Failed to expand marking stack capacity from "
@@ -314,7 +357,7 @@
314 _capacity / K, new_capacity / K); 357 _capacity / K, new_capacity / K);
315 } 358 }
316 } 359 }
317@@ -581,7 +581,7 @@ 360@@ -581,7 +581,7 @@ ConcurrentMark::ConcurrentMark(G1CollectedHeap* g1h, G1RegionToSpaceMapper* prev
318 _verbose_level = verbose_level; 361 _verbose_level = verbose_level;
319 362
320 if (verbose_low()) { 363 if (verbose_low()) {
@@ -323,7 +366,7 @@
323 "heap end = " INTPTR_FORMAT, p2i(_heap_start), p2i(_heap_end)); 366 "heap end = " INTPTR_FORMAT, p2i(_heap_start), p2i(_heap_end));
324 } 367 }
325 368
326@@ -838,7 +838,7 @@ 369@@ -838,7 +838,7 @@ void ConcurrentMark::set_concurrency_and_phase(uint active_tasks, bool concurren
327 // in a STW phase. 370 // in a STW phase.
328 assert(!concurrent_marking_in_progress(), "invariant"); 371 assert(!concurrent_marking_in_progress(), "invariant");
329 assert(out_of_regions(), 372 assert(out_of_regions(),
@@ -332,7 +375,7 @@
332 p2i(_finger), p2i(_heap_end))); 375 p2i(_finger), p2i(_heap_end)));
333 } 376 }
334 } 377 }
335@@ -1453,7 +1453,7 @@ 378@@ -1453,7 +1453,7 @@ public:
336 379
337 assert(start <= hr->end() && start <= ntams && ntams <= hr->end(), 380 assert(start <= hr->end() && start <= ntams && ntams <= hr->end(),
338 err_msg("Preconditions not met - " 381 err_msg("Preconditions not met - "
@@ -341,7 +384,7 @@
341 p2i(start), p2i(ntams), p2i(hr->end()))); 384 p2i(start), p2i(ntams), p2i(hr->end())));
342 385
343 // Find the first marked object at or after "start". 386 // Find the first marked object at or after "start".
344@@ -1770,10 +1770,10 @@ 387@@ -1770,10 +1770,10 @@ class FinalCountDataUpdateClosure: public CMCountDataClosureBase {
345 } 388 }
346 389
347 assert(end_idx <= _card_bm->size(), 390 assert(end_idx <= _card_bm->size(),
@@ -354,7 +397,7 @@
354 start_idx, _card_bm->size())); 397 start_idx, _card_bm->size()));
355 398
356 _cm->set_card_bitmap_range(_card_bm, start_idx, end_idx, true /* is_par */); 399 _cm->set_card_bitmap_range(_card_bm, start_idx, end_idx, true /* is_par */);
357@@ -2278,7 +2278,7 @@ 400@@ -2278,7 +2278,7 @@ class G1CMKeepAliveAndDrainClosure: public OopClosure {
358 oop obj = oopDesc::load_decode_heap_oop(p); 401 oop obj = oopDesc::load_decode_heap_oop(p);
359 if (_cm->verbose_high()) { 402 if (_cm->verbose_high()) {
360 gclog_or_tty->print_cr("\t[%u] we're looking at location " 403 gclog_or_tty->print_cr("\t[%u] we're looking at location "
@@ -363,7 +406,7 @@
363 _task->worker_id(), p2i(p), p2i((void*) obj)); 406 _task->worker_id(), p2i(p), p2i((void*) obj));
364 } 407 }
365 408
366@@ -2847,7 +2847,7 @@ 409@@ -2847,7 +2847,7 @@ public:
367 } 410 }
368 } 411 }
369 412
@@ -372,7 +415,7 @@
372 p2i(p), p2i((void*) obj), str, str2); 415 p2i(p), p2i((void*) obj), str, str2);
373 } 416 }
374 }; 417 };
375@@ -2874,7 +2874,7 @@ 418@@ -2874,7 +2874,7 @@ public:
376 bool print_it = _all || over_tams || marked; 419 bool print_it = _all || over_tams || marked;
377 420
378 if (print_it) { 421 if (print_it) {
@@ -381,7 +424,7 @@
381 p2i((void *)o), (over_tams) ? " >" : (marked) ? " M" : ""); 424 p2i((void *)o), (over_tams) ? " >" : (marked) ? " M" : "");
382 PrintReachableOopClosure oopCl(_out, _vo, _all); 425 PrintReachableOopClosure oopCl(_out, _vo, _all);
383 o->oop_iterate_no_header(&oopCl); 426 o->oop_iterate_no_header(&oopCl);
384@@ -2895,7 +2895,7 @@ 427@@ -2895,7 +2895,7 @@ public:
385 HeapWord* e = hr->end(); 428 HeapWord* e = hr->end();
386 HeapWord* t = hr->top(); 429 HeapWord* t = hr->top();
387 HeapWord* p = _g1h->top_at_mark_start(hr, _vo); 430 HeapWord* p = _g1h->top_at_mark_start(hr, _vo);
@@ -390,7 +433,7 @@
390 "TAMS: " PTR_FORMAT, p2i(b), p2i(e), p2i(t), p2i(p)); 433 "TAMS: " PTR_FORMAT, p2i(b), p2i(e), p2i(t), p2i(p));
391 _out->cr(); 434 _out->cr();
392 435
393@@ -3019,9 +3019,9 @@ 436@@ -3019,9 +3019,9 @@ ConcurrentMark::claim_region(uint worker_id) {
394 HeapWord* limit = curr_region->next_top_at_mark_start(); 437 HeapWord* limit = curr_region->next_top_at_mark_start();
395 438
396 if (verbose_low()) { 439 if (verbose_low()) {
@@ -403,7 +446,7 @@
403 worker_id, p2i(curr_region), p2i(bottom), p2i(end), p2i(limit)); 446 worker_id, p2i(curr_region), p2i(bottom), p2i(end), p2i(limit));
404 } 447 }
405 448
406@@ -3036,7 +3036,7 @@ 449@@ -3036,7 +3036,7 @@ ConcurrentMark::claim_region(uint worker_id) {
407 450
408 if (limit > bottom) { 451 if (limit > bottom) {
409 if (verbose_low()) { 452 if (verbose_low()) {
@@ -412,7 +455,7 @@
412 "returning it ", worker_id, p2i(curr_region)); 455 "returning it ", worker_id, p2i(curr_region));
413 } 456 }
414 return curr_region; 457 return curr_region;
415@@ -3044,7 +3044,7 @@ 458@@ -3044,7 +3044,7 @@ ConcurrentMark::claim_region(uint worker_id) {
416 assert(limit == bottom, 459 assert(limit == bottom,
417 "the region limit should be at bottom"); 460 "the region limit should be at bottom");
418 if (verbose_low()) { 461 if (verbose_low()) {
@@ -421,7 +464,7 @@
421 "returning NULL", worker_id, p2i(curr_region)); 464 "returning NULL", worker_id, p2i(curr_region));
422 } 465 }
423 // we return NULL and the caller should try calling 466 // we return NULL and the caller should try calling
424@@ -3056,13 +3056,13 @@ 467@@ -3056,13 +3056,13 @@ ConcurrentMark::claim_region(uint worker_id) {
425 if (verbose_low()) { 468 if (verbose_low()) {
426 if (curr_region == NULL) { 469 if (curr_region == NULL) {
427 gclog_or_tty->print_cr("[%u] found uncommitted region, moving finger, " 470 gclog_or_tty->print_cr("[%u] found uncommitted region, moving finger, "
@@ -439,7 +482,7 @@
439 worker_id, p2i(_finger), p2i(finger)); 482 worker_id, p2i(_finger), p2i(finger));
440 } 483 }
441 } 484 }
442@@ -3098,7 +3098,7 @@ 485@@ -3098,7 +3098,7 @@ private:
443 486
444 void do_object_work(oop obj) { 487 void do_object_work(oop obj) {
445 guarantee(!_g1h->obj_in_cs(obj), 488 guarantee(!_g1h->obj_in_cs(obj),
@@ -448,7 +491,7 @@
448 p2i((void*) obj), phase_str(), _info)); 491 p2i((void*) obj), phase_str(), _info));
449 } 492 }
450 493
451@@ -3159,7 +3159,7 @@ 494@@ -3159,7 +3159,7 @@ void ConcurrentMark::verify_no_cset_oops() {
452 // here. 495 // here.
453 HeapRegion* global_hr = _g1h->heap_region_containing_raw(global_finger); 496 HeapRegion* global_hr = _g1h->heap_region_containing_raw(global_finger);
454 guarantee(global_hr == NULL || global_finger == global_hr->bottom(), 497 guarantee(global_hr == NULL || global_finger == global_hr->bottom(),
@@ -457,7 +500,7 @@
457 p2i(global_finger), HR_FORMAT_PARAMS(global_hr))); 500 p2i(global_finger), HR_FORMAT_PARAMS(global_hr)));
458 } 501 }
459 502
460@@ -3173,7 +3173,7 @@ 503@@ -3173,7 +3173,7 @@ void ConcurrentMark::verify_no_cset_oops() {
461 HeapRegion* task_hr = _g1h->heap_region_containing_raw(task_finger); 504 HeapRegion* task_hr = _g1h->heap_region_containing_raw(task_finger);
462 guarantee(task_hr == NULL || task_finger == task_hr->bottom() || 505 guarantee(task_hr == NULL || task_finger == task_hr->bottom() ||
463 !task_hr->in_collection_set(), 506 !task_hr->in_collection_set(),
@@ -466,7 +509,7 @@
466 p2i(task_finger), HR_FORMAT_PARAMS(task_hr))); 509 p2i(task_finger), HR_FORMAT_PARAMS(task_hr)));
467 } 510 }
468 } 511 }
469@@ -3215,8 +3215,8 @@ 512@@ -3215,8 +3215,8 @@ class AggregateCountDataHRClosure: public HeapRegionClosure {
470 513
471 assert(start <= limit && limit <= hr->top() && hr->top() <= hr->end(), 514 assert(start <= limit && limit <= hr->top() && hr->top() <= hr->end(),
472 err_msg("Preconditions not met - " 515 err_msg("Preconditions not met - "
@@ -477,7 +520,7 @@
477 p2i(start), p2i(limit), p2i(hr->top()), p2i(hr->end()))); 520 p2i(start), p2i(limit), p2i(hr->top()), p2i(hr->end())));
478 521
479 assert(hr->next_marked_bytes() == 0, "Precondition"); 522 assert(hr->next_marked_bytes() == 0, "Precondition");
480@@ -3495,7 +3495,7 @@ 523@@ -3495,7 +3495,7 @@ bool ConcurrentMark::do_yield_check(uint worker_id) {
481 #ifndef PRODUCT 524 #ifndef PRODUCT
482 // for debugging purposes 525 // for debugging purposes
483 void ConcurrentMark::print_finger() { 526 void ConcurrentMark::print_finger() {
@@ -486,7 +529,7 @@
486 p2i(_heap_start), p2i(_heap_end), p2i(_finger)); 529 p2i(_heap_start), p2i(_heap_end), p2i(_finger));
487 for (uint i = 0; i < _max_worker_id; ++i) { 530 for (uint i = 0; i < _max_worker_id; ++i) {
488 gclog_or_tty->print(" %u: " PTR_FORMAT, i, p2i(_tasks[i]->finger())); 531 gclog_or_tty->print(" %u: " PTR_FORMAT, i, p2i(_tasks[i]->finger()));
489@@ -3580,7 +3580,7 @@ 532@@ -3580,7 +3580,7 @@ void CMTask::setup_for_region(HeapRegion* hr) {
490 "claim_region() should have filtered out continues humongous regions"); 533 "claim_region() should have filtered out continues humongous regions");
491 534
492 if (_cm->verbose_low()) { 535 if (_cm->verbose_low()) {
@@ -495,7 +538,7 @@
495 _worker_id, p2i(hr)); 538 _worker_id, p2i(hr));
496 } 539 }
497 540
498@@ -3597,7 +3597,7 @@ 541@@ -3597,7 +3597,7 @@ void CMTask::update_region_limit() {
499 if (limit == bottom) { 542 if (limit == bottom) {
500 if (_cm->verbose_low()) { 543 if (_cm->verbose_low()) {
501 gclog_or_tty->print_cr("[%u] found an empty region " 544 gclog_or_tty->print_cr("[%u] found an empty region "
@@ -504,7 +547,7 @@
504 _worker_id, p2i(bottom), p2i(limit)); 547 _worker_id, p2i(bottom), p2i(limit));
505 } 548 }
506 // The region was collected underneath our feet. 549 // The region was collected underneath our feet.
507@@ -3629,7 +3629,7 @@ 550@@ -3629,7 +3629,7 @@ void CMTask::update_region_limit() {
508 void CMTask::giveup_current_region() { 551 void CMTask::giveup_current_region() {
509 assert(_curr_region != NULL, "invariant"); 552 assert(_curr_region != NULL, "invariant");
510 if (_cm->verbose_low()) { 553 if (_cm->verbose_low()) {
@@ -513,7 +556,7 @@
513 _worker_id, p2i(_curr_region)); 556 _worker_id, p2i(_curr_region));
514 } 557 }
515 clear_region_fields(); 558 clear_region_fields();
516@@ -3751,7 +3751,7 @@ 559@@ -3751,7 +3751,7 @@ void CMTask::regular_clock_call() {
517 560
518 if (_cm->verbose_medium()) { 561 if (_cm->verbose_medium()) {
519 gclog_or_tty->print_cr("[%u] regular clock, interval = %1.2lfms, " 562 gclog_or_tty->print_cr("[%u] regular clock, interval = %1.2lfms, "
@@ -522,7 +565,7 @@
522 _worker_id, last_interval_ms, 565 _worker_id, last_interval_ms,
523 _words_scanned, 566 _words_scanned,
524 (_words_scanned >= _words_scanned_limit) ? " (*)" : "", 567 (_words_scanned >= _words_scanned_limit) ? " (*)" : "",
525@@ -3920,7 +3920,7 @@ 568@@ -3920,7 +3920,7 @@ void CMTask::drain_local_queue(bool partially) {
526 statsOnly( ++_local_pops ); 569 statsOnly( ++_local_pops );
527 570
528 if (_cm->verbose_high()) { 571 if (_cm->verbose_high()) {
@@ -531,7 +574,7 @@
531 p2i((void*) obj)); 574 p2i((void*) obj));
532 } 575 }
533 576
534@@ -4273,8 +4273,8 @@ 577@@ -4273,8 +4273,8 @@ void CMTask::do_marking_step(double time_target_ms,
535 578
536 if (_cm->verbose_low()) { 579 if (_cm->verbose_low()) {
537 gclog_or_tty->print_cr("[%u] we're scanning part " 580 gclog_or_tty->print_cr("[%u] we're scanning part "
@@ -542,7 +585,7 @@
542 _worker_id, p2i(_finger), p2i(_region_limit), 585 _worker_id, p2i(_finger), p2i(_region_limit),
543 HR_FORMAT_PARAMS(_curr_region)); 586 HR_FORMAT_PARAMS(_curr_region));
544 } 587 }
545@@ -4361,7 +4361,7 @@ 588@@ -4361,7 +4361,7 @@ void CMTask::do_marking_step(double time_target_ms,
546 589
547 if (_cm->verbose_low()) { 590 if (_cm->verbose_low()) {
548 gclog_or_tty->print_cr("[%u] we successfully claimed " 591 gclog_or_tty->print_cr("[%u] we successfully claimed "
@@ -551,7 +594,7 @@
551 _worker_id, p2i(claimed_region)); 594 _worker_id, p2i(claimed_region));
552 } 595 }
553 596
554@@ -4422,7 +4422,7 @@ 597@@ -4422,7 +4422,7 @@ void CMTask::do_marking_step(double time_target_ms,
555 598
556 if (_cm->try_stealing(_worker_id, &_hash_seed, obj)) { 599 if (_cm->try_stealing(_worker_id, &_hash_seed, obj)) {
557 if (_cm->verbose_medium()) { 600 if (_cm->verbose_medium()) {
@@ -560,7 +603,7 @@
560 _worker_id, p2i((void*) obj)); 603 _worker_id, p2i((void*) obj));
561 } 604 }
562 605
563@@ -4630,7 +4630,7 @@ 606@@ -4630,7 +4630,7 @@ CMTask::CMTask(uint worker_id,
564 // identify them easily in a large log file. 607 // identify them easily in a large log file.
565 #define G1PPRL_LINE_PREFIX "###" 608 #define G1PPRL_LINE_PREFIX "###"
566 609
@@ -569,7 +612,7 @@
569 #ifdef _LP64 612 #ifdef _LP64
570 #define G1PPRL_ADDR_BASE_H_FORMAT " %37s" 613 #define G1PPRL_ADDR_BASE_H_FORMAT " %37s"
571 #else // _LP64 614 #else // _LP64
572@@ -4640,16 +4640,16 @@ 615@@ -4640,16 +4640,16 @@ CMTask::CMTask(uint worker_id,
573 // For per-region info 616 // For per-region info
574 #define G1PPRL_TYPE_FORMAT " %-4s" 617 #define G1PPRL_TYPE_FORMAT " %-4s"
575 #define G1PPRL_TYPE_H_FORMAT " %4s" 618 #define G1PPRL_TYPE_H_FORMAT " %4s"
@@ -591,307 +634,44 @@
591 634
592 G1PrintRegionLivenessInfoClosure:: 635 G1PrintRegionLivenessInfoClosure::
593 G1PrintRegionLivenessInfoClosure(outputStream* out, const char* phase_name) 636 G1PrintRegionLivenessInfoClosure(outputStream* out, const char* phase_name)
594--- hotspot/src/share/vm/oops/constantPool.cpp.orig 2015-09-02 10:35:07.000000000 +0200 637diff --git hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
595+++ hotspot/src/share/vm/oops/constantPool.cpp 2015-09-02 10:36:03.000000000 +0200 638index 4e84d49..46ab546 100644
596@@ -1494,7 +1494,7 @@ 639--- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
597 } 640+++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
598 case JVM_CONSTANT_Long: { 641@@ -196,8 +196,8 @@ inline bool CMBitMapRO::iterate(BitMapClosure* cl) {
599 u8 val = Bytes::get_Java_u8(bytes); 642 assert(_bmStartWord <= (addr) && (addr) < (_bmStartWord + _bmWordSize), \
600- printf("long "INT64_FORMAT, (int64_t) *(jlong *) &val); 643 "outside underlying space?"); \
601+ printf("long " INT64_FORMAT, (int64_t) *(jlong *) &val); 644 assert(G1CollectedHeap::heap()->is_in_exact(addr), \
602 ent_size = 8; 645- err_msg("Trying to access not available bitmap "PTR_FORMAT \
603 idx++; // Long takes two cpool slots 646- " corresponding to "PTR_FORMAT" (%u)", \
604 break; 647+ err_msg("Trying to access not available bitmap " PTR_FORMAT \
605--- hotspot/src/share/vm/oops/cpCache.cpp.orig 2015-09-02 10:35:13.000000000 +0200 648+ " corresponding to " PTR_FORMAT " (%u)", \
606+++ hotspot/src/share/vm/oops/cpCache.cpp 2015-09-02 10:36:48.000000000 +0200 649 p2i(this), p2i(addr), G1CollectedHeap::heap()->addr_to_region(addr)));
607@@ -305,7 +305,7 @@
608 adapter->size_of_parameters());
609
610 if (TraceInvokeDynamic) {
611- tty->print_cr("set_method_handle bc=%d appendix="PTR_FORMAT"%s method_type="PTR_FORMAT"%s method="PTR_FORMAT" ",
612+ tty->print_cr("set_method_handle bc=%d appendix=" PTR_FORMAT "%s method_type=" PTR_FORMAT "%s method=" PTR_FORMAT " ",
613 invoke_code,
614 (void *)appendix(), (has_appendix ? "" : " (unused)"),
615 (void *)method_type(), (has_method_type ? "" : " (unused)"),
616@@ -540,12 +540,12 @@
617 // print separator
618 if (index == 0) st->print_cr(" -------------");
619 // print entry
620- st->print("%3d ("PTR_FORMAT") ", index, (intptr_t)this);
621+ st->print("%3d (" PTR_FORMAT ") ", index, (intptr_t)this);
622 st->print_cr("[%02x|%02x|%5d]", bytecode_2(), bytecode_1(),
623 constant_pool_index());
624- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f1);
625- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f2);
626- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_flags);
627+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f1);
628+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f2);
629+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_flags);
630 st->print_cr(" -------------");
631 }
632
633--- hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.orig 2015-09-02 10:12:48.000000000 +0200
634+++ hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-09-02 10:39:26.000000000 +0200
635@@ -838,18 +838,18 @@
636 GenCollectedHeap* gch = GenCollectedHeap::heap();
637 if (PrintGCDetails) {
638 if (Verbose) {
639- gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"("SIZE_FORMAT")]",
640+ gclog_or_tty->print("[%d %s-%s: " SIZE_FORMAT "(" SIZE_FORMAT ")]",
641 level(), short_name(), s, used(), capacity());
642 } else {
643- gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"K("SIZE_FORMAT"K)]",
644+ gclog_or_tty->print("[%d %s-%s: " SIZE_FORMAT "K(" SIZE_FORMAT "K)]",
645 level(), short_name(), s, used() / K, capacity() / K);
646 }
647 }
648 if (Verbose) {
649- gclog_or_tty->print(" "SIZE_FORMAT"("SIZE_FORMAT")",
650+ gclog_or_tty->print(" " SIZE_FORMAT "(" SIZE_FORMAT ")",
651 gch->used(), gch->capacity());
652 } else {
653- gclog_or_tty->print(" "SIZE_FORMAT"K("SIZE_FORMAT"K)",
654+ gclog_or_tty->print(" " SIZE_FORMAT "K(" SIZE_FORMAT "K)",
655 gch->used() / K, gch->capacity() / K);
656 }
657 }
658@@ -879,8 +879,8 @@
659 bool res = (available >= av_promo) || (available >= max_promotion_in_bytes);
660 if (Verbose && PrintGCDetails) {
661 gclog_or_tty->print_cr(
662- "CMS: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT"),"
663- "max_promo("SIZE_FORMAT")",
664+ "CMS: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT "),"
665+ "max_promo(" SIZE_FORMAT ")",
666 res? "":" not", available, res? ">=":"<",
667 av_promo, max_promotion_in_bytes);
668 }
669@@ -966,8 +966,8 @@
670 desired_free_percentage);
671 gclog_or_tty->print_cr(" Maximum free fraction %f",
672 maximum_free_percentage);
673- gclog_or_tty->print_cr(" Capactiy "SIZE_FORMAT, capacity()/1000);
674- gclog_or_tty->print_cr(" Desired capacity "SIZE_FORMAT,
675+ gclog_or_tty->print_cr(" Capactiy " SIZE_FORMAT, capacity()/1000);
676+ gclog_or_tty->print_cr(" Desired capacity " SIZE_FORMAT,
677 desired_capacity/1000);
678 int prev_level = level() - 1;
679 if (prev_level >= 0) {
680@@ -975,14 +975,14 @@
681 GenCollectedHeap* gch = GenCollectedHeap::heap();
682 Generation* prev_gen = gch->_gens[prev_level];
683 prev_size = prev_gen->capacity();
684- gclog_or_tty->print_cr(" Younger gen size "SIZE_FORMAT,
685+ gclog_or_tty->print_cr(" Younger gen size " SIZE_FORMAT,
686 prev_size/1000);
687 }
688- gclog_or_tty->print_cr(" unsafe_max_alloc_nogc "SIZE_FORMAT,
689+ gclog_or_tty->print_cr(" unsafe_max_alloc_nogc " SIZE_FORMAT,
690 unsafe_max_alloc_nogc()/1000);
691- gclog_or_tty->print_cr(" contiguous available "SIZE_FORMAT,
692+ gclog_or_tty->print_cr(" contiguous available " SIZE_FORMAT,
693 contiguous_available()/1000);
694- gclog_or_tty->print_cr(" Expand by "SIZE_FORMAT" (bytes)",
695+ gclog_or_tty->print_cr(" Expand by " SIZE_FORMAT " (bytes)",
696 expand_bytes);
697 }
698 // safe if expansion fails
699@@ -1513,8 +1513,8 @@
700 stats().print_on(gclog_or_tty);
701 gclog_or_tty->print_cr("time_until_cms_gen_full %3.7f",
702 stats().time_until_cms_gen_full());
703- gclog_or_tty->print_cr("free="SIZE_FORMAT, _cmsGen->free());
704- gclog_or_tty->print_cr("contiguous_available="SIZE_FORMAT,
705+ gclog_or_tty->print_cr("free=" SIZE_FORMAT, _cmsGen->free());
706+ gclog_or_tty->print_cr("contiguous_available=" SIZE_FORMAT,
707 _cmsGen->contiguous_available());
708 gclog_or_tty->print_cr("promotion_rate=%g", stats().promotion_rate());
709 gclog_or_tty->print_cr("cms_allocation_rate=%g", stats().cms_allocation_rate());
710@@ -2792,7 +2792,7 @@
711 assert(_numObjectsPromoted == 0, "check");
712 assert(_numWordsPromoted == 0, "check");
713 if (Verbose && PrintGC) {
714- gclog_or_tty->print("Allocated "SIZE_FORMAT" objects, "
715+ gclog_or_tty->print("Allocated " SIZE_FORMAT " objects, "
716 SIZE_FORMAT" bytes concurrently",
717 _numObjectsAllocated, _numWordsAllocated*sizeof(HeapWord));
718 }
719@@ -2879,7 +2879,7 @@
720 assert(_numObjectsAllocated == 0, "check");
721 assert(_numWordsAllocated == 0, "check");
722 if (Verbose && PrintGC) {
723- gclog_or_tty->print("Promoted "SIZE_FORMAT" objects, "
724+ gclog_or_tty->print("Promoted " SIZE_FORMAT " objects, "
725 SIZE_FORMAT" bytes",
726 _numObjectsPromoted, _numWordsPromoted*sizeof(HeapWord));
727 }
728@@ -2890,7 +2890,7 @@
729 if (PrintGC && Verbose) {
730 // Call down the chain in contiguous_available needs the freelistLock
731 // so print this out before releasing the freeListLock.
732- gclog_or_tty->print(" Contiguous available "SIZE_FORMAT" bytes ",
733+ gclog_or_tty->print(" Contiguous available " SIZE_FORMAT " bytes ",
734 contiguous_available());
735 }
736 }
737@@ -2978,7 +2978,7 @@
738 HeapWord* addr = _marks->offsetToHeapWord(offset);
739 if (!_marks->isMarked(addr)) {
740 oop(addr)->print_on(gclog_or_tty);
741- gclog_or_tty->print_cr(" ("INTPTR_FORMAT" should have been marked)", addr);
742+ gclog_or_tty->print_cr(" (" INTPTR_FORMAT " should have been marked)", addr);
743 _failed = true;
744 }
745 return true;
746@@ -5037,7 +5037,7 @@
747 650
748 SpecializationStats::clear(); 651 inline void CMBitMap::mark(HeapWord* addr) {
749 if (PrintGCDetails) { 652@@ -343,7 +343,7 @@ inline void CMTask::make_reference_grey(oop obj, HeapRegion* hr) {
750- gclog_or_tty->print("[YG occupancy: "SIZE_FORMAT" K ("SIZE_FORMAT" K)]",
751+ gclog_or_tty->print("[YG occupancy: " SIZE_FORMAT " K (" SIZE_FORMAT " K)]",
752 _young_gen->used() / K,
753 _young_gen->capacity() / K);
754 }
755@@ -5170,8 +5170,8 @@
756 if (ser_ovflw > 0) {
757 if (PrintCMSStatistics != 0) {
758 gclog_or_tty->print_cr("Marking stack overflow (benign) "
759- "(pmc_pc="SIZE_FORMAT", pmc_rm="SIZE_FORMAT", kac="SIZE_FORMAT
760- ", kac_preclean="SIZE_FORMAT")",
761+ "(pmc_pc=" SIZE_FORMAT ", pmc_rm=" SIZE_FORMAT ", kac=" SIZE_FORMAT
762+ ", kac_preclean=" SIZE_FORMAT ")",
763 _ser_pmc_preclean_ovflw, _ser_pmc_remark_ovflw,
764 _ser_kac_ovflw, _ser_kac_preclean_ovflw);
765 }
766@@ -5184,7 +5184,7 @@
767 if (_par_pmc_remark_ovflw > 0 || _par_kac_ovflw > 0) {
768 if (PrintCMSStatistics != 0) {
769 gclog_or_tty->print_cr("Work queue overflow (benign) "
770- "(pmc_rm="SIZE_FORMAT", kac="SIZE_FORMAT")",
771+ "(pmc_rm=" SIZE_FORMAT ", kac=" SIZE_FORMAT ")",
772 _par_pmc_remark_ovflw, _par_kac_ovflw);
773 }
774 _par_pmc_remark_ovflw = 0;
775@@ -5192,12 +5192,12 @@
776 }
777 if (PrintCMSStatistics != 0) {
778 if (_markStack._hit_limit > 0) {
779- gclog_or_tty->print_cr(" (benign) Hit max stack size limit ("SIZE_FORMAT")",
780+ gclog_or_tty->print_cr(" (benign) Hit max stack size limit (" SIZE_FORMAT ")",
781 _markStack._hit_limit);
782 }
783 if (_markStack._failed_double > 0) {
784- gclog_or_tty->print_cr(" (benign) Failed stack doubling ("SIZE_FORMAT"),"
785- " current capacity "SIZE_FORMAT,
786+ gclog_or_tty->print_cr(" (benign) Failed stack doubling (" SIZE_FORMAT "),"
787+ " current capacity " SIZE_FORMAT,
788 _markStack._failed_double,
789 _markStack.capacity());
790 }
791@@ -5961,7 +5961,7 @@
792 &markFromDirtyCardsClosure);
793 verify_work_stacks_empty();
794 if (PrintCMSStatistics != 0) {
795- gclog_or_tty->print(" (re-scanned "SIZE_FORMAT" dirty cards in cms gen) ",
796+ gclog_or_tty->print(" (re-scanned " SIZE_FORMAT " dirty cards in cms gen) ",
797 markFromDirtyCardsClosure.num_dirty_cards());
798 }
799 }
800@@ -6892,7 +6892,7 @@
801 } else if (_failed_double++ == 0 && !CMSConcurrentMTEnabled && PrintGCDetails) {
802 // Failed to double capacity, continue;
803 // we print a detail message only once per CMS cycle.
804- gclog_or_tty->print(" (benign) Failed to expand marking stack from "SIZE_FORMAT"K to "
805+ gclog_or_tty->print(" (benign) Failed to expand marking stack from " SIZE_FORMAT "K to "
806 SIZE_FORMAT"K",
807 _capacity / K, new_capacity / K);
808 }
809@@ -8215,25 +8215,25 @@
810 ShouldNotReachHere();
811 }
812 if (Verbose && PrintGC) {
813- gclog_or_tty->print("Collected "SIZE_FORMAT" objects, " SIZE_FORMAT " bytes",
814+ gclog_or_tty->print("Collected " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes",
815 _numObjectsFreed, _numWordsFreed*sizeof(HeapWord));
816- gclog_or_tty->print_cr("\nLive "SIZE_FORMAT" objects, "
817+ gclog_or_tty->print_cr("\nLive " SIZE_FORMAT " objects, "
818 SIZE_FORMAT" bytes "
819- "Already free "SIZE_FORMAT" objects, "SIZE_FORMAT" bytes",
820+ "Already free " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes",
821 _numObjectsLive, _numWordsLive*sizeof(HeapWord),
822 _numObjectsAlreadyFree, _numWordsAlreadyFree*sizeof(HeapWord));
823 size_t totalBytes = (_numWordsFreed + _numWordsLive + _numWordsAlreadyFree)
824 * sizeof(HeapWord);
825- gclog_or_tty->print_cr("Total sweep: "SIZE_FORMAT" bytes", totalBytes);
826+ gclog_or_tty->print_cr("Total sweep: " SIZE_FORMAT " bytes", totalBytes);
827 653
828 if (PrintCMSStatistics && CMSVerifyReturnedBytes) { 654 inline void CMTask::deal_with_reference(oop obj) {
829 size_t indexListReturnedBytes = _sp->sumIndexedFreeListArrayReturnedBytes(); 655 if (_cm->verbose_high()) {
830 size_t dict_returned_bytes = _sp->dictionary()->sum_dict_returned_bytes(); 656- gclog_or_tty->print_cr("[%u] we're dealing with reference = "PTR_FORMAT,
831 size_t returned_bytes = indexListReturnedBytes + dict_returned_bytes; 657+ gclog_or_tty->print_cr("[%u] we're dealing with reference = " PTR_FORMAT,
832- gclog_or_tty->print("Returned "SIZE_FORMAT" bytes", returned_bytes); 658 _worker_id, p2i((void*) obj));
833- gclog_or_tty->print(" Indexed List Returned "SIZE_FORMAT" bytes",
834+ gclog_or_tty->print("Returned " SIZE_FORMAT " bytes", returned_bytes);
835+ gclog_or_tty->print(" Indexed List Returned " SIZE_FORMAT " bytes",
836 indexListReturnedBytes);
837- gclog_or_tty->print_cr(" Dictionary Returned "SIZE_FORMAT" bytes",
838+ gclog_or_tty->print_cr(" Dictionary Returned " SIZE_FORMAT " bytes",
839 dict_returned_bytes);
840 }
841 } 659 }
842@@ -8312,13 +8312,13 @@
843 // coalesced chunk to the appropriate free list.
844 if (inFreeRange()) {
845 assert(freeFinger() >= _sp->bottom() && freeFinger() < _limit,
846- err_msg("freeFinger() " PTR_FORMAT" is out-of-bounds", freeFinger()));
847+ err_msg("freeFinger() " PTR_FORMAT " is out-of-bounds", freeFinger()));
848 flush_cur_free_chunk(freeFinger(),
849 pointer_delta(addr, freeFinger()));
850 if (CMSTraceSweeper) {
851 gclog_or_tty->print("Sweep: last chunk: ");
852- gclog_or_tty->print("put_free_blk 0x%x ("SIZE_FORMAT") "
853- "[coalesced:"SIZE_FORMAT"]\n",
854+ gclog_or_tty->print("put_free_blk 0x%x (" SIZE_FORMAT ") "
855+ "[coalesced:" SIZE_FORMAT "]\n",
856 freeFinger(), pointer_delta(addr, freeFinger()),
857 lastFreeRangeCoalesced());
858 }
859--- hotspot/src/share/vm/classfile/dictionary.hpp.orig 2015-09-02 10:40:01.000000000 +0200
860+++ hotspot/src/share/vm/classfile/dictionary.hpp 2015-09-02 10:40:32.000000000 +0200
861@@ -370,7 +370,7 @@
862
863 void print_on(outputStream* st) const {
864 symbol()->print_value_on(st);
865- st->print("/mode="INTX_FORMAT, symbol_mode());
866+ st->print("/mode=" INTX_FORMAT, symbol_mode());
867 st->print(" -> ");
868 bool printed = false;
869 if (method() != NULL) {
870--- hotspot/src/share/vm/compiler/disassembler.cpp.orig 2015-09-02 10:40:09.000000000 +0200
871+++ hotspot/src/share/vm/compiler/disassembler.cpp 2015-09-02 10:41:33.000000000 +0200
872@@ -60,7 +60,7 @@
873 Disassembler::decode_func_virtual Disassembler::_decode_instructions_virtual = NULL;
874 Disassembler::decode_func Disassembler::_decode_instructions = NULL;
875 660
876-static const char hsdis_library_name[] = "hsdis-"HOTSPOT_LIB_ARCH; 661@@ -392,7 +392,7 @@ inline void ConcurrentMark::grayRoot(oop obj, size_t word_size,
877+static const char hsdis_library_name[] = "hsdis-" HOTSPOT_LIB_ARCH; 662 // assert that word_size is under an upper bound which is its
878 static const char decode_instructions_virtual_name[] = "decode_instructions_virtual"; 663 // containing region's capacity.
879 static const char decode_instructions_name[] = "decode_instructions"; 664 assert(word_size * HeapWordSize <= hr->capacity(),
880 static bool use_new_version = true; 665- err_msg("size: "SIZE_FORMAT" capacity: "SIZE_FORMAT" "HR_FORMAT,
881--- hotspot/src/share/vm/code/exceptionHandlerTable.cpp.orig 2015-09-02 10:44:06.000000000 +0200 666+ err_msg("size: " SIZE_FORMAT " capacity: " SIZE_FORMAT " " HR_FORMAT,
882+++ hotspot/src/share/vm/code/exceptionHandlerTable.cpp 2015-09-02 10:44:32.000000000 +0200 667 word_size * HeapWordSize, hr->capacity(),
883@@ -186,7 +186,7 @@ 668 HR_FORMAT_PARAMS(hr)));
884 void ImplicitExceptionTable::print(address base) const {
885 tty->print("{");
886 for( uint i=0; i<len(); i++ )
887- tty->print("< "INTPTR_FORMAT", "INTPTR_FORMAT" > ",base + *adr(i), base + *(adr(i)+1));
888+ tty->print("< " INTPTR_FORMAT ", " INTPTR_FORMAT " > ",base + *adr(i), base + *(adr(i)+1));
889 tty->print_cr("}");
890 }
891 669
892--- hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp.orig 2015-09-02 10:47:14.000000000 +0200 670diff --git hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp
893+++ hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp 2015-09-02 10:47:49.000000000 +0200 671index 697a402..f92ae11 100644
894@@ -140,7 +140,7 @@ 672--- hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp
673+++ hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp
674@@ -140,7 +140,7 @@ HeapWord* G1AllocRegion::new_alloc_region_and_allocate(size_t word_size,
895 } 675 }
896 676
897 void G1AllocRegion::fill_in_ext_msg(ar_ext_msg* msg, const char* message) { 677 void G1AllocRegion::fill_in_ext_msg(ar_ext_msg* msg, const char* message) {
@@ -900,7 +680,7 @@
900 _name, message, _count, BOOL_TO_STR(_bot_updates), 680 _name, message, _count, BOOL_TO_STR(_bot_updates),
901 p2i(_alloc_region), _used_bytes_before); 681 p2i(_alloc_region), _used_bytes_before);
902 } 682 }
903@@ -217,7 +217,7 @@ 683@@ -217,7 +217,7 @@ void G1AllocRegion::trace(const char* str, size_t word_size, HeapWord* result) {
904 684
905 if (G1_ALLOC_REGION_TRACING > 1) { 685 if (G1_ALLOC_REGION_TRACING > 1) {
906 if (result != NULL) { 686 if (result != NULL) {
@@ -909,9 +689,24 @@
909 word_size, result); 689 word_size, result);
910 } else if (word_size != 0) { 690 } else if (word_size != 0) {
911 jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT, word_size); 691 jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT, word_size);
912--- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp.orig 2015-09-02 10:47:14.000000000 +0200 692diff --git hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp
913+++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp 2015-09-02 10:53:32.000000000 +0200 693index b32a419..04628b7 100644
914@@ -385,11 +385,11 @@ 694--- hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp
695+++ hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp
696@@ -73,7 +73,7 @@ public:
697
698 void decrease_used(size_t bytes) {
699 assert(_summary_bytes_used >= bytes,
700- err_msg("invariant: _summary_bytes_used: "SIZE_FORMAT" should be >= bytes: "SIZE_FORMAT,
701+ err_msg("invariant: _summary_bytes_used: " SIZE_FORMAT " should be >= bytes: " SIZE_FORMAT,
702 _summary_bytes_used, bytes));
703 _summary_bytes_used -= bytes;
704 }
705diff --git hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp
706index 44f0d58..f6ef670 100644
707--- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp
708+++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp
709@@ -385,11 +385,11 @@ G1BlockOffsetArray::verify_for_object(HeapWord* obj_start,
915 HeapWord* card_addr = _array->address_for_index(card); 710 HeapWord* card_addr = _array->address_for_index(card);
916 HeapWord* block_start = block_start_const(card_addr); 711 HeapWord* block_start = block_start_const(card_addr);
917 if (block_start != obj_start) { 712 if (block_start != obj_start) {
@@ -928,7 +723,7 @@
928 block_start, card, card_addr, 723 block_start, card, card_addr,
929 _array->offset_array(card), 724 _array->offset_array(card),
930 obj_start, word_size, first_card, last_card); 725 obj_start, word_size, first_card, last_card);
931@@ -404,11 +404,11 @@ 726@@ -404,11 +404,11 @@ void
932 G1BlockOffsetArray::print_on(outputStream* out) { 727 G1BlockOffsetArray::print_on(outputStream* out) {
933 size_t from_index = _array->index_for(_bottom); 728 size_t from_index = _array->index_for(_bottom);
934 size_t to_index = _array->index_for(_end); 729 size_t to_index = _array->index_for(_end);
@@ -943,7 +738,7 @@
943 i, _array->address_for_index(i), 738 i, _array->address_for_index(i),
944 (uint) _array->offset_array(i)); 739 (uint) _array->offset_array(i));
945 } 740 }
946@@ -488,7 +488,7 @@ 741@@ -488,7 +488,7 @@ G1BlockOffsetArrayContigSpace::set_for_starts_humongous(HeapWord* new_top) {
947 void 742 void
948 G1BlockOffsetArrayContigSpace::print_on(outputStream* out) { 743 G1BlockOffsetArrayContigSpace::print_on(outputStream* out) {
949 G1BlockOffsetArray::print_on(out); 744 G1BlockOffsetArray::print_on(out);
@@ -953,9 +748,40 @@
953+ out->print_cr(" next offset index: " SIZE_FORMAT, _next_offset_index); 748+ out->print_cr(" next offset index: " SIZE_FORMAT, _next_offset_index);
954 } 749 }
955 #endif // !PRODUCT 750 #endif // !PRODUCT
956--- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp.orig 2015-09-02 10:47:15.000000000 +0200 751diff --git hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp
957+++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp 2015-09-02 10:54:04.000000000 +0200 752index be5cf30..ca424d3 100644
958@@ -44,7 +44,7 @@ 753--- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp
754+++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp
755@@ -47,15 +47,15 @@ G1BlockOffsetTable::block_start_const(const void* addr) const {
756 }
757 }
758
759-#define check_index(index, msg) \
760- assert((index) < (_reserved.word_size() >> LogN_words), \
761- err_msg("%s - index: "SIZE_FORMAT", _vs.committed_size: "SIZE_FORMAT, \
762- msg, (index), (_reserved.word_size() >> LogN_words))); \
763- assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \
764- err_msg("Index "SIZE_FORMAT" corresponding to "PTR_FORMAT \
765- " (%u) is not in committed area.", \
766- (index), \
767- p2i(address_for_index_raw(index)), \
768+#define check_index(index, msg) \
769+ assert((index) < (_reserved.word_size() >> LogN_words), \
770+ err_msg("%s - index: " SIZE_FORMAT ", _vs.committed_size: " SIZE_FORMAT, \
771+ msg, (index), (_reserved.word_size() >> LogN_words))); \
772+ assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \
773+ err_msg("Index " SIZE_FORMAT " corresponding to " PTR_FORMAT \
774+ " (%u) is not in committed area.", \
775+ (index), \
776+ p2i(address_for_index_raw(index)), \
777 G1CollectedHeap::heap()->addr_to_region(address_for_index_raw(index))));
778
779 u_char G1BlockOffsetSharedArray::offset_array(size_t index) const {
780diff --git hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp
781index 76bf850..0023998 100644
782--- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp
783+++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp
784@@ -44,7 +44,7 @@ void G1CardCountsMappingChangedListener::on_commit(uint start_idx, size_t num_re
959 void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) { 785 void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) {
960 if (has_count_table()) { 786 if (has_count_table()) {
961 assert(from_card_num < to_card_num, 787 assert(from_card_num < to_card_num,
@@ -964,7 +790,7 @@
964 from_card_num, to_card_num)); 790 from_card_num, to_card_num));
965 Copy::fill_to_bytes(&_card_counts[from_card_num], (to_card_num - from_card_num)); 791 Copy::fill_to_bytes(&_card_counts[from_card_num], (to_card_num - from_card_num));
966 } 792 }
967@@ -87,7 +87,7 @@ 793@@ -87,7 +87,7 @@ uint G1CardCounts::add_card_count(jbyte* card_ptr) {
968 if (has_count_table()) { 794 if (has_count_table()) {
969 size_t card_num = ptr_2_card_num(card_ptr); 795 size_t card_num = ptr_2_card_num(card_ptr);
970 assert(card_num < _reserved_max_card_num, 796 assert(card_num < _reserved_max_card_num,
@@ -973,112 +799,24 @@
973 card_num, _reserved_max_card_num)); 799 card_num, _reserved_max_card_num));
974 count = (uint) _card_counts[card_num]; 800 count = (uint) _card_counts[card_num];
975 if (count < G1ConcRSHotCardLimit) { 801 if (count < G1ConcRSHotCardLimit) {
976--- hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp.orig 2015-09-02 10:57:01.000000000 +0200 802diff --git hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp
977+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 2015-09-02 11:02:01.000000000 +0200 803index 7dcad45..b2ab012 100644
978@@ -199,7 +199,7 @@ 804--- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp
979 const size_t region_size = HeapRegion::GrainWords; 805+++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp
980 if (YoungPLABSize > region_size || OldPLABSize > region_size) { 806@@ -91,7 +91,7 @@ class G1CardCounts: public CHeapObj<mtGC> {
981 char buffer[128];
982- jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most "SIZE_FORMAT,
983+ jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most " SIZE_FORMAT,
984 OldPLABSize > region_size ? "Old" : "Young", region_size);
985 vm_exit_during_initialization(buffer);
986 }
987@@ -846,7 +846,7 @@
988 update_survivors_policy();
989
990 assert(_g1->used() == _g1->recalculate_used(),
991- err_msg("sanity, used: "SIZE_FORMAT" recalculate_used: "SIZE_FORMAT,
992+ err_msg("sanity, used: " SIZE_FORMAT " recalculate_used: " SIZE_FORMAT,
993 _g1->used(), _g1->recalculate_used()));
994
995 double s_w_t_ms = (start_time_sec - _stop_world_start) * 1000.0;
996@@ -1231,10 +1231,10 @@
997 (_young_list_target_length * HeapRegion::GrainBytes) - survivor_used_bytes_after_gc;
998
999 gclog_or_tty->print(
1000- " [Eden: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT") "
1001- "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" "
1002- "Heap: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"
1003- EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")]",
1004+ " [Eden: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->" EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ") "
1005+ "Survivors: " EXT_SIZE_FORMAT "->" EXT_SIZE_FORMAT " "
1006+ "Heap: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->"
1007+ EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")]",
1008 EXT_SIZE_PARAMS(_eden_used_bytes_before_gc),
1009 EXT_SIZE_PARAMS(_eden_capacity_bytes_before_gc),
1010 EXT_SIZE_PARAMS(eden_used_bytes_after_gc),
1011@@ -1863,7 +1863,7 @@
1012 while (csr != NULL) {
1013 HeapRegion* next = csr->next_in_collection_set();
1014 assert(csr->in_collection_set(), "bad CS");
1015- st->print_cr(" "HR_FORMAT", P: "PTR_FORMAT "N: "PTR_FORMAT", age: %4d",
1016+ st->print_cr(" " HR_FORMAT ", P: " PTR_FORMAT "N: " PTR_FORMAT ", age: %4d",
1017 HR_FORMAT_PARAMS(csr),
1018 csr->prev_top_at_mark_start(), csr->next_top_at_mark_start(),
1019 csr->age_in_surv_rate_group_cond());
1020--- hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp.orig 2015-09-06 14:02:06.000000000 +0200
1021+++ hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp 2015-09-10 13:33:10.594040691 +0200
1022@@ -330,7 +330,7 @@
1023 }
1024
1025 void G1GCPhaseTimes::print_stats(int level, const char* str, size_t value) {
1026- LineBuffer(level).append_and_print_cr("[%s: "SIZE_FORMAT"]", str, value);
1027+ LineBuffer(level).append_and_print_cr("[%s: " SIZE_FORMAT "]", str, value);
1028 }
1029
1030 void G1GCPhaseTimes::print_stats(int level, const char* str, double value, uint workers) {
1031@@ -450,7 +450,7 @@
1032
1033 if (phase->_thread_work_items != NULL) {
1034 LineBuffer buf2(phase->_thread_work_items->_indent_level);
1035- buf2.append_and_print_cr("[%s: "SIZE_FORMAT"]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id));
1036+ buf2.append_and_print_cr("[%s: " SIZE_FORMAT "]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id));
1037 }
1038 }
1039 807
1040--- hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp.orig 2015-09-02 10:57:01.000000000 +0200 808 jbyte* card_num_2_ptr(size_t card_num) {
1041+++ hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp 2015-09-02 11:03:16.000000000 +0200 809 assert(card_num >= 0 && card_num < _reserved_max_card_num,
1042@@ -84,18 +84,18 @@ 810- err_msg("card num out of range: "SIZE_FORMAT, card_num));
1043 811+ err_msg("card num out of range: " SIZE_FORMAT, card_num));
1044 if (type_str != NULL) { 812 return (jbyte*) (_ct_bot + card_num);
1045 if (top != NULL) {
1046- gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT" "PTR_FORMAT,
1047+ gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT " " PTR_FORMAT,
1048 action_str, type_str, bottom, top);
1049 } else {
1050- gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT,
1051+ gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT,
1052 action_str, type_str, bottom);
1053 }
1054 } else {
1055 if (top != NULL) {
1056- gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT" "PTR_FORMAT,
1057+ gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT " " PTR_FORMAT,
1058 action_str, bottom, top);
1059 } else {
1060- gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT,
1061+ gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT,
1062 action_str, bottom);
1063 }
1064 } 813 }
1065@@ -104,11 +104,11 @@
1066 void G1HRPrinter::print(ActionType action, HeapWord* bottom, HeapWord* end) {
1067 const char* action_str = action_name(action);
1068 814
1069- gclog_or_tty->print_cr(G1HR_PREFIX" %s ["PTR_FORMAT","PTR_FORMAT"]", 815diff --git hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
1070+ gclog_or_tty->print_cr(G1HR_PREFIX" %s [" PTR_FORMAT "," PTR_FORMAT "]", 816index 76bfcd6..aed811b 100644
1071 action_str, bottom, end); 817--- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
1072 } 818+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
1073 819@@ -230,7 +230,7 @@ bool YoungList::check_list_well_formed() {
1074 void G1HRPrinter::print(PhaseType phase, size_t phase_num) {
1075 const char* phase_str = phase_name(phase);
1076- gclog_or_tty->print_cr(G1HR_PREFIX" #%s "SIZE_FORMAT, phase_str, phase_num);
1077+ gclog_or_tty->print_cr(G1HR_PREFIX" #%s " SIZE_FORMAT, phase_str, phase_num);
1078 }
1079--- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.orig 2015-09-06 14:02:06.000000000 +0200
1080+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2015-09-10 12:46:24.202030127 +0200
1081@@ -230,7 +230,7 @@
1082 HeapRegion* last = NULL; 820 HeapRegion* last = NULL;
1083 while (curr != NULL) { 821 while (curr != NULL) {
1084 if (!curr->is_young()) { 822 if (!curr->is_young()) {
@@ -1087,7 +825,7 @@
1087 "incorrectly tagged (y: %d, surv: %d)", 825 "incorrectly tagged (y: %d, surv: %d)",
1088 curr->bottom(), curr->end(), 826 curr->bottom(), curr->end(),
1089 curr->is_young(), curr->is_survivor()); 827 curr->is_young(), curr->is_survivor());
1090@@ -359,7 +359,7 @@ 828@@ -359,7 +359,7 @@ void YoungList::print() {
1091 if (curr == NULL) 829 if (curr == NULL)
1092 gclog_or_tty->print_cr(" empty"); 830 gclog_or_tty->print_cr(" empty");
1093 while (curr != NULL) { 831 while (curr != NULL) {
@@ -1096,7 +834,7 @@
1096 HR_FORMAT_PARAMS(curr), 834 HR_FORMAT_PARAMS(curr),
1097 curr->prev_top_at_mark_start(), 835 curr->prev_top_at_mark_start(),
1098 curr->next_top_at_mark_start(), 836 curr->next_top_at_mark_start(),
1099@@ -490,7 +490,7 @@ 837@@ -490,7 +490,7 @@ void G1CollectedHeap::check_ct_logs_at_safepoint() {
1100 gclog_or_tty->print_cr("Log entries = %d, dirty cards = %d.", 838 gclog_or_tty->print_cr("Log entries = %d, dirty cards = %d.",
1101 clear.num_processed(), orig_count); 839 clear.num_processed(), orig_count);
1102 guarantee(redirty.num_processed() == clear.num_processed(), 840 guarantee(redirty.num_processed() == clear.num_processed(),
@@ -1105,7 +843,7 @@
1105 redirty.num_processed(), clear.num_processed())); 843 redirty.num_processed(), clear.num_processed()));
1106 844
1107 CountNonCleanMemRegionClosure count3(this); 845 CountNonCleanMemRegionClosure count3(this);
1108@@ -528,7 +528,7 @@ 846@@ -528,7 +528,7 @@ G1CollectedHeap::new_region_try_secondary_free_list(bool is_old) {
1109 HeapRegion* res = _hrm.allocate_free_region(is_old); 847 HeapRegion* res = _hrm.allocate_free_region(is_old);
1110 if (G1ConcRegionFreeingVerbose) { 848 if (G1ConcRegionFreeingVerbose) {
1111 gclog_or_tty->print_cr("G1ConcRegionFreeing [region alloc] : " 849 gclog_or_tty->print_cr("G1ConcRegionFreeing [region alloc] : "
@@ -1114,7 +852,7 @@
1114 HR_FORMAT_PARAMS(res)); 852 HR_FORMAT_PARAMS(res));
1115 } 853 }
1116 return res; 854 return res;
1117@@ -1597,8 +1597,8 @@ 855@@ -1597,8 +1597,8 @@ resize_if_necessary_after_full_collection(size_t word_size) {
1118 // This assert only makes sense here, before we adjust them 856 // This assert only makes sense here, before we adjust them
1119 // with respect to the min and max heap size. 857 // with respect to the min and max heap size.
1120 assert(minimum_desired_capacity <= maximum_desired_capacity, 858 assert(minimum_desired_capacity <= maximum_desired_capacity,
@@ -1125,7 +863,7 @@
1125 minimum_desired_capacity, maximum_desired_capacity)); 863 minimum_desired_capacity, maximum_desired_capacity));
1126 864
1127 // Should not be greater than the heap max size. No need to adjust 865 // Should not be greater than the heap max size. No need to adjust
1128@@ -2256,7 +2256,7 @@ 866@@ -2256,7 +2256,7 @@ public:
1129 virtual bool doHeapRegion(HeapRegion* hr) { 867 virtual bool doHeapRegion(HeapRegion* hr) {
1130 unsigned region_gc_time_stamp = hr->get_gc_time_stamp(); 868 unsigned region_gc_time_stamp = hr->get_gc_time_stamp();
1131 if (_gc_time_stamp != region_gc_time_stamp) { 869 if (_gc_time_stamp != region_gc_time_stamp) {
@@ -1134,7 +872,7 @@
1134 "expected %d", HR_FORMAT_PARAMS(hr), 872 "expected %d", HR_FORMAT_PARAMS(hr),
1135 region_gc_time_stamp, _gc_time_stamp); 873 region_gc_time_stamp, _gc_time_stamp);
1136 _failures = true; 874 _failures = true;
1137@@ -2678,7 +2678,7 @@ 875@@ -2679,7 +2679,7 @@ public:
1138 } else if (r->continuesHumongous()) { 876 } else if (r->continuesHumongous()) {
1139 if (r->humongous_start_region() != _sh_region) { 877 if (r->humongous_start_region() != _sh_region) {
1140 gclog_or_tty->print_cr("Region " HR_FORMAT ", " 878 gclog_or_tty->print_cr("Region " HR_FORMAT ", "
@@ -1143,7 +881,7 @@
1143 HR_FORMAT_PARAMS(r), 881 HR_FORMAT_PARAMS(r),
1144 r->humongous_start_region(), 882 r->humongous_start_region(),
1145 _sh_region); 883 _sh_region);
1146@@ -2990,10 +2990,10 @@ 884@@ -2991,10 +2991,10 @@ public:
1147 if (!oopDesc::is_null(heap_oop)) { 885 if (!oopDesc::is_null(heap_oop)) {
1148 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); 886 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
1149 if (_g1h->is_obj_dead_cond(obj, _vo)) { 887 if (_g1h->is_obj_dead_cond(obj, _vo)) {
@@ -1157,7 +895,7 @@
1157 } 895 }
1158 obj->print_on(gclog_or_tty); 896 obj->print_on(gclog_or_tty);
1159 _failures = true; 897 _failures = true;
1160@@ -3040,9 +3040,9 @@ 898@@ -3041,9 +3041,9 @@ class G1VerifyCodeRootOopClosure: public OopClosure {
1161 // Verify that the strong code root list for this region 899 // Verify that the strong code root list for this region
1162 // contains the nmethod 900 // contains the nmethod
1163 if (!hrrs->strong_code_roots_list_contains(_nm)) { 901 if (!hrrs->strong_code_roots_list_contains(_nm)) {
@@ -1170,7 +908,7 @@
1170 p, _nm, hr->bottom(), hr->end()); 908 p, _nm, hr->bottom(), hr->end());
1171 _failures = true; 909 _failures = true;
1172 } 910 }
1173@@ -3172,7 +3172,7 @@ 911@@ -3173,7 +3173,7 @@ public:
1174 if (o != NULL) { 912 if (o != NULL) {
1175 HeapWord *start = (HeapWord *) o; 913 HeapWord *start = (HeapWord *) o;
1176 size_t word_sz = o->size(); 914 size_t word_sz = o->size();
@@ -1179,7 +917,7 @@
1179 " isMarkedPrev %d isMarkedNext %d isAllocSince %d\n", 917 " isMarkedPrev %d isMarkedNext %d isAllocSince %d\n",
1180 (void*) o, word_sz, 918 (void*) o, word_sz,
1181 _g1->isMarkedPrev(o), 919 _g1->isMarkedPrev(o),
1182@@ -3183,7 +3183,7 @@ 920@@ -3184,7 +3184,7 @@ public:
1183 int *val; 921 int *val;
1184 for (cur = start; cur < end; cur++) { 922 for (cur = start; cur < end; cur++) {
1185 val = (int *) cur; 923 val = (int *) cur;
@@ -1188,7 +926,7 @@
1188 } 926 }
1189 } 927 }
1190 } 928 }
1191@@ -3218,9 +3218,9 @@ 929@@ -3219,9 +3219,9 @@ public:
1192 r->object_iterate(&not_dead_yet_cl); 930 r->object_iterate(&not_dead_yet_cl);
1193 if (_vo != VerifyOption_G1UseNextMarking) { 931 if (_vo != VerifyOption_G1UseNextMarking) {
1194 if (r->max_live_bytes() < not_dead_yet_cl.live_bytes()) { 932 if (r->max_live_bytes() < not_dead_yet_cl.live_bytes()) {
@@ -1201,7 +939,7 @@
1201 r->bottom(), r->end(), 939 r->bottom(), r->end(),
1202 r->max_live_bytes(), 940 r->max_live_bytes(),
1203 not_dead_yet_cl.live_bytes()); 941 not_dead_yet_cl.live_bytes());
1204@@ -3532,7 +3532,7 @@ 942@@ -3533,7 +3533,7 @@ public:
1205 size_t occupied = hrrs->occupied(); 943 size_t occupied = hrrs->occupied();
1206 _occupied_sum += occupied; 944 _occupied_sum += occupied;
1207 945
@@ -1210,7 +948,7 @@
1210 HR_FORMAT_PARAMS(r)); 948 HR_FORMAT_PARAMS(r));
1211 if (occupied == 0) { 949 if (occupied == 0) {
1212 gclog_or_tty->print_cr(" RSet is empty"); 950 gclog_or_tty->print_cr(" RSet is empty");
1213@@ -3551,7 +3551,7 @@ 951@@ -3552,7 +3552,7 @@ public:
1214 } 952 }
1215 953
1216 ~PrintRSetsClosure() { 954 ~PrintRSetsClosure() {
@@ -1219,7 +957,7 @@
1219 gclog_or_tty->print_cr("========================================"); 957 gclog_or_tty->print_cr("========================================");
1220 gclog_or_tty->cr(); 958 gclog_or_tty->cr();
1221 } 959 }
1222@@ -4372,7 +4372,7 @@ 960@@ -4416,7 +4416,7 @@ oop
1223 G1CollectedHeap::handle_evacuation_failure_par(G1ParScanThreadState* _par_scan_state, 961 G1CollectedHeap::handle_evacuation_failure_par(G1ParScanThreadState* _par_scan_state,
1224 oop old) { 962 oop old) {
1225 assert(obj_in_cs(old), 963 assert(obj_in_cs(old),
@@ -1228,7 +966,7 @@
1228 (HeapWord*) old)); 966 (HeapWord*) old));
1229 markOop m = old->mark(); 967 markOop m = old->mark();
1230 oop forward_ptr = old->forward_to_atomic(old); 968 oop forward_ptr = old->forward_to_atomic(old);
1231@@ -4406,7 +4406,7 @@ 969@@ -4450,7 +4450,7 @@ G1CollectedHeap::handle_evacuation_failure_par(G1ParScanThreadState* _par_scan_s
1232 // space for this object (old != forward_ptr) or they beat us in 970 // space for this object (old != forward_ptr) or they beat us in
1233 // self-forwarding it (old == forward_ptr). 971 // self-forwarding it (old == forward_ptr).
1234 assert(old == forward_ptr || !obj_in_cs(forward_ptr), 972 assert(old == forward_ptr || !obj_in_cs(forward_ptr),
@@ -1237,7 +975,7 @@
1237 "should not be in the CSet", 975 "should not be in the CSet",
1238 (HeapWord*) old, (HeapWord*) forward_ptr)); 976 (HeapWord*) old, (HeapWord*) forward_ptr));
1239 return forward_ptr; 977 return forward_ptr;
1240@@ -4793,16 +4793,16 @@ 978@@ -4837,16 +4837,16 @@ public:
1241 979
1242 ~G1StringSymbolTableUnlinkTask() { 980 ~G1StringSymbolTableUnlinkTask() {
1243 guarantee(!_process_strings || !_do_in_parallel || StringTable::parallel_claimed_index() >= _initial_string_table_size, 981 guarantee(!_process_strings || !_do_in_parallel || StringTable::parallel_claimed_index() >= _initial_string_table_size,
@@ -1258,7 +996,7 @@
1258 strings_processed(), strings_removed(), 996 strings_processed(), strings_removed(),
1259 symbols_processed(), symbols_removed()); 997 symbols_processed(), symbols_removed());
1260 } 998 }
1261@@ -6001,13 +6001,13 @@ 999@@ -6029,13 +6029,13 @@ void G1CollectedHeap::verify_dirty_young_regions() {
1262 bool G1CollectedHeap::verify_no_bits_over_tams(const char* bitmap_name, CMBitMapRO* bitmap, 1000 bool G1CollectedHeap::verify_no_bits_over_tams(const char* bitmap_name, CMBitMapRO* bitmap,
1263 HeapWord* tams, HeapWord* end) { 1001 HeapWord* tams, HeapWord* end) {
1264 guarantee(tams <= end, 1002 guarantee(tams <= end,
@@ -1275,7 +1013,7 @@
1275 bitmap_name, tams, end); 1013 bitmap_name, tams, end);
1276 return false; 1014 return false;
1277 } 1015 }
1278@@ -6033,7 +6033,7 @@ 1016@@ -6061,7 +6061,7 @@ bool G1CollectedHeap::verify_bitmaps(const char* caller, HeapRegion* hr) {
1279 res_n = verify_no_bits_over_tams("next", next_bitmap, ntams, end); 1017 res_n = verify_no_bits_over_tams("next", next_bitmap, ntams, end);
1280 } 1018 }
1281 if (!res_p || !res_n) { 1019 if (!res_p || !res_n) {
@@ -1284,7 +1022,7 @@
1284 HR_FORMAT_PARAMS(hr)); 1022 HR_FORMAT_PARAMS(hr));
1285 gclog_or_tty->print_cr("#### Caller: %s", caller); 1023 gclog_or_tty->print_cr("#### Caller: %s", caller);
1286 return false; 1024 return false;
1287@@ -6345,7 +6345,7 @@ 1025@@ -6373,7 +6373,7 @@ class G1FreeHumongousRegionClosure : public HeapRegionClosure {
1288 !r->rem_set()->is_empty()) { 1026 !r->rem_set()->is_empty()) {
1289 1027
1290 if (G1TraceEagerReclaimHumongousObjects) { 1028 if (G1TraceEagerReclaimHumongousObjects) {
@@ -1293,7 +1031,7 @@
1293 region_idx, 1031 region_idx,
1294 obj->size()*HeapWordSize, 1032 obj->size()*HeapWordSize,
1295 r->bottom(), 1033 r->bottom(),
1296@@ -6367,7 +6367,7 @@ 1034@@ -6395,7 +6395,7 @@ class G1FreeHumongousRegionClosure : public HeapRegionClosure {
1297 r->bottom())); 1035 r->bottom()));
1298 1036
1299 if (G1TraceEagerReclaimHumongousObjects) { 1037 if (G1TraceEagerReclaimHumongousObjects) {
@@ -1302,7 +1040,7 @@
1302 region_idx, 1040 region_idx,
1303 obj->size()*HeapWordSize, 1041 obj->size()*HeapWordSize,
1304 r->bottom(), 1042 r->bottom(),
1305@@ -6523,7 +6523,7 @@ 1043@@ -6551,7 +6551,7 @@ public:
1306 NoYoungRegionsClosure() : _success(true) { } 1044 NoYoungRegionsClosure() : _success(true) { }
1307 bool doHeapRegion(HeapRegion* r) { 1045 bool doHeapRegion(HeapRegion* r) {
1308 if (r->is_young()) { 1046 if (r->is_young()) {
@@ -1311,7 +1049,7 @@
1311 r->bottom(), r->end()); 1049 r->bottom(), r->end());
1312 _success = false; 1050 _success = false;
1313 } 1051 }
1314@@ -6652,7 +6652,7 @@ 1052@@ -6680,7 +6680,7 @@ void G1CollectedHeap::rebuild_region_sets(bool free_list_only) {
1315 } 1053 }
1316 assert(_allocator->used_unlocked() == recalculate_used(), 1054 assert(_allocator->used_unlocked() == recalculate_used(),
1317 err_msg("inconsistent _allocator->used_unlocked(), " 1055 err_msg("inconsistent _allocator->used_unlocked(), "
@@ -1320,7 +1058,7 @@
1320 _allocator->used_unlocked(), recalculate_used())); 1058 _allocator->used_unlocked(), recalculate_used()));
1321 } 1059 }
1322 1060
1323@@ -6873,8 +6873,8 @@ 1061@@ -6901,8 +6901,8 @@ class RegisterNMethodOopClosure: public OopClosure {
1324 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); 1062 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
1325 HeapRegion* hr = _g1h->heap_region_containing(obj); 1063 HeapRegion* hr = _g1h->heap_region_containing(obj);
1326 assert(!hr->continuesHumongous(), 1064 assert(!hr->continuesHumongous(),
@@ -1331,7 +1069,7 @@
1331 _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()))); 1069 _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
1332 1070
1333 // HeapRegion::add_strong_code_root_locked() avoids adding duplicate entries. 1071 // HeapRegion::add_strong_code_root_locked() avoids adding duplicate entries.
1334@@ -6900,8 +6900,8 @@ 1072@@ -6928,8 +6928,8 @@ class UnregisterNMethodOopClosure: public OopClosure {
1335 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); 1073 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
1336 HeapRegion* hr = _g1h->heap_region_containing(obj); 1074 HeapRegion* hr = _g1h->heap_region_containing(obj);
1337 assert(!hr->continuesHumongous(), 1075 assert(!hr->continuesHumongous(),
@@ -1342,9 +1080,178 @@
1342 _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()))); 1080 _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
1343 1081
1344 hr->remove_strong_code_root(_nm); 1082 hr->remove_strong_code_root(_nm);
1345--- hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp.orig 2015-09-02 11:07:35.000000000 +0200 1083diff --git hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
1346+++ hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp 2015-09-02 11:08:48.000000000 +0200 1084index 0fd2786..7b26fdb 100644
1347@@ -475,7 +475,7 @@ 1085--- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
1086+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
1087@@ -81,7 +81,7 @@ inline HeapRegion* G1CollectedHeap::region_at(uint index) const { return _hrm.at
1088
1089 inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const {
1090 assert(is_in_reserved(addr),
1091- err_msg("Cannot calculate region index for address "PTR_FORMAT" that is outside of the heap ["PTR_FORMAT", "PTR_FORMAT")",
1092+ err_msg("Cannot calculate region index for address " PTR_FORMAT " that is outside of the heap [" PTR_FORMAT ", " PTR_FORMAT ")",
1093 p2i(addr), p2i(_reserved.start()), p2i(_reserved.end())));
1094 return (uint)(pointer_delta(addr, _reserved.start(), sizeof(uint8_t)) >> HeapRegion::LogOfHRGrainBytes);
1095 }
1096@@ -94,7 +94,7 @@ template <class T>
1097 inline HeapRegion* G1CollectedHeap::heap_region_containing_raw(const T addr) const {
1098 assert(addr != NULL, "invariant");
1099 assert(is_in_g1_reserved((const void*) addr),
1100- err_msg("Address "PTR_FORMAT" is outside of the heap ranging from ["PTR_FORMAT" to "PTR_FORMAT")",
1101+ err_msg("Address " PTR_FORMAT " is outside of the heap ranging from [" PTR_FORMAT " to " PTR_FORMAT ")",
1102 p2i((void*)addr), p2i(g1_reserved().start()), p2i(g1_reserved().end())));
1103 return _hrm.addr_to_region((HeapWord*) addr);
1104 }
1105diff --git hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
1106index ea80c44..c4463f5 100644
1107--- hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
1108+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
1109@@ -199,7 +199,7 @@ G1CollectorPolicy::G1CollectorPolicy() :
1110 const size_t region_size = HeapRegion::GrainWords;
1111 if (YoungPLABSize > region_size || OldPLABSize > region_size) {
1112 char buffer[128];
1113- jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most "SIZE_FORMAT,
1114+ jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most " SIZE_FORMAT,
1115 OldPLABSize > region_size ? "Old" : "Young", region_size);
1116 vm_exit_during_initialization(buffer);
1117 }
1118@@ -846,7 +846,7 @@ void G1CollectorPolicy::record_collection_pause_start(double start_time_sec) {
1119 update_survivors_policy();
1120
1121 assert(_g1->used() == _g1->recalculate_used(),
1122- err_msg("sanity, used: "SIZE_FORMAT" recalculate_used: "SIZE_FORMAT,
1123+ err_msg("sanity, used: " SIZE_FORMAT " recalculate_used: " SIZE_FORMAT,
1124 _g1->used(), _g1->recalculate_used()));
1125
1126 double s_w_t_ms = (start_time_sec - _stop_world_start) * 1000.0;
1127@@ -1231,10 +1231,10 @@ void G1CollectorPolicy::print_detailed_heap_transition(bool full) {
1128 (_young_list_target_length * HeapRegion::GrainBytes) - survivor_used_bytes_after_gc;
1129
1130 gclog_or_tty->print(
1131- " [Eden: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT") "
1132- "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" "
1133- "Heap: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"
1134- EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")]",
1135+ " [Eden: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->" EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ") "
1136+ "Survivors: " EXT_SIZE_FORMAT "->" EXT_SIZE_FORMAT " "
1137+ "Heap: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->"
1138+ EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")]",
1139 EXT_SIZE_PARAMS(_eden_used_bytes_before_gc),
1140 EXT_SIZE_PARAMS(_eden_capacity_bytes_before_gc),
1141 EXT_SIZE_PARAMS(eden_used_bytes_after_gc),
1142@@ -1851,7 +1851,7 @@ void G1CollectorPolicy::print_collection_set(HeapRegion* list_head, outputStream
1143 while (csr != NULL) {
1144 HeapRegion* next = csr->next_in_collection_set();
1145 assert(csr->in_collection_set(), "bad CS");
1146- st->print_cr(" "HR_FORMAT", P: "PTR_FORMAT "N: "PTR_FORMAT", age: %4d",
1147+ st->print_cr(" " HR_FORMAT ", P: " PTR_FORMAT "N: " PTR_FORMAT ", age: %4d",
1148 HR_FORMAT_PARAMS(csr),
1149 csr->prev_top_at_mark_start(), csr->next_top_at_mark_start(),
1150 csr->age_in_surv_rate_group_cond());
1151diff --git hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
1152index eff1196..fff1663 100644
1153--- hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
1154+++ hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
1155@@ -121,15 +121,15 @@ public:
1156 // Single parameter format strings
1157 #define ergo_format_str(_name_) ", " _name_ ": %s"
1158 #define ergo_format_region(_name_) ", " _name_ ": %u regions"
1159-#define ergo_format_byte(_name_) ", " _name_ ": "SIZE_FORMAT" bytes"
1160+#define ergo_format_byte(_name_) ", " _name_ ": " SIZE_FORMAT " bytes"
1161 #define ergo_format_double(_name_) ", " _name_ ": %1.2f"
1162 #define ergo_format_perc(_name_) ", " _name_ ": %1.2f %%"
1163 #define ergo_format_ms(_name_) ", " _name_ ": %1.2f ms"
1164-#define ergo_format_size(_name_) ", " _name_ ": "SIZE_FORMAT
1165+#define ergo_format_size(_name_) ", " _name_ ": " SIZE_FORMAT
1166
1167 // Double parameter format strings
1168 #define ergo_format_byte_perc(_name_) \
1169- ", " _name_ ": "SIZE_FORMAT" bytes (%1.2f %%)"
1170+ ", " _name_ ": " SIZE_FORMAT " bytes (%1.2f %%)"
1171
1172 // Generates the format string
1173 #define ergo_format(_extra_format_) \
1174diff --git hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp
1175index c037110..af0bdb9 100644
1176--- hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp
1177+++ hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp
1178@@ -332,7 +332,7 @@ void G1GCPhaseTimes::print_stats(int level, const char* str, double value) {
1179 }
1180
1181 void G1GCPhaseTimes::print_stats(int level, const char* str, size_t value) {
1182- LineBuffer(level).append_and_print_cr("[%s: "SIZE_FORMAT"]", str, value);
1183+ LineBuffer(level).append_and_print_cr("[%s: " SIZE_FORMAT "]", str, value);
1184 }
1185
1186 void G1GCPhaseTimes::print_stats(int level, const char* str, double value, uint workers) {
1187@@ -452,7 +452,7 @@ class G1GCParPhasePrinter : public StackObj {
1188
1189 if (phase->_thread_work_items != NULL) {
1190 LineBuffer buf2(phase->_thread_work_items->_indent_level);
1191- buf2.append_and_print_cr("[%s: "SIZE_FORMAT"]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id));
1192+ buf2.append_and_print_cr("[%s: " SIZE_FORMAT "]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id));
1193 }
1194 }
1195
1196diff --git hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp
1197index 8139048..9cc752a 100644
1198--- hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp
1199+++ hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp
1200@@ -84,18 +84,18 @@ void G1HRPrinter::print(ActionType action, RegionType type,
1201
1202 if (type_str != NULL) {
1203 if (top != NULL) {
1204- gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT" "PTR_FORMAT,
1205+ gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT " " PTR_FORMAT,
1206 action_str, type_str, bottom, top);
1207 } else {
1208- gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT,
1209+ gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT,
1210 action_str, type_str, bottom);
1211 }
1212 } else {
1213 if (top != NULL) {
1214- gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT" "PTR_FORMAT,
1215+ gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT " " PTR_FORMAT,
1216 action_str, bottom, top);
1217 } else {
1218- gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT,
1219+ gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT,
1220 action_str, bottom);
1221 }
1222 }
1223@@ -104,11 +104,11 @@ void G1HRPrinter::print(ActionType action, RegionType type,
1224 void G1HRPrinter::print(ActionType action, HeapWord* bottom, HeapWord* end) {
1225 const char* action_str = action_name(action);
1226
1227- gclog_or_tty->print_cr(G1HR_PREFIX" %s ["PTR_FORMAT","PTR_FORMAT"]",
1228+ gclog_or_tty->print_cr(G1HR_PREFIX" %s [" PTR_FORMAT "," PTR_FORMAT "]",
1229 action_str, bottom, end);
1230 }
1231
1232 void G1HRPrinter::print(PhaseType phase, size_t phase_num) {
1233 const char* phase_str = phase_name(phase);
1234- gclog_or_tty->print_cr(G1HR_PREFIX" #%s "SIZE_FORMAT, phase_str, phase_num);
1235+ gclog_or_tty->print_cr(G1HR_PREFIX" #%s " SIZE_FORMAT, phase_str, phase_num);
1236 }
1237diff --git hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
1238index a00cd7a..0385f66 100644
1239--- hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
1240+++ hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
1241@@ -118,7 +118,7 @@ inline void G1CMOopClosure::do_oop_nv(T* p) {
1242 oop obj = oopDesc::load_decode_heap_oop(p);
1243 if (_cm->verbose_high()) {
1244 gclog_or_tty->print_cr("[%u] we're looking at location "
1245- "*"PTR_FORMAT" = "PTR_FORMAT,
1246+ "*" PTR_FORMAT " = " PTR_FORMAT,
1247 _task->worker_id(), p2i(p), p2i((void*) obj));
1248 }
1249 _task->deal_with_reference(obj);
1250diff --git hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
1251index ca714dc..da4d632 100644
1252--- hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
1253+++ hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
1254@@ -442,7 +442,7 @@ G1UpdateRSOrPushRefOopClosure(G1CollectedHeap* g1h,
1348 bool G1RemSet::refine_card(jbyte* card_ptr, uint worker_i, 1255 bool G1RemSet::refine_card(jbyte* card_ptr, uint worker_i,
1349 bool check_for_refs_into_cset) { 1256 bool check_for_refs_into_cset) {
1350 assert(_g1->is_in_exact(_ct_bs->addr_for(card_ptr)), 1257 assert(_g1->is_in_exact(_ct_bs->addr_for(card_ptr)),
@@ -1353,9 +1260,11 @@
1353 p2i(card_ptr), 1260 p2i(card_ptr),
1354 _ct_bs->index_for(_ct_bs->addr_for(card_ptr)), 1261 _ct_bs->index_for(_ct_bs->addr_for(card_ptr)),
1355 _ct_bs->addr_for(card_ptr), 1262 _ct_bs->addr_for(card_ptr),
1356--- hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp.orig 2015-09-02 11:13:52.000000000 +0200 1263diff --git hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp
1357+++ hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 2015-09-02 11:15:30.000000000 +0200 1264index c55165b..8d654dc 100644
1358@@ -187,22 +187,22 @@ 1265--- hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp
1266+++ hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp
1267@@ -187,22 +187,22 @@ public:
1359 size_t code_root_elems() const { return _code_root_elems; } 1268 size_t code_root_elems() const { return _code_root_elems; }
1360 1269
1361 void print_rs_mem_info_on(outputStream * out, size_t total) { 1270 void print_rs_mem_info_on(outputStream * out, size_t total) {
@@ -1382,7 +1291,7 @@
1382 code_root_elems(), code_root_elems_percent_of(total), amount(), _name); 1291 code_root_elems(), code_root_elems_percent_of(total), amount(), _name);
1383 } 1292 }
1384 }; 1293 };
1385@@ -280,19 +280,19 @@ 1294@@ -280,19 +280,19 @@ public:
1386 RegionTypeCounter* counters[] = { &_young, &_humonguous, &_free, &_old, NULL }; 1295 RegionTypeCounter* counters[] = { &_young, &_humonguous, &_free, &_old, NULL };
1387 1296
1388 out->print_cr("\n Current rem set statistics"); 1297 out->print_cr("\n Current rem set statistics");
@@ -1407,11 +1316,13 @@
1407 total_cards_occupied()); 1316 total_cards_occupied());
1408 for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) { 1317 for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
1409 (*current)->print_cards_occupied_info_on(out, total_cards_occupied()); 1318 (*current)->print_cards_occupied_info_on(out, total_cards_occupied());
1410@@ -301,29 +301,29 @@ 1319@@ -300,30 +300,30 @@ public:
1320
1411 // Largest sized rem set region statistics 1321 // Largest sized rem set region statistics
1412 HeapRegionRemSet* rem_set = max_rs_mem_sz_region()->rem_set(); 1322 HeapRegionRemSet* rem_set = max_rs_mem_sz_region()->rem_set();
1413 out->print_cr(" Region with largest rem set = "HR_FORMAT", " 1323- out->print_cr(" Region with largest rem set = "HR_FORMAT", "
1414- "size = "SIZE_FORMAT "K, occupied = "SIZE_FORMAT"K.", 1324- "size = "SIZE_FORMAT "K, occupied = "SIZE_FORMAT"K.",
1325+ out->print_cr(" Region with largest rem set = " HR_FORMAT ", "
1415+ "size = " SIZE_FORMAT "K, occupied = " SIZE_FORMAT "K.", 1326+ "size = " SIZE_FORMAT "K, occupied = " SIZE_FORMAT "K.",
1416 HR_FORMAT_PARAMS(max_rs_mem_sz_region()), 1327 HR_FORMAT_PARAMS(max_rs_mem_sz_region()),
1417 round_to_K(rem_set->mem_size()), 1328 round_to_K(rem_set->mem_size()),
@@ -1443,7 +1354,7 @@
1443 HR_FORMAT_PARAMS(max_code_root_mem_sz_region()), 1354 HR_FORMAT_PARAMS(max_code_root_mem_sz_region()),
1444 round_to_K(max_code_root_rem_set->strong_code_roots_mem_size()), 1355 round_to_K(max_code_root_rem_set->strong_code_roots_mem_size()),
1445 round_to_K(max_code_root_rem_set->strong_code_roots_list_length())); 1356 round_to_K(max_code_root_rem_set->strong_code_roots_list_length()));
1446@@ -332,16 +332,16 @@ 1357@@ -332,16 +332,16 @@ public:
1447 1358
1448 void G1RemSetSummary::print_on(outputStream* out) { 1359 void G1RemSetSummary::print_on(outputStream* out) {
1449 out->print_cr("\n Recent concurrent refinement statistics"); 1360 out->print_cr("\n Recent concurrent refinement statistics");
@@ -1465,9 +1376,11 @@
1465 out->print_cr(" Concurrent RS threads times (s)"); 1376 out->print_cr(" Concurrent RS threads times (s)");
1466 out->print(" "); 1377 out->print(" ");
1467 for (uint i = 0; i < _num_vtimes; i++) { 1378 for (uint i = 0; i < _num_vtimes; i++) {
1468--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp.orig 2015-09-02 11:13:52.000000000 +0200 1379diff --git hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
1469+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2015-09-02 11:15:44.000000000 +0200 1380index 8ae53e3..747f61b 100644
1470@@ -151,7 +151,7 @@ 1381--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
1382+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
1383@@ -151,7 +151,7 @@ void G1StringDedupQueue::unlink_or_oops_do(G1StringDedupUnlinkOrOopsDoClosure* c
1471 void G1StringDedupQueue::print_statistics(outputStream* st) { 1384 void G1StringDedupQueue::print_statistics(outputStream* st) {
1472 st->print_cr( 1385 st->print_cr(
1473 " [Queue]\n" 1386 " [Queue]\n"
@@ -1476,9 +1389,11 @@
1476 } 1389 }
1477 1390
1478 void G1StringDedupQueue::verify() { 1391 void G1StringDedupQueue::verify() {
1479--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp.orig 2015-09-02 11:13:52.000000000 +0200 1392diff --git hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp
1480+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp 2015-09-02 11:18:07.000000000 +0200 1393index 2d5523c..f9700e1 100644
1481@@ -80,8 +80,8 @@ 1394--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp
1395+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp
1396@@ -80,8 +80,8 @@ void G1StringDedupStat::print_summary(outputStream* st, const G1StringDedupStat&
1482 st->stamp(PrintGCTimeStamps); 1397 st->stamp(PrintGCTimeStamps);
1483 st->print_cr( 1398 st->print_cr(
1484 "[GC concurrent-string-deduplication, " 1399 "[GC concurrent-string-deduplication, "
@@ -1489,7 +1404,7 @@
1489 G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes), 1404 G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes),
1490 G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes - last_stat._deduped_bytes), 1405 G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes - last_stat._deduped_bytes),
1491 G1_STRDEDUP_BYTES_PARAM(last_stat._deduped_bytes), 1406 G1_STRDEDUP_BYTES_PARAM(last_stat._deduped_bytes),
1492@@ -135,22 +135,22 @@ 1407@@ -135,22 +135,22 @@ void G1StringDedupStat::print_statistics(outputStream* st, const G1StringDedupSt
1493 1408
1494 if (total) { 1409 if (total) {
1495 st->print_cr( 1410 st->print_cr(
@@ -1522,20 +1437,11 @@
1522 stat._inspected, 1437 stat._inspected,
1523 stat._skipped, skipped_percent, 1438 stat._skipped, skipped_percent,
1524 stat._hashed, hashed_percent, 1439 stat._hashed, hashed_percent,
1525--- hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp.orig 2015-09-02 12:36:40.000000000 +0200 1440diff --git hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
1526+++ hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 2015-09-02 12:37:19.000000000 +0200 1441index 2b41688..39a3306 100644
1527@@ -300,7 +300,7 @@ 1442--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
1528 1443+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
1529 // Largest sized rem set region statistics 1444@@ -554,12 +554,12 @@ void G1StringDedupTable::trim_entry_cache() {
1530 HeapRegionRemSet* rem_set = max_rs_mem_sz_region()->rem_set();
1531- out->print_cr(" Region with largest rem set = "HR_FORMAT", "
1532+ out->print_cr(" Region with largest rem set = " HR_FORMAT ", "
1533 "size = " SIZE_FORMAT "K, occupied = " SIZE_FORMAT "K.",
1534 HR_FORMAT_PARAMS(max_rs_mem_sz_region()),
1535 round_to_K(rem_set->mem_size()),
1536--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp.orig 2015-09-02 12:36:40.000000000 +0200
1537+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2015-09-02 12:41:56.000000000 +0200
1538@@ -554,12 +554,12 @@
1539 void G1StringDedupTable::print_statistics(outputStream* st) { 1445 void G1StringDedupTable::print_statistics(outputStream* st) {
1540 st->print_cr( 1446 st->print_cr(
1541 " [Table]\n" 1447 " [Table]\n"
@@ -1554,31 +1460,11 @@
1554 G1_STRDEDUP_BYTES_PARAM(_table->_size * sizeof(G1StringDedupEntry*) + (_table->_entries + _entry_cache->size()) * sizeof(G1StringDedupEntry)), 1460 G1_STRDEDUP_BYTES_PARAM(_table->_size * sizeof(G1StringDedupEntry*) + (_table->_entries + _entry_cache->size()) * sizeof(G1StringDedupEntry)),
1555 _table->_size, _min_size, _max_size, 1461 _table->_size, _min_size, _max_size,
1556 _table->_entries, (double)_table->_entries / (double)_table->_size * 100.0, _entry_cache->size(), _entries_added, _entries_removed, 1462 _table->_entries, (double)_table->_entries / (double)_table->_size * 100.0, _entry_cache->size(), _entries_added, _entries_removed,
1557--- hotspot/src/share/vm/memory/genCollectedHeap.cpp.orig 2015-09-02 12:51:37.000000000 +0200 1463diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
1558+++ hotspot/src/share/vm/memory/genCollectedHeap.cpp 2015-09-02 12:52:12.000000000 +0200 1464index ef5b437..eefa1c9 100644
1559@@ -1315,7 +1315,7 @@ 1465--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
1560 // back a time later than 'now'. 1466+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
1561 jlong retVal = now - tolgc_cl.time(); 1467@@ -333,7 +333,7 @@ void HeapRegion::note_self_forwarding_removal_end(bool during_initial_mark,
1562 if (retVal < 0) {
1563- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, (int64_t) retVal);)
1564+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, (int64_t) retVal);)
1565 return 0;
1566 }
1567 return retVal;
1568--- hotspot/src/share/vm/memory/generation.cpp.orig 2015-09-02 12:51:38.000000000 +0200
1569+++ hotspot/src/share/vm/memory/generation.cpp 2015-09-02 12:52:33.000000000 +0200
1570@@ -187,7 +187,7 @@
1571 bool res = (available >= max_promotion_in_bytes);
1572 if (PrintGC && Verbose) {
1573 gclog_or_tty->print_cr(
1574- "Generation: promo attempt is%s safe: available("SIZE_FORMAT") %s max_promo("SIZE_FORMAT")",
1575+ "Generation: promo attempt is%s safe: available(" SIZE_FORMAT ") %s max_promo(" SIZE_FORMAT ")",
1576 res? "":" not", available, res? ">=":"<",
1577 max_promotion_in_bytes);
1578 }
1579--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp.orig 2015-09-02 12:57:25.000000000 +0200
1580+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2015-09-02 13:00:29.000000000 +0200
1581@@ -371,7 +371,7 @@
1582 bool during_conc_mark, 1468 bool during_conc_mark,
1583 size_t marked_bytes) { 1469 size_t marked_bytes) {
1584 assert(0 <= marked_bytes && marked_bytes <= used(), 1470 assert(0 <= marked_bytes && marked_bytes <= used(),
@@ -1587,7 +1473,7 @@
1587 marked_bytes, used())); 1473 marked_bytes, used()));
1588 _prev_top_at_mark_start = top(); 1474 _prev_top_at_mark_start = top();
1589 _prev_marked_bytes = marked_bytes; 1475 _prev_marked_bytes = marked_bytes;
1590@@ -559,9 +559,9 @@ 1476@@ -514,9 +514,9 @@ class VerifyStrongCodeRootOopClosure: public OopClosure {
1591 // Object is in the region. Check that its less than top 1477 // Object is in the region. Check that its less than top
1592 if (_hr->top() <= (HeapWord*)obj) { 1478 if (_hr->top() <= (HeapWord*)obj) {
1593 // Object is above top 1479 // Object is above top
@@ -1600,7 +1486,7 @@
1600 (void *)obj, _hr->bottom(), _hr->end(), _hr->top()); 1486 (void *)obj, _hr->bottom(), _hr->end(), _hr->top());
1601 _failures = true; 1487 _failures = true;
1602 return; 1488 return;
1603@@ -595,22 +595,22 @@ 1489@@ -550,22 +550,22 @@ public:
1604 if (nm != NULL) { 1490 if (nm != NULL) {
1605 // Verify that the nemthod is live 1491 // Verify that the nemthod is live
1606 if (!nm->is_alive()) { 1492 if (!nm->is_alive()) {
@@ -1629,7 +1515,7 @@
1629 _hr->bottom(), _hr->end(), nm); 1515 _hr->bottom(), _hr->end(), nm);
1630 _failures = true; 1516 _failures = true;
1631 } 1517 }
1632@@ -644,8 +644,8 @@ 1518@@ -599,8 +599,8 @@ void HeapRegion::verify_strong_code_roots(VerifyOption vo, bool* failures) const
1633 // on its strong code root list 1519 // on its strong code root list
1634 if (is_empty()) { 1520 if (is_empty()) {
1635 if (strong_code_roots_length > 0) { 1521 if (strong_code_roots_length > 0) {
@@ -1640,7 +1526,7 @@
1640 bottom(), end(), strong_code_roots_length); 1526 bottom(), end(), strong_code_roots_length);
1641 *failures = true; 1527 *failures = true;
1642 } 1528 }
1643@@ -654,8 +654,8 @@ 1529@@ -609,8 +609,8 @@ void HeapRegion::verify_strong_code_roots(VerifyOption vo, bool* failures) const
1644 1530
1645 if (continuesHumongous()) { 1531 if (continuesHumongous()) {
1646 if (strong_code_roots_length > 0) { 1532 if (strong_code_roots_length > 0) {
@@ -1651,7 +1537,7 @@
1651 HR_FORMAT_PARAMS(this), strong_code_roots_length); 1537 HR_FORMAT_PARAMS(this), strong_code_roots_length);
1652 *failures = true; 1538 *failures = true;
1653 } 1539 }
1654@@ -679,7 +679,7 @@ 1540@@ -634,7 +634,7 @@ void HeapRegion::print_on(outputStream* st) const {
1655 else 1541 else
1656 st->print(" "); 1542 st->print(" ");
1657 st->print(" TS %5d", _gc_time_stamp); 1543 st->print(" TS %5d", _gc_time_stamp);
@@ -1660,7 +1546,7 @@
1660 prev_top_at_mark_start(), next_top_at_mark_start()); 1546 prev_top_at_mark_start(), next_top_at_mark_start());
1661 G1OffsetTableContigSpace::print_on(st); 1547 G1OffsetTableContigSpace::print_on(st);
1662 } 1548 }
1663@@ -744,25 +744,25 @@ 1549@@ -708,25 +708,25 @@ public:
1664 } 1550 }
1665 if (!_g1h->is_in_closed_subset(obj)) { 1551 if (!_g1h->is_in_closed_subset(obj)) {
1666 HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p); 1552 HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
@@ -1695,27 +1581,27 @@
1695 (void*) obj, to->bottom(), to->end()); 1581 (void*) obj, to->bottom(), to->end());
1696 print_object(gclog_or_tty, obj); 1582 print_object(gclog_or_tty, obj);
1697 } 1583 }
1698@@ -798,14 +798,14 @@ 1584@@ -784,14 +784,14 @@ public:
1699 gclog_or_tty->print_cr("----------"); 1585 gclog_or_tty->print_cr("----------");
1700 } 1586 }
1701 gclog_or_tty->print_cr("Missing rem set entry:"); 1587 gclog_or_tty->print_cr("Missing rem set entry:");
1702- gclog_or_tty->print_cr("Field "PTR_FORMAT" " 1588- gclog_or_tty->print_cr("Field "PTR_FORMAT" "
1703- "of obj "PTR_FORMAT", " 1589- "of obj "PTR_FORMAT", "
1704- "in region "HR_FORMAT, 1590- "in region "HR_FORMAT,
1705+ gclog_or_tty->print_cr("Field " PTR_FORMAT " " 1591+ gclog_or_tty->print_cr("Field " PTR_FORMAT " "
1706+ "of obj " PTR_FORMAT ", " 1592+ "of obj " PTR_FORMAT ", "
1707+ "in region " HR_FORMAT, 1593+ "in region " HR_FORMAT,
1708 p, (void*) _containing_obj, 1594 p, (void*) _containing_obj,
1709 HR_FORMAT_PARAMS(from)); 1595 HR_FORMAT_PARAMS(from));
1710 _containing_obj->print_on(gclog_or_tty); 1596 _containing_obj->print_on(gclog_or_tty);
1711- gclog_or_tty->print_cr("points to obj "PTR_FORMAT" " 1597- gclog_or_tty->print_cr("points to obj "PTR_FORMAT" "
1712- "in region "HR_FORMAT, 1598- "in region "HR_FORMAT,
1713+ gclog_or_tty->print_cr("points to obj " PTR_FORMAT " " 1599+ gclog_or_tty->print_cr("points to obj " PTR_FORMAT " "
1714+ "in region " HR_FORMAT, 1600+ "in region " HR_FORMAT,
1715 (void*) obj, 1601 (void*) obj,
1716 HR_FORMAT_PARAMS(to)); 1602 HR_FORMAT_PARAMS(to));
1717 obj->print_on(gclog_or_tty); 1603 if (obj->is_oop()) {
1718@@ -842,8 +842,8 @@ 1604@@ -830,8 +830,8 @@ void HeapRegion::verify(VerifyOption vo,
1719 1605
1720 if (is_humongous != g1->isHumongous(obj_size) && 1606 if (is_humongous != g1->isHumongous(obj_size) &&
1721 !g1->is_obj_dead(obj, this)) { // Dead objects may have bigger block_size since they span several objects. 1607 !g1->is_obj_dead(obj, this)) { // Dead objects may have bigger block_size since they span several objects.
@@ -1726,7 +1612,7 @@
1726 p, g1->isHumongous(obj_size) ? "" : "non-", 1612 p, g1->isHumongous(obj_size) ? "" : "non-",
1727 obj_size, is_humongous ? "" : "non-"); 1613 obj_size, is_humongous ? "" : "non-");
1728 *failures = true; 1614 *failures = true;
1729@@ -866,12 +866,12 @@ 1615@@ -854,12 +854,12 @@ void HeapRegion::verify(VerifyOption vo,
1730 (vo == VerifyOption_G1UsePrevMarking && 1616 (vo == VerifyOption_G1UsePrevMarking &&
1731 ClassLoaderDataGraph::unload_list_contains(klass)); 1617 ClassLoaderDataGraph::unload_list_contains(klass));
1732 if (!is_metaspace_object) { 1618 if (!is_metaspace_object) {
@@ -1741,16 +1627,16 @@
1741 "not a klass", klass, (void *)obj); 1627 "not a klass", klass, (void *)obj);
1742 *failures = true; 1628 *failures = true;
1743 return; 1629 return;
1744@@ -887,7 +887,7 @@ 1630@@ -891,7 +891,7 @@ void HeapRegion::verify(VerifyOption vo,
1745 } 1631 }
1746 } 1632 }
1747 } else { 1633 } else {
1748- gclog_or_tty->print_cr(PTR_FORMAT" no an oop", (void *)obj); 1634- gclog_or_tty->print_cr(PTR_FORMAT" not an oop", (void *)obj);
1749+ gclog_or_tty->print_cr(PTR_FORMAT " no an oop", (void *)obj); 1635+ gclog_or_tty->print_cr(PTR_FORMAT " not an oop", (void *)obj);
1750 *failures = true; 1636 *failures = true;
1751 return; 1637 return;
1752 } 1638 }
1753@@ -897,8 +897,8 @@ 1639@@ -901,8 +901,8 @@ void HeapRegion::verify(VerifyOption vo,
1754 } 1640 }
1755 1641
1756 if (p != top()) { 1642 if (p != top()) {
@@ -1761,7 +1647,7 @@
1761 *failures = true; 1647 *failures = true;
1762 return; 1648 return;
1763 } 1649 }
1764@@ -913,8 +913,8 @@ 1650@@ -917,8 +917,8 @@ void HeapRegion::verify(VerifyOption vo,
1765 HeapWord* addr_1 = p; 1651 HeapWord* addr_1 = p;
1766 HeapWord* b_start_1 = _offsets.block_start_const(addr_1); 1652 HeapWord* b_start_1 = _offsets.block_start_const(addr_1);
1767 if (b_start_1 != p) { 1653 if (b_start_1 != p) {
@@ -1772,7 +1658,7 @@
1772 addr_1, b_start_1, p); 1658 addr_1, b_start_1, p);
1773 *failures = true; 1659 *failures = true;
1774 return; 1660 return;
1775@@ -925,8 +925,8 @@ 1661@@ -929,8 +929,8 @@ void HeapRegion::verify(VerifyOption vo,
1776 if (addr_2 < the_end) { 1662 if (addr_2 < the_end) {
1777 HeapWord* b_start_2 = _offsets.block_start_const(addr_2); 1663 HeapWord* b_start_2 = _offsets.block_start_const(addr_2);
1778 if (b_start_2 != p) { 1664 if (b_start_2 != p) {
@@ -1783,7 +1669,7 @@
1783 addr_2, b_start_2, p); 1669 addr_2, b_start_2, p);
1784 *failures = true; 1670 *failures = true;
1785 return; 1671 return;
1786@@ -939,8 +939,8 @@ 1672@@ -943,8 +943,8 @@ void HeapRegion::verify(VerifyOption vo,
1787 if (addr_3 < the_end) { 1673 if (addr_3 < the_end) {
1788 HeapWord* b_start_3 = _offsets.block_start_const(addr_3); 1674 HeapWord* b_start_3 = _offsets.block_start_const(addr_3);
1789 if (b_start_3 != p) { 1675 if (b_start_3 != p) {
@@ -1794,7 +1680,7 @@
1794 addr_3, b_start_3, p); 1680 addr_3, b_start_3, p);
1795 *failures = true; 1681 *failures = true;
1796 return; 1682 return;
1797@@ -951,8 +951,8 @@ 1683@@ -955,8 +955,8 @@ void HeapRegion::verify(VerifyOption vo,
1798 HeapWord* addr_4 = the_end - 1; 1684 HeapWord* addr_4 = the_end - 1;
1799 HeapWord* b_start_4 = _offsets.block_start_const(addr_4); 1685 HeapWord* b_start_4 = _offsets.block_start_const(addr_4);
1800 if (b_start_4 != p) { 1686 if (b_start_4 != p) {
@@ -1805,7 +1691,7 @@
1805 addr_4, b_start_4, p); 1691 addr_4, b_start_4, p);
1806 *failures = true; 1692 *failures = true;
1807 return; 1693 return;
1808@@ -960,8 +960,8 @@ 1694@@ -964,8 +964,8 @@ void HeapRegion::verify(VerifyOption vo,
1809 } 1695 }
1810 1696
1811 if (is_humongous && object_num > 1) { 1697 if (is_humongous && object_num > 1) {
@@ -1816,9 +1702,48 @@
1816 bottom(), end(), object_num); 1702 bottom(), end(), object_num);
1817 *failures = true; 1703 *failures = true;
1818 return; 1704 return;
1819--- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp.orig 2015-09-02 12:57:25.000000000 +0200 1705diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
1820+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp 2015-09-02 13:01:10.000000000 +0200 1706index e62a2ab..76627e7 100644
1821@@ -414,7 +414,7 @@ 1707--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
1708+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
1709@@ -52,7 +52,7 @@ class HeapRegion;
1710 class HeapRegionSetBase;
1711 class nmethod;
1712
1713-#define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]"
1714+#define HR_FORMAT "%u:(%s)[" PTR_FORMAT "," PTR_FORMAT "," PTR_FORMAT "]"
1715 #define HR_FORMAT_PARAMS(_hr_) \
1716 (_hr_)->hrm_index(), \
1717 (_hr_)->get_short_type_str(), \
1718@@ -534,8 +534,8 @@ class HeapRegion: public G1OffsetTableContigSpace {
1719 void set_containing_set(HeapRegionSetBase* containing_set) {
1720 assert((containing_set == NULL && _containing_set != NULL) ||
1721 (containing_set != NULL && _containing_set == NULL),
1722- err_msg("containing_set: "PTR_FORMAT" "
1723- "_containing_set: "PTR_FORMAT,
1724+ err_msg("containing_set: " PTR_FORMAT " "
1725+ "_containing_set: " PTR_FORMAT,
1726 p2i(containing_set), p2i(_containing_set)));
1727
1728 _containing_set = containing_set;
1729diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
1730index 62ae230..46e8b00 100644
1731--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
1732+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
1733@@ -112,7 +112,7 @@ HeapRegion::block_size(const HeapWord *addr) const {
1734
1735 assert(ClassUnloadingWithConcurrentMark,
1736 err_msg("All blocks should be objects if G1 Class Unloading isn't used. "
1737- "HR: ["PTR_FORMAT", "PTR_FORMAT", "PTR_FORMAT") "
1738+ "HR: [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ") "
1739 "addr: " PTR_FORMAT,
1740 p2i(bottom()), p2i(top()), p2i(end()), p2i(addr)));
1741
1742diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
1743index 020eb08..14673df 100644
1744--- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
1745+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
1746@@ -432,7 +432,7 @@ void HeapRegionManager::verify() {
1822 HeapRegion* hr = _regions.get_by_index(i); 1747 HeapRegion* hr = _regions.get_by_index(i);
1823 guarantee(hr != NULL, err_msg("invariant: i: %u", i)); 1748 guarantee(hr != NULL, err_msg("invariant: i: %u", i));
1824 guarantee(!prev_committed || hr->bottom() == prev_end, 1749 guarantee(!prev_committed || hr->bottom() == prev_end,
@@ -1827,9 +1752,27 @@
1827 i, HR_FORMAT_PARAMS(hr), p2i(prev_end))); 1752 i, HR_FORMAT_PARAMS(hr), p2i(prev_end)));
1828 guarantee(hr->hrm_index() == i, 1753 guarantee(hr->hrm_index() == i,
1829 err_msg("invariant: i: %u hrm_index(): %u", i, hr->hrm_index())); 1754 err_msg("invariant: i: %u hrm_index(): %u", i, hr->hrm_index()));
1830--- hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.orig 2015-09-02 12:57:25.000000000 +0200 1755diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp
1831+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2015-09-02 13:03:44.000000000 +0200 1756index 96bc92f..68840d6 100644
1832@@ -91,7 +91,7 @@ 1757--- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp
1758+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp
1759@@ -31,9 +31,9 @@
1760
1761 inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const {
1762 assert(addr < heap_end(),
1763- err_msg("addr: "PTR_FORMAT" end: "PTR_FORMAT, p2i(addr), p2i(heap_end())));
1764+ err_msg("addr: " PTR_FORMAT " end: " PTR_FORMAT, p2i(addr), p2i(heap_end())));
1765 assert(addr >= heap_bottom(),
1766- err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT, p2i(addr), p2i(heap_bottom())));
1767+ err_msg("addr: " PTR_FORMAT " bottom: " PTR_FORMAT, p2i(addr), p2i(heap_bottom())));
1768
1769 HeapRegion* hr = _regions.get_by_address(addr);
1770 return hr;
1771diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
1772index 662f4f1..6659960 100644
1773--- hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
1774+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
1775@@ -91,7 +91,7 @@ protected:
1833 // concurrency. 1776 // concurrency.
1834 1777
1835 if (G1TraceHeapRegionRememberedSet) { 1778 if (G1TraceHeapRegionRememberedSet) {
@@ -1838,7 +1781,7 @@
1838 from, 1781 from,
1839 UseCompressedOops 1782 UseCompressedOops
1840 ? (void *)oopDesc::load_decode_heap_oop((narrowOop*)from) 1783 ? (void *)oopDesc::load_decode_heap_oop((narrowOop*)from)
1841@@ -377,7 +377,7 @@ 1784@@ -381,7 +381,7 @@ void FromCardCache::initialize(uint n_par_rs, uint max_num_regions) {
1842 1785
1843 void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) { 1786 void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) {
1844 guarantee((size_t)start_idx + new_num_regions <= max_uintx, 1787 guarantee((size_t)start_idx + new_num_regions <= max_uintx,
@@ -1847,7 +1790,7 @@
1847 start_idx, new_num_regions)); 1790 start_idx, new_num_regions));
1848 for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) { 1791 for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) {
1849 uint end_idx = (start_idx + (uint)new_num_regions); 1792 uint end_idx = (start_idx + (uint)new_num_regions);
1850@@ -392,7 +392,7 @@ 1793@@ -396,7 +396,7 @@ void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) {
1851 void FromCardCache::print(outputStream* out) { 1794 void FromCardCache::print(outputStream* out) {
1852 for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) { 1795 for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) {
1853 for (uint j = 0; j < _max_regions; j++) { 1796 for (uint j = 0; j < _max_regions; j++) {
@@ -1856,7 +1799,7 @@
1856 i, j, at(i, j)); 1799 i, j, at(i, j));
1857 } 1800 }
1858 } 1801 }
1859@@ -432,7 +432,7 @@ 1802@@ -436,7 +436,7 @@ void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, int tid) {
1860 int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift); 1803 int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift);
1861 1804
1862 if (G1TraceHeapRegionRememberedSet) { 1805 if (G1TraceHeapRegionRememberedSet) {
@@ -1865,7 +1808,7 @@
1865 hr()->bottom(), from_card, 1808 hr()->bottom(), from_card,
1866 FromCardCache::at((uint)tid, cur_hrm_ind)); 1809 FromCardCache::at((uint)tid, cur_hrm_ind));
1867 } 1810 }
1868@@ -637,13 +637,13 @@ 1811@@ -642,13 +642,13 @@ void OtherRegionsTable::scrub(CardTableModRefBS* ctbs,
1869 1812
1870 assert(_coarse_map.size() == region_bm->size(), "Precondition"); 1813 assert(_coarse_map.size() == region_bm->size(), "Precondition");
1871 if (G1RSScrubVerbose) { 1814 if (G1RSScrubVerbose) {
@@ -1881,7 +1824,7 @@
1881 } 1824 }
1882 1825
1883 // Now do the fine-grained maps. 1826 // Now do the fine-grained maps.
1884@@ -1027,7 +1027,7 @@ 1827@@ -1044,7 +1044,7 @@ bool HeapRegionRemSetIterator::fine_has_next(size_t& card_index) {
1885 1828
1886 card_index = _cur_region_card_offset + _cur_card_in_prt; 1829 card_index = _cur_region_card_offset + _cur_card_in_prt;
1887 guarantee(_cur_card_in_prt < HeapRegion::CardsPerRegion, 1830 guarantee(_cur_card_in_prt < HeapRegion::CardsPerRegion,
@@ -1890,7 +1833,7 @@
1890 return true; 1833 return true;
1891 } 1834 }
1892 1835
1893@@ -1196,8 +1196,8 @@ 1836@@ -1213,8 +1213,8 @@ void PerRegionTable::test_fl_mem_size() {
1894 1837
1895 size_t min_prt_size = sizeof(void*) + dummy->bm()->size_in_words() * HeapWordSize; 1838 size_t min_prt_size = sizeof(void*) + dummy->bm()->size_in_words() * HeapWordSize;
1896 assert(dummy->mem_size() > min_prt_size, 1839 assert(dummy->mem_size() > min_prt_size,
@@ -1901,9 +1844,11 @@
1901 free(dummy); 1844 free(dummy);
1902 guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size"); 1845 guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size");
1903 // try to reset the state 1846 // try to reset the state
1904--- hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp.orig 2015-09-02 12:57:25.000000000 +0200 1847diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp
1905+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp 2015-09-02 13:04:36.000000000 +0200 1848index b654430..9ffb46f 100644
1906@@ -32,7 +32,7 @@ 1849--- hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp
1850+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp
1851@@ -32,7 +32,7 @@ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
1907 uint FreeRegionList::_unrealistically_long_length = 0; 1852 uint FreeRegionList::_unrealistically_long_length = 0;
1908 1853
1909 void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) { 1854 void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) {
@@ -1912,7 +1857,7 @@
1912 name(), message, length(), total_capacity_bytes()); 1857 name(), message, length(), total_capacity_bytes());
1913 fill_in_ext_msg_extra(msg); 1858 fill_in_ext_msg_extra(msg);
1914 } 1859 }
1915@@ -84,13 +84,13 @@ 1860@@ -84,13 +84,13 @@ void HeapRegionSetBase::verify_end() {
1916 1861
1917 void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) { 1862 void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) {
1918 out->cr(); 1863 out->cr();
@@ -1928,7 +1873,7 @@
1928 total_capacity_bytes()); 1873 total_capacity_bytes());
1929 } 1874 }
1930 1875
1931@@ -106,7 +106,7 @@ 1876@@ -106,7 +106,7 @@ void FreeRegionList::set_unrealistically_long_length(uint len) {
1932 } 1877 }
1933 1878
1934 void FreeRegionList::fill_in_ext_msg_extra(hrs_ext_msg* msg) { 1879 void FreeRegionList::fill_in_ext_msg_extra(hrs_ext_msg* msg) {
@@ -1937,7 +1882,7 @@
1937 } 1882 }
1938 1883
1939 void FreeRegionList::remove_all() { 1884 void FreeRegionList::remove_all() {
1940@@ -277,8 +277,8 @@ 1885@@ -277,8 +277,8 @@ void FreeRegionList::clear() {
1941 void FreeRegionList::print_on(outputStream* out, bool print_contents) { 1886 void FreeRegionList::print_on(outputStream* out, bool print_contents) {
1942 HeapRegionSetBase::print_on(out, print_contents); 1887 HeapRegionSetBase::print_on(out, print_contents);
1943 out->print_cr(" Linking"); 1888 out->print_cr(" Linking");
@@ -1948,7 +1893,7 @@
1948 1893
1949 if (print_contents) { 1894 if (print_contents) {
1950 out->print_cr(" Contents"); 1895 out->print_cr(" Contents");
1951@@ -306,7 +306,7 @@ 1896@@ -306,7 +306,7 @@ void FreeRegionList::verify_list() {
1952 1897
1953 count++; 1898 count++;
1954 guarantee(count < _unrealistically_long_length, 1899 guarantee(count < _unrealistically_long_length,
@@ -1957,9 +1902,37 @@
1957 1902
1958 if (curr->next() != NULL) { 1903 if (curr->next() != NULL) {
1959 guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up"); 1904 guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up");
1960--- hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp.orig 2015-09-02 13:07:15.000000000 +0200 1905diff --git hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
1961+++ hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2015-09-02 13:10:48.000000000 +0200 1906index 114d39d..c877400 100644
1962@@ -86,7 +86,7 @@ 1907--- hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
1908+++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
1909@@ -668,7 +668,7 @@ jlong PSMarkSweep::millis_since_last_gc() {
1910 jlong ret_val = now - _time_of_last_gc;
1911 // XXX See note in genCollectedHeap::millis_since_last_gc().
1912 if (ret_val < 0) {
1913- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
1914+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);)
1915 return 0;
1916 }
1917 return ret_val;
1918diff --git hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
1919index 8175ded..dd02250 100644
1920--- hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
1921+++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
1922@@ -3291,7 +3291,7 @@ jlong PSParallelCompact::millis_since_last_gc() {
1923 jlong ret_val = now - _time_of_last_gc;
1924 // XXX See note in genCollectedHeap::millis_since_last_gc().
1925 if (ret_val < 0) {
1926- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
1927+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);)
1928 return 0;
1929 }
1930 return ret_val;
1931diff --git hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
1932index 9a9ed05..39a370c 100644
1933--- hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
1934+++ hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
1935@@ -86,7 +86,7 @@ void MutableNUMASpace::ensure_parsability() {
1963 while (words_left_to_fill > 0) { 1936 while (words_left_to_fill > 0) {
1964 size_t words_to_fill = MIN2(words_left_to_fill, CollectedHeap::filler_array_max_size()); 1937 size_t words_to_fill = MIN2(words_left_to_fill, CollectedHeap::filler_array_max_size());
1965 assert(words_to_fill >= CollectedHeap::min_fill_size(), 1938 assert(words_to_fill >= CollectedHeap::min_fill_size(),
@@ -1968,9 +1941,248 @@
1968 words_to_fill, words_left_to_fill, CollectedHeap::filler_array_max_size())); 1941 words_to_fill, words_left_to_fill, CollectedHeap::filler_array_max_size()));
1969 CollectedHeap::fill_with_object((HeapWord*)cur_top, words_to_fill); 1942 CollectedHeap::fill_with_object((HeapWord*)cur_top, words_to_fill);
1970 if (!os::numa_has_static_binding()) { 1943 if (!os::numa_has_static_binding()) {
1971--- hotspot/src/share/vm/prims/methodHandles.cpp.orig 2015-09-02 13:07:15.000000000 +0200 1944diff --git hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp
1972+++ hotspot/src/share/vm/prims/methodHandles.cpp 2015-09-02 13:10:16.000000000 +0200 1945index bddf14b..923c34e 100644
1973@@ -1300,27 +1300,27 @@ 1946--- hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp
1947+++ hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp
1948@@ -98,10 +98,10 @@ void PLABStats::adjust_desired_plab_sz(uint no_of_gc_workers) {
1949 if (_allocated == 0) {
1950 assert(_unused == 0,
1951 err_msg("Inconsistency in PLAB stats: "
1952- "_allocated: "SIZE_FORMAT", "
1953- "_wasted: "SIZE_FORMAT", "
1954- "_unused: "SIZE_FORMAT", "
1955- "_used : "SIZE_FORMAT,
1956+ "_allocated: " SIZE_FORMAT ", "
1957+ "_wasted: " SIZE_FORMAT ", "
1958+ "_unused: " SIZE_FORMAT ", "
1959+ "_used : " SIZE_FORMAT,
1960 _allocated, _wasted, _unused, _used));
1961
1962 _allocated = 1;
1963diff --git hotspot/src/share/vm/memory/cardTableModRefBS.hpp hotspot/src/share/vm/memory/cardTableModRefBS.hpp
1964index c824e61..f08d7e2 100644
1965--- hotspot/src/share/vm/memory/cardTableModRefBS.hpp
1966+++ hotspot/src/share/vm/memory/cardTableModRefBS.hpp
1967@@ -158,8 +158,8 @@ class CardTableModRefBS: public ModRefBarrierSet {
1968 // Mapping from address to card marking array entry
1969 jbyte* byte_for(const void* p) const {
1970 assert(_whole_heap.contains(p),
1971- err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of "
1972- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
1973+ err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of "
1974+ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
1975 p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
1976 jbyte* result = &byte_map_base[uintptr_t(p) >> card_shift];
1977 assert(result >= _byte_map && result < _byte_map + _byte_map_size,
1978@@ -436,8 +436,8 @@ public:
1979 size_t delta = pointer_delta(p, byte_map_base, sizeof(jbyte));
1980 HeapWord* result = (HeapWord*) (delta << card_shift);
1981 assert(_whole_heap.contains(result),
1982- err_msg("Returning result = "PTR_FORMAT" out of bounds of "
1983- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
1984+ err_msg("Returning result = " PTR_FORMAT " out of bounds of "
1985+ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
1986 p2i(result), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
1987 return result;
1988 }
1989@@ -445,8 +445,8 @@ public:
1990 // Mapping from address to card marking array index.
1991 size_t index_for(void* p) {
1992 assert(_whole_heap.contains(p),
1993- err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of "
1994- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
1995+ err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of "
1996+ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
1997 p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
1998 return byte_for(p) - _byte_map;
1999 }
2000diff --git hotspot/src/share/vm/memory/genCollectedHeap.cpp hotspot/src/share/vm/memory/genCollectedHeap.cpp
2001index f7c9591..f1852e6 100644
2002--- hotspot/src/share/vm/memory/genCollectedHeap.cpp
2003+++ hotspot/src/share/vm/memory/genCollectedHeap.cpp
2004@@ -1403,7 +1403,7 @@ jlong GenCollectedHeap::millis_since_last_gc() {
2005 // back a time later than 'now'.
2006 jlong retVal = now - tolgc_cl.time();
2007 if (retVal < 0) {
2008- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, (int64_t) retVal);)
2009+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, (int64_t) retVal);)
2010 return 0;
2011 }
2012 return retVal;
2013diff --git hotspot/src/share/vm/memory/generation.cpp hotspot/src/share/vm/memory/generation.cpp
2014index d52f325..3c45a91 100644
2015--- hotspot/src/share/vm/memory/generation.cpp
2016+++ hotspot/src/share/vm/memory/generation.cpp
2017@@ -187,7 +187,7 @@ bool Generation::promotion_attempt_is_safe(size_t max_promotion_in_bytes) const
2018 bool res = (available >= max_promotion_in_bytes);
2019 if (PrintGC && Verbose) {
2020 gclog_or_tty->print_cr(
2021- "Generation: promo attempt is%s safe: available("SIZE_FORMAT") %s max_promo("SIZE_FORMAT")",
2022+ "Generation: promo attempt is%s safe: available(" SIZE_FORMAT ") %s max_promo(" SIZE_FORMAT ")",
2023 res? "":" not", available, res? ">=":"<",
2024 max_promotion_in_bytes);
2025 }
2026diff --git hotspot/src/share/vm/memory/generation.hpp hotspot/src/share/vm/memory/generation.hpp
2027index 63dccb7..c23295a 100644
2028--- hotspot/src/share/vm/memory/generation.hpp
2029+++ hotspot/src/share/vm/memory/generation.hpp
2030@@ -422,7 +422,7 @@ class Generation: public CHeapObj<mtGC> {
2031 // have to guard against non-monotonicity.
2032 NOT_PRODUCT(
2033 if (now < _time_of_last_gc) {
2034- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now);
2035+ warning("time warp: " INT64_FORMAT " to " INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now);
2036 }
2037 )
2038 return _time_of_last_gc;
2039diff --git hotspot/src/share/vm/memory/referenceProcessor.cpp hotspot/src/share/vm/memory/referenceProcessor.cpp
2040index 3c776f4..d851886 100644
2041--- hotspot/src/share/vm/memory/referenceProcessor.cpp
2042+++ hotspot/src/share/vm/memory/referenceProcessor.cpp
2043@@ -161,7 +161,7 @@ void ReferenceProcessor::update_soft_ref_master_clock() {
2044
2045 NOT_PRODUCT(
2046 if (now < _soft_ref_timestamp_clock) {
2047- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT,
2048+ warning("time warp: " INT64_FORMAT " to " INT64_FORMAT,
2049 _soft_ref_timestamp_clock, now);
2050 }
2051 )
2052diff --git hotspot/src/share/vm/memory/tenuredGeneration.cpp hotspot/src/share/vm/memory/tenuredGeneration.cpp
2053index d7432ba..cdc51ee 100644
2054--- hotspot/src/share/vm/memory/tenuredGeneration.cpp
2055+++ hotspot/src/share/vm/memory/tenuredGeneration.cpp
2056@@ -294,8 +294,8 @@ bool TenuredGeneration::promotion_attempt_is_safe(size_t max_promotion_in_bytes)
2057 bool res = (available >= av_promo) || (available >= max_promotion_in_bytes);
2058 if (PrintGC && Verbose) {
2059 gclog_or_tty->print_cr(
2060- "Tenured: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT"),"
2061- "max_promo("SIZE_FORMAT")",
2062+ "Tenured: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT "),"
2063+ "max_promo(" SIZE_FORMAT ")",
2064 res? "":" not", available, res? ">=":"<",
2065 av_promo, max_promotion_in_bytes);
2066 }
2067diff --git hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp
2068index cf3fefb..b19bd93 100644
2069--- hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp
2070+++ hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp
2071@@ -94,10 +94,10 @@ void ThreadLocalAllocBuffer::record_slow_allocation(size_t obj_size) {
2072
2073 if (PrintTLAB && Verbose) {
2074 Thread* thrd = myThread();
2075- gclog_or_tty->print("TLAB: %s thread: "INTPTR_FORMAT" [id: %2d]"
2076- " obj: "SIZE_FORMAT
2077- " free: "SIZE_FORMAT
2078- " waste: "SIZE_FORMAT"\n",
2079+ gclog_or_tty->print("TLAB: %s thread: " INTPTR_FORMAT " [id: %2d]"
2080+ " obj: " SIZE_FORMAT
2081+ " free: " SIZE_FORMAT
2082+ " waste: " SIZE_FORMAT "\n",
2083 "slow", p2i(thrd), thrd->osthread()->thread_id(),
2084 obj_size, free(), refill_waste_limit());
2085 }
2086diff --git hotspot/src/share/vm/memory/universe.cpp hotspot/src/share/vm/memory/universe.cpp
2087index 2e1e90f..bfbe2ec 100644
2088--- hotspot/src/share/vm/memory/universe.cpp
2089+++ hotspot/src/share/vm/memory/universe.cpp
2090@@ -926,7 +926,7 @@ void Universe::print_compressed_oops_mode() {
2091 // Reserve the Java heap, which is now the same for all GCs.
2092 ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
2093 assert(alignment <= Arguments::conservative_max_heap_alignment(),
2094- err_msg("actual alignment "SIZE_FORMAT" must be within maximum heap alignment "SIZE_FORMAT,
2095+ err_msg("actual alignment " SIZE_FORMAT " must be within maximum heap alignment " SIZE_FORMAT,
2096 alignment, Arguments::conservative_max_heap_alignment()));
2097 size_t total_reserved = align_size_up(heap_size, alignment);
2098 assert(!UseCompressedOops || (total_reserved <= (OopEncodingHeapMax - os::vm_page_size())),
2099diff --git hotspot/src/share/vm/oops/constantPool.cpp hotspot/src/share/vm/oops/constantPool.cpp
2100index a9685b2..b76435f 100644
2101--- hotspot/src/share/vm/oops/constantPool.cpp
2102+++ hotspot/src/share/vm/oops/constantPool.cpp
2103@@ -1494,7 +1494,7 @@ static void print_cpool_bytes(jint cnt, u1 *bytes) {
2104 }
2105 case JVM_CONSTANT_Long: {
2106 u8 val = Bytes::get_Java_u8(bytes);
2107- printf("long "INT64_FORMAT, (int64_t) *(jlong *) &val);
2108+ printf("long " INT64_FORMAT, (int64_t) *(jlong *) &val);
2109 ent_size = 8;
2110 idx++; // Long takes two cpool slots
2111 break;
2112diff --git hotspot/src/share/vm/oops/cpCache.cpp hotspot/src/share/vm/oops/cpCache.cpp
2113index d0c7750..e0f396d 100644
2114--- hotspot/src/share/vm/oops/cpCache.cpp
2115+++ hotspot/src/share/vm/oops/cpCache.cpp
2116@@ -305,7 +305,7 @@ void ConstantPoolCacheEntry::set_method_handle_common(constantPoolHandle cpool,
2117 adapter->size_of_parameters());
2118
2119 if (TraceInvokeDynamic) {
2120- tty->print_cr("set_method_handle bc=%d appendix="PTR_FORMAT"%s method_type="PTR_FORMAT"%s method="PTR_FORMAT" ",
2121+ tty->print_cr("set_method_handle bc=%d appendix=" PTR_FORMAT "%s method_type=" PTR_FORMAT "%s method=" PTR_FORMAT " ",
2122 invoke_code,
2123 (void *)appendix(), (has_appendix ? "" : " (unused)"),
2124 (void *)method_type(), (has_method_type ? "" : " (unused)"),
2125@@ -536,12 +536,12 @@ void ConstantPoolCacheEntry::print(outputStream* st, int index) const {
2126 // print separator
2127 if (index == 0) st->print_cr(" -------------");
2128 // print entry
2129- st->print("%3d ("PTR_FORMAT") ", index, (intptr_t)this);
2130+ st->print("%3d (" PTR_FORMAT ") ", index, (intptr_t)this);
2131 st->print_cr("[%02x|%02x|%5d]", bytecode_2(), bytecode_1(),
2132 constant_pool_index());
2133- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f1);
2134- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f2);
2135- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_flags);
2136+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f1);
2137+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f2);
2138+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_flags);
2139 st->print_cr(" -------------");
2140 }
2141
2142diff --git hotspot/src/share/vm/oops/markOop.cpp hotspot/src/share/vm/oops/markOop.cpp
2143index 1cc8a19..9bca601 100644
2144--- hotspot/src/share/vm/oops/markOop.cpp
2145+++ hotspot/src/share/vm/oops/markOop.cpp
2146@@ -49,7 +49,7 @@ void markOopDesc::print_on(outputStream* st) const {
2147 st->print("monitor=NULL");
2148 else {
2149 BasicLock * bl = (BasicLock *) mon->owner();
2150- st->print("monitor={count="INTPTR_FORMAT",waiters="INTPTR_FORMAT",recursions="INTPTR_FORMAT",owner="INTPTR_FORMAT"}",
2151+ st->print("monitor={count=" INTPTR_FORMAT ",waiters=" INTPTR_FORMAT ",recursions=" INTPTR_FORMAT ",owner=" INTPTR_FORMAT "}",
2152 mon->count(), mon->waiters(), mon->recursions(), p2i(bl));
2153 }
2154 } else {
2155diff --git hotspot/src/share/vm/oops/objArrayKlass.cpp hotspot/src/share/vm/oops/objArrayKlass.cpp
2156index a4c51d0..4f637f4 100644
2157--- hotspot/src/share/vm/oops/objArrayKlass.cpp
2158+++ hotspot/src/share/vm/oops/objArrayKlass.cpp
2159@@ -657,7 +657,7 @@ void ObjArrayKlass::oop_print_value_on(oop obj, outputStream* st) {
2160 if (i > max_objArray_print_length) {
2161 st->print("..."); break;
2162 }
2163- st->print(" "INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i));
2164+ st->print(" " INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i));
2165 }
2166 st->print(" }");
2167 }
2168diff --git hotspot/src/share/vm/oops/oop.cpp hotspot/src/share/vm/oops/oop.cpp
2169index 1be5781..3df79d4 100644
2170--- hotspot/src/share/vm/oops/oop.cpp
2171+++ hotspot/src/share/vm/oops/oop.cpp
2172@@ -46,7 +46,7 @@ void oopDesc::print_on(outputStream* st) const {
2173
2174 void oopDesc::print_address_on(outputStream* st) const {
2175 if (PrintOopAddress) {
2176- st->print("{"INTPTR_FORMAT"}", this);
2177+ st->print("{" INTPTR_FORMAT "}", this);
2178 }
2179 }
2180
2181diff --git hotspot/src/share/vm/prims/methodHandles.cpp hotspot/src/share/vm/prims/methodHandles.cpp
2182index 62aece7..0a2f76e 100644
2183--- hotspot/src/share/vm/prims/methodHandles.cpp
2184+++ hotspot/src/share/vm/prims/methodHandles.cpp
2185@@ -1321,27 +1321,27 @@ JVM_END
1974 2186
1975 // These are the native methods on java.lang.invoke.MethodHandleNatives. 2187 // These are the native methods on java.lang.invoke.MethodHandleNatives.
1976 static JNINativeMethod MHN_methods[] = { 2188 static JNINativeMethod MHN_methods[] = {
@@ -2012,117 +2224,11 @@
2012 }; 2224 };
2013 2225
2014 /** 2226 /**
2015--- hotspot/src/share/vm/oops/objArrayKlass.cpp.orig 2015-09-02 13:19:26.000000000 +0200 2227diff --git hotspot/src/share/vm/prims/perf.cpp hotspot/src/share/vm/prims/perf.cpp
2016+++ hotspot/src/share/vm/oops/objArrayKlass.cpp 2015-09-02 13:22:11.000000000 +0200 2228index 9ad0f4c..342cb2f 100644
2017@@ -657,7 +657,7 @@ 2229--- hotspot/src/share/vm/prims/perf.cpp
2018 if (i > max_objArray_print_length) { 2230+++ hotspot/src/share/vm/prims/perf.cpp
2019 st->print("..."); break; 2231@@ -290,17 +290,17 @@ PERF_END
2020 }
2021- st->print(" "INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i));
2022+ st->print(" " INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i));
2023 }
2024 st->print(" }");
2025 }
2026--- hotspot/src/share/vm/oops/oop.cpp.orig 2015-09-02 13:19:26.000000000 +0200
2027+++ hotspot/src/share/vm/oops/oop.cpp 2015-09-02 13:22:22.000000000 +0200
2028@@ -46,7 +46,7 @@
2029
2030 void oopDesc::print_address_on(outputStream* st) const {
2031 if (PrintOopAddress) {
2032- st->print("{"INTPTR_FORMAT"}", this);
2033+ st->print("{" INTPTR_FORMAT "}", this);
2034 }
2035 }
2036
2037--- hotspot/src/os/posix/vm/os_posix.cpp.orig 2015-09-02 13:32:01.000000000 +0200
2038+++ hotspot/src/os/posix/vm/os_posix.cpp 2015-09-02 13:33:42.000000000 +0200
2039@@ -594,7 +594,7 @@
2040 strncpy(buffer, "none", size);
2041
2042 const struct {
2043- int i;
2044+ unsigned i;
2045 const char* s;
2046 } flaginfo [] = {
2047 { SA_NOCLDSTOP, "SA_NOCLDSTOP" },
2048--- hotspot/src/share/vm/code/nmethod.cpp.orig 2015-09-02 13:19:26.000000000 +0200
2049+++ hotspot/src/share/vm/code/nmethod.cpp 2015-09-02 13:27:23.000000000 +0200
2050@@ -2303,7 +2303,7 @@
2051 void maybe_print(oop* p) {
2052 if (_print_nm == NULL) return;
2053 if (!_detected_scavenge_root) _print_nm->print_on(tty, "new scavenge root");
2054- tty->print_cr(""PTR_FORMAT"[offset=%d] detected scavengable oop "PTR_FORMAT" (found at "PTR_FORMAT")",
2055+ tty->print_cr("" PTR_FORMAT "[offset=%d] detected scavengable oop " PTR_FORMAT " (found at " PTR_FORMAT ")",
2056 _print_nm, (int)((intptr_t)p - (intptr_t)_print_nm),
2057 (void *)(*p), (intptr_t)p);
2058 (*p)->print();
2059@@ -2684,7 +2684,7 @@
2060 _nm->print_nmethod(true);
2061 _ok = false;
2062 }
2063- tty->print_cr("*** non-oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)",
2064+ tty->print_cr("*** non-oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)",
2065 (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
2066 }
2067 virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
2068@@ -2808,7 +2808,7 @@
2069 _nm->print_nmethod(true);
2070 _ok = false;
2071 }
2072- tty->print_cr("*** scavengable oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)",
2073+ tty->print_cr("*** scavengable oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)",
2074 (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
2075 (*p)->print();
2076 }
2077@@ -2853,7 +2853,7 @@
2078 print_on(tty, NULL);
2079
2080 if (WizardMode) {
2081- tty->print("((nmethod*) "INTPTR_FORMAT ") ", this);
2082+ tty->print("((nmethod*) " INTPTR_FORMAT ") ", this);
2083 tty->print(" for method " INTPTR_FORMAT , (address)method());
2084 tty->print(" { ");
2085 if (is_in_use()) tty->print("in_use ");
2086--- hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp.orig 2015-09-02 13:28:16.000000000 +0200
2087+++ hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp 2015-09-02 13:31:09.000000000 +0200
2088@@ -98,10 +98,10 @@
2089 if (_allocated == 0) {
2090 assert(_unused == 0,
2091 err_msg("Inconsistency in PLAB stats: "
2092- "_allocated: "SIZE_FORMAT", "
2093- "_wasted: "SIZE_FORMAT", "
2094- "_unused: "SIZE_FORMAT", "
2095- "_used : "SIZE_FORMAT,
2096+ "_allocated: " SIZE_FORMAT ", "
2097+ "_wasted: " SIZE_FORMAT ", "
2098+ "_unused: " SIZE_FORMAT ", "
2099+ "_used : " SIZE_FORMAT,
2100 _allocated, _wasted, _unused, _used));
2101
2102 _allocated = 1;
2103--- hotspot/src/share/vm/utilities/ostream.cpp.orig 2015-09-02 13:28:16.000000000 +0200
2104+++ hotspot/src/share/vm/utilities/ostream.cpp 2015-09-02 13:34:57.000000000 +0200
2105@@ -277,7 +277,7 @@
2106 size_t limit = (len + 16) / 16 * 16;
2107 for (size_t i = 0; i < limit; ++i) {
2108 if (i % 16 == 0) {
2109- indent().print(SIZE_FORMAT_HEX_W(07)":", i);
2110+ indent().print(SIZE_FORMAT_HEX_W(07) ":", i);
2111 }
2112 if (i % 2 == 0) {
2113 print(" ");
2114@@ -945,7 +945,7 @@
2115 // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if
2116 // we ever get round to introduce that method on the os class
2117 xs->head("hotspot_log version='%d %d'"
2118- " process='%d' time_ms='"INT64_FORMAT"'",
2119+ " process='%d' time_ms='" INT64_FORMAT "'",
2120 LOG_MAJOR_VERSION, LOG_MINOR_VERSION,
2121 os::current_process_id(), (int64_t)time_ms);
2122 // Write VM version header immediately.
2123--- hotspot/src/share/vm/prims/perf.cpp.orig 2015-09-02 13:36:01.000000000 +0200
2124+++ hotspot/src/share/vm/prims/perf.cpp 2015-09-02 13:37:33.000000000 +0200
2125@@ -290,17 +290,17 @@
2126 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f) 2232 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
2127 #define BB "Ljava/nio/ByteBuffer;" 2233 #define BB "Ljava/nio/ByteBuffer;"
2128 #define JLS "Ljava/lang/String;" 2234 #define JLS "Ljava/lang/String;"
@@ -2148,105 +2254,11 @@
2148 }; 2254 };
2149 2255
2150 #undef CBA_ARGS 2256 #undef CBA_ARGS
2151--- hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp.orig 2015-09-02 13:39:42.000000000 +0200 2257diff --git hotspot/src/share/vm/prims/unsafe.cpp hotspot/src/share/vm/prims/unsafe.cpp
2152+++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2015-09-02 13:40:05.000000000 +0200 2258index 0846b20..5e61217 100644
2153@@ -669,7 +669,7 @@ 2259--- hotspot/src/share/vm/prims/unsafe.cpp
2154 jlong ret_val = now - _time_of_last_gc; 2260+++ hotspot/src/share/vm/prims/unsafe.cpp
2155 // XXX See note in genCollectedHeap::millis_since_last_gc(). 2261@@ -1009,7 +1009,7 @@ UNSAFE_ENTRY(jclass, Unsafe_DefineClass0(JNIEnv *env, jobject unsafe, jstring na
2156 if (ret_val < 0) {
2157- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
2158+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);)
2159 return 0;
2160 }
2161 return ret_val;
2162--- hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.orig 2015-09-02 13:39:42.000000000 +0200
2163+++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-09-02 13:40:50.000000000 +0200
2164@@ -3292,7 +3292,7 @@
2165 jlong ret_val = now - _time_of_last_gc;
2166 // XXX See note in genCollectedHeap::millis_since_last_gc().
2167 if (ret_val < 0) {
2168- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
2169+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);)
2170 return 0;
2171 }
2172 return ret_val;
2173--- hotspot/src/share/vm/memory/referenceProcessor.cpp.orig 2015-09-02 13:42:24.000000000 +0200
2174+++ hotspot/src/share/vm/memory/referenceProcessor.cpp 2015-09-02 13:42:55.000000000 +0200
2175@@ -161,7 +161,7 @@
2176
2177 NOT_PRODUCT(
2178 if (now < _soft_ref_timestamp_clock) {
2179- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT,
2180+ warning("time warp: " INT64_FORMAT " to " INT64_FORMAT,
2181 _soft_ref_timestamp_clock, now);
2182 }
2183 )
2184--- hotspot/src/share/vm/runtime/safepoint.cpp.orig 2015-09-02 14:51:21.000000000 +0200
2185+++ hotspot/src/share/vm/runtime/safepoint.cpp 2015-09-02 14:52:56.000000000 +0200
2186@@ -983,7 +983,7 @@
2187
2188 case _running:
2189 default:
2190- tty->print_cr("restart thread "INTPTR_FORMAT" with state %d",
2191+ tty->print_cr("restart thread " INTPTR_FORMAT " with state %d",
2192 _thread, _type);
2193 _thread->print();
2194 ShouldNotReachHere();
2195@@ -1340,14 +1340,14 @@
2196
2197 for (int index = 0; index < VM_Operation::VMOp_Terminating; index++) {
2198 if (_safepoint_reasons[index] != 0) {
2199- tty->print_cr("%-26s"UINT64_FORMAT_W(10), VM_Operation::name(index),
2200+ tty->print_cr("%-26s" UINT64_FORMAT_W(10), VM_Operation::name(index),
2201 _safepoint_reasons[index]);
2202 }
2203 }
2204
2205 tty->print_cr(UINT64_FORMAT_W(5)" VM operations coalesced during safepoint",
2206 _coalesced_vmop_count);
2207- tty->print_cr("Maximum sync time "INT64_FORMAT_W(5)" ms",
2208+ tty->print_cr("Maximum sync time " INT64_FORMAT_W(5) " ms",
2209 _max_sync_time / MICROUNITS);
2210 tty->print_cr("Maximum vm operation time (except for Exit VM operation) "
2211 INT64_FORMAT_W(5)" ms",
2212--- hotspot/src/share/vm/memory/tenuredGeneration.cpp.orig 2015-09-02 18:11:24.000000000 +0200
2213+++ hotspot/src/share/vm/memory/tenuredGeneration.cpp 2015-09-02 18:11:32.000000000 +0200
2214@@ -292,8 +292,8 @@
2215 bool res = (available >= av_promo) || (available >= max_promotion_in_bytes);
2216 if (PrintGC && Verbose) {
2217 gclog_or_tty->print_cr(
2218- "Tenured: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT"),"
2219- "max_promo("SIZE_FORMAT")",
2220+ "Tenured: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT "),"
2221+ "max_promo(" SIZE_FORMAT ")",
2222 res? "":" not", available, res? ">=":"<",
2223 av_promo, max_promotion_in_bytes);
2224 }
2225--- hotspot/src/share/vm/services/threadService.cpp.orig 2015-09-02 18:11:24.000000000 +0200
2226+++ hotspot/src/share/vm/services/threadService.cpp 2015-09-02 18:11:32.000000000 +0200
2227@@ -889,7 +889,7 @@
2228 st->print(" waiting to lock monitor " INTPTR_FORMAT, waitingToLockMonitor);
2229 oop obj = (oop)waitingToLockMonitor->object();
2230 if (obj != NULL) {
2231- st->print(" (object "INTPTR_FORMAT ", a %s)", (address)obj,
2232+ st->print(" (object " INTPTR_FORMAT ", a %s)", (address)obj,
2233 (InstanceKlass::cast(obj->klass()))->external_name());
2234
2235 if (!currentThread->current_pending_monitor_is_from_java()) {
2236--- hotspot/src/share/vm/memory/universe.cpp.orig 2015-09-02 18:25:28.000000000 +0200
2237+++ hotspot/src/share/vm/memory/universe.cpp 2015-09-02 18:26:04.000000000 +0200
2238@@ -919,7 +919,7 @@
2239 // Reserve the Java heap, which is now the same for all GCs.
2240 ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
2241 assert(alignment <= Arguments::conservative_max_heap_alignment(),
2242- err_msg("actual alignment "SIZE_FORMAT" must be within maximum heap alignment "SIZE_FORMAT,
2243+ err_msg("actual alignment " SIZE_FORMAT " must be within maximum heap alignment " SIZE_FORMAT,
2244 alignment, Arguments::conservative_max_heap_alignment()));
2245 size_t total_reserved = align_size_up(heap_size, alignment);
2246 assert(!UseCompressedOops || (total_reserved <= (OopEncodingHeapMax - os::vm_page_size())),
2247--- hotspot/src/share/vm/prims/unsafe.cpp.orig 2015-09-02 18:25:32.000000000 +0200
2248+++ hotspot/src/share/vm/prims/unsafe.cpp 2015-09-02 18:47:09.000000000 +0200
2249@@ -977,7 +977,7 @@
2250 UNSAFE_END 2262 UNSAFE_END
2251 2263
2252 2264
@@ -2255,7 +2267,7 @@
2255 // define a class but do not make it known to the class loader or system dictionary 2267 // define a class but do not make it known to the class loader or system dictionary
2256 // - host_class: supplies context for linkage, access control, protection domain, and class loader 2268 // - host_class: supplies context for linkage, access control, protection domain, and class loader
2257 // - data: bytes of a class file, a raw memory address (length gives the number of bytes) 2269 // - data: bytes of a class file, a raw memory address (length gives the number of bytes)
2258@@ -1337,47 +1337,47 @@ 2270@@ -1374,47 +1374,47 @@ UNSAFE_END
2259 2271
2260 #define LANG "Ljava/lang/" 2272 #define LANG "Ljava/lang/"
2261 2273
@@ -2323,7 +2335,7 @@
2323 2335
2324 DECLARE_GETSETOOP_140(Boolean, Z), 2336 DECLARE_GETSETOOP_140(Boolean, Z),
2325 DECLARE_GETSETOOP_140(Byte, B), 2337 DECLARE_GETSETOOP_140(Byte, B),
2326@@ -1396,33 +1396,33 @@ 2338@@ -1433,33 +1433,33 @@ static JNINativeMethod methods_140[] = {
2327 DECLARE_GETSETNATIVE(Float, F), 2339 DECLARE_GETSETNATIVE(Float, F),
2328 DECLARE_GETSETNATIVE(Double, D), 2340 DECLARE_GETSETNATIVE(Double, D),
2329 2341
@@ -2335,16 +2347,15 @@
2335- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, 2347- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
2336- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, 2348- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
2337- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, 2349- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
2338- 2350+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
2351+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2352+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2353
2339- {CC"fieldOffset", CC"("FLD")I", FN_PTR(Unsafe_FieldOffset)}, 2354- {CC"fieldOffset", CC"("FLD")I", FN_PTR(Unsafe_FieldOffset)},
2340- {CC"staticFieldBase", CC"("CLS")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)}, 2355- {CC"staticFieldBase", CC"("CLS")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)},
2341- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 2356- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2342- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 2357- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
2343- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, 2358- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
2344+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
2345+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2346+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2347+
2348+ {CC"fieldOffset", CC"(" FLD ")I", FN_PTR(Unsafe_FieldOffset)}, 2359+ {CC"fieldOffset", CC"(" FLD ")I", FN_PTR(Unsafe_FieldOffset)},
2349+ {CC"staticFieldBase", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)}, 2360+ {CC"staticFieldBase", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)},
2350+ {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 2361+ {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)},
@@ -2376,7 +2387,7 @@
2376 2387
2377 DECLARE_GETSETOOP_141(Boolean, Z), 2388 DECLARE_GETSETOOP_141(Boolean, Z),
2378 DECLARE_GETSETOOP_141(Byte, B), 2389 DECLARE_GETSETOOP_141(Byte, B),
2379@@ -1441,37 +1441,37 @@ 2390@@ -1478,37 +1478,37 @@ static JNINativeMethod methods_141[] = {
2380 DECLARE_GETSETNATIVE(Float, F), 2391 DECLARE_GETSETNATIVE(Float, F),
2381 DECLARE_GETSETNATIVE(Double, D), 2392 DECLARE_GETSETNATIVE(Double, D),
2382 2393
@@ -2388,17 +2399,16 @@
2388- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, 2399- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
2389- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, 2400- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
2390- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, 2401- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
2391- 2402+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
2403+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2404+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2405
2392- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 2406- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2393- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, 2407- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
2394- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 2408- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
2395- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 2409- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2396- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 2410- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
2397- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, 2411- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
2398+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
2399+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2400+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2401+
2402+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 2412+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2403+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, 2413+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
2404+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 2414+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
@@ -2436,7 +2446,7 @@
2436 2446
2437 2447
2438 DECLARE_GETSETOOP(Boolean, Z), 2448 DECLARE_GETSETOOP(Boolean, Z),
2439@@ -1491,42 +1491,42 @@ 2449@@ -1528,42 +1528,42 @@ static JNINativeMethod methods_15[] = {
2440 DECLARE_GETSETNATIVE(Float, F), 2450 DECLARE_GETSETNATIVE(Float, F),
2441 DECLARE_GETSETNATIVE(Double, D), 2451 DECLARE_GETSETNATIVE(Double, D),
2442 2452
@@ -2448,17 +2458,16 @@
2448- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, 2458- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
2449- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, 2459- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
2450- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, 2460- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
2451- 2461+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
2462+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2463+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2464
2452- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 2465- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2453- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, 2466- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
2454- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 2467- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
2455- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 2468- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2456- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 2469- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
2457- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, 2470- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
2458+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
2459+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2460+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2461+
2462+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 2471+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2463+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, 2472+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
2464+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 2473+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
@@ -2505,7 +2514,7 @@
2505 2514
2506 DECLARE_GETSETOOP(Boolean, Z), 2515 DECLARE_GETSETOOP(Boolean, Z),
2507 DECLARE_GETSETOOP(Byte, B), 2516 DECLARE_GETSETOOP(Byte, B),
2508@@ -1545,45 +1545,45 @@ 2517@@ -1582,45 +1582,45 @@ static JNINativeMethod methods_16[] = {
2509 DECLARE_GETSETNATIVE(Float, F), 2518 DECLARE_GETSETNATIVE(Float, F),
2510 DECLARE_GETSETNATIVE(Double, D), 2519 DECLARE_GETSETNATIVE(Double, D),
2511 2520
@@ -2517,17 +2526,16 @@
2517- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, 2526- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
2518- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, 2527- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
2519- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, 2528- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
2520- 2529+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
2530+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2531+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2532
2521- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 2533- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2522- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, 2534- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
2523- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 2535- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
2524- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 2536- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2525- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 2537- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
2526- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, 2538- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
2527+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
2528+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2529+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2530+
2531+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 2539+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2532+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, 2540+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
2533+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 2541+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
@@ -2581,7 +2589,7 @@
2581 2589
2582 DECLARE_GETSETOOP(Boolean, Z), 2590 DECLARE_GETSETOOP(Boolean, Z),
2583 DECLARE_GETSETOOP(Byte, B), 2591 DECLARE_GETSETOOP(Byte, B),
2584@@ -1602,36 +1602,36 @@ 2592@@ -1639,36 +1639,36 @@ static JNINativeMethod methods_18[] = {
2585 DECLARE_GETSETNATIVE(Float, F), 2593 DECLARE_GETSETNATIVE(Float, F),
2586 DECLARE_GETSETNATIVE(Double, D), 2594 DECLARE_GETSETNATIVE(Double, D),
2587 2595
@@ -2593,17 +2601,16 @@
2593- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, 2601- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
2594- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, 2602- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
2595- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, 2603- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
2596- 2604+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
2605+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2606+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2607
2597- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 2608- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2598- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, 2609- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
2599- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 2610- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
2600- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 2611- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2601- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 2612- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
2602- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, 2613- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
2603+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
2604+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2605+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2606+
2607+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 2614+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2608+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, 2615+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
2609+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 2616+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
@@ -2643,7 +2650,7 @@
2643 }; 2650 };
2644 2651
2645 JNINativeMethod loadavg_method[] = { 2652 JNINativeMethod loadavg_method[] = {
2646@@ -1639,28 +1639,28 @@ 2653@@ -1676,28 +1676,28 @@ JNINativeMethod loadavg_method[] = {
2647 }; 2654 };
2648 2655
2649 JNINativeMethod prefetch_methods[] = { 2656 JNINativeMethod prefetch_methods[] = {
@@ -2682,9 +2689,11 @@
2682 }; 2689 };
2683 2690
2684 JNINativeMethod fence_methods[] = { 2691 JNINativeMethod fence_methods[] = {
2685--- hotspot/src/share/vm/prims/whitebox.cpp.orig 2015-09-02 18:55:43.000000000 +0200 2692diff --git hotspot/src/share/vm/prims/whitebox.cpp hotspot/src/share/vm/prims/whitebox.cpp
2686+++ hotspot/src/share/vm/prims/whitebox.cpp 2015-09-02 18:58:04.000000000 +0200 2693index c3e0688..fdf8649 100644
2687@@ -157,8 +157,8 @@ 2694--- hotspot/src/share/vm/prims/whitebox.cpp
2695+++ hotspot/src/share/vm/prims/whitebox.cpp
2696@@ -166,8 +166,8 @@ WB_END
2688 2697
2689 WB_ENTRY(void, WB_PrintHeapSizes(JNIEnv* env, jobject o)) { 2698 WB_ENTRY(void, WB_PrintHeapSizes(JNIEnv* env, jobject o)) {
2690 CollectorPolicy * p = Universe::heap()->collector_policy(); 2699 CollectorPolicy * p = Universe::heap()->collector_policy();
@@ -2695,7 +2704,7 @@
2695 p->min_heap_byte_size(), p->initial_heap_byte_size(), p->max_heap_byte_size(), 2704 p->min_heap_byte_size(), p->initial_heap_byte_size(), p->max_heap_byte_size(),
2696 p->space_alignment(), p->heap_alignment()); 2705 p->space_alignment(), p->heap_alignment());
2697 } 2706 }
2698@@ -193,8 +193,8 @@ 2707@@ -202,8 +202,8 @@ WB_ENTRY(void, WB_ReadFromNoaccessArea(JNIEnv* env, jobject o))
2699 Universe::narrow_oop_use_implicit_null_checks() )) { 2708 Universe::narrow_oop_use_implicit_null_checks() )) {
2700 tty->print_cr("WB_ReadFromNoaccessArea method is useless:\n " 2709 tty->print_cr("WB_ReadFromNoaccessArea method is useless:\n "
2701 "\tUseCompressedOops is %d\n" 2710 "\tUseCompressedOops is %d\n"
@@ -2706,7 +2715,7 @@
2706 "\tUniverse::narrow_oop_use_implicit_null_checks() is %d", 2715 "\tUniverse::narrow_oop_use_implicit_null_checks() is %d",
2707 UseCompressedOops, 2716 UseCompressedOops,
2708 rhs.base(), 2717 rhs.base(),
2709@@ -247,8 +247,8 @@ 2718@@ -256,8 +256,8 @@ static jint wb_stress_virtual_space_resize(size_t reserved_space_size,
2710 2719
2711 WB_ENTRY(jint, WB_StressVirtualSpaceResize(JNIEnv* env, jobject o, 2720 WB_ENTRY(jint, WB_StressVirtualSpaceResize(JNIEnv* env, jobject o,
2712 jlong reserved_space_size, jlong magnitude, jlong iterations)) 2721 jlong reserved_space_size, jlong magnitude, jlong iterations))
@@ -2717,14 +2726,114 @@
2717 iterations); 2726 iterations);
2718 if (reserved_space_size < 0 || magnitude < 0 || iterations < 0) { 2727 if (reserved_space_size < 0 || magnitude < 0 || iterations < 0) {
2719 tty->print_cr("One of variables printed above is negative. Can't proceed.\n"); 2728 tty->print_cr("One of variables printed above is negative. Can't proceed.\n");
2720--- hotspot/src/share/vm/oops/markOop.cpp.orig 2015-09-10 13:28:34.918039653 +0200 2729diff --git hotspot/src/share/vm/runtime/safepoint.cpp hotspot/src/share/vm/runtime/safepoint.cpp
2721+++ hotspot/src/share/vm/oops/markOop.cpp 2015-09-10 13:29:26.890039849 +0200 2730index 2f46a84..bbf0339 100644
2722@@ -49,7 +49,7 @@ 2731--- hotspot/src/share/vm/runtime/safepoint.cpp
2723 st->print("monitor=NULL"); 2732+++ hotspot/src/share/vm/runtime/safepoint.cpp
2724 else { 2733@@ -914,7 +914,7 @@ void ThreadSafepointState::restart() {
2725 BasicLock * bl = (BasicLock *) mon->owner(); 2734
2726- st->print("monitor={count="INTPTR_FORMAT",waiters="INTPTR_FORMAT",recursions="INTPTR_FORMAT",owner="INTPTR_FORMAT"}", 2735 case _running:
2727+ st->print("monitor={count=" INTPTR_FORMAT ",waiters=" INTPTR_FORMAT ",recursions=" INTPTR_FORMAT ",owner=" INTPTR_FORMAT "}", 2736 default:
2728 mon->count(), mon->waiters(), mon->recursions(), p2i(bl)); 2737- tty->print_cr("restart thread "INTPTR_FORMAT" with state %d",
2729 } 2738+ tty->print_cr("restart thread " INTPTR_FORMAT " with state %d",
2730 } else { 2739 _thread, _type);
2740 _thread->print();
2741 ShouldNotReachHere();
2742@@ -1271,14 +1271,14 @@ void SafepointSynchronize::print_stat_on_exit() {
2743
2744 for (int index = 0; index < VM_Operation::VMOp_Terminating; index++) {
2745 if (_safepoint_reasons[index] != 0) {
2746- tty->print_cr("%-26s"UINT64_FORMAT_W(10), VM_Operation::name(index),
2747+ tty->print_cr("%-26s" UINT64_FORMAT_W(10), VM_Operation::name(index),
2748 _safepoint_reasons[index]);
2749 }
2750 }
2751
2752 tty->print_cr(UINT64_FORMAT_W(5)" VM operations coalesced during safepoint",
2753 _coalesced_vmop_count);
2754- tty->print_cr("Maximum sync time "INT64_FORMAT_W(5)" ms",
2755+ tty->print_cr("Maximum sync time " INT64_FORMAT_W(5) " ms",
2756 _max_sync_time / MICROUNITS);
2757 tty->print_cr("Maximum vm operation time (except for Exit VM operation) "
2758 INT64_FORMAT_W(5)" ms",
2759diff --git hotspot/src/share/vm/services/threadService.cpp hotspot/src/share/vm/services/threadService.cpp
2760index 02156a2..be5acfd 100644
2761--- hotspot/src/share/vm/services/threadService.cpp
2762+++ hotspot/src/share/vm/services/threadService.cpp
2763@@ -889,7 +889,7 @@ void DeadlockCycle::print_on(outputStream* st) const {
2764 st->print(" waiting to lock monitor " INTPTR_FORMAT, waitingToLockMonitor);
2765 oop obj = (oop)waitingToLockMonitor->object();
2766 if (obj != NULL) {
2767- st->print(" (object "INTPTR_FORMAT ", a %s)", (address)obj,
2768+ st->print(" (object " INTPTR_FORMAT ", a %s)", (address)obj,
2769 (InstanceKlass::cast(obj->klass()))->external_name());
2770
2771 if (!currentThread->current_pending_monitor_is_from_java()) {
2772diff --git hotspot/src/share/vm/trace/traceStream.hpp hotspot/src/share/vm/trace/traceStream.hpp
2773index 89911ea..e2c982a 100644
2774--- hotspot/src/share/vm/trace/traceStream.hpp
2775+++ hotspot/src/share/vm/trace/traceStream.hpp
2776@@ -40,31 +40,31 @@ class TraceStream : public StackObj {
2777 TraceStream(outputStream& stream): _st(stream) {}
2778
2779 void print_val(const char* label, u1 val) {
2780- _st.print("%s = "UINT32_FORMAT, label, val);
2781+ _st.print("%s = " UINT32_FORMAT, label, val);
2782 }
2783
2784 void print_val(const char* label, u2 val) {
2785- _st.print("%s = "UINT32_FORMAT, label, val);
2786+ _st.print("%s = " UINT32_FORMAT, label, val);
2787 }
2788
2789 void print_val(const char* label, s2 val) {
2790- _st.print("%s = "INT32_FORMAT, label, val);
2791+ _st.print("%s = " INT32_FORMAT, label, val);
2792 }
2793
2794 void print_val(const char* label, u4 val) {
2795- _st.print("%s = "UINT32_FORMAT, label, val);
2796+ _st.print("%s = " UINT32_FORMAT, label, val);
2797 }
2798
2799 void print_val(const char* label, s4 val) {
2800- _st.print("%s = "INT32_FORMAT, label, val);
2801+ _st.print("%s = " INT32_FORMAT, label, val);
2802 }
2803
2804 void print_val(const char* label, u8 val) {
2805- _st.print("%s = "UINT64_FORMAT, label, val);
2806+ _st.print("%s = " UINT64_FORMAT, label, val);
2807 }
2808
2809 void print_val(const char* label, s8 val) {
2810- _st.print("%s = "INT64_FORMAT, label, (int64_t) val);
2811+ _st.print("%s = " INT64_FORMAT, label, (int64_t) val);
2812 }
2813
2814 void print_val(const char* label, bool val) {
2815diff --git hotspot/src/share/vm/utilities/ostream.cpp hotspot/src/share/vm/utilities/ostream.cpp
2816index 21bdd69..44ce683 100644
2817--- hotspot/src/share/vm/utilities/ostream.cpp
2818+++ hotspot/src/share/vm/utilities/ostream.cpp
2819@@ -277,7 +277,7 @@ void outputStream::print_data(void* data, size_t len, bool with_ascii) {
2820 size_t limit = (len + 16) / 16 * 16;
2821 for (size_t i = 0; i < limit; ++i) {
2822 if (i % 16 == 0) {
2823- indent().print(SIZE_FORMAT_HEX_W(07)":", i);
2824+ indent().print(SIZE_FORMAT_HEX_W(07) ":", i);
2825 }
2826 if (i % 2 == 0) {
2827 print(" ");
2828@@ -945,7 +945,7 @@ void defaultStream::start_log() {
2829 // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if
2830 // we ever get round to introduce that method on the os class
2831 xs->head("hotspot_log version='%d %d'"
2832- " process='%d' time_ms='"INT64_FORMAT"'",
2833+ " process='%d' time_ms='" INT64_FORMAT "'",
2834 LOG_MAJOR_VERSION, LOG_MINOR_VERSION,
2835 os::current_process_id(), (int64_t)time_ms);
2836 // Write VM version header immediately.
2837--
28382.7.4
2839
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-zero-mode-crash.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-zero-mode-crash.patch
new file mode 100644
index 0000000..29702fa
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-zero-mode-crash.patch
@@ -0,0 +1,49 @@
1# HG changeset patch
2# User aph
3# Date 1461121375 -3600
4# Wed Apr 20 04:02:55 2016 +0100
5# Node ID 6811f311f905409fe71d2b1c2fb34c3268758724
6# Parent c66e4cc0fce57664ab44c55c47fa1a2f1bf02638
78154210: Zero: Better byte behaviour
8Summary: Complete support for 8132051 on Zero and fix failure on 64-bit big-endian systems
9Reviewed-by: andrew, chrisphi, coleenp
10
11Upstream-Status: Backport [Fixed in u112]
12
13diff --git hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
14--- hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
15+++ hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
16@@ -220,9 +220,16 @@
17 // Push our result
18 for (int i = 0; i < result_slots; i++) {
19 // Adjust result to smaller
20- intptr_t res = result[-i];
21+ union {
22+ intptr_t res;
23+ jint res_jint;
24+ };
25+ res = result[-i];
26 if (result_slots == 1) {
27- res = narrow(method->result_type(), res);
28+ BasicType t = method->result_type();
29+ if (is_subword_type(t)) {
30+ res_jint = (jint)narrow(t, res_jint);
31+ }
32 }
33 stack->push(res);
34 }
35diff --git hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
36--- hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
37+++ hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
38@@ -593,8 +593,9 @@
39 /* 0xDC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
40
41 /* 0xE0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
42-/* 0xE4 */ &&opc_default, &&opc_fast_aldc, &&opc_fast_aldc_w, &&opc_return_register_finalizer,
43-/* 0xE8 */ &&opc_invokehandle,&&opc_default, &&opc_default, &&opc_default,
44+/* 0xE4 */ &&opc_default, &&opc_default, &&opc_fast_aldc, &&opc_fast_aldc_w,
45+/* 0xE8 */ &&opc_return_register_finalizer,
46+ &&opc_invokehandle, &&opc_default, &&opc_default,
47 /* 0xEC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
48
49 /* 0xF0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch
deleted file mode 100644
index f3dc864..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1# HG changeset patch
2# User sgehwolf
3# Date 1434121785 -3600
4# Node ID 6217fd2c767b467641bf7b41a9c37273e8fa0cbd
5# Parent ff0929a59ced0e144201aa05819ae2e47d6f2c61
68087120: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms.
7Summary: Use __builtin_frame_address(0) rather than returning address of local variable.
8Reviewed-by: dholmes
9
10diff -r ff0929a59ced -r 6217fd2c767b src/os_cpu/linux_zero/vm/os_linux_zero.cpp
11--- hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp.orig Thu Jun 11 20:19:26 2015 -0700
12+++ hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Fri Jun 12 16:09:45 2015 +0100
13@@ -59,8 +59,8 @@
14 extern sigjmp_buf* get_jmp_buf_for_continuation();
15
16 address os::current_stack_pointer() {
17- address dummy = (address) &dummy;
18- return dummy;
19+ // return the address of the current function
20+ return (address)__builtin_frame_address(0);
21 }
22
23 frame os::get_sender_for_C_frame(frame* fr) {
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-25 12:07:24 +0000