[oe] [meta-java][PATCH v2 1/2] openjdk-8: Upgrade from u72 to u102
Erkka Kääriä
erkka.kaaria at intel.com
Mon Aug 15 09:36:19 UTC 2016
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 at intel.com>
---
recipes-core/openjdk/openjdk-8-native_102b14.bb | 2 +
recipes-core/openjdk/openjdk-8-native_72b05.bb | 2 -
...ease-72b05.inc => openjdk-8-release-102b14.inc} | 51 +-
.../{openjdk-8_72b05.bb => openjdk-8_102b14.bb} | 4 +-
.../{openjre-8_72b05.bb => openjre-8_102b14.bb} | 4 +-
.../openjdk8-avoid-early-ldflags-expansion.patch | 53 -
.../openjdk8-fix-shark-stdc++11.patch | 2623 ++++++++++----------
.../openjdk8-fix-zero-mode-crash.patch | 49 +
..._than_returning_address_of_local_variable.patch | 23 -
9 files changed, 1446 insertions(+), 1365 deletions(-)
create mode 100644 recipes-core/openjdk/openjdk-8-native_102b14.bb
delete mode 100644 recipes-core/openjdk/openjdk-8-native_72b05.bb
rename recipes-core/openjdk/{openjdk-8-release-72b05.inc => openjdk-8-release-102b14.inc} (62%)
rename recipes-core/openjdk/{openjdk-8_72b05.bb => openjdk-8_102b14.bb} (95%)
rename recipes-core/openjdk/{openjre-8_72b05.bb => openjre-8_102b14.bb} (92%)
delete mode 100644 recipes-core/openjdk/patches-openjdk-8/openjdk8-avoid-early-ldflags-expansion.patch
create mode 100644 recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-zero-mode-crash.patch
delete mode 100644 recipes-core/openjdk/patches-openjdk-8/openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch
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 @@
+require openjdk-8-release-102b14.inc
+require 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 @@
-require openjdk-8-release-72b05.inc
-require openjdk-8-native.inc
diff --git a/recipes-core/openjdk/openjdk-8-release-72b05.inc b/recipes-core/openjdk/openjdk-8-release-102b14.inc
similarity index 62%
rename from recipes-core/openjdk/openjdk-8-release-72b05.inc
rename to 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="\
file://dont-expect-fqpn-for-make.patch;striplevel=0 \
file://openjdk8-no-genx11-in-headless.patch;apply=no \
file://openjdk8-no-unused-deps.patch;apply=no \
- file://openjdk8-avoid-early-ldflags-expansion.patch;apply=no \
file://openjdk8-find-compiler-fix-env-respect.patch;apply=no \
file://openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch;apply=no \
"
@@ -16,40 +15,40 @@ BUILD_DIR_ECJ = "openjdk.build-ecj"
# Force arm mode for now
ARM_INSTRUCTION_SET_armv4t = "ARM"
-# Enable zero mode for arm based builds, as normal hotspot fails to build
+# Enable zero mode for arm based builds, as normal hotspot fails to build
PACKAGECONFIG_append_arm = " zero"
-CORBA_CHANGESET = "7deeb4f70404"
-SRC_URI[corba.md5sum] = "544b4963d14fb7155b12dbc56d058649"
-SRC_URI[corba.sha256sum] = "a75c31706f634585baf0d0a0b20e321ac634d41d6afb62bd6ffb1f9c0b766d09"
+CORBA_CHANGESET = "56b133772ec1"
+SRC_URI[corba.md5sum] = "b67bd442400e6805ddb986e78adc2834"
+SRC_URI[corba.sha256sum] = "d5aabb9b3681b0593dde1b9eee4ff9b4cbabe7568b041f9e63e6fa73ba11bb86"
-HOTSPOT_CHANGESET = "d7b01fb81aa8"
-SRC_URI[hotspot.md5sum] = "9a94802c1179faedf06d65d2f6fcc6c7"
-SRC_URI[hotspot.sha256sum] = "5dacf0b9c86aa78061ca87c9ade1708b56deba35e2e559dcf9dbc50d85ba3ace"
+HOTSPOT_CHANGESET = "ac29c9c1193a"
+SRC_URI[hotspot.md5sum] = "4383d833de07fc617595a01a78efd0fc"
+SRC_URI[hotspot.sha256sum] = "1e36c6d207ac1a7d6d08f28a61bf061188df0562d89baf606138d8245d690982"
-JAXP_CHANGESET = "acbcb6682c9b"
-SRC_URI[jaxp.md5sum] = "34b6700d03a0e2f13a272b4121536544"
-SRC_URI[jaxp.sha256sum] = "b6b60e174c3d980773dd56e0a2e7cacc26b05e401f6a08a1ffef594b6166865a"
+JAXP_CHANGESET = "1f032000ff4b"
+SRC_URI[jaxp.md5sum] = "a4a46860d00f8b513a690166b9ae0b56"
+SRC_URI[jaxp.sha256sum] = "dfa0098ca9b9f99cb9de4ee9f3c61b0ad28f968ecda770f09e603c6dd8f78df3"
-JAXWS_CHANGESET = "6aba0f814a15"
-SRC_URI[jaxws.md5sum] = "bad8a6e540dca0889d5c0edef47fe6ca"
-SRC_URI[jaxws.sha256sum] = "ae57bb090ec2c5338c6f740dbfd20a92f52e60379b764c4bc874464c5955b375"
+JAXWS_CHANGESET = "81f2d81a48d7"
+SRC_URI[jaxws.md5sum] = "0077cb7f1d1b31ba882f910bd3c30050"
+SRC_URI[jaxws.sha256sum] = "c28322d7a9805d06b6f3a49d316aa4746076dfc106431a952fe0d12b6690cbdc"
-JDK_CHANGESET = "39baa472e20c"
-SRC_URI[jdk.md5sum] = "746e4d38fa3d31a22239d160688ed447"
-SRC_URI[jdk.sha256sum] = "e3587fa57eec72c561f0695723649a745966bb2a74803ff8a451b80fd2079f99"
+JDK_CHANGESET = "48c99b423839"
+SRC_URI[jdk.md5sum] = "316fc871a823ff8f1db39a2fca51bd12"
+SRC_URI[jdk.sha256sum] = "bca18458ba0a0b8d79639829b8a71cdf65dd788b5c28658102b6b4691a47a420"
-LANGTOOLS_CHANGESET = "10ffafaf5340"
-SRC_URI[langtools.md5sum] = "4562acae958cc9b9f68300d5c2e6feb3"
-SRC_URI[langtools.sha256sum] = "5d14b666fbc6ee93d60c6a135eb8163a95ca5de96d390894e0c0b59719cf7fe4"
+LANGTOOLS_CHANGESET = "0549bf2f507d"
+SRC_URI[langtools.md5sum] = "bff92b915d26afd0c9b7c4b9013ee424"
+SRC_URI[langtools.sha256sum] = "4a918bab7a8f13b6705085be0d043b03e24afb4ff3c67ad98000c6b9fe577cb8"
-NASHORN_CHANGESET = "9ff5c2181333"
-SRC_URI[nashorn.md5sum] = "c6d234d73ab4d95072b7600b731bbfff"
-SRC_URI[nashorn.sha256sum] = "f56ee0bc65c8f4954bbec0e777c0158a44dc4b744407991a96f6627be433807d"
+NASHORN_CHANGESET = "0948e61a3722"
+SRC_URI[nashorn.md5sum] = "19e79a31ad20b55b47d6b9f1b20eaac0"
+SRC_URI[nashorn.sha256sum] = "caa1f648cfbe45c081460bc9c2d9a7b83910bb468c325d8acc2ee4417460915e"
-OPENJDK_CHANGESET = "e8bed1496ff2"
-SRC_URI[openjdk.md5sum] = "182992a90cbe209b34142f934319704b"
-SRC_URI[openjdk.sha256sum] = "d835a9adcf766e68d5a73fb36040d9e35b36c0363c883b8f05560c49bb22bf0c"
+OPENJDK_CHANGESET = "bf0932d3e0f8"
+SRC_URI[openjdk.md5sum] = "2b52cc3d439fe0da2ecbb28671fbe5aa"
+SRC_URI[openjdk.sha256sum] = "66fa6ecf3047b7d8a216c1372616babe96f0fb40e89cb51575b80bf602d9ba59"
OPENJDK_HG_U = "jdk8u"
OPENJDK_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
similarity index 95%
rename from recipes-core/openjdk/openjdk-8_72b05.bb
rename to 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 @@
-require openjdk-8-release-72b05.inc
+require openjdk-8-release-102b14.inc
require openjdk-8-cross.inc
# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch
@@ -8,10 +8,10 @@ PATCHES_URI_append = "\
file://openjdk8-restrict-to-staging-dir.patch;apply=no \
file://openjdk8-fix-shark-build.patch;apply=no \
file://openjdk8-fix-shark-stdc++11.patch;apply=no \
- file://openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch;apply=no \
file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \
file://openjdk8-fix-adlc-flags.patch;apply=no \
file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \
+ file://openjdk8-fix-zero-mode-crash.patch;apply=no \
"
do_install() {
diff --git a/recipes-core/openjdk/openjre-8_72b05.bb b/recipes-core/openjdk/openjre-8_102b14.bb
similarity index 92%
rename from recipes-core/openjdk/openjre-8_72b05.bb
rename to 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 @@
-require openjdk-8-release-72b05.inc
+require openjdk-8-release-102b14.inc
require openjdk-8-cross.inc
# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch
@@ -8,10 +8,10 @@ PATCHES_URI_append = "\
file://openjdk8-restrict-to-staging-dir.patch;apply=no \
file://openjdk8-fix-shark-build.patch;apply=no \
file://openjdk8-fix-shark-stdc++11.patch;apply=no \
- file://openjdk8-use_builtin_frame_address_0_rather_than_returning_address_of_local_variable.patch;apply=no \
file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \
file://openjdk8-fix-adlc-flags.patch;apply=no \
file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \
+ file://openjdk8-fix-zero-mode-crash.patch;apply=no \
"
do_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 @@
-# HG changeset patch
-# User andrew
-# Date 1452261185 0
-# Fri Jan 08 13:53:05 2016 +0000
-# Node ID 92c6a16b6daccda4b7c7f9612e4057df006b9f22
-# Parent b95e325137b439b33a7bb013be21475df5da3a03
-8146566: OpenJDK build can't handle commas in LDFLAGS
-Summary: Backport part of 8142907 to avoid early LDFLAGS expansion
-Reviewed-by: erikj
-
-diff --git jdk/make/CompileDemos.gmk jdk/make/CompileDemos.gmk
---- jdk/make/CompileDemos.gmk
-+++ jdk/make/CompileDemos.gmk
-@@ -224,17 +224,17 @@ define SetupJVMTIDemo
- $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2)/README.txt) \
- $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2)/sample.makefile.txt)
- BUILD_DEMO_JVMTI_$1_EXTRA_INC := $$(addprefix -I, $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC))
- BUILD_DEMO_JVMTI_$1_LANG := C
- ifneq (, $4)
- BUILD_DEMO_JVMTI_$1_LANG := $4
- endif
- ifeq (C++, $4)
-- $1_EXTRA_CXX := $(LDFLAGS_CXX_JDK) $(LIBCXX)
-+ $1_EXTRA_CXX := $$(LDFLAGS_CXX_JDK) $(LIBCXX)
- endif
-
- $1_CXXFLAGS := $(CXXFLAGS_JDKLIB) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 \
- $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 \
- $(CXXFLAGS_DEBUG_SYMBOLS)
- ifeq ($1-$(OPENJDK_TARGET_CPU_ARCH), waiters-sparc)
- $1_FILTER := -xregs=no%appl
- $1_CXXFLAGS := $$(filter-out $$($1_FILTER), $$($1_CXXFLAGS))
-@@ -246,18 +246,18 @@ define SetupJVMTIDemo
- -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3
-
- # Remove the -incremental:no setting to get .ilk-files like in the old build.
- $$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \
- SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
- LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
- OPTIMIZATION := LOW, \
- CXXFLAGS := $$($1_CXXFLAGS), \
-- LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
-- LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
-+ LDFLAGS := $(filter-out -incremental:no -opt:ref, $$(LDFLAGS_JDKLIB)), \
-+ LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN), \
- LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
- LDFLAGS_SUFFIX_posix := $5, \
- LDFLAGS_SUFFIX_windows := $6, \
- LDFLAGS_SUFFIX_solaris := $7 -lc, \
- LDFLAGS_SUFFIX_linux := $8, \
- VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
- RC_FLAGS := $$(RC_FLAGS) \
- -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,638 +1,113 @@
---- hotspot/src/share/vm/memory/cardTableModRefBS.hpp.orig 2015-09-02 09:45:31.000000000 +0200
-+++ hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2015-09-02 09:46:59.000000000 +0200
-@@ -158,8 +158,8 @@
- // Mapping from address to card marking array entry
- jbyte* byte_for(const void* p) const {
- assert(_whole_heap.contains(p),
-- err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of "
-- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
-+ err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of "
-+ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
- p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
- jbyte* result = &byte_map_base[uintptr_t(p) >> card_shift];
- assert(result >= _byte_map && result < _byte_map + _byte_map_size,
-@@ -436,8 +436,8 @@
- size_t delta = pointer_delta(p, byte_map_base, sizeof(jbyte));
- HeapWord* result = (HeapWord*) (delta << card_shift);
- assert(_whole_heap.contains(result),
-- err_msg("Returning result = "PTR_FORMAT" out of bounds of "
-- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
-+ err_msg("Returning result = " PTR_FORMAT " out of bounds of "
-+ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
- p2i(result), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
- return result;
- }
-@@ -445,8 +445,8 @@
- // Mapping from address to card marking array index.
- size_t index_for(void* p) {
- assert(_whole_heap.contains(p),
-- err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of "
-- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
-+ err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of "
-+ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
- p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
- return byte_for(p) - _byte_map;
- }
---- hotspot/src/share/vm/memory/generation.hpp.orig 2015-09-02 09:45:31.000000000 +0200
-+++ hotspot/src/share/vm/memory/generation.hpp 2015-09-02 09:47:36.000000000 +0200
-@@ -422,7 +422,7 @@
- // have to guard against non-monotonicity.
- NOT_PRODUCT(
- if (now < _time_of_last_gc) {
-- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now);
-+ warning("time warp: " INT64_FORMAT " to " INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now);
- }
- )
- return _time_of_last_gc;
---- hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp.orig 2015-09-02 09:45:31.000000000 +0200
-+++ hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp 2015-09-02 09:48:07.000000000 +0200
-@@ -94,10 +94,10 @@
-
- if (PrintTLAB && Verbose) {
- Thread* thrd = myThread();
-- gclog_or_tty->print("TLAB: %s thread: "INTPTR_FORMAT" [id: %2d]"
-- " obj: "SIZE_FORMAT
-- " free: "SIZE_FORMAT
-- " waste: "SIZE_FORMAT"\n",
-+ gclog_or_tty->print("TLAB: %s thread: " INTPTR_FORMAT " [id: %2d]"
-+ " obj: " SIZE_FORMAT
-+ " free: " SIZE_FORMAT
-+ " waste: " SIZE_FORMAT "\n",
- "slow", p2i(thrd), thrd->osthread()->thread_id(),
- obj_size, free(), refill_waste_limit());
- }
---- hotspot/src/share/vm/trace/traceStream.hpp.orig 2015-09-02 09:45:31.000000000 +0200
-+++ hotspot/src/share/vm/trace/traceStream.hpp 2015-09-02 09:49:16.000000000 +0200
-@@ -40,31 +40,31 @@
- TraceStream(outputStream& stream): _st(stream) {}
-
- void print_val(const char* label, u1 val) {
-- _st.print("%s = "UINT32_FORMAT, label, val);
-+ _st.print("%s = " UINT32_FORMAT, label, val);
- }
-
- void print_val(const char* label, u2 val) {
-- _st.print("%s = "UINT32_FORMAT, label, val);
-+ _st.print("%s = " UINT32_FORMAT, label, val);
- }
-
- void print_val(const char* label, s2 val) {
-- _st.print("%s = "INT32_FORMAT, label, val);
-+ _st.print("%s = " INT32_FORMAT, label, val);
- }
-
- void print_val(const char* label, u4 val) {
-- _st.print("%s = "UINT32_FORMAT, label, val);
-+ _st.print("%s = " UINT32_FORMAT, label, val);
- }
-
- void print_val(const char* label, s4 val) {
-- _st.print("%s = "INT32_FORMAT, label, val);
-+ _st.print("%s = " INT32_FORMAT, label, val);
- }
-
- void print_val(const char* label, u8 val) {
-- _st.print("%s = "UINT64_FORMAT, label, val);
-+ _st.print("%s = " UINT64_FORMAT, label, val);
- }
-
- void print_val(const char* label, s8 val) {
-- _st.print("%s = "INT64_FORMAT, label, (int64_t) val);
-+ _st.print("%s = " INT64_FORMAT, label, (int64_t) val);
- }
-
- void print_val(const char* label, bool val) {
---- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp.orig 2015-09-02 09:59:23.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp 2015-09-02 10:04:07.000000000 +0200
-@@ -31,9 +31,9 @@
-
- inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const {
- assert(addr < heap_end(),
-- err_msg("addr: "PTR_FORMAT" end: "PTR_FORMAT, p2i(addr), p2i(heap_end())));
-+ err_msg("addr: " PTR_FORMAT " end: " PTR_FORMAT, p2i(addr), p2i(heap_end())));
- assert(addr >= heap_bottom(),
-- err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT, p2i(addr), p2i(heap_bottom())));
-+ err_msg("addr: " PTR_FORMAT " bottom: " PTR_FORMAT, p2i(addr), p2i(heap_bottom())));
-
- HeapRegion* hr = _regions.get_by_address(addr);
- return hr;
---- hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp.orig 2015-09-02 09:59:23.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp 2015-09-02 10:03:44.000000000 +0200
-@@ -112,7 +112,7 @@
-
- assert(ClassUnloadingWithConcurrentMark,
- err_msg("All blocks should be objects if G1 Class Unloading isn't used. "
-- "HR: ["PTR_FORMAT", "PTR_FORMAT", "PTR_FORMAT") "
-+ "HR: [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ") "
- "addr: " PTR_FORMAT,
- p2i(bottom()), p2i(top()), p2i(end()), p2i(addr)));
-
---- hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp.orig 2015-09-02 09:59:23.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp 2015-09-02 10:03:17.000000000 +0200
-@@ -52,7 +52,7 @@
- class HeapRegionSetBase;
- class nmethod;
-
--#define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]"
-+#define HR_FORMAT "%u:(%s)[" PTR_FORMAT "," PTR_FORMAT "," PTR_FORMAT "]"
- #define HR_FORMAT_PARAMS(_hr_) \
- (_hr_)->hrm_index(), \
- (_hr_)->get_short_type_str(), \
-@@ -542,8 +542,8 @@
- void set_containing_set(HeapRegionSetBase* containing_set) {
- assert((containing_set == NULL && _containing_set != NULL) ||
- (containing_set != NULL && _containing_set == NULL),
-- err_msg("containing_set: "PTR_FORMAT" "
-- "_containing_set: "PTR_FORMAT,
-+ err_msg("containing_set: " PTR_FORMAT " "
-+ "_containing_set: " PTR_FORMAT,
- p2i(containing_set), p2i(_containing_set)));
-
- _containing_set = containing_set;
---- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp.orig 2015-09-02 09:59:23.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp 2015-09-02 10:02:55.000000000 +0200
-@@ -46,7 +46,7 @@
-
- inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const {
- assert(is_in_reserved(addr),
-- err_msg("Cannot calculate region index for address "PTR_FORMAT" that is outside of the heap ["PTR_FORMAT", "PTR_FORMAT")",
-+ err_msg("Cannot calculate region index for address " PTR_FORMAT " that is outside of the heap [" PTR_FORMAT ", " PTR_FORMAT ")",
- p2i(addr), p2i(_reserved.start()), p2i(_reserved.end())));
- return (uint)(pointer_delta(addr, _reserved.start(), sizeof(uint8_t)) >> HeapRegion::LogOfHRGrainBytes);
- }
-@@ -59,7 +59,7 @@
- inline HeapRegion* G1CollectedHeap::heap_region_containing_raw(const T addr) const {
- assert(addr != NULL, "invariant");
- assert(is_in_g1_reserved((const void*) addr),
-- err_msg("Address "PTR_FORMAT" is outside of the heap ranging from ["PTR_FORMAT" to "PTR_FORMAT")",
-+ err_msg("Address " PTR_FORMAT " is outside of the heap ranging from [" PTR_FORMAT " to " PTR_FORMAT ")",
- p2i((void*)addr), p2i(g1_reserved().start()), p2i(g1_reserved().end())));
- return _hrm.addr_to_region((HeapWord*) addr);
- }
---- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp.orig 2015-09-02 09:59:22.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp 2015-09-02 10:01:43.000000000 +0200
-@@ -47,15 +47,15 @@
- }
- }
-
--#define check_index(index, msg) \
-- assert((index) < (_reserved.word_size() >> LogN_words), \
-- err_msg("%s - index: "SIZE_FORMAT", _vs.committed_size: "SIZE_FORMAT, \
-- msg, (index), (_reserved.word_size() >> LogN_words))); \
-- assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \
-- err_msg("Index "SIZE_FORMAT" corresponding to "PTR_FORMAT \
-- " (%u) is not in committed area.", \
-- (index), \
-- p2i(address_for_index_raw(index)), \
-+#define check_index(index, msg) \
-+ assert((index) < (_reserved.word_size() >> LogN_words), \
-+ err_msg("%s - index: " SIZE_FORMAT ", _vs.committed_size: " SIZE_FORMAT, \
-+ msg, (index), (_reserved.word_size() >> LogN_words))); \
-+ assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \
-+ err_msg("Index " SIZE_FORMAT " corresponding to " PTR_FORMAT \
-+ " (%u) is not in committed area.", \
-+ (index), \
-+ p2i(address_for_index_raw(index)), \
- G1CollectedHeap::heap()->addr_to_region(address_for_index_raw(index))));
-
- u_char G1BlockOffsetSharedArray::offset_array(size_t index) const {
---- hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp.orig 2015-09-02 09:59:22.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp 2015-09-02 10:00:36.000000000 +0200
-@@ -78,7 +78,7 @@
-
- void decrease_used(size_t bytes) {
- assert(_summary_bytes_used >= bytes,
-- err_msg("invariant: _summary_bytes_used: "SIZE_FORMAT" should be >= bytes: "SIZE_FORMAT,
-+ err_msg("invariant: _summary_bytes_used: " SIZE_FORMAT " should be >= bytes: " SIZE_FORMAT,
- _summary_bytes_used, bytes));
- _summary_bytes_used -= bytes;
- }
---- hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp.orig 2015-09-02 09:59:22.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp 2015-09-02 10:00:20.000000000 +0200
-@@ -92,7 +92,7 @@
- regions_at_put(_curr_index, NULL);
- assert(hr->reclaimable_bytes() <= _remaining_reclaimable_bytes,
- err_msg("remaining reclaimable bytes inconsistent "
-- "from region: "SIZE_FORMAT" remaining: "SIZE_FORMAT,
-+ "from region: " SIZE_FORMAT " remaining: " SIZE_FORMAT,
- hr->reclaimable_bytes(), _remaining_reclaimable_bytes));
- _remaining_reclaimable_bytes -= hr->reclaimable_bytes();
- _curr_index += 1;
---- hotspot/src/share/vm/compiler/compileBroker.cpp.orig 2015-09-02 10:08:43.000000000 +0200
-+++ hotspot/src/share/vm/compiler/compileBroker.cpp 2015-09-02 10:09:37.000000000 +0200
-@@ -203,7 +203,7 @@
- }
-
- void log_nmethod(JavaThread* thread, nmethod* nm) {
-- log(thread, "nmethod %d%s " INTPTR_FORMAT " code ["INTPTR_FORMAT ", " INTPTR_FORMAT "]",
-+ log(thread, "nmethod %d%s " INTPTR_FORMAT " code [" INTPTR_FORMAT ", " INTPTR_FORMAT "]",
- nm->compile_id(), nm->is_osr_method() ? "%" : "",
- p2i(nm), p2i(nm->code_begin()), p2i(nm->code_end()));
- }
---- hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp.orig 2015-09-02 10:08:44.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp 2015-09-02 10:09:56.000000000 +0200
-@@ -121,15 +121,15 @@
- // Single parameter format strings
- #define ergo_format_str(_name_) ", " _name_ ": %s"
- #define ergo_format_region(_name_) ", " _name_ ": %u regions"
--#define ergo_format_byte(_name_) ", " _name_ ": "SIZE_FORMAT" bytes"
-+#define ergo_format_byte(_name_) ", " _name_ ": " SIZE_FORMAT " bytes"
- #define ergo_format_double(_name_) ", " _name_ ": %1.2f"
- #define ergo_format_perc(_name_) ", " _name_ ": %1.2f %%"
- #define ergo_format_ms(_name_) ", " _name_ ": %1.2f ms"
--#define ergo_format_size(_name_) ", " _name_ ": "SIZE_FORMAT
-+#define ergo_format_size(_name_) ", " _name_ ": " SIZE_FORMAT
-
- // Double parameter format strings
- #define ergo_format_byte_perc(_name_) \
-- ", " _name_ ": "SIZE_FORMAT" bytes (%1.2f %%)"
-+ ", " _name_ ": " SIZE_FORMAT " bytes (%1.2f %%)"
-
- // Generates the format string
- #define ergo_format(_extra_format_) \
---- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp.orig 2015-09-02 10:12:49.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp 2015-09-02 10:21:24.000000000 +0200
-@@ -196,8 +196,8 @@
- assert(_bmStartWord <= (addr) && (addr) < (_bmStartWord + _bmWordSize), \
- "outside underlying space?"); \
- assert(G1CollectedHeap::heap()->is_in_exact(addr), \
-- err_msg("Trying to access not available bitmap "PTR_FORMAT \
-- " corresponding to "PTR_FORMAT" (%u)", \
-+ err_msg("Trying to access not available bitmap " PTR_FORMAT \
-+ " corresponding to " PTR_FORMAT " (%u)", \
- p2i(this), p2i(addr), G1CollectedHeap::heap()->addr_to_region(addr)));
-
- inline void CMBitMap::mark(HeapWord* addr) {
-@@ -270,7 +270,7 @@
-
- inline void CMTask::deal_with_reference(oop obj) {
- if (_cm->verbose_high()) {
-- gclog_or_tty->print_cr("[%u] we're dealing with reference = "PTR_FORMAT,
-+ gclog_or_tty->print_cr("[%u] we're dealing with reference = " PTR_FORMAT,
- _worker_id, p2i((void*) obj));
- }
-
-@@ -374,7 +374,7 @@
- // assert that word_size is under an upper bound which is its
- // containing region's capacity.
- assert(word_size * HeapWordSize <= hr->capacity(),
-- err_msg("size: "SIZE_FORMAT" capacity: "SIZE_FORMAT" "HR_FORMAT,
-+ err_msg("size: " SIZE_FORMAT " capacity: " SIZE_FORMAT " " HR_FORMAT,
- word_size * HeapWordSize, hr->capacity(),
- HR_FORMAT_PARAMS(hr)));
-
---- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp.orig 2015-09-02 10:12:49.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp 2015-09-02 10:21:38.000000000 +0200
-@@ -91,7 +91,7 @@
-
- jbyte* card_num_2_ptr(size_t card_num) {
- assert(card_num >= 0 && card_num < _reserved_max_card_num,
-- err_msg("card num out of range: "SIZE_FORMAT, card_num));
-+ err_msg("card num out of range: " SIZE_FORMAT, card_num));
- return (jbyte*) (_ct_bot + card_num);
- }
-
---- hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp.orig 2015-09-02 10:24:04.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp 2015-09-02 10:24:14.000000000 +0200
-@@ -118,7 +118,7 @@
- oop obj = oopDesc::load_decode_heap_oop(p);
- if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("[%u] we're looking at location "
-- "*"PTR_FORMAT" = "PTR_FORMAT,
-+ "*" PTR_FORMAT " = " PTR_FORMAT,
- _task->worker_id(), p2i(p), p2i((void*) obj));
- }
- _task->deal_with_reference(obj);
---- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.orig 2015-09-06 14:02:06.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2015-09-10 12:03:16.130020385 +0200
-@@ -284,7 +284,7 @@
- if (PrintGCDetails && Verbose) {
- // Failed to double capacity, continue;
- gclog_or_tty->print(" (benign) Failed to expand marking stack capacity from "
-- SIZE_FORMAT"K to " SIZE_FORMAT"K",
-+ SIZE_FORMAT "K to " SIZE_FORMAT "K",
- _capacity / K, new_capacity / K);
- }
- }
-@@ -581,7 +581,7 @@
- _verbose_level = verbose_level;
-
- if (verbose_low()) {
-- gclog_or_tty->print_cr("[global] init, heap start = "PTR_FORMAT", "
-+ gclog_or_tty->print_cr("[global] init, heap start = " PTR_FORMAT ", "
- "heap end = " INTPTR_FORMAT, p2i(_heap_start), p2i(_heap_end));
- }
-
-@@ -838,7 +838,7 @@
- // in a STW phase.
- assert(!concurrent_marking_in_progress(), "invariant");
- assert(out_of_regions(),
-- err_msg("only way to get here: _finger: "PTR_FORMAT", _heap_end: "PTR_FORMAT,
-+ err_msg("only way to get here: _finger: " PTR_FORMAT ", _heap_end: " PTR_FORMAT,
- p2i(_finger), p2i(_heap_end)));
- }
- }
-@@ -1453,7 +1453,7 @@
-
- assert(start <= hr->end() && start <= ntams && ntams <= hr->end(),
- err_msg("Preconditions not met - "
-- "start: "PTR_FORMAT", ntams: "PTR_FORMAT", end: "PTR_FORMAT,
-+ "start: " PTR_FORMAT ", ntams: " PTR_FORMAT ", end: " PTR_FORMAT,
- p2i(start), p2i(ntams), p2i(hr->end())));
-
- // Find the first marked object at or after "start".
-@@ -1770,10 +1770,10 @@
- }
-
- assert(end_idx <= _card_bm->size(),
-- err_msg("oob: end_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT,
-+ err_msg("oob: end_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT,
- end_idx, _card_bm->size()));
- assert(start_idx < _card_bm->size(),
-- err_msg("oob: start_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT,
-+ err_msg("oob: start_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT,
- start_idx, _card_bm->size()));
-
- _cm->set_card_bitmap_range(_card_bm, start_idx, end_idx, true /* is_par */);
-@@ -2278,7 +2278,7 @@
- oop obj = oopDesc::load_decode_heap_oop(p);
- if (_cm->verbose_high()) {
- gclog_or_tty->print_cr("\t[%u] we're looking at location "
-- "*"PTR_FORMAT" = "PTR_FORMAT,
-+ "*" PTR_FORMAT " = " PTR_FORMAT,
- _task->worker_id(), p2i(p), p2i((void*) obj));
- }
-
-@@ -2847,7 +2847,7 @@
- }
- }
-
-- _out->print_cr(" "PTR_FORMAT": "PTR_FORMAT"%s%s",
-+ _out->print_cr(" " PTR_FORMAT ": " PTR_FORMAT "%s%s",
- p2i(p), p2i((void*) obj), str, str2);
- }
- };
-@@ -2874,7 +2874,7 @@
- bool print_it = _all || over_tams || marked;
-
- if (print_it) {
-- _out->print_cr(" "PTR_FORMAT"%s",
-+ _out->print_cr(" " PTR_FORMAT "%s",
- p2i((void *)o), (over_tams) ? " >" : (marked) ? " M" : "");
- PrintReachableOopClosure oopCl(_out, _vo, _all);
- o->oop_iterate_no_header(&oopCl);
-@@ -2895,7 +2895,7 @@
- HeapWord* e = hr->end();
- HeapWord* t = hr->top();
- HeapWord* p = _g1h->top_at_mark_start(hr, _vo);
-- _out->print_cr("** ["PTR_FORMAT", "PTR_FORMAT"] top: "PTR_FORMAT" "
-+ _out->print_cr("** [" PTR_FORMAT ", " PTR_FORMAT "] top: " PTR_FORMAT " "
- "TAMS: " PTR_FORMAT, p2i(b), p2i(e), p2i(t), p2i(p));
- _out->cr();
-
-@@ -3019,9 +3019,9 @@
- HeapWord* limit = curr_region->next_top_at_mark_start();
-
- if (verbose_low()) {
-- gclog_or_tty->print_cr("[%u] curr_region = "PTR_FORMAT" "
-- "["PTR_FORMAT", "PTR_FORMAT"), "
-- "limit = "PTR_FORMAT,
-+ gclog_or_tty->print_cr("[%u] curr_region = " PTR_FORMAT " "
-+ "[" PTR_FORMAT ", " PTR_FORMAT "), "
-+ "limit = " PTR_FORMAT,
- worker_id, p2i(curr_region), p2i(bottom), p2i(end), p2i(limit));
- }
-
-@@ -3036,7 +3036,7 @@
-
- if (limit > bottom) {
- if (verbose_low()) {
-- gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is not empty, "
-+ gclog_or_tty->print_cr("[%u] region " PTR_FORMAT " is not empty, "
- "returning it ", worker_id, p2i(curr_region));
- }
- return curr_region;
-@@ -3044,7 +3044,7 @@
- assert(limit == bottom,
- "the region limit should be at bottom");
- if (verbose_low()) {
-- gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is empty, "
-+ gclog_or_tty->print_cr("[%u] region " PTR_FORMAT " is empty, "
- "returning NULL", worker_id, p2i(curr_region));
- }
- // we return NULL and the caller should try calling
-@@ -3056,13 +3056,13 @@
- if (verbose_low()) {
- if (curr_region == NULL) {
- gclog_or_tty->print_cr("[%u] found uncommitted region, moving finger, "
-- "global finger = "PTR_FORMAT", "
-- "our finger = "PTR_FORMAT,
-+ "global finger = " PTR_FORMAT ", "
-+ "our finger = " PTR_FORMAT,
- worker_id, p2i(_finger), p2i(finger));
- } else {
- gclog_or_tty->print_cr("[%u] somebody else moved the finger, "
-- "global finger = "PTR_FORMAT", "
-- "our finger = "PTR_FORMAT,
-+ "global finger = " PTR_FORMAT ", "
-+ "our finger = " PTR_FORMAT,
- worker_id, p2i(_finger), p2i(finger));
- }
- }
-@@ -3098,7 +3098,7 @@
+diff --git hotspot/src/os/posix/vm/os_posix.cpp hotspot/src/os/posix/vm/os_posix.cpp
+index d1bf84f..a88417c 100644
+--- hotspot/src/os/posix/vm/os_posix.cpp
++++ hotspot/src/os/posix/vm/os_posix.cpp
+@@ -594,7 +594,7 @@ const char* os::Posix::describe_sa_flags(int flags, char* buffer, size_t size) {
+ strncpy(buffer, "none", size);
- void do_object_work(oop obj) {
- guarantee(!_g1h->obj_in_cs(obj),
-- err_msg("obj: "PTR_FORMAT" in CSet, phase: %s, info: %d",
-+ err_msg("obj: " PTR_FORMAT " in CSet, phase: %s, info: %d",
- p2i((void*) obj), phase_str(), _info));
- }
+ const struct {
+- int i;
++ unsigned i;
+ const char* s;
+ } flaginfo [] = {
+ { SA_NOCLDSTOP, "SA_NOCLDSTOP" },
+diff --git hotspot/src/share/vm/classfile/dictionary.hpp hotspot/src/share/vm/classfile/dictionary.hpp
+index 504e735..9ed0def 100644
+--- hotspot/src/share/vm/classfile/dictionary.hpp
++++ hotspot/src/share/vm/classfile/dictionary.hpp
+@@ -373,7 +373,7 @@ class SymbolPropertyEntry : public HashtableEntry<Symbol*, mtSymbol> {
-@@ -3159,7 +3159,7 @@
- // here.
- HeapRegion* global_hr = _g1h->heap_region_containing_raw(global_finger);
- guarantee(global_hr == NULL || global_finger == global_hr->bottom(),
-- err_msg("global finger: "PTR_FORMAT" region: "HR_FORMAT,
-+ err_msg("global finger: " PTR_FORMAT " region: " HR_FORMAT,
- p2i(global_finger), HR_FORMAT_PARAMS(global_hr)));
- }
+ void print_on(outputStream* st) const {
+ symbol()->print_value_on(st);
+- st->print("/mode="INTX_FORMAT, symbol_mode());
++ st->print("/mode=" INTX_FORMAT, symbol_mode());
+ st->print(" -> ");
+ bool printed = false;
+ if (method() != NULL) {
+diff --git hotspot/src/share/vm/code/exceptionHandlerTable.cpp hotspot/src/share/vm/code/exceptionHandlerTable.cpp
+index 511b84d..224e164 100644
+--- hotspot/src/share/vm/code/exceptionHandlerTable.cpp
++++ hotspot/src/share/vm/code/exceptionHandlerTable.cpp
+@@ -186,7 +186,7 @@ uint ImplicitExceptionTable::at( uint exec_off ) const {
+ void ImplicitExceptionTable::print(address base) const {
+ tty->print("{");
+ for( uint i=0; i<len(); i++ )
+- tty->print("< "INTPTR_FORMAT", "INTPTR_FORMAT" > ",base + *adr(i), base + *(adr(i)+1));
++ tty->print("< " INTPTR_FORMAT ", " INTPTR_FORMAT " > ",base + *adr(i), base + *(adr(i)+1));
+ tty->print_cr("}");
+ }
-@@ -3173,7 +3173,7 @@
- HeapRegion* task_hr = _g1h->heap_region_containing_raw(task_finger);
- guarantee(task_hr == NULL || task_finger == task_hr->bottom() ||
- !task_hr->in_collection_set(),
-- err_msg("task finger: "PTR_FORMAT" region: "HR_FORMAT,
-+ err_msg("task finger: " PTR_FORMAT " region: " HR_FORMAT,
- p2i(task_finger), HR_FORMAT_PARAMS(task_hr)));
+diff --git hotspot/src/share/vm/code/nmethod.cpp hotspot/src/share/vm/code/nmethod.cpp
+index 6ea39ae..94a7eef 100644
+--- hotspot/src/share/vm/code/nmethod.cpp
++++ hotspot/src/share/vm/code/nmethod.cpp
+@@ -2319,7 +2319,7 @@ public:
+ void maybe_print(oop* p) {
+ if (_print_nm == NULL) return;
+ if (!_detected_scavenge_root) _print_nm->print_on(tty, "new scavenge root");
+- tty->print_cr(""PTR_FORMAT"[offset=%d] detected scavengable oop "PTR_FORMAT" (found at "PTR_FORMAT")",
++ tty->print_cr("" PTR_FORMAT "[offset=%d] detected scavengable oop " PTR_FORMAT " (found at " PTR_FORMAT ")",
+ _print_nm, (int)((intptr_t)p - (intptr_t)_print_nm),
+ (void *)(*p), (intptr_t)p);
+ (*p)->print();
+@@ -2700,7 +2700,7 @@ public:
+ _nm->print_nmethod(true);
+ _ok = false;
}
+- tty->print_cr("*** non-oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)",
++ tty->print_cr("*** non-oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)",
+ (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
}
-@@ -3215,8 +3215,8 @@
-
- assert(start <= limit && limit <= hr->top() && hr->top() <= hr->end(),
- err_msg("Preconditions not met - "
-- "start: "PTR_FORMAT", limit: "PTR_FORMAT", "
-- "top: "PTR_FORMAT", end: "PTR_FORMAT,
-+ "start: " PTR_FORMAT ", limit: " PTR_FORMAT ", "
-+ "top: " PTR_FORMAT ", end: " PTR_FORMAT,
- p2i(start), p2i(limit), p2i(hr->top()), p2i(hr->end())));
-
- assert(hr->next_marked_bytes() == 0, "Precondition");
-@@ -3495,7 +3495,7 @@
- #ifndef PRODUCT
- // for debugging purposes
- void ConcurrentMark::print_finger() {
-- gclog_or_tty->print_cr("heap ["PTR_FORMAT", "PTR_FORMAT"), global finger = "PTR_FORMAT,
-+ gclog_or_tty->print_cr("heap [" PTR_FORMAT ", " PTR_FORMAT "), global finger = " PTR_FORMAT,
- p2i(_heap_start), p2i(_heap_end), p2i(_finger));
- for (uint i = 0; i < _max_worker_id; ++i) {
- gclog_or_tty->print(" %u: " PTR_FORMAT, i, p2i(_tasks[i]->finger()));
-@@ -3580,7 +3580,7 @@
- "claim_region() should have filtered out continues humongous regions");
-
- if (_cm->verbose_low()) {
-- gclog_or_tty->print_cr("[%u] setting up for region "PTR_FORMAT,
-+ gclog_or_tty->print_cr("[%u] setting up for region " PTR_FORMAT,
- _worker_id, p2i(hr));
- }
-
-@@ -3597,7 +3597,7 @@
- if (limit == bottom) {
- if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%u] found an empty region "
-- "["PTR_FORMAT", "PTR_FORMAT")",
-+ "[" PTR_FORMAT ", " PTR_FORMAT ")",
- _worker_id, p2i(bottom), p2i(limit));
+ virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
+@@ -2824,7 +2824,7 @@ public:
+ _nm->print_nmethod(true);
+ _ok = false;
}
- // The region was collected underneath our feet.
-@@ -3629,7 +3629,7 @@
- void CMTask::giveup_current_region() {
- assert(_curr_region != NULL, "invariant");
- if (_cm->verbose_low()) {
-- gclog_or_tty->print_cr("[%u] giving up region "PTR_FORMAT,
-+ gclog_or_tty->print_cr("[%u] giving up region " PTR_FORMAT,
- _worker_id, p2i(_curr_region));
+- tty->print_cr("*** scavengable oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)",
++ tty->print_cr("*** scavengable oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)",
+ (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
+ (*p)->print();
}
- clear_region_fields();
-@@ -3751,7 +3751,7 @@
-
- if (_cm->verbose_medium()) {
- gclog_or_tty->print_cr("[%u] regular clock, interval = %1.2lfms, "
-- "scanned = "SIZE_FORMAT"%s, refs reached = "SIZE_FORMAT"%s",
-+ "scanned = " SIZE_FORMAT "%s, refs reached = " SIZE_FORMAT "%s",
- _worker_id, last_interval_ms,
- _words_scanned,
- (_words_scanned >= _words_scanned_limit) ? " (*)" : "",
-@@ -3920,7 +3920,7 @@
- statsOnly( ++_local_pops );
-
- if (_cm->verbose_high()) {
-- gclog_or_tty->print_cr("[%u] popped "PTR_FORMAT, _worker_id,
-+ gclog_or_tty->print_cr("[%u] popped " PTR_FORMAT, _worker_id,
- p2i((void*) obj));
- }
-
-@@ -4273,8 +4273,8 @@
-
- if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%u] we're scanning part "
-- "["PTR_FORMAT", "PTR_FORMAT") "
-- "of region "HR_FORMAT,
-+ "[" PTR_FORMAT ", " PTR_FORMAT ") "
-+ "of region " HR_FORMAT,
- _worker_id, p2i(_finger), p2i(_region_limit),
- HR_FORMAT_PARAMS(_curr_region));
- }
-@@ -4361,7 +4361,7 @@
-
- if (_cm->verbose_low()) {
- gclog_or_tty->print_cr("[%u] we successfully claimed "
-- "region "PTR_FORMAT,
-+ "region " PTR_FORMAT,
- _worker_id, p2i(claimed_region));
- }
-
-@@ -4422,7 +4422,7 @@
-
- if (_cm->try_stealing(_worker_id, &_hash_seed, obj)) {
- if (_cm->verbose_medium()) {
-- gclog_or_tty->print_cr("[%u] stolen "PTR_FORMAT" successfully",
-+ gclog_or_tty->print_cr("[%u] stolen " PTR_FORMAT " successfully",
- _worker_id, p2i((void*) obj));
- }
-
-@@ -4630,7 +4630,7 @@
- // identify them easily in a large log file.
- #define G1PPRL_LINE_PREFIX "###"
-
--#define G1PPRL_ADDR_BASE_FORMAT " "PTR_FORMAT"-"PTR_FORMAT
-+#define G1PPRL_ADDR_BASE_FORMAT " " PTR_FORMAT "-" PTR_FORMAT
- #ifdef _LP64
- #define G1PPRL_ADDR_BASE_H_FORMAT " %37s"
- #else // _LP64
-@@ -4640,16 +4640,16 @@
- // For per-region info
- #define G1PPRL_TYPE_FORMAT " %-4s"
- #define G1PPRL_TYPE_H_FORMAT " %4s"
--#define G1PPRL_BYTE_FORMAT " "SIZE_FORMAT_W(9)
-+#define G1PPRL_BYTE_FORMAT " " SIZE_FORMAT_W(9)
- #define G1PPRL_BYTE_H_FORMAT " %9s"
- #define G1PPRL_DOUBLE_FORMAT " %14.1f"
- #define G1PPRL_DOUBLE_H_FORMAT " %14s"
-
- // For summary info
--#define G1PPRL_SUM_ADDR_FORMAT(tag) " "tag":"G1PPRL_ADDR_BASE_FORMAT
--#define G1PPRL_SUM_BYTE_FORMAT(tag) " "tag": "SIZE_FORMAT
--#define G1PPRL_SUM_MB_FORMAT(tag) " "tag": %1.2f MB"
--#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag)" / %1.2f %%"
-+#define G1PPRL_SUM_ADDR_FORMAT(tag) " " tag ":" G1PPRL_ADDR_BASE_FORMAT
-+#define G1PPRL_SUM_BYTE_FORMAT(tag) " " tag ": " SIZE_FORMAT
-+#define G1PPRL_SUM_MB_FORMAT(tag) " " tag ": %1.2f MB"
-+#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag) " / %1.2f %%"
+@@ -2869,7 +2869,7 @@ void nmethod::print() const {
+ print_on(tty, NULL);
- G1PrintRegionLivenessInfoClosure::
- G1PrintRegionLivenessInfoClosure(outputStream* out, const char* phase_name)
---- hotspot/src/share/vm/oops/constantPool.cpp.orig 2015-09-02 10:35:07.000000000 +0200
-+++ hotspot/src/share/vm/oops/constantPool.cpp 2015-09-02 10:36:03.000000000 +0200
-@@ -1494,7 +1494,7 @@
- }
- case JVM_CONSTANT_Long: {
- u8 val = Bytes::get_Java_u8(bytes);
-- printf("long "INT64_FORMAT, (int64_t) *(jlong *) &val);
-+ printf("long " INT64_FORMAT, (int64_t) *(jlong *) &val);
- ent_size = 8;
- idx++; // Long takes two cpool slots
- break;
---- hotspot/src/share/vm/oops/cpCache.cpp.orig 2015-09-02 10:35:13.000000000 +0200
-+++ hotspot/src/share/vm/oops/cpCache.cpp 2015-09-02 10:36:48.000000000 +0200
-@@ -305,7 +305,7 @@
- adapter->size_of_parameters());
+ if (WizardMode) {
+- tty->print("((nmethod*) "INTPTR_FORMAT ") ", this);
++ tty->print("((nmethod*) " INTPTR_FORMAT ") ", this);
+ tty->print(" for method " INTPTR_FORMAT , (address)method());
+ tty->print(" { ");
+ if (is_in_use()) tty->print("in_use ");
+diff --git hotspot/src/share/vm/compiler/compileBroker.cpp hotspot/src/share/vm/compiler/compileBroker.cpp
+index dad99ec..81429cc 100644
+--- hotspot/src/share/vm/compiler/compileBroker.cpp
++++ hotspot/src/share/vm/compiler/compileBroker.cpp
+@@ -203,7 +203,7 @@ class CompilationLog : public StringEventLog {
+ }
- if (TraceInvokeDynamic) {
-- tty->print_cr("set_method_handle bc=%d appendix="PTR_FORMAT"%s method_type="PTR_FORMAT"%s method="PTR_FORMAT" ",
-+ tty->print_cr("set_method_handle bc=%d appendix=" PTR_FORMAT "%s method_type=" PTR_FORMAT "%s method=" PTR_FORMAT " ",
- invoke_code,
- (void *)appendix(), (has_appendix ? "" : " (unused)"),
- (void *)method_type(), (has_method_type ? "" : " (unused)"),
-@@ -540,12 +540,12 @@
- // print separator
- if (index == 0) st->print_cr(" -------------");
- // print entry
-- st->print("%3d ("PTR_FORMAT") ", index, (intptr_t)this);
-+ st->print("%3d (" PTR_FORMAT ") ", index, (intptr_t)this);
- st->print_cr("[%02x|%02x|%5d]", bytecode_2(), bytecode_1(),
- constant_pool_index());
-- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f1);
-- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f2);
-- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_flags);
-+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f1);
-+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f2);
-+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_flags);
- st->print_cr(" -------------");
- }
+ void log_nmethod(JavaThread* thread, nmethod* nm) {
+- log(thread, "nmethod %d%s " INTPTR_FORMAT " code ["INTPTR_FORMAT ", " INTPTR_FORMAT "]",
++ log(thread, "nmethod %d%s " INTPTR_FORMAT " code [" INTPTR_FORMAT ", " INTPTR_FORMAT "]",
+ nm->compile_id(), nm->is_osr_method() ? "%" : "",
+ p2i(nm), p2i(nm->code_begin()), p2i(nm->code_end()));
+ }
+diff --git hotspot/src/share/vm/compiler/disassembler.cpp hotspot/src/share/vm/compiler/disassembler.cpp
+index 3291360..93cd9e8 100644
+--- hotspot/src/share/vm/compiler/disassembler.cpp
++++ hotspot/src/share/vm/compiler/disassembler.cpp
+@@ -60,7 +60,7 @@ bool Disassembler::_tried_to_load_library = false;
+ Disassembler::decode_func_virtual Disassembler::_decode_instructions_virtual = NULL;
+ Disassembler::decode_func Disassembler::_decode_instructions = NULL;
---- hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.orig 2015-09-02 10:12:48.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-09-02 10:39:26.000000000 +0200
-@@ -838,18 +838,18 @@
+-static const char hsdis_library_name[] = "hsdis-"HOTSPOT_LIB_ARCH;
++static const char hsdis_library_name[] = "hsdis-" HOTSPOT_LIB_ARCH;
+ static const char decode_instructions_virtual_name[] = "decode_instructions_virtual";
+ static const char decode_instructions_name[] = "decode_instructions";
+ static bool use_new_version = true;
+diff --git hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+index 14f09d1..7427120 100644
+--- hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
++++ hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+@@ -838,18 +838,18 @@ void ConcurrentMarkSweepGeneration::printOccupancy(const char *s) {
GenCollectedHeap* gch = GenCollectedHeap::heap();
if (PrintGCDetails) {
if (Verbose) {
@@ -655,7 +130,7 @@
gch->used() / K, gch->capacity() / K);
}
}
-@@ -879,8 +879,8 @@
+@@ -879,8 +879,8 @@ bool ConcurrentMarkSweepGeneration::promotion_attempt_is_safe(size_t max_promoti
bool res = (available >= av_promo) || (available >= max_promotion_in_bytes);
if (Verbose && PrintGCDetails) {
gclog_or_tty->print_cr(
@@ -666,7 +141,7 @@
res? "":" not", available, res? ">=":"<",
av_promo, max_promotion_in_bytes);
}
-@@ -966,8 +966,8 @@
+@@ -966,8 +966,8 @@ void ConcurrentMarkSweepGeneration::compute_new_size_free_list() {
desired_free_percentage);
gclog_or_tty->print_cr(" Maximum free fraction %f",
maximum_free_percentage);
@@ -677,7 +152,7 @@
desired_capacity/1000);
int prev_level = level() - 1;
if (prev_level >= 0) {
-@@ -975,14 +975,14 @@
+@@ -975,14 +975,14 @@ void ConcurrentMarkSweepGeneration::compute_new_size_free_list() {
GenCollectedHeap* gch = GenCollectedHeap::heap();
Generation* prev_gen = gch->_gens[prev_level];
prev_size = prev_gen->capacity();
@@ -696,7 +171,7 @@
expand_bytes);
}
// safe if expansion fails
-@@ -1513,8 +1513,8 @@
+@@ -1513,8 +1513,8 @@ bool CMSCollector::shouldConcurrentCollect() {
stats().print_on(gclog_or_tty);
gclog_or_tty->print_cr("time_until_cms_gen_full %3.7f",
stats().time_until_cms_gen_full());
@@ -707,7 +182,7 @@
_cmsGen->contiguous_available());
gclog_or_tty->print_cr("promotion_rate=%g", stats().promotion_rate());
gclog_or_tty->print_cr("cms_allocation_rate=%g", stats().cms_allocation_rate());
-@@ -2792,7 +2792,7 @@
+@@ -2792,7 +2792,7 @@ void ConcurrentMarkSweepGeneration::gc_prologue_work(bool full,
assert(_numObjectsPromoted == 0, "check");
assert(_numWordsPromoted == 0, "check");
if (Verbose && PrintGC) {
@@ -716,7 +191,7 @@
SIZE_FORMAT" bytes concurrently",
_numObjectsAllocated, _numWordsAllocated*sizeof(HeapWord));
}
-@@ -2879,7 +2879,7 @@
+@@ -2879,7 +2879,7 @@ void ConcurrentMarkSweepGeneration::gc_epilogue_work(bool full) {
assert(_numObjectsAllocated == 0, "check");
assert(_numWordsAllocated == 0, "check");
if (Verbose && PrintGC) {
@@ -725,7 +200,7 @@
SIZE_FORMAT" bytes",
_numObjectsPromoted, _numWordsPromoted*sizeof(HeapWord));
}
-@@ -2890,7 +2890,7 @@
+@@ -2890,7 +2890,7 @@ void ConcurrentMarkSweepGeneration::gc_epilogue_work(bool full) {
if (PrintGC && Verbose) {
// Call down the chain in contiguous_available needs the freelistLock
// so print this out before releasing the freeListLock.
@@ -734,7 +209,7 @@
contiguous_available());
}
}
-@@ -2978,7 +2978,7 @@
+@@ -2978,7 +2978,7 @@ class VerifyMarkedClosure: public BitMapClosure {
HeapWord* addr = _marks->offsetToHeapWord(offset);
if (!_marks->isMarked(addr)) {
oop(addr)->print_on(gclog_or_tty);
@@ -743,7 +218,7 @@
_failed = true;
}
return true;
-@@ -5037,7 +5037,7 @@
+@@ -5039,7 +5039,7 @@ void CMSCollector::checkpointRootsFinal(bool asynch,
SpecializationStats::clear();
if (PrintGCDetails) {
@@ -752,7 +227,7 @@
_young_gen->used() / K,
_young_gen->capacity() / K);
}
-@@ -5170,8 +5170,8 @@
+@@ -5172,8 +5172,8 @@ void CMSCollector::checkpointRootsFinalWork(bool asynch,
if (ser_ovflw > 0) {
if (PrintCMSStatistics != 0) {
gclog_or_tty->print_cr("Marking stack overflow (benign) "
@@ -763,7 +238,7 @@
_ser_pmc_preclean_ovflw, _ser_pmc_remark_ovflw,
_ser_kac_ovflw, _ser_kac_preclean_ovflw);
}
-@@ -5184,7 +5184,7 @@
+@@ -5186,7 +5186,7 @@ void CMSCollector::checkpointRootsFinalWork(bool asynch,
if (_par_pmc_remark_ovflw > 0 || _par_kac_ovflw > 0) {
if (PrintCMSStatistics != 0) {
gclog_or_tty->print_cr("Work queue overflow (benign) "
@@ -772,7 +247,7 @@
_par_pmc_remark_ovflw, _par_kac_ovflw);
}
_par_pmc_remark_ovflw = 0;
-@@ -5192,12 +5192,12 @@
+@@ -5194,12 +5194,12 @@ void CMSCollector::checkpointRootsFinalWork(bool asynch,
}
if (PrintCMSStatistics != 0) {
if (_markStack._hit_limit > 0) {
@@ -788,7 +263,7 @@
_markStack._failed_double,
_markStack.capacity());
}
-@@ -5961,7 +5961,7 @@
+@@ -5963,7 +5963,7 @@ void CMSCollector::do_remark_non_parallel() {
&markFromDirtyCardsClosure);
verify_work_stacks_empty();
if (PrintCMSStatistics != 0) {
@@ -797,7 +272,7 @@
markFromDirtyCardsClosure.num_dirty_cards());
}
}
-@@ -6892,7 +6892,7 @@
+@@ -6893,7 +6893,7 @@ void CMSMarkStack::expand() {
} else if (_failed_double++ == 0 && !CMSConcurrentMTEnabled && PrintGCDetails) {
// Failed to double capacity, continue;
// we print a detail message only once per CMS cycle.
@@ -806,92 +281,397 @@
SIZE_FORMAT"K",
_capacity / K, new_capacity / K);
}
-@@ -8215,25 +8215,25 @@
+@@ -8216,25 +8216,25 @@ SweepClosure::~SweepClosure() {
ShouldNotReachHere();
}
- if (Verbose && PrintGC) {
-- gclog_or_tty->print("Collected "SIZE_FORMAT" objects, " SIZE_FORMAT " bytes",
-+ gclog_or_tty->print("Collected " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes",
- _numObjectsFreed, _numWordsFreed*sizeof(HeapWord));
-- gclog_or_tty->print_cr("\nLive "SIZE_FORMAT" objects, "
-+ gclog_or_tty->print_cr("\nLive " SIZE_FORMAT " objects, "
- SIZE_FORMAT" bytes "
-- "Already free "SIZE_FORMAT" objects, "SIZE_FORMAT" bytes",
-+ "Already free " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes",
- _numObjectsLive, _numWordsLive*sizeof(HeapWord),
- _numObjectsAlreadyFree, _numWordsAlreadyFree*sizeof(HeapWord));
- size_t totalBytes = (_numWordsFreed + _numWordsLive + _numWordsAlreadyFree)
- * sizeof(HeapWord);
-- gclog_or_tty->print_cr("Total sweep: "SIZE_FORMAT" bytes", totalBytes);
-+ gclog_or_tty->print_cr("Total sweep: " SIZE_FORMAT " bytes", totalBytes);
+ if (Verbose && PrintGC) {
+- gclog_or_tty->print("Collected "SIZE_FORMAT" objects, " SIZE_FORMAT " bytes",
++ gclog_or_tty->print("Collected " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes",
+ _numObjectsFreed, _numWordsFreed*sizeof(HeapWord));
+- gclog_or_tty->print_cr("\nLive "SIZE_FORMAT" objects, "
++ gclog_or_tty->print_cr("\nLive " SIZE_FORMAT " objects, "
+ SIZE_FORMAT" bytes "
+- "Already free "SIZE_FORMAT" objects, "SIZE_FORMAT" bytes",
++ "Already free " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes",
+ _numObjectsLive, _numWordsLive*sizeof(HeapWord),
+ _numObjectsAlreadyFree, _numWordsAlreadyFree*sizeof(HeapWord));
+ size_t totalBytes = (_numWordsFreed + _numWordsLive + _numWordsAlreadyFree)
+ * sizeof(HeapWord);
+- gclog_or_tty->print_cr("Total sweep: "SIZE_FORMAT" bytes", totalBytes);
++ gclog_or_tty->print_cr("Total sweep: " SIZE_FORMAT " bytes", totalBytes);
+
+ if (PrintCMSStatistics && CMSVerifyReturnedBytes) {
+ size_t indexListReturnedBytes = _sp->sumIndexedFreeListArrayReturnedBytes();
+ size_t dict_returned_bytes = _sp->dictionary()->sum_dict_returned_bytes();
+ size_t returned_bytes = indexListReturnedBytes + dict_returned_bytes;
+- gclog_or_tty->print("Returned "SIZE_FORMAT" bytes", returned_bytes);
+- gclog_or_tty->print(" Indexed List Returned "SIZE_FORMAT" bytes",
++ gclog_or_tty->print("Returned " SIZE_FORMAT " bytes", returned_bytes);
++ gclog_or_tty->print(" Indexed List Returned " SIZE_FORMAT " bytes",
+ indexListReturnedBytes);
+- gclog_or_tty->print_cr(" Dictionary Returned "SIZE_FORMAT" bytes",
++ gclog_or_tty->print_cr(" Dictionary Returned " SIZE_FORMAT " bytes",
+ dict_returned_bytes);
+ }
+ }
+@@ -8313,13 +8313,13 @@ size_t SweepClosure::do_blk_careful(HeapWord* addr) {
+ // coalesced chunk to the appropriate free list.
+ if (inFreeRange()) {
+ assert(freeFinger() >= _sp->bottom() && freeFinger() < _limit,
+- err_msg("freeFinger() " PTR_FORMAT" is out-of-bounds", freeFinger()));
++ err_msg("freeFinger() " PTR_FORMAT " is out-of-bounds", freeFinger()));
+ flush_cur_free_chunk(freeFinger(),
+ pointer_delta(addr, freeFinger()));
+ if (CMSTraceSweeper) {
+ gclog_or_tty->print("Sweep: last chunk: ");
+- gclog_or_tty->print("put_free_blk 0x%x ("SIZE_FORMAT") "
+- "[coalesced:"SIZE_FORMAT"]\n",
++ gclog_or_tty->print("put_free_blk 0x%x (" SIZE_FORMAT ") "
++ "[coalesced:" SIZE_FORMAT "]\n",
+ freeFinger(), pointer_delta(addr, freeFinger()),
+ lastFreeRangeCoalesced());
+ }
+diff --git hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
+index e177fd1..c36852e 100644
+--- hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
++++ hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
+@@ -92,7 +92,7 @@ public:
+ regions_at_put(_curr_index, NULL);
+ assert(hr->reclaimable_bytes() <= _remaining_reclaimable_bytes,
+ err_msg("remaining reclaimable bytes inconsistent "
+- "from region: "SIZE_FORMAT" remaining: "SIZE_FORMAT,
++ "from region: " SIZE_FORMAT " remaining: " SIZE_FORMAT,
+ hr->reclaimable_bytes(), _remaining_reclaimable_bytes));
+ _remaining_reclaimable_bytes -= hr->reclaimable_bytes();
+ _curr_index += 1;
+diff --git hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+index 9226191..29b4899 100644
+--- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+@@ -284,7 +284,7 @@ void CMMarkStack::expand() {
+ if (PrintGCDetails && Verbose) {
+ // Failed to double capacity, continue;
+ gclog_or_tty->print(" (benign) Failed to expand marking stack capacity from "
+- SIZE_FORMAT"K to " SIZE_FORMAT"K",
++ SIZE_FORMAT "K to " SIZE_FORMAT "K",
+ _capacity / K, new_capacity / K);
+ }
+ }
+@@ -581,7 +581,7 @@ ConcurrentMark::ConcurrentMark(G1CollectedHeap* g1h, G1RegionToSpaceMapper* prev
+ _verbose_level = verbose_level;
+
+ if (verbose_low()) {
+- gclog_or_tty->print_cr("[global] init, heap start = "PTR_FORMAT", "
++ gclog_or_tty->print_cr("[global] init, heap start = " PTR_FORMAT ", "
+ "heap end = " INTPTR_FORMAT, p2i(_heap_start), p2i(_heap_end));
+ }
+
+@@ -838,7 +838,7 @@ void ConcurrentMark::set_concurrency_and_phase(uint active_tasks, bool concurren
+ // in a STW phase.
+ assert(!concurrent_marking_in_progress(), "invariant");
+ assert(out_of_regions(),
+- err_msg("only way to get here: _finger: "PTR_FORMAT", _heap_end: "PTR_FORMAT,
++ err_msg("only way to get here: _finger: " PTR_FORMAT ", _heap_end: " PTR_FORMAT,
+ p2i(_finger), p2i(_heap_end)));
+ }
+ }
+@@ -1453,7 +1453,7 @@ public:
+
+ assert(start <= hr->end() && start <= ntams && ntams <= hr->end(),
+ err_msg("Preconditions not met - "
+- "start: "PTR_FORMAT", ntams: "PTR_FORMAT", end: "PTR_FORMAT,
++ "start: " PTR_FORMAT ", ntams: " PTR_FORMAT ", end: " PTR_FORMAT,
+ p2i(start), p2i(ntams), p2i(hr->end())));
+
+ // Find the first marked object at or after "start".
+@@ -1770,10 +1770,10 @@ class FinalCountDataUpdateClosure: public CMCountDataClosureBase {
+ }
+
+ assert(end_idx <= _card_bm->size(),
+- err_msg("oob: end_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT,
++ err_msg("oob: end_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT,
+ end_idx, _card_bm->size()));
+ assert(start_idx < _card_bm->size(),
+- err_msg("oob: start_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT,
++ err_msg("oob: start_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT,
+ start_idx, _card_bm->size()));
+
+ _cm->set_card_bitmap_range(_card_bm, start_idx, end_idx, true /* is_par */);
+@@ -2278,7 +2278,7 @@ class G1CMKeepAliveAndDrainClosure: public OopClosure {
+ oop obj = oopDesc::load_decode_heap_oop(p);
+ if (_cm->verbose_high()) {
+ gclog_or_tty->print_cr("\t[%u] we're looking at location "
+- "*"PTR_FORMAT" = "PTR_FORMAT,
++ "*" PTR_FORMAT " = " PTR_FORMAT,
+ _task->worker_id(), p2i(p), p2i((void*) obj));
+ }
+
+@@ -2847,7 +2847,7 @@ public:
+ }
+ }
+
+- _out->print_cr(" "PTR_FORMAT": "PTR_FORMAT"%s%s",
++ _out->print_cr(" " PTR_FORMAT ": " PTR_FORMAT "%s%s",
+ p2i(p), p2i((void*) obj), str, str2);
+ }
+ };
+@@ -2874,7 +2874,7 @@ public:
+ bool print_it = _all || over_tams || marked;
+
+ if (print_it) {
+- _out->print_cr(" "PTR_FORMAT"%s",
++ _out->print_cr(" " PTR_FORMAT "%s",
+ p2i((void *)o), (over_tams) ? " >" : (marked) ? " M" : "");
+ PrintReachableOopClosure oopCl(_out, _vo, _all);
+ o->oop_iterate_no_header(&oopCl);
+@@ -2895,7 +2895,7 @@ public:
+ HeapWord* e = hr->end();
+ HeapWord* t = hr->top();
+ HeapWord* p = _g1h->top_at_mark_start(hr, _vo);
+- _out->print_cr("** ["PTR_FORMAT", "PTR_FORMAT"] top: "PTR_FORMAT" "
++ _out->print_cr("** [" PTR_FORMAT ", " PTR_FORMAT "] top: " PTR_FORMAT " "
+ "TAMS: " PTR_FORMAT, p2i(b), p2i(e), p2i(t), p2i(p));
+ _out->cr();
+
+@@ -3019,9 +3019,9 @@ ConcurrentMark::claim_region(uint worker_id) {
+ HeapWord* limit = curr_region->next_top_at_mark_start();
+
+ if (verbose_low()) {
+- gclog_or_tty->print_cr("[%u] curr_region = "PTR_FORMAT" "
+- "["PTR_FORMAT", "PTR_FORMAT"), "
+- "limit = "PTR_FORMAT,
++ gclog_or_tty->print_cr("[%u] curr_region = " PTR_FORMAT " "
++ "[" PTR_FORMAT ", " PTR_FORMAT "), "
++ "limit = " PTR_FORMAT,
+ worker_id, p2i(curr_region), p2i(bottom), p2i(end), p2i(limit));
+ }
+
+@@ -3036,7 +3036,7 @@ ConcurrentMark::claim_region(uint worker_id) {
+
+ if (limit > bottom) {
+ if (verbose_low()) {
+- gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is not empty, "
++ gclog_or_tty->print_cr("[%u] region " PTR_FORMAT " is not empty, "
+ "returning it ", worker_id, p2i(curr_region));
+ }
+ return curr_region;
+@@ -3044,7 +3044,7 @@ ConcurrentMark::claim_region(uint worker_id) {
+ assert(limit == bottom,
+ "the region limit should be at bottom");
+ if (verbose_low()) {
+- gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is empty, "
++ gclog_or_tty->print_cr("[%u] region " PTR_FORMAT " is empty, "
+ "returning NULL", worker_id, p2i(curr_region));
+ }
+ // we return NULL and the caller should try calling
+@@ -3056,13 +3056,13 @@ ConcurrentMark::claim_region(uint worker_id) {
+ if (verbose_low()) {
+ if (curr_region == NULL) {
+ gclog_or_tty->print_cr("[%u] found uncommitted region, moving finger, "
+- "global finger = "PTR_FORMAT", "
+- "our finger = "PTR_FORMAT,
++ "global finger = " PTR_FORMAT ", "
++ "our finger = " PTR_FORMAT,
+ worker_id, p2i(_finger), p2i(finger));
+ } else {
+ gclog_or_tty->print_cr("[%u] somebody else moved the finger, "
+- "global finger = "PTR_FORMAT", "
+- "our finger = "PTR_FORMAT,
++ "global finger = " PTR_FORMAT ", "
++ "our finger = " PTR_FORMAT,
+ worker_id, p2i(_finger), p2i(finger));
+ }
+ }
+@@ -3098,7 +3098,7 @@ private:
+
+ void do_object_work(oop obj) {
+ guarantee(!_g1h->obj_in_cs(obj),
+- err_msg("obj: "PTR_FORMAT" in CSet, phase: %s, info: %d",
++ err_msg("obj: " PTR_FORMAT " in CSet, phase: %s, info: %d",
+ p2i((void*) obj), phase_str(), _info));
+ }
+
+@@ -3159,7 +3159,7 @@ void ConcurrentMark::verify_no_cset_oops() {
+ // here.
+ HeapRegion* global_hr = _g1h->heap_region_containing_raw(global_finger);
+ guarantee(global_hr == NULL || global_finger == global_hr->bottom(),
+- err_msg("global finger: "PTR_FORMAT" region: "HR_FORMAT,
++ err_msg("global finger: " PTR_FORMAT " region: " HR_FORMAT,
+ p2i(global_finger), HR_FORMAT_PARAMS(global_hr)));
+ }
+
+@@ -3173,7 +3173,7 @@ void ConcurrentMark::verify_no_cset_oops() {
+ HeapRegion* task_hr = _g1h->heap_region_containing_raw(task_finger);
+ guarantee(task_hr == NULL || task_finger == task_hr->bottom() ||
+ !task_hr->in_collection_set(),
+- err_msg("task finger: "PTR_FORMAT" region: "HR_FORMAT,
++ err_msg("task finger: " PTR_FORMAT " region: " HR_FORMAT,
+ p2i(task_finger), HR_FORMAT_PARAMS(task_hr)));
+ }
+ }
+@@ -3215,8 +3215,8 @@ class AggregateCountDataHRClosure: public HeapRegionClosure {
+
+ assert(start <= limit && limit <= hr->top() && hr->top() <= hr->end(),
+ err_msg("Preconditions not met - "
+- "start: "PTR_FORMAT", limit: "PTR_FORMAT", "
+- "top: "PTR_FORMAT", end: "PTR_FORMAT,
++ "start: " PTR_FORMAT ", limit: " PTR_FORMAT ", "
++ "top: " PTR_FORMAT ", end: " PTR_FORMAT,
+ p2i(start), p2i(limit), p2i(hr->top()), p2i(hr->end())));
+
+ assert(hr->next_marked_bytes() == 0, "Precondition");
+@@ -3495,7 +3495,7 @@ bool ConcurrentMark::do_yield_check(uint worker_id) {
+ #ifndef PRODUCT
+ // for debugging purposes
+ void ConcurrentMark::print_finger() {
+- gclog_or_tty->print_cr("heap ["PTR_FORMAT", "PTR_FORMAT"), global finger = "PTR_FORMAT,
++ gclog_or_tty->print_cr("heap [" PTR_FORMAT ", " PTR_FORMAT "), global finger = " PTR_FORMAT,
+ p2i(_heap_start), p2i(_heap_end), p2i(_finger));
+ for (uint i = 0; i < _max_worker_id; ++i) {
+ gclog_or_tty->print(" %u: " PTR_FORMAT, i, p2i(_tasks[i]->finger()));
+@@ -3580,7 +3580,7 @@ void CMTask::setup_for_region(HeapRegion* hr) {
+ "claim_region() should have filtered out continues humongous regions");
+
+ if (_cm->verbose_low()) {
+- gclog_or_tty->print_cr("[%u] setting up for region "PTR_FORMAT,
++ gclog_or_tty->print_cr("[%u] setting up for region " PTR_FORMAT,
+ _worker_id, p2i(hr));
+ }
- if (PrintCMSStatistics && CMSVerifyReturnedBytes) {
- size_t indexListReturnedBytes = _sp->sumIndexedFreeListArrayReturnedBytes();
- size_t dict_returned_bytes = _sp->dictionary()->sum_dict_returned_bytes();
- size_t returned_bytes = indexListReturnedBytes + dict_returned_bytes;
-- gclog_or_tty->print("Returned "SIZE_FORMAT" bytes", returned_bytes);
-- gclog_or_tty->print(" Indexed List Returned "SIZE_FORMAT" bytes",
-+ gclog_or_tty->print("Returned " SIZE_FORMAT " bytes", returned_bytes);
-+ gclog_or_tty->print(" Indexed List Returned " SIZE_FORMAT " bytes",
- indexListReturnedBytes);
-- gclog_or_tty->print_cr(" Dictionary Returned "SIZE_FORMAT" bytes",
-+ gclog_or_tty->print_cr(" Dictionary Returned " SIZE_FORMAT " bytes",
- dict_returned_bytes);
+@@ -3597,7 +3597,7 @@ void CMTask::update_region_limit() {
+ if (limit == bottom) {
+ if (_cm->verbose_low()) {
+ gclog_or_tty->print_cr("[%u] found an empty region "
+- "["PTR_FORMAT", "PTR_FORMAT")",
++ "[" PTR_FORMAT ", " PTR_FORMAT ")",
+ _worker_id, p2i(bottom), p2i(limit));
}
+ // The region was collected underneath our feet.
+@@ -3629,7 +3629,7 @@ void CMTask::update_region_limit() {
+ void CMTask::giveup_current_region() {
+ assert(_curr_region != NULL, "invariant");
+ if (_cm->verbose_low()) {
+- gclog_or_tty->print_cr("[%u] giving up region "PTR_FORMAT,
++ gclog_or_tty->print_cr("[%u] giving up region " PTR_FORMAT,
+ _worker_id, p2i(_curr_region));
}
-@@ -8312,13 +8312,13 @@
- // coalesced chunk to the appropriate free list.
- if (inFreeRange()) {
- assert(freeFinger() >= _sp->bottom() && freeFinger() < _limit,
-- err_msg("freeFinger() " PTR_FORMAT" is out-of-bounds", freeFinger()));
-+ err_msg("freeFinger() " PTR_FORMAT " is out-of-bounds", freeFinger()));
- flush_cur_free_chunk(freeFinger(),
- pointer_delta(addr, freeFinger()));
- if (CMSTraceSweeper) {
- gclog_or_tty->print("Sweep: last chunk: ");
-- gclog_or_tty->print("put_free_blk 0x%x ("SIZE_FORMAT") "
-- "[coalesced:"SIZE_FORMAT"]\n",
-+ gclog_or_tty->print("put_free_blk 0x%x (" SIZE_FORMAT ") "
-+ "[coalesced:" SIZE_FORMAT "]\n",
- freeFinger(), pointer_delta(addr, freeFinger()),
- lastFreeRangeCoalesced());
+ clear_region_fields();
+@@ -3751,7 +3751,7 @@ void CMTask::regular_clock_call() {
+
+ if (_cm->verbose_medium()) {
+ gclog_or_tty->print_cr("[%u] regular clock, interval = %1.2lfms, "
+- "scanned = "SIZE_FORMAT"%s, refs reached = "SIZE_FORMAT"%s",
++ "scanned = " SIZE_FORMAT "%s, refs reached = " SIZE_FORMAT "%s",
+ _worker_id, last_interval_ms,
+ _words_scanned,
+ (_words_scanned >= _words_scanned_limit) ? " (*)" : "",
+@@ -3920,7 +3920,7 @@ void CMTask::drain_local_queue(bool partially) {
+ statsOnly( ++_local_pops );
+
+ if (_cm->verbose_high()) {
+- gclog_or_tty->print_cr("[%u] popped "PTR_FORMAT, _worker_id,
++ gclog_or_tty->print_cr("[%u] popped " PTR_FORMAT, _worker_id,
+ p2i((void*) obj));
}
---- hotspot/src/share/vm/classfile/dictionary.hpp.orig 2015-09-02 10:40:01.000000000 +0200
-+++ hotspot/src/share/vm/classfile/dictionary.hpp 2015-09-02 10:40:32.000000000 +0200
-@@ -370,7 +370,7 @@
- void print_on(outputStream* st) const {
- symbol()->print_value_on(st);
-- st->print("/mode="INTX_FORMAT, symbol_mode());
-+ st->print("/mode=" INTX_FORMAT, symbol_mode());
- st->print(" -> ");
- bool printed = false;
- if (method() != NULL) {
---- hotspot/src/share/vm/compiler/disassembler.cpp.orig 2015-09-02 10:40:09.000000000 +0200
-+++ hotspot/src/share/vm/compiler/disassembler.cpp 2015-09-02 10:41:33.000000000 +0200
-@@ -60,7 +60,7 @@
- Disassembler::decode_func_virtual Disassembler::_decode_instructions_virtual = NULL;
- Disassembler::decode_func Disassembler::_decode_instructions = NULL;
+@@ -4273,8 +4273,8 @@ void CMTask::do_marking_step(double time_target_ms,
--static const char hsdis_library_name[] = "hsdis-"HOTSPOT_LIB_ARCH;
-+static const char hsdis_library_name[] = "hsdis-" HOTSPOT_LIB_ARCH;
- static const char decode_instructions_virtual_name[] = "decode_instructions_virtual";
- static const char decode_instructions_name[] = "decode_instructions";
- static bool use_new_version = true;
---- hotspot/src/share/vm/code/exceptionHandlerTable.cpp.orig 2015-09-02 10:44:06.000000000 +0200
-+++ hotspot/src/share/vm/code/exceptionHandlerTable.cpp 2015-09-02 10:44:32.000000000 +0200
-@@ -186,7 +186,7 @@
- void ImplicitExceptionTable::print(address base) const {
- tty->print("{");
- for( uint i=0; i<len(); i++ )
-- tty->print("< "INTPTR_FORMAT", "INTPTR_FORMAT" > ",base + *adr(i), base + *(adr(i)+1));
-+ tty->print("< " INTPTR_FORMAT ", " INTPTR_FORMAT " > ",base + *adr(i), base + *(adr(i)+1));
- tty->print_cr("}");
- }
+ if (_cm->verbose_low()) {
+ gclog_or_tty->print_cr("[%u] we're scanning part "
+- "["PTR_FORMAT", "PTR_FORMAT") "
+- "of region "HR_FORMAT,
++ "[" PTR_FORMAT ", " PTR_FORMAT ") "
++ "of region " HR_FORMAT,
+ _worker_id, p2i(_finger), p2i(_region_limit),
+ HR_FORMAT_PARAMS(_curr_region));
+ }
+@@ -4361,7 +4361,7 @@ void CMTask::do_marking_step(double time_target_ms,
+
+ if (_cm->verbose_low()) {
+ gclog_or_tty->print_cr("[%u] we successfully claimed "
+- "region "PTR_FORMAT,
++ "region " PTR_FORMAT,
+ _worker_id, p2i(claimed_region));
+ }
+
+@@ -4422,7 +4422,7 @@ void CMTask::do_marking_step(double time_target_ms,
+
+ if (_cm->try_stealing(_worker_id, &_hash_seed, obj)) {
+ if (_cm->verbose_medium()) {
+- gclog_or_tty->print_cr("[%u] stolen "PTR_FORMAT" successfully",
++ gclog_or_tty->print_cr("[%u] stolen " PTR_FORMAT " successfully",
+ _worker_id, p2i((void*) obj));
+ }
+
+@@ -4630,7 +4630,7 @@ CMTask::CMTask(uint worker_id,
+ // identify them easily in a large log file.
+ #define G1PPRL_LINE_PREFIX "###"
+
+-#define G1PPRL_ADDR_BASE_FORMAT " "PTR_FORMAT"-"PTR_FORMAT
++#define G1PPRL_ADDR_BASE_FORMAT " " PTR_FORMAT "-" PTR_FORMAT
+ #ifdef _LP64
+ #define G1PPRL_ADDR_BASE_H_FORMAT " %37s"
+ #else // _LP64
+@@ -4640,16 +4640,16 @@ CMTask::CMTask(uint worker_id,
+ // For per-region info
+ #define G1PPRL_TYPE_FORMAT " %-4s"
+ #define G1PPRL_TYPE_H_FORMAT " %4s"
+-#define G1PPRL_BYTE_FORMAT " "SIZE_FORMAT_W(9)
++#define G1PPRL_BYTE_FORMAT " " SIZE_FORMAT_W(9)
+ #define G1PPRL_BYTE_H_FORMAT " %9s"
+ #define G1PPRL_DOUBLE_FORMAT " %14.1f"
+ #define G1PPRL_DOUBLE_H_FORMAT " %14s"
+
+ // For summary info
+-#define G1PPRL_SUM_ADDR_FORMAT(tag) " "tag":"G1PPRL_ADDR_BASE_FORMAT
+-#define G1PPRL_SUM_BYTE_FORMAT(tag) " "tag": "SIZE_FORMAT
+-#define G1PPRL_SUM_MB_FORMAT(tag) " "tag": %1.2f MB"
+-#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag)" / %1.2f %%"
++#define G1PPRL_SUM_ADDR_FORMAT(tag) " " tag ":" G1PPRL_ADDR_BASE_FORMAT
++#define G1PPRL_SUM_BYTE_FORMAT(tag) " " tag ": " SIZE_FORMAT
++#define G1PPRL_SUM_MB_FORMAT(tag) " " tag ": %1.2f MB"
++#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag) " / %1.2f %%"
+
+ G1PrintRegionLivenessInfoClosure::
+ G1PrintRegionLivenessInfoClosure(outputStream* out, const char* phase_name)
+diff --git hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
+index 4e84d49..46ab546 100644
+--- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
++++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
+@@ -196,8 +196,8 @@ inline bool CMBitMapRO::iterate(BitMapClosure* cl) {
+ assert(_bmStartWord <= (addr) && (addr) < (_bmStartWord + _bmWordSize), \
+ "outside underlying space?"); \
+ assert(G1CollectedHeap::heap()->is_in_exact(addr), \
+- err_msg("Trying to access not available bitmap "PTR_FORMAT \
+- " corresponding to "PTR_FORMAT" (%u)", \
++ err_msg("Trying to access not available bitmap " PTR_FORMAT \
++ " corresponding to " PTR_FORMAT " (%u)", \
+ p2i(this), p2i(addr), G1CollectedHeap::heap()->addr_to_region(addr)));
+
+ inline void CMBitMap::mark(HeapWord* addr) {
+@@ -343,7 +343,7 @@ inline void CMTask::make_reference_grey(oop obj, HeapRegion* hr) {
+
+ inline void CMTask::deal_with_reference(oop obj) {
+ if (_cm->verbose_high()) {
+- gclog_or_tty->print_cr("[%u] we're dealing with reference = "PTR_FORMAT,
++ gclog_or_tty->print_cr("[%u] we're dealing with reference = " PTR_FORMAT,
+ _worker_id, p2i((void*) obj));
+ }
+
+@@ -392,7 +392,7 @@ inline void ConcurrentMark::grayRoot(oop obj, size_t word_size,
+ // assert that word_size is under an upper bound which is its
+ // containing region's capacity.
+ assert(word_size * HeapWordSize <= hr->capacity(),
+- err_msg("size: "SIZE_FORMAT" capacity: "SIZE_FORMAT" "HR_FORMAT,
++ err_msg("size: " SIZE_FORMAT " capacity: " SIZE_FORMAT " " HR_FORMAT,
+ word_size * HeapWordSize, hr->capacity(),
+ HR_FORMAT_PARAMS(hr)));
---- hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp.orig 2015-09-02 10:47:14.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp 2015-09-02 10:47:49.000000000 +0200
-@@ -140,7 +140,7 @@
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp
+index 697a402..f92ae11 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp
+@@ -140,7 +140,7 @@ HeapWord* G1AllocRegion::new_alloc_region_and_allocate(size_t word_size,
}
void G1AllocRegion::fill_in_ext_msg(ar_ext_msg* msg, const char* message) {
@@ -900,7 +680,7 @@
_name, message, _count, BOOL_TO_STR(_bot_updates),
p2i(_alloc_region), _used_bytes_before);
}
-@@ -217,7 +217,7 @@
+@@ -217,7 +217,7 @@ void G1AllocRegion::trace(const char* str, size_t word_size, HeapWord* result) {
if (G1_ALLOC_REGION_TRACING > 1) {
if (result != NULL) {
@@ -909,9 +689,24 @@
word_size, result);
} else if (word_size != 0) {
jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT, word_size);
---- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp.orig 2015-09-02 10:47:14.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp 2015-09-02 10:53:32.000000000 +0200
-@@ -385,11 +385,11 @@
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp
+index b32a419..04628b7 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp
+@@ -73,7 +73,7 @@ public:
+
+ void decrease_used(size_t bytes) {
+ assert(_summary_bytes_used >= bytes,
+- err_msg("invariant: _summary_bytes_used: "SIZE_FORMAT" should be >= bytes: "SIZE_FORMAT,
++ err_msg("invariant: _summary_bytes_used: " SIZE_FORMAT " should be >= bytes: " SIZE_FORMAT,
+ _summary_bytes_used, bytes));
+ _summary_bytes_used -= bytes;
+ }
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp
+index 44f0d58..f6ef670 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp
+@@ -385,11 +385,11 @@ G1BlockOffsetArray::verify_for_object(HeapWord* obj_start,
HeapWord* card_addr = _array->address_for_index(card);
HeapWord* block_start = block_start_const(card_addr);
if (block_start != obj_start) {
@@ -928,7 +723,7 @@
block_start, card, card_addr,
_array->offset_array(card),
obj_start, word_size, first_card, last_card);
-@@ -404,11 +404,11 @@
+@@ -404,11 +404,11 @@ void
G1BlockOffsetArray::print_on(outputStream* out) {
size_t from_index = _array->index_for(_bottom);
size_t to_index = _array->index_for(_end);
@@ -943,7 +738,7 @@
i, _array->address_for_index(i),
(uint) _array->offset_array(i));
}
-@@ -488,7 +488,7 @@
+@@ -488,7 +488,7 @@ G1BlockOffsetArrayContigSpace::set_for_starts_humongous(HeapWord* new_top) {
void
G1BlockOffsetArrayContigSpace::print_on(outputStream* out) {
G1BlockOffsetArray::print_on(out);
@@ -953,132 +748,75 @@
+ out->print_cr(" next offset index: " SIZE_FORMAT, _next_offset_index);
}
#endif // !PRODUCT
---- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp.orig 2015-09-02 10:47:15.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp 2015-09-02 10:54:04.000000000 +0200
-@@ -44,7 +44,7 @@
- void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) {
- if (has_count_table()) {
- assert(from_card_num < to_card_num,
-- err_msg("Wrong order? from: " SIZE_FORMAT ", to: "SIZE_FORMAT,
-+ err_msg("Wrong order? from: " SIZE_FORMAT ", to: " SIZE_FORMAT,
- from_card_num, to_card_num));
- Copy::fill_to_bytes(&_card_counts[from_card_num], (to_card_num - from_card_num));
- }
-@@ -87,7 +87,7 @@
- if (has_count_table()) {
- size_t card_num = ptr_2_card_num(card_ptr);
- assert(card_num < _reserved_max_card_num,
-- err_msg("Card "SIZE_FORMAT" outside of card counts table (max size "SIZE_FORMAT")",
-+ err_msg("Card " SIZE_FORMAT " outside of card counts table (max size " SIZE_FORMAT ")",
- card_num, _reserved_max_card_num));
- count = (uint) _card_counts[card_num];
- if (count < G1ConcRSHotCardLimit) {
---- hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp.orig 2015-09-02 10:57:01.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 2015-09-02 11:02:01.000000000 +0200
-@@ -199,7 +199,7 @@
- const size_t region_size = HeapRegion::GrainWords;
- if (YoungPLABSize > region_size || OldPLABSize > region_size) {
- char buffer[128];
-- jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most "SIZE_FORMAT,
-+ jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most " SIZE_FORMAT,
- OldPLABSize > region_size ? "Old" : "Young", region_size);
- vm_exit_during_initialization(buffer);
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp
+index be5cf30..ca424d3 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp
+@@ -47,15 +47,15 @@ G1BlockOffsetTable::block_start_const(const void* addr) const {
}
-@@ -846,7 +846,7 @@
- update_survivors_policy();
-
- assert(_g1->used() == _g1->recalculate_used(),
-- err_msg("sanity, used: "SIZE_FORMAT" recalculate_used: "SIZE_FORMAT,
-+ err_msg("sanity, used: " SIZE_FORMAT " recalculate_used: " SIZE_FORMAT,
- _g1->used(), _g1->recalculate_used()));
-
- double s_w_t_ms = (start_time_sec - _stop_world_start) * 1000.0;
-@@ -1231,10 +1231,10 @@
- (_young_list_target_length * HeapRegion::GrainBytes) - survivor_used_bytes_after_gc;
-
- gclog_or_tty->print(
-- " [Eden: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT") "
-- "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" "
-- "Heap: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"
-- EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")]",
-+ " [Eden: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->" EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ") "
-+ "Survivors: " EXT_SIZE_FORMAT "->" EXT_SIZE_FORMAT " "
-+ "Heap: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->"
-+ EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")]",
- EXT_SIZE_PARAMS(_eden_used_bytes_before_gc),
- EXT_SIZE_PARAMS(_eden_capacity_bytes_before_gc),
- EXT_SIZE_PARAMS(eden_used_bytes_after_gc),
-@@ -1863,7 +1863,7 @@
- while (csr != NULL) {
- HeapRegion* next = csr->next_in_collection_set();
- assert(csr->in_collection_set(), "bad CS");
-- st->print_cr(" "HR_FORMAT", P: "PTR_FORMAT "N: "PTR_FORMAT", age: %4d",
-+ st->print_cr(" " HR_FORMAT ", P: " PTR_FORMAT "N: " PTR_FORMAT ", age: %4d",
- HR_FORMAT_PARAMS(csr),
- csr->prev_top_at_mark_start(), csr->next_top_at_mark_start(),
- csr->age_in_surv_rate_group_cond());
---- hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp.orig 2015-09-06 14:02:06.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp 2015-09-10 13:33:10.594040691 +0200
-@@ -330,7 +330,7 @@
- }
-
- void G1GCPhaseTimes::print_stats(int level, const char* str, size_t value) {
-- LineBuffer(level).append_and_print_cr("[%s: "SIZE_FORMAT"]", str, value);
-+ LineBuffer(level).append_and_print_cr("[%s: " SIZE_FORMAT "]", str, value);
}
- void G1GCPhaseTimes::print_stats(int level, const char* str, double value, uint workers) {
-@@ -450,7 +450,7 @@
+-#define check_index(index, msg) \
+- assert((index) < (_reserved.word_size() >> LogN_words), \
+- err_msg("%s - index: "SIZE_FORMAT", _vs.committed_size: "SIZE_FORMAT, \
+- msg, (index), (_reserved.word_size() >> LogN_words))); \
+- assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \
+- err_msg("Index "SIZE_FORMAT" corresponding to "PTR_FORMAT \
+- " (%u) is not in committed area.", \
+- (index), \
+- p2i(address_for_index_raw(index)), \
++#define check_index(index, msg) \
++ assert((index) < (_reserved.word_size() >> LogN_words), \
++ err_msg("%s - index: " SIZE_FORMAT ", _vs.committed_size: " SIZE_FORMAT, \
++ msg, (index), (_reserved.word_size() >> LogN_words))); \
++ assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \
++ err_msg("Index " SIZE_FORMAT " corresponding to " PTR_FORMAT \
++ " (%u) is not in committed area.", \
++ (index), \
++ p2i(address_for_index_raw(index)), \
+ G1CollectedHeap::heap()->addr_to_region(address_for_index_raw(index))));
- if (phase->_thread_work_items != NULL) {
- LineBuffer buf2(phase->_thread_work_items->_indent_level);
-- buf2.append_and_print_cr("[%s: "SIZE_FORMAT"]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id));
-+ buf2.append_and_print_cr("[%s: " SIZE_FORMAT "]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id));
- }
+ u_char G1BlockOffsetSharedArray::offset_array(size_t index) const {
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp
+index 76bf850..0023998 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp
+@@ -44,7 +44,7 @@ void G1CardCountsMappingChangedListener::on_commit(uint start_idx, size_t num_re
+ void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) {
+ if (has_count_table()) {
+ assert(from_card_num < to_card_num,
+- err_msg("Wrong order? from: " SIZE_FORMAT ", to: "SIZE_FORMAT,
++ err_msg("Wrong order? from: " SIZE_FORMAT ", to: " SIZE_FORMAT,
+ from_card_num, to_card_num));
+ Copy::fill_to_bytes(&_card_counts[from_card_num], (to_card_num - from_card_num));
}
+@@ -87,7 +87,7 @@ uint G1CardCounts::add_card_count(jbyte* card_ptr) {
+ if (has_count_table()) {
+ size_t card_num = ptr_2_card_num(card_ptr);
+ assert(card_num < _reserved_max_card_num,
+- err_msg("Card "SIZE_FORMAT" outside of card counts table (max size "SIZE_FORMAT")",
++ err_msg("Card " SIZE_FORMAT " outside of card counts table (max size " SIZE_FORMAT ")",
+ card_num, _reserved_max_card_num));
+ count = (uint) _card_counts[card_num];
+ if (count < G1ConcRSHotCardLimit) {
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp
+index 7dcad45..b2ab012 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp
+@@ -91,7 +91,7 @@ class G1CardCounts: public CHeapObj<mtGC> {
---- hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp.orig 2015-09-02 10:57:01.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp 2015-09-02 11:03:16.000000000 +0200
-@@ -84,18 +84,18 @@
-
- if (type_str != NULL) {
- if (top != NULL) {
-- gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT" "PTR_FORMAT,
-+ gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT " " PTR_FORMAT,
- action_str, type_str, bottom, top);
- } else {
-- gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT,
-+ gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT,
- action_str, type_str, bottom);
- }
- } else {
- if (top != NULL) {
-- gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT" "PTR_FORMAT,
-+ gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT " " PTR_FORMAT,
- action_str, bottom, top);
- } else {
-- gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT,
-+ gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT,
- action_str, bottom);
- }
+ jbyte* card_num_2_ptr(size_t card_num) {
+ assert(card_num >= 0 && card_num < _reserved_max_card_num,
+- err_msg("card num out of range: "SIZE_FORMAT, card_num));
++ err_msg("card num out of range: " SIZE_FORMAT, card_num));
+ return (jbyte*) (_ct_bot + card_num);
}
-@@ -104,11 +104,11 @@
- void G1HRPrinter::print(ActionType action, HeapWord* bottom, HeapWord* end) {
- const char* action_str = action_name(action);
-
-- gclog_or_tty->print_cr(G1HR_PREFIX" %s ["PTR_FORMAT","PTR_FORMAT"]",
-+ gclog_or_tty->print_cr(G1HR_PREFIX" %s [" PTR_FORMAT "," PTR_FORMAT "]",
- action_str, bottom, end);
- }
- void G1HRPrinter::print(PhaseType phase, size_t phase_num) {
- const char* phase_str = phase_name(phase);
-- gclog_or_tty->print_cr(G1HR_PREFIX" #%s "SIZE_FORMAT, phase_str, phase_num);
-+ gclog_or_tty->print_cr(G1HR_PREFIX" #%s " SIZE_FORMAT, phase_str, phase_num);
- }
---- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.orig 2015-09-06 14:02:06.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2015-09-10 12:46:24.202030127 +0200
-@@ -230,7 +230,7 @@
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+index 76bfcd6..aed811b 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+@@ -230,7 +230,7 @@ bool YoungList::check_list_well_formed() {
HeapRegion* last = NULL;
while (curr != NULL) {
if (!curr->is_young()) {
@@ -1087,7 +825,7 @@
"incorrectly tagged (y: %d, surv: %d)",
curr->bottom(), curr->end(),
curr->is_young(), curr->is_survivor());
-@@ -359,7 +359,7 @@
+@@ -359,7 +359,7 @@ void YoungList::print() {
if (curr == NULL)
gclog_or_tty->print_cr(" empty");
while (curr != NULL) {
@@ -1096,7 +834,7 @@
HR_FORMAT_PARAMS(curr),
curr->prev_top_at_mark_start(),
curr->next_top_at_mark_start(),
-@@ -490,7 +490,7 @@
+@@ -490,7 +490,7 @@ void G1CollectedHeap::check_ct_logs_at_safepoint() {
gclog_or_tty->print_cr("Log entries = %d, dirty cards = %d.",
clear.num_processed(), orig_count);
guarantee(redirty.num_processed() == clear.num_processed(),
@@ -1105,7 +843,7 @@
redirty.num_processed(), clear.num_processed()));
CountNonCleanMemRegionClosure count3(this);
-@@ -528,7 +528,7 @@
+@@ -528,7 +528,7 @@ G1CollectedHeap::new_region_try_secondary_free_list(bool is_old) {
HeapRegion* res = _hrm.allocate_free_region(is_old);
if (G1ConcRegionFreeingVerbose) {
gclog_or_tty->print_cr("G1ConcRegionFreeing [region alloc] : "
@@ -1114,7 +852,7 @@
HR_FORMAT_PARAMS(res));
}
return res;
-@@ -1597,8 +1597,8 @@
+@@ -1597,8 +1597,8 @@ resize_if_necessary_after_full_collection(size_t word_size) {
// This assert only makes sense here, before we adjust them
// with respect to the min and max heap size.
assert(minimum_desired_capacity <= maximum_desired_capacity,
@@ -1125,7 +863,7 @@
minimum_desired_capacity, maximum_desired_capacity));
// Should not be greater than the heap max size. No need to adjust
-@@ -2256,7 +2256,7 @@
+@@ -2256,7 +2256,7 @@ public:
virtual bool doHeapRegion(HeapRegion* hr) {
unsigned region_gc_time_stamp = hr->get_gc_time_stamp();
if (_gc_time_stamp != region_gc_time_stamp) {
@@ -1134,7 +872,7 @@
"expected %d", HR_FORMAT_PARAMS(hr),
region_gc_time_stamp, _gc_time_stamp);
_failures = true;
-@@ -2678,7 +2678,7 @@
+@@ -2679,7 +2679,7 @@ public:
} else if (r->continuesHumongous()) {
if (r->humongous_start_region() != _sh_region) {
gclog_or_tty->print_cr("Region " HR_FORMAT ", "
@@ -1143,7 +881,7 @@
HR_FORMAT_PARAMS(r),
r->humongous_start_region(),
_sh_region);
-@@ -2990,10 +2990,10 @@
+@@ -2991,10 +2991,10 @@ public:
if (!oopDesc::is_null(heap_oop)) {
oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
if (_g1h->is_obj_dead_cond(obj, _vo)) {
@@ -1157,7 +895,7 @@
}
obj->print_on(gclog_or_tty);
_failures = true;
-@@ -3040,9 +3040,9 @@
+@@ -3041,9 +3041,9 @@ class G1VerifyCodeRootOopClosure: public OopClosure {
// Verify that the strong code root list for this region
// contains the nmethod
if (!hrrs->strong_code_roots_list_contains(_nm)) {
@@ -1170,7 +908,7 @@
p, _nm, hr->bottom(), hr->end());
_failures = true;
}
-@@ -3172,7 +3172,7 @@
+@@ -3173,7 +3173,7 @@ public:
if (o != NULL) {
HeapWord *start = (HeapWord *) o;
size_t word_sz = o->size();
@@ -1179,7 +917,7 @@
" isMarkedPrev %d isMarkedNext %d isAllocSince %d\n",
(void*) o, word_sz,
_g1->isMarkedPrev(o),
-@@ -3183,7 +3183,7 @@
+@@ -3184,7 +3184,7 @@ public:
int *val;
for (cur = start; cur < end; cur++) {
val = (int *) cur;
@@ -1188,7 +926,7 @@
}
}
}
-@@ -3218,9 +3218,9 @@
+@@ -3219,9 +3219,9 @@ public:
r->object_iterate(¬_dead_yet_cl);
if (_vo != VerifyOption_G1UseNextMarking) {
if (r->max_live_bytes() < not_dead_yet_cl.live_bytes()) {
@@ -1201,7 +939,7 @@
r->bottom(), r->end(),
r->max_live_bytes(),
not_dead_yet_cl.live_bytes());
-@@ -3532,7 +3532,7 @@
+@@ -3533,7 +3533,7 @@ public:
size_t occupied = hrrs->occupied();
_occupied_sum += occupied;
@@ -1210,7 +948,7 @@
HR_FORMAT_PARAMS(r));
if (occupied == 0) {
gclog_or_tty->print_cr(" RSet is empty");
-@@ -3551,7 +3551,7 @@
+@@ -3552,7 +3552,7 @@ public:
}
~PrintRSetsClosure() {
@@ -1219,7 +957,7 @@
gclog_or_tty->print_cr("========================================");
gclog_or_tty->cr();
}
-@@ -4372,7 +4372,7 @@
+@@ -4416,7 +4416,7 @@ oop
G1CollectedHeap::handle_evacuation_failure_par(G1ParScanThreadState* _par_scan_state,
oop old) {
assert(obj_in_cs(old),
@@ -1228,7 +966,7 @@
(HeapWord*) old));
markOop m = old->mark();
oop forward_ptr = old->forward_to_atomic(old);
-@@ -4406,7 +4406,7 @@
+@@ -4450,7 +4450,7 @@ G1CollectedHeap::handle_evacuation_failure_par(G1ParScanThreadState* _par_scan_s
// space for this object (old != forward_ptr) or they beat us in
// self-forwarding it (old == forward_ptr).
assert(old == forward_ptr || !obj_in_cs(forward_ptr),
@@ -1237,7 +975,7 @@
"should not be in the CSet",
(HeapWord*) old, (HeapWord*) forward_ptr));
return forward_ptr;
-@@ -4793,16 +4793,16 @@
+@@ -4837,16 +4837,16 @@ public:
~G1StringSymbolTableUnlinkTask() {
guarantee(!_process_strings || !_do_in_parallel || StringTable::parallel_claimed_index() >= _initial_string_table_size,
@@ -1258,7 +996,7 @@
strings_processed(), strings_removed(),
symbols_processed(), symbols_removed());
}
-@@ -6001,13 +6001,13 @@
+@@ -6029,13 +6029,13 @@ void G1CollectedHeap::verify_dirty_young_regions() {
bool G1CollectedHeap::verify_no_bits_over_tams(const char* bitmap_name, CMBitMapRO* bitmap,
HeapWord* tams, HeapWord* end) {
guarantee(tams <= end,
@@ -1275,7 +1013,7 @@
bitmap_name, tams, end);
return false;
}
-@@ -6033,7 +6033,7 @@
+@@ -6061,7 +6061,7 @@ bool G1CollectedHeap::verify_bitmaps(const char* caller, HeapRegion* hr) {
res_n = verify_no_bits_over_tams("next", next_bitmap, ntams, end);
}
if (!res_p || !res_n) {
@@ -1284,7 +1022,7 @@
HR_FORMAT_PARAMS(hr));
gclog_or_tty->print_cr("#### Caller: %s", caller);
return false;
-@@ -6345,7 +6345,7 @@
+@@ -6373,7 +6373,7 @@ class G1FreeHumongousRegionClosure : public HeapRegionClosure {
!r->rem_set()->is_empty()) {
if (G1TraceEagerReclaimHumongousObjects) {
@@ -1293,7 +1031,7 @@
region_idx,
obj->size()*HeapWordSize,
r->bottom(),
-@@ -6367,7 +6367,7 @@
+@@ -6395,7 +6395,7 @@ class G1FreeHumongousRegionClosure : public HeapRegionClosure {
r->bottom()));
if (G1TraceEagerReclaimHumongousObjects) {
@@ -1302,7 +1040,7 @@
region_idx,
obj->size()*HeapWordSize,
r->bottom(),
-@@ -6523,7 +6523,7 @@
+@@ -6551,7 +6551,7 @@ public:
NoYoungRegionsClosure() : _success(true) { }
bool doHeapRegion(HeapRegion* r) {
if (r->is_young()) {
@@ -1311,7 +1049,7 @@
r->bottom(), r->end());
_success = false;
}
-@@ -6652,7 +6652,7 @@
+@@ -6680,7 +6680,7 @@ void G1CollectedHeap::rebuild_region_sets(bool free_list_only) {
}
assert(_allocator->used_unlocked() == recalculate_used(),
err_msg("inconsistent _allocator->used_unlocked(), "
@@ -1320,7 +1058,7 @@
_allocator->used_unlocked(), recalculate_used()));
}
-@@ -6873,8 +6873,8 @@
+@@ -6901,8 +6901,8 @@ class RegisterNMethodOopClosure: public OopClosure {
oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
HeapRegion* hr = _g1h->heap_region_containing(obj);
assert(!hr->continuesHumongous(),
@@ -1331,7 +1069,7 @@
_nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
// HeapRegion::add_strong_code_root_locked() avoids adding duplicate entries.
-@@ -6900,8 +6900,8 @@
+@@ -6928,8 +6928,8 @@ class UnregisterNMethodOopClosure: public OopClosure {
oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
HeapRegion* hr = _g1h->heap_region_containing(obj);
assert(!hr->continuesHumongous(),
@@ -1342,9 +1080,178 @@
_nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
hr->remove_strong_code_root(_nm);
---- hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp.orig 2015-09-02 11:07:35.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp 2015-09-02 11:08:48.000000000 +0200
-@@ -475,7 +475,7 @@
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
+index 0fd2786..7b26fdb 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
+@@ -81,7 +81,7 @@ inline HeapRegion* G1CollectedHeap::region_at(uint index) const { return _hrm.at
+
+ inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const {
+ assert(is_in_reserved(addr),
+- err_msg("Cannot calculate region index for address "PTR_FORMAT" that is outside of the heap ["PTR_FORMAT", "PTR_FORMAT")",
++ err_msg("Cannot calculate region index for address " PTR_FORMAT " that is outside of the heap [" PTR_FORMAT ", " PTR_FORMAT ")",
+ p2i(addr), p2i(_reserved.start()), p2i(_reserved.end())));
+ return (uint)(pointer_delta(addr, _reserved.start(), sizeof(uint8_t)) >> HeapRegion::LogOfHRGrainBytes);
+ }
+@@ -94,7 +94,7 @@ template <class T>
+ inline HeapRegion* G1CollectedHeap::heap_region_containing_raw(const T addr) const {
+ assert(addr != NULL, "invariant");
+ assert(is_in_g1_reserved((const void*) addr),
+- err_msg("Address "PTR_FORMAT" is outside of the heap ranging from ["PTR_FORMAT" to "PTR_FORMAT")",
++ err_msg("Address " PTR_FORMAT " is outside of the heap ranging from [" PTR_FORMAT " to " PTR_FORMAT ")",
+ p2i((void*)addr), p2i(g1_reserved().start()), p2i(g1_reserved().end())));
+ return _hrm.addr_to_region((HeapWord*) addr);
+ }
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
+index ea80c44..c4463f5 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
+@@ -199,7 +199,7 @@ G1CollectorPolicy::G1CollectorPolicy() :
+ const size_t region_size = HeapRegion::GrainWords;
+ if (YoungPLABSize > region_size || OldPLABSize > region_size) {
+ char buffer[128];
+- jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most "SIZE_FORMAT,
++ jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most " SIZE_FORMAT,
+ OldPLABSize > region_size ? "Old" : "Young", region_size);
+ vm_exit_during_initialization(buffer);
+ }
+@@ -846,7 +846,7 @@ void G1CollectorPolicy::record_collection_pause_start(double start_time_sec) {
+ update_survivors_policy();
+
+ assert(_g1->used() == _g1->recalculate_used(),
+- err_msg("sanity, used: "SIZE_FORMAT" recalculate_used: "SIZE_FORMAT,
++ err_msg("sanity, used: " SIZE_FORMAT " recalculate_used: " SIZE_FORMAT,
+ _g1->used(), _g1->recalculate_used()));
+
+ double s_w_t_ms = (start_time_sec - _stop_world_start) * 1000.0;
+@@ -1231,10 +1231,10 @@ void G1CollectorPolicy::print_detailed_heap_transition(bool full) {
+ (_young_list_target_length * HeapRegion::GrainBytes) - survivor_used_bytes_after_gc;
+
+ gclog_or_tty->print(
+- " [Eden: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT") "
+- "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" "
+- "Heap: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"
+- EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")]",
++ " [Eden: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->" EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ") "
++ "Survivors: " EXT_SIZE_FORMAT "->" EXT_SIZE_FORMAT " "
++ "Heap: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->"
++ EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")]",
+ EXT_SIZE_PARAMS(_eden_used_bytes_before_gc),
+ EXT_SIZE_PARAMS(_eden_capacity_bytes_before_gc),
+ EXT_SIZE_PARAMS(eden_used_bytes_after_gc),
+@@ -1851,7 +1851,7 @@ void G1CollectorPolicy::print_collection_set(HeapRegion* list_head, outputStream
+ while (csr != NULL) {
+ HeapRegion* next = csr->next_in_collection_set();
+ assert(csr->in_collection_set(), "bad CS");
+- st->print_cr(" "HR_FORMAT", P: "PTR_FORMAT "N: "PTR_FORMAT", age: %4d",
++ st->print_cr(" " HR_FORMAT ", P: " PTR_FORMAT "N: " PTR_FORMAT ", age: %4d",
+ HR_FORMAT_PARAMS(csr),
+ csr->prev_top_at_mark_start(), csr->next_top_at_mark_start(),
+ csr->age_in_surv_rate_group_cond());
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
+index eff1196..fff1663 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
+@@ -121,15 +121,15 @@ public:
+ // Single parameter format strings
+ #define ergo_format_str(_name_) ", " _name_ ": %s"
+ #define ergo_format_region(_name_) ", " _name_ ": %u regions"
+-#define ergo_format_byte(_name_) ", " _name_ ": "SIZE_FORMAT" bytes"
++#define ergo_format_byte(_name_) ", " _name_ ": " SIZE_FORMAT " bytes"
+ #define ergo_format_double(_name_) ", " _name_ ": %1.2f"
+ #define ergo_format_perc(_name_) ", " _name_ ": %1.2f %%"
+ #define ergo_format_ms(_name_) ", " _name_ ": %1.2f ms"
+-#define ergo_format_size(_name_) ", " _name_ ": "SIZE_FORMAT
++#define ergo_format_size(_name_) ", " _name_ ": " SIZE_FORMAT
+
+ // Double parameter format strings
+ #define ergo_format_byte_perc(_name_) \
+- ", " _name_ ": "SIZE_FORMAT" bytes (%1.2f %%)"
++ ", " _name_ ": " SIZE_FORMAT " bytes (%1.2f %%)"
+
+ // Generates the format string
+ #define ergo_format(_extra_format_) \
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp
+index c037110..af0bdb9 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp
+@@ -332,7 +332,7 @@ void G1GCPhaseTimes::print_stats(int level, const char* str, double value) {
+ }
+
+ void G1GCPhaseTimes::print_stats(int level, const char* str, size_t value) {
+- LineBuffer(level).append_and_print_cr("[%s: "SIZE_FORMAT"]", str, value);
++ LineBuffer(level).append_and_print_cr("[%s: " SIZE_FORMAT "]", str, value);
+ }
+
+ void G1GCPhaseTimes::print_stats(int level, const char* str, double value, uint workers) {
+@@ -452,7 +452,7 @@ class G1GCParPhasePrinter : public StackObj {
+
+ if (phase->_thread_work_items != NULL) {
+ LineBuffer buf2(phase->_thread_work_items->_indent_level);
+- buf2.append_and_print_cr("[%s: "SIZE_FORMAT"]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id));
++ buf2.append_and_print_cr("[%s: " SIZE_FORMAT "]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id));
+ }
+ }
+
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp
+index 8139048..9cc752a 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp
+@@ -84,18 +84,18 @@ void G1HRPrinter::print(ActionType action, RegionType type,
+
+ if (type_str != NULL) {
+ if (top != NULL) {
+- gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT" "PTR_FORMAT,
++ gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT " " PTR_FORMAT,
+ action_str, type_str, bottom, top);
+ } else {
+- gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT,
++ gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT,
+ action_str, type_str, bottom);
+ }
+ } else {
+ if (top != NULL) {
+- gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT" "PTR_FORMAT,
++ gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT " " PTR_FORMAT,
+ action_str, bottom, top);
+ } else {
+- gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT,
++ gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT,
+ action_str, bottom);
+ }
+ }
+@@ -104,11 +104,11 @@ void G1HRPrinter::print(ActionType action, RegionType type,
+ void G1HRPrinter::print(ActionType action, HeapWord* bottom, HeapWord* end) {
+ const char* action_str = action_name(action);
+
+- gclog_or_tty->print_cr(G1HR_PREFIX" %s ["PTR_FORMAT","PTR_FORMAT"]",
++ gclog_or_tty->print_cr(G1HR_PREFIX" %s [" PTR_FORMAT "," PTR_FORMAT "]",
+ action_str, bottom, end);
+ }
+
+ void G1HRPrinter::print(PhaseType phase, size_t phase_num) {
+ const char* phase_str = phase_name(phase);
+- gclog_or_tty->print_cr(G1HR_PREFIX" #%s "SIZE_FORMAT, phase_str, phase_num);
++ gclog_or_tty->print_cr(G1HR_PREFIX" #%s " SIZE_FORMAT, phase_str, phase_num);
+ }
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
+index a00cd7a..0385f66 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
+@@ -118,7 +118,7 @@ inline void G1CMOopClosure::do_oop_nv(T* p) {
+ oop obj = oopDesc::load_decode_heap_oop(p);
+ if (_cm->verbose_high()) {
+ gclog_or_tty->print_cr("[%u] we're looking at location "
+- "*"PTR_FORMAT" = "PTR_FORMAT,
++ "*" PTR_FORMAT " = " PTR_FORMAT,
+ _task->worker_id(), p2i(p), p2i((void*) obj));
+ }
+ _task->deal_with_reference(obj);
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
+index ca714dc..da4d632 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
+@@ -442,7 +442,7 @@ G1UpdateRSOrPushRefOopClosure(G1CollectedHeap* g1h,
bool G1RemSet::refine_card(jbyte* card_ptr, uint worker_i,
bool check_for_refs_into_cset) {
assert(_g1->is_in_exact(_ct_bs->addr_for(card_ptr)),
@@ -1353,9 +1260,11 @@
p2i(card_ptr),
_ct_bs->index_for(_ct_bs->addr_for(card_ptr)),
_ct_bs->addr_for(card_ptr),
---- hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp.orig 2015-09-02 11:13:52.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 2015-09-02 11:15:30.000000000 +0200
-@@ -187,22 +187,22 @@
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp
+index c55165b..8d654dc 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp
+@@ -187,22 +187,22 @@ public:
size_t code_root_elems() const { return _code_root_elems; }
void print_rs_mem_info_on(outputStream * out, size_t total) {
@@ -1382,7 +1291,7 @@
code_root_elems(), code_root_elems_percent_of(total), amount(), _name);
}
};
-@@ -280,19 +280,19 @@
+@@ -280,19 +280,19 @@ public:
RegionTypeCounter* counters[] = { &_young, &_humonguous, &_free, &_old, NULL };
out->print_cr("\n Current rem set statistics");
@@ -1407,11 +1316,13 @@
total_cards_occupied());
for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
(*current)->print_cards_occupied_info_on(out, total_cards_occupied());
-@@ -301,29 +301,29 @@
+@@ -300,30 +300,30 @@ public:
+
// Largest sized rem set region statistics
HeapRegionRemSet* rem_set = max_rs_mem_sz_region()->rem_set();
- out->print_cr(" Region with largest rem set = "HR_FORMAT", "
+- out->print_cr(" Region with largest rem set = "HR_FORMAT", "
- "size = "SIZE_FORMAT "K, occupied = "SIZE_FORMAT"K.",
++ out->print_cr(" Region with largest rem set = " HR_FORMAT ", "
+ "size = " SIZE_FORMAT "K, occupied = " SIZE_FORMAT "K.",
HR_FORMAT_PARAMS(max_rs_mem_sz_region()),
round_to_K(rem_set->mem_size()),
@@ -1443,7 +1354,7 @@
HR_FORMAT_PARAMS(max_code_root_mem_sz_region()),
round_to_K(max_code_root_rem_set->strong_code_roots_mem_size()),
round_to_K(max_code_root_rem_set->strong_code_roots_list_length()));
-@@ -332,16 +332,16 @@
+@@ -332,16 +332,16 @@ public:
void G1RemSetSummary::print_on(outputStream* out) {
out->print_cr("\n Recent concurrent refinement statistics");
@@ -1465,9 +1376,11 @@
out->print_cr(" Concurrent RS threads times (s)");
out->print(" ");
for (uint i = 0; i < _num_vtimes; i++) {
---- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp.orig 2015-09-02 11:13:52.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2015-09-02 11:15:44.000000000 +0200
-@@ -151,7 +151,7 @@
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
+index 8ae53e3..747f61b 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
+@@ -151,7 +151,7 @@ void G1StringDedupQueue::unlink_or_oops_do(G1StringDedupUnlinkOrOopsDoClosure* c
void G1StringDedupQueue::print_statistics(outputStream* st) {
st->print_cr(
" [Queue]\n"
@@ -1476,9 +1389,11 @@
}
void G1StringDedupQueue::verify() {
---- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp.orig 2015-09-02 11:13:52.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp 2015-09-02 11:18:07.000000000 +0200
-@@ -80,8 +80,8 @@
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp
+index 2d5523c..f9700e1 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp
+@@ -80,8 +80,8 @@ void G1StringDedupStat::print_summary(outputStream* st, const G1StringDedupStat&
st->stamp(PrintGCTimeStamps);
st->print_cr(
"[GC concurrent-string-deduplication, "
@@ -1489,7 +1404,7 @@
G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes),
G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes - last_stat._deduped_bytes),
G1_STRDEDUP_BYTES_PARAM(last_stat._deduped_bytes),
-@@ -135,22 +135,22 @@
+@@ -135,22 +135,22 @@ void G1StringDedupStat::print_statistics(outputStream* st, const G1StringDedupSt
if (total) {
st->print_cr(
@@ -1522,20 +1437,11 @@
stat._inspected,
stat._skipped, skipped_percent,
stat._hashed, hashed_percent,
---- hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp.orig 2015-09-02 12:36:40.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 2015-09-02 12:37:19.000000000 +0200
-@@ -300,7 +300,7 @@
-
- // Largest sized rem set region statistics
- HeapRegionRemSet* rem_set = max_rs_mem_sz_region()->rem_set();
-- out->print_cr(" Region with largest rem set = "HR_FORMAT", "
-+ out->print_cr(" Region with largest rem set = " HR_FORMAT ", "
- "size = " SIZE_FORMAT "K, occupied = " SIZE_FORMAT "K.",
- HR_FORMAT_PARAMS(max_rs_mem_sz_region()),
- round_to_K(rem_set->mem_size()),
---- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp.orig 2015-09-02 12:36:40.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2015-09-02 12:41:56.000000000 +0200
-@@ -554,12 +554,12 @@
+diff --git hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+index 2b41688..39a3306 100644
+--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+@@ -554,12 +554,12 @@ void G1StringDedupTable::trim_entry_cache() {
void G1StringDedupTable::print_statistics(outputStream* st) {
st->print_cr(
" [Table]\n"
@@ -1554,31 +1460,11 @@
G1_STRDEDUP_BYTES_PARAM(_table->_size * sizeof(G1StringDedupEntry*) + (_table->_entries + _entry_cache->size()) * sizeof(G1StringDedupEntry)),
_table->_size, _min_size, _max_size,
_table->_entries, (double)_table->_entries / (double)_table->_size * 100.0, _entry_cache->size(), _entries_added, _entries_removed,
---- hotspot/src/share/vm/memory/genCollectedHeap.cpp.orig 2015-09-02 12:51:37.000000000 +0200
-+++ hotspot/src/share/vm/memory/genCollectedHeap.cpp 2015-09-02 12:52:12.000000000 +0200
-@@ -1315,7 +1315,7 @@
- // back a time later than 'now'.
- jlong retVal = now - tolgc_cl.time();
- if (retVal < 0) {
-- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, (int64_t) retVal);)
-+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, (int64_t) retVal);)
- return 0;
- }
- return retVal;
---- hotspot/src/share/vm/memory/generation.cpp.orig 2015-09-02 12:51:38.000000000 +0200
-+++ hotspot/src/share/vm/memory/generation.cpp 2015-09-02 12:52:33.000000000 +0200
-@@ -187,7 +187,7 @@
- bool res = (available >= max_promotion_in_bytes);
- if (PrintGC && Verbose) {
- gclog_or_tty->print_cr(
-- "Generation: promo attempt is%s safe: available("SIZE_FORMAT") %s max_promo("SIZE_FORMAT")",
-+ "Generation: promo attempt is%s safe: available(" SIZE_FORMAT ") %s max_promo(" SIZE_FORMAT ")",
- res? "":" not", available, res? ">=":"<",
- max_promotion_in_bytes);
- }
---- hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp.orig 2015-09-02 12:57:25.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2015-09-02 13:00:29.000000000 +0200
-@@ -371,7 +371,7 @@
+diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
+index ef5b437..eefa1c9 100644
+--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
+@@ -333,7 +333,7 @@ void HeapRegion::note_self_forwarding_removal_end(bool during_initial_mark,
bool during_conc_mark,
size_t marked_bytes) {
assert(0 <= marked_bytes && marked_bytes <= used(),
@@ -1587,7 +1473,7 @@
marked_bytes, used()));
_prev_top_at_mark_start = top();
_prev_marked_bytes = marked_bytes;
-@@ -559,9 +559,9 @@
+@@ -514,9 +514,9 @@ class VerifyStrongCodeRootOopClosure: public OopClosure {
// Object is in the region. Check that its less than top
if (_hr->top() <= (HeapWord*)obj) {
// Object is above top
@@ -1600,7 +1486,7 @@
(void *)obj, _hr->bottom(), _hr->end(), _hr->top());
_failures = true;
return;
-@@ -595,22 +595,22 @@
+@@ -550,22 +550,22 @@ public:
if (nm != NULL) {
// Verify that the nemthod is live
if (!nm->is_alive()) {
@@ -1629,7 +1515,7 @@
_hr->bottom(), _hr->end(), nm);
_failures = true;
}
-@@ -644,8 +644,8 @@
+@@ -599,8 +599,8 @@ void HeapRegion::verify_strong_code_roots(VerifyOption vo, bool* failures) const
// on its strong code root list
if (is_empty()) {
if (strong_code_roots_length > 0) {
@@ -1640,7 +1526,7 @@
bottom(), end(), strong_code_roots_length);
*failures = true;
}
-@@ -654,8 +654,8 @@
+@@ -609,8 +609,8 @@ void HeapRegion::verify_strong_code_roots(VerifyOption vo, bool* failures) const
if (continuesHumongous()) {
if (strong_code_roots_length > 0) {
@@ -1651,7 +1537,7 @@
HR_FORMAT_PARAMS(this), strong_code_roots_length);
*failures = true;
}
-@@ -679,7 +679,7 @@
+@@ -634,7 +634,7 @@ void HeapRegion::print_on(outputStream* st) const {
else
st->print(" ");
st->print(" TS %5d", _gc_time_stamp);
@@ -1660,7 +1546,7 @@
prev_top_at_mark_start(), next_top_at_mark_start());
G1OffsetTableContigSpace::print_on(st);
}
-@@ -744,25 +744,25 @@
+@@ -708,25 +708,25 @@ public:
}
if (!_g1h->is_in_closed_subset(obj)) {
HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
@@ -1695,27 +1581,27 @@
(void*) obj, to->bottom(), to->end());
print_object(gclog_or_tty, obj);
}
-@@ -798,14 +798,14 @@
- gclog_or_tty->print_cr("----------");
- }
- gclog_or_tty->print_cr("Missing rem set entry:");
-- gclog_or_tty->print_cr("Field "PTR_FORMAT" "
-- "of obj "PTR_FORMAT", "
-- "in region "HR_FORMAT,
-+ gclog_or_tty->print_cr("Field " PTR_FORMAT " "
-+ "of obj " PTR_FORMAT ", "
-+ "in region " HR_FORMAT,
- p, (void*) _containing_obj,
- HR_FORMAT_PARAMS(from));
- _containing_obj->print_on(gclog_or_tty);
-- gclog_or_tty->print_cr("points to obj "PTR_FORMAT" "
-- "in region "HR_FORMAT,
-+ gclog_or_tty->print_cr("points to obj " PTR_FORMAT " "
-+ "in region " HR_FORMAT,
- (void*) obj,
- HR_FORMAT_PARAMS(to));
- obj->print_on(gclog_or_tty);
-@@ -842,8 +842,8 @@
+@@ -784,14 +784,14 @@ public:
+ gclog_or_tty->print_cr("----------");
+ }
+ gclog_or_tty->print_cr("Missing rem set entry:");
+- gclog_or_tty->print_cr("Field "PTR_FORMAT" "
+- "of obj "PTR_FORMAT", "
+- "in region "HR_FORMAT,
++ gclog_or_tty->print_cr("Field " PTR_FORMAT " "
++ "of obj " PTR_FORMAT ", "
++ "in region " HR_FORMAT,
+ p, (void*) _containing_obj,
+ HR_FORMAT_PARAMS(from));
+ _containing_obj->print_on(gclog_or_tty);
+- gclog_or_tty->print_cr("points to obj "PTR_FORMAT" "
+- "in region "HR_FORMAT,
++ gclog_or_tty->print_cr("points to obj " PTR_FORMAT " "
++ "in region " HR_FORMAT,
+ (void*) obj,
+ HR_FORMAT_PARAMS(to));
+ if (obj->is_oop()) {
+@@ -830,8 +830,8 @@ void HeapRegion::verify(VerifyOption vo,
if (is_humongous != g1->isHumongous(obj_size) &&
!g1->is_obj_dead(obj, this)) { // Dead objects may have bigger block_size since they span several objects.
@@ -1726,7 +1612,7 @@
p, g1->isHumongous(obj_size) ? "" : "non-",
obj_size, is_humongous ? "" : "non-");
*failures = true;
-@@ -866,12 +866,12 @@
+@@ -854,12 +854,12 @@ void HeapRegion::verify(VerifyOption vo,
(vo == VerifyOption_G1UsePrevMarking &&
ClassLoaderDataGraph::unload_list_contains(klass));
if (!is_metaspace_object) {
@@ -1741,16 +1627,16 @@
"not a klass", klass, (void *)obj);
*failures = true;
return;
-@@ -887,7 +887,7 @@
+@@ -891,7 +891,7 @@ void HeapRegion::verify(VerifyOption vo,
}
}
} else {
-- gclog_or_tty->print_cr(PTR_FORMAT" no an oop", (void *)obj);
-+ gclog_or_tty->print_cr(PTR_FORMAT " no an oop", (void *)obj);
+- gclog_or_tty->print_cr(PTR_FORMAT" not an oop", (void *)obj);
++ gclog_or_tty->print_cr(PTR_FORMAT " not an oop", (void *)obj);
*failures = true;
return;
}
-@@ -897,8 +897,8 @@
+@@ -901,8 +901,8 @@ void HeapRegion::verify(VerifyOption vo,
}
if (p != top()) {
@@ -1761,7 +1647,7 @@
*failures = true;
return;
}
-@@ -913,8 +913,8 @@
+@@ -917,8 +917,8 @@ void HeapRegion::verify(VerifyOption vo,
HeapWord* addr_1 = p;
HeapWord* b_start_1 = _offsets.block_start_const(addr_1);
if (b_start_1 != p) {
@@ -1772,7 +1658,7 @@
addr_1, b_start_1, p);
*failures = true;
return;
-@@ -925,8 +925,8 @@
+@@ -929,8 +929,8 @@ void HeapRegion::verify(VerifyOption vo,
if (addr_2 < the_end) {
HeapWord* b_start_2 = _offsets.block_start_const(addr_2);
if (b_start_2 != p) {
@@ -1783,7 +1669,7 @@
addr_2, b_start_2, p);
*failures = true;
return;
-@@ -939,8 +939,8 @@
+@@ -943,8 +943,8 @@ void HeapRegion::verify(VerifyOption vo,
if (addr_3 < the_end) {
HeapWord* b_start_3 = _offsets.block_start_const(addr_3);
if (b_start_3 != p) {
@@ -1794,7 +1680,7 @@
addr_3, b_start_3, p);
*failures = true;
return;
-@@ -951,8 +951,8 @@
+@@ -955,8 +955,8 @@ void HeapRegion::verify(VerifyOption vo,
HeapWord* addr_4 = the_end - 1;
HeapWord* b_start_4 = _offsets.block_start_const(addr_4);
if (b_start_4 != p) {
@@ -1805,7 +1691,7 @@
addr_4, b_start_4, p);
*failures = true;
return;
-@@ -960,8 +960,8 @@
+@@ -964,8 +964,8 @@ void HeapRegion::verify(VerifyOption vo,
}
if (is_humongous && object_num > 1) {
@@ -1816,9 +1702,48 @@
bottom(), end(), object_num);
*failures = true;
return;
---- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp.orig 2015-09-02 12:57:25.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp 2015-09-02 13:01:10.000000000 +0200
-@@ -414,7 +414,7 @@
+diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
+index e62a2ab..76627e7 100644
+--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
++++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
+@@ -52,7 +52,7 @@ class HeapRegion;
+ class HeapRegionSetBase;
+ class nmethod;
+
+-#define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]"
++#define HR_FORMAT "%u:(%s)[" PTR_FORMAT "," PTR_FORMAT "," PTR_FORMAT "]"
+ #define HR_FORMAT_PARAMS(_hr_) \
+ (_hr_)->hrm_index(), \
+ (_hr_)->get_short_type_str(), \
+@@ -534,8 +534,8 @@ class HeapRegion: public G1OffsetTableContigSpace {
+ void set_containing_set(HeapRegionSetBase* containing_set) {
+ assert((containing_set == NULL && _containing_set != NULL) ||
+ (containing_set != NULL && _containing_set == NULL),
+- err_msg("containing_set: "PTR_FORMAT" "
+- "_containing_set: "PTR_FORMAT,
++ err_msg("containing_set: " PTR_FORMAT " "
++ "_containing_set: " PTR_FORMAT,
+ p2i(containing_set), p2i(_containing_set)));
+
+ _containing_set = containing_set;
+diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
+index 62ae230..46e8b00 100644
+--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
++++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
+@@ -112,7 +112,7 @@ HeapRegion::block_size(const HeapWord *addr) const {
+
+ assert(ClassUnloadingWithConcurrentMark,
+ err_msg("All blocks should be objects if G1 Class Unloading isn't used. "
+- "HR: ["PTR_FORMAT", "PTR_FORMAT", "PTR_FORMAT") "
++ "HR: [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ") "
+ "addr: " PTR_FORMAT,
+ p2i(bottom()), p2i(top()), p2i(end()), p2i(addr)));
+
+diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
+index 020eb08..14673df 100644
+--- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
+@@ -432,7 +432,7 @@ void HeapRegionManager::verify() {
HeapRegion* hr = _regions.get_by_index(i);
guarantee(hr != NULL, err_msg("invariant: i: %u", i));
guarantee(!prev_committed || hr->bottom() == prev_end,
@@ -1827,9 +1752,27 @@
i, HR_FORMAT_PARAMS(hr), p2i(prev_end)));
guarantee(hr->hrm_index() == i,
err_msg("invariant: i: %u hrm_index(): %u", i, hr->hrm_index()));
---- hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.orig 2015-09-02 12:57:25.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2015-09-02 13:03:44.000000000 +0200
-@@ -91,7 +91,7 @@
+diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp
+index 96bc92f..68840d6 100644
+--- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp
++++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp
+@@ -31,9 +31,9 @@
+
+ inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const {
+ assert(addr < heap_end(),
+- err_msg("addr: "PTR_FORMAT" end: "PTR_FORMAT, p2i(addr), p2i(heap_end())));
++ err_msg("addr: " PTR_FORMAT " end: " PTR_FORMAT, p2i(addr), p2i(heap_end())));
+ assert(addr >= heap_bottom(),
+- err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT, p2i(addr), p2i(heap_bottom())));
++ err_msg("addr: " PTR_FORMAT " bottom: " PTR_FORMAT, p2i(addr), p2i(heap_bottom())));
+
+ HeapRegion* hr = _regions.get_by_address(addr);
+ return hr;
+diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
+index 662f4f1..6659960 100644
+--- hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
+@@ -91,7 +91,7 @@ protected:
// concurrency.
if (G1TraceHeapRegionRememberedSet) {
@@ -1838,7 +1781,7 @@
from,
UseCompressedOops
? (void *)oopDesc::load_decode_heap_oop((narrowOop*)from)
-@@ -377,7 +377,7 @@
+@@ -381,7 +381,7 @@ void FromCardCache::initialize(uint n_par_rs, uint max_num_regions) {
void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) {
guarantee((size_t)start_idx + new_num_regions <= max_uintx,
@@ -1847,7 +1790,7 @@
start_idx, new_num_regions));
for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) {
uint end_idx = (start_idx + (uint)new_num_regions);
-@@ -392,7 +392,7 @@
+@@ -396,7 +396,7 @@ void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) {
void FromCardCache::print(outputStream* out) {
for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) {
for (uint j = 0; j < _max_regions; j++) {
@@ -1856,7 +1799,7 @@
i, j, at(i, j));
}
}
-@@ -432,7 +432,7 @@
+@@ -436,7 +436,7 @@ void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, int tid) {
int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift);
if (G1TraceHeapRegionRememberedSet) {
@@ -1865,7 +1808,7 @@
hr()->bottom(), from_card,
FromCardCache::at((uint)tid, cur_hrm_ind));
}
-@@ -637,13 +637,13 @@
+@@ -642,13 +642,13 @@ void OtherRegionsTable::scrub(CardTableModRefBS* ctbs,
assert(_coarse_map.size() == region_bm->size(), "Precondition");
if (G1RSScrubVerbose) {
@@ -1881,7 +1824,7 @@
}
// Now do the fine-grained maps.
-@@ -1027,7 +1027,7 @@
+@@ -1044,7 +1044,7 @@ bool HeapRegionRemSetIterator::fine_has_next(size_t& card_index) {
card_index = _cur_region_card_offset + _cur_card_in_prt;
guarantee(_cur_card_in_prt < HeapRegion::CardsPerRegion,
@@ -1890,7 +1833,7 @@
return true;
}
-@@ -1196,8 +1196,8 @@
+@@ -1213,8 +1213,8 @@ void PerRegionTable::test_fl_mem_size() {
size_t min_prt_size = sizeof(void*) + dummy->bm()->size_in_words() * HeapWordSize;
assert(dummy->mem_size() > min_prt_size,
@@ -1901,9 +1844,11 @@
free(dummy);
guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size");
// try to reset the state
---- hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp.orig 2015-09-02 12:57:25.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp 2015-09-02 13:04:36.000000000 +0200
-@@ -32,7 +32,7 @@
+diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp
+index b654430..9ffb46f 100644
+--- hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp
++++ hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp
+@@ -32,7 +32,7 @@ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
uint FreeRegionList::_unrealistically_long_length = 0;
void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) {
@@ -1912,7 +1857,7 @@
name(), message, length(), total_capacity_bytes());
fill_in_ext_msg_extra(msg);
}
-@@ -84,13 +84,13 @@
+@@ -84,13 +84,13 @@ void HeapRegionSetBase::verify_end() {
void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) {
out->cr();
@@ -1928,7 +1873,7 @@
total_capacity_bytes());
}
-@@ -106,7 +106,7 @@
+@@ -106,7 +106,7 @@ void FreeRegionList::set_unrealistically_long_length(uint len) {
}
void FreeRegionList::fill_in_ext_msg_extra(hrs_ext_msg* msg) {
@@ -1937,7 +1882,7 @@
}
void FreeRegionList::remove_all() {
-@@ -277,8 +277,8 @@
+@@ -277,8 +277,8 @@ void FreeRegionList::clear() {
void FreeRegionList::print_on(outputStream* out, bool print_contents) {
HeapRegionSetBase::print_on(out, print_contents);
out->print_cr(" Linking");
@@ -1948,7 +1893,7 @@
if (print_contents) {
out->print_cr(" Contents");
-@@ -306,7 +306,7 @@
+@@ -306,7 +306,7 @@ void FreeRegionList::verify_list() {
count++;
guarantee(count < _unrealistically_long_length,
@@ -1957,9 +1902,37 @@
if (curr->next() != NULL) {
guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up");
---- hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp.orig 2015-09-02 13:07:15.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2015-09-02 13:10:48.000000000 +0200
-@@ -86,7 +86,7 @@
+diff --git hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
+index 114d39d..c877400 100644
+--- hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
++++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
+@@ -668,7 +668,7 @@ jlong PSMarkSweep::millis_since_last_gc() {
+ jlong ret_val = now - _time_of_last_gc;
+ // XXX See note in genCollectedHeap::millis_since_last_gc().
+ if (ret_val < 0) {
+- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
++ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);)
+ return 0;
+ }
+ return ret_val;
+diff --git hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+index 8175ded..dd02250 100644
+--- hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
++++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+@@ -3291,7 +3291,7 @@ jlong PSParallelCompact::millis_since_last_gc() {
+ jlong ret_val = now - _time_of_last_gc;
+ // XXX See note in genCollectedHeap::millis_since_last_gc().
+ if (ret_val < 0) {
+- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
++ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);)
+ return 0;
+ }
+ return ret_val;
+diff --git hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
+index 9a9ed05..39a370c 100644
+--- hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
++++ hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
+@@ -86,7 +86,7 @@ void MutableNUMASpace::ensure_parsability() {
while (words_left_to_fill > 0) {
size_t words_to_fill = MIN2(words_left_to_fill, CollectedHeap::filler_array_max_size());
assert(words_to_fill >= CollectedHeap::min_fill_size(),
@@ -1968,9 +1941,248 @@
words_to_fill, words_left_to_fill, CollectedHeap::filler_array_max_size()));
CollectedHeap::fill_with_object((HeapWord*)cur_top, words_to_fill);
if (!os::numa_has_static_binding()) {
---- hotspot/src/share/vm/prims/methodHandles.cpp.orig 2015-09-02 13:07:15.000000000 +0200
-+++ hotspot/src/share/vm/prims/methodHandles.cpp 2015-09-02 13:10:16.000000000 +0200
-@@ -1300,27 +1300,27 @@
+diff --git hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp
+index bddf14b..923c34e 100644
+--- hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp
++++ hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp
+@@ -98,10 +98,10 @@ void PLABStats::adjust_desired_plab_sz(uint no_of_gc_workers) {
+ if (_allocated == 0) {
+ assert(_unused == 0,
+ err_msg("Inconsistency in PLAB stats: "
+- "_allocated: "SIZE_FORMAT", "
+- "_wasted: "SIZE_FORMAT", "
+- "_unused: "SIZE_FORMAT", "
+- "_used : "SIZE_FORMAT,
++ "_allocated: " SIZE_FORMAT ", "
++ "_wasted: " SIZE_FORMAT ", "
++ "_unused: " SIZE_FORMAT ", "
++ "_used : " SIZE_FORMAT,
+ _allocated, _wasted, _unused, _used));
+
+ _allocated = 1;
+diff --git hotspot/src/share/vm/memory/cardTableModRefBS.hpp hotspot/src/share/vm/memory/cardTableModRefBS.hpp
+index c824e61..f08d7e2 100644
+--- hotspot/src/share/vm/memory/cardTableModRefBS.hpp
++++ hotspot/src/share/vm/memory/cardTableModRefBS.hpp
+@@ -158,8 +158,8 @@ class CardTableModRefBS: public ModRefBarrierSet {
+ // Mapping from address to card marking array entry
+ jbyte* byte_for(const void* p) const {
+ assert(_whole_heap.contains(p),
+- err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of "
+- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
++ err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of "
++ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
+ p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
+ jbyte* result = &byte_map_base[uintptr_t(p) >> card_shift];
+ assert(result >= _byte_map && result < _byte_map + _byte_map_size,
+@@ -436,8 +436,8 @@ public:
+ size_t delta = pointer_delta(p, byte_map_base, sizeof(jbyte));
+ HeapWord* result = (HeapWord*) (delta << card_shift);
+ assert(_whole_heap.contains(result),
+- err_msg("Returning result = "PTR_FORMAT" out of bounds of "
+- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
++ err_msg("Returning result = " PTR_FORMAT " out of bounds of "
++ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
+ p2i(result), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
+ return result;
+ }
+@@ -445,8 +445,8 @@ public:
+ // Mapping from address to card marking array index.
+ size_t index_for(void* p) {
+ assert(_whole_heap.contains(p),
+- err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of "
+- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
++ err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of "
++ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
+ p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
+ return byte_for(p) - _byte_map;
+ }
+diff --git hotspot/src/share/vm/memory/genCollectedHeap.cpp hotspot/src/share/vm/memory/genCollectedHeap.cpp
+index f7c9591..f1852e6 100644
+--- hotspot/src/share/vm/memory/genCollectedHeap.cpp
++++ hotspot/src/share/vm/memory/genCollectedHeap.cpp
+@@ -1403,7 +1403,7 @@ jlong GenCollectedHeap::millis_since_last_gc() {
+ // back a time later than 'now'.
+ jlong retVal = now - tolgc_cl.time();
+ if (retVal < 0) {
+- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, (int64_t) retVal);)
++ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, (int64_t) retVal);)
+ return 0;
+ }
+ return retVal;
+diff --git hotspot/src/share/vm/memory/generation.cpp hotspot/src/share/vm/memory/generation.cpp
+index d52f325..3c45a91 100644
+--- hotspot/src/share/vm/memory/generation.cpp
++++ hotspot/src/share/vm/memory/generation.cpp
+@@ -187,7 +187,7 @@ bool Generation::promotion_attempt_is_safe(size_t max_promotion_in_bytes) const
+ bool res = (available >= max_promotion_in_bytes);
+ if (PrintGC && Verbose) {
+ gclog_or_tty->print_cr(
+- "Generation: promo attempt is%s safe: available("SIZE_FORMAT") %s max_promo("SIZE_FORMAT")",
++ "Generation: promo attempt is%s safe: available(" SIZE_FORMAT ") %s max_promo(" SIZE_FORMAT ")",
+ res? "":" not", available, res? ">=":"<",
+ max_promotion_in_bytes);
+ }
+diff --git hotspot/src/share/vm/memory/generation.hpp hotspot/src/share/vm/memory/generation.hpp
+index 63dccb7..c23295a 100644
+--- hotspot/src/share/vm/memory/generation.hpp
++++ hotspot/src/share/vm/memory/generation.hpp
+@@ -422,7 +422,7 @@ class Generation: public CHeapObj<mtGC> {
+ // have to guard against non-monotonicity.
+ NOT_PRODUCT(
+ if (now < _time_of_last_gc) {
+- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now);
++ warning("time warp: " INT64_FORMAT " to " INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now);
+ }
+ )
+ return _time_of_last_gc;
+diff --git hotspot/src/share/vm/memory/referenceProcessor.cpp hotspot/src/share/vm/memory/referenceProcessor.cpp
+index 3c776f4..d851886 100644
+--- hotspot/src/share/vm/memory/referenceProcessor.cpp
++++ hotspot/src/share/vm/memory/referenceProcessor.cpp
+@@ -161,7 +161,7 @@ void ReferenceProcessor::update_soft_ref_master_clock() {
+
+ NOT_PRODUCT(
+ if (now < _soft_ref_timestamp_clock) {
+- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT,
++ warning("time warp: " INT64_FORMAT " to " INT64_FORMAT,
+ _soft_ref_timestamp_clock, now);
+ }
+ )
+diff --git hotspot/src/share/vm/memory/tenuredGeneration.cpp hotspot/src/share/vm/memory/tenuredGeneration.cpp
+index d7432ba..cdc51ee 100644
+--- hotspot/src/share/vm/memory/tenuredGeneration.cpp
++++ hotspot/src/share/vm/memory/tenuredGeneration.cpp
+@@ -294,8 +294,8 @@ bool TenuredGeneration::promotion_attempt_is_safe(size_t max_promotion_in_bytes)
+ bool res = (available >= av_promo) || (available >= max_promotion_in_bytes);
+ if (PrintGC && Verbose) {
+ gclog_or_tty->print_cr(
+- "Tenured: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT"),"
+- "max_promo("SIZE_FORMAT")",
++ "Tenured: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT "),"
++ "max_promo(" SIZE_FORMAT ")",
+ res? "":" not", available, res? ">=":"<",
+ av_promo, max_promotion_in_bytes);
+ }
+diff --git hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp
+index cf3fefb..b19bd93 100644
+--- hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp
++++ hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp
+@@ -94,10 +94,10 @@ void ThreadLocalAllocBuffer::record_slow_allocation(size_t obj_size) {
+
+ if (PrintTLAB && Verbose) {
+ Thread* thrd = myThread();
+- gclog_or_tty->print("TLAB: %s thread: "INTPTR_FORMAT" [id: %2d]"
+- " obj: "SIZE_FORMAT
+- " free: "SIZE_FORMAT
+- " waste: "SIZE_FORMAT"\n",
++ gclog_or_tty->print("TLAB: %s thread: " INTPTR_FORMAT " [id: %2d]"
++ " obj: " SIZE_FORMAT
++ " free: " SIZE_FORMAT
++ " waste: " SIZE_FORMAT "\n",
+ "slow", p2i(thrd), thrd->osthread()->thread_id(),
+ obj_size, free(), refill_waste_limit());
+ }
+diff --git hotspot/src/share/vm/memory/universe.cpp hotspot/src/share/vm/memory/universe.cpp
+index 2e1e90f..bfbe2ec 100644
+--- hotspot/src/share/vm/memory/universe.cpp
++++ hotspot/src/share/vm/memory/universe.cpp
+@@ -926,7 +926,7 @@ void Universe::print_compressed_oops_mode() {
+ // Reserve the Java heap, which is now the same for all GCs.
+ ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
+ assert(alignment <= Arguments::conservative_max_heap_alignment(),
+- err_msg("actual alignment "SIZE_FORMAT" must be within maximum heap alignment "SIZE_FORMAT,
++ err_msg("actual alignment " SIZE_FORMAT " must be within maximum heap alignment " SIZE_FORMAT,
+ alignment, Arguments::conservative_max_heap_alignment()));
+ size_t total_reserved = align_size_up(heap_size, alignment);
+ assert(!UseCompressedOops || (total_reserved <= (OopEncodingHeapMax - os::vm_page_size())),
+diff --git hotspot/src/share/vm/oops/constantPool.cpp hotspot/src/share/vm/oops/constantPool.cpp
+index a9685b2..b76435f 100644
+--- hotspot/src/share/vm/oops/constantPool.cpp
++++ hotspot/src/share/vm/oops/constantPool.cpp
+@@ -1494,7 +1494,7 @@ static void print_cpool_bytes(jint cnt, u1 *bytes) {
+ }
+ case JVM_CONSTANT_Long: {
+ u8 val = Bytes::get_Java_u8(bytes);
+- printf("long "INT64_FORMAT, (int64_t) *(jlong *) &val);
++ printf("long " INT64_FORMAT, (int64_t) *(jlong *) &val);
+ ent_size = 8;
+ idx++; // Long takes two cpool slots
+ break;
+diff --git hotspot/src/share/vm/oops/cpCache.cpp hotspot/src/share/vm/oops/cpCache.cpp
+index d0c7750..e0f396d 100644
+--- hotspot/src/share/vm/oops/cpCache.cpp
++++ hotspot/src/share/vm/oops/cpCache.cpp
+@@ -305,7 +305,7 @@ void ConstantPoolCacheEntry::set_method_handle_common(constantPoolHandle cpool,
+ adapter->size_of_parameters());
+
+ if (TraceInvokeDynamic) {
+- tty->print_cr("set_method_handle bc=%d appendix="PTR_FORMAT"%s method_type="PTR_FORMAT"%s method="PTR_FORMAT" ",
++ tty->print_cr("set_method_handle bc=%d appendix=" PTR_FORMAT "%s method_type=" PTR_FORMAT "%s method=" PTR_FORMAT " ",
+ invoke_code,
+ (void *)appendix(), (has_appendix ? "" : " (unused)"),
+ (void *)method_type(), (has_method_type ? "" : " (unused)"),
+@@ -536,12 +536,12 @@ void ConstantPoolCacheEntry::print(outputStream* st, int index) const {
+ // print separator
+ if (index == 0) st->print_cr(" -------------");
+ // print entry
+- st->print("%3d ("PTR_FORMAT") ", index, (intptr_t)this);
++ st->print("%3d (" PTR_FORMAT ") ", index, (intptr_t)this);
+ st->print_cr("[%02x|%02x|%5d]", bytecode_2(), bytecode_1(),
+ constant_pool_index());
+- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f1);
+- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f2);
+- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_flags);
++ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f1);
++ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f2);
++ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_flags);
+ st->print_cr(" -------------");
+ }
+
+diff --git hotspot/src/share/vm/oops/markOop.cpp hotspot/src/share/vm/oops/markOop.cpp
+index 1cc8a19..9bca601 100644
+--- hotspot/src/share/vm/oops/markOop.cpp
++++ hotspot/src/share/vm/oops/markOop.cpp
+@@ -49,7 +49,7 @@ void markOopDesc::print_on(outputStream* st) const {
+ st->print("monitor=NULL");
+ else {
+ BasicLock * bl = (BasicLock *) mon->owner();
+- st->print("monitor={count="INTPTR_FORMAT",waiters="INTPTR_FORMAT",recursions="INTPTR_FORMAT",owner="INTPTR_FORMAT"}",
++ st->print("monitor={count=" INTPTR_FORMAT ",waiters=" INTPTR_FORMAT ",recursions=" INTPTR_FORMAT ",owner=" INTPTR_FORMAT "}",
+ mon->count(), mon->waiters(), mon->recursions(), p2i(bl));
+ }
+ } else {
+diff --git hotspot/src/share/vm/oops/objArrayKlass.cpp hotspot/src/share/vm/oops/objArrayKlass.cpp
+index a4c51d0..4f637f4 100644
+--- hotspot/src/share/vm/oops/objArrayKlass.cpp
++++ hotspot/src/share/vm/oops/objArrayKlass.cpp
+@@ -657,7 +657,7 @@ void ObjArrayKlass::oop_print_value_on(oop obj, outputStream* st) {
+ if (i > max_objArray_print_length) {
+ st->print("..."); break;
+ }
+- st->print(" "INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i));
++ st->print(" " INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i));
+ }
+ st->print(" }");
+ }
+diff --git hotspot/src/share/vm/oops/oop.cpp hotspot/src/share/vm/oops/oop.cpp
+index 1be5781..3df79d4 100644
+--- hotspot/src/share/vm/oops/oop.cpp
++++ hotspot/src/share/vm/oops/oop.cpp
+@@ -46,7 +46,7 @@ void oopDesc::print_on(outputStream* st) const {
+
+ void oopDesc::print_address_on(outputStream* st) const {
+ if (PrintOopAddress) {
+- st->print("{"INTPTR_FORMAT"}", this);
++ st->print("{" INTPTR_FORMAT "}", this);
+ }
+ }
+
+diff --git hotspot/src/share/vm/prims/methodHandles.cpp hotspot/src/share/vm/prims/methodHandles.cpp
+index 62aece7..0a2f76e 100644
+--- hotspot/src/share/vm/prims/methodHandles.cpp
++++ hotspot/src/share/vm/prims/methodHandles.cpp
+@@ -1321,27 +1321,27 @@ JVM_END
// These are the native methods on java.lang.invoke.MethodHandleNatives.
static JNINativeMethod MHN_methods[] = {
@@ -1993,136 +2205,30 @@
- {CC"setCallSiteTargetVolatile", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetVolatile)},
- {CC"staticFieldOffset", CC"("MEM")J", FN_PTR(MHN_staticFieldOffset)},
- {CC"staticFieldBase", CC"("MEM")"OBJ, FN_PTR(MHN_staticFieldBase)},
-- {CC"getMemberVMInfo", CC"("MEM")"OBJ, FN_PTR(MHN_getMemberVMInfo)}
-+ {CC "getMembers", CC "(" CLS "" STRG "" STRG "I" CLS "I[" MEM ")I", FN_PTR(MHN_getMembers)},
-+ {CC "objectFieldOffset", CC "(" MEM ")J", FN_PTR(MHN_objectFieldOffset)},
-+ {CC "setCallSiteTargetNormal", CC "(" CS "" MH ")V", FN_PTR(MHN_setCallSiteTargetNormal)},
-+ {CC "setCallSiteTargetVolatile", CC "(" CS "" MH ")V", FN_PTR(MHN_setCallSiteTargetVolatile)},
-+ {CC "staticFieldOffset", CC "(" MEM ")J", FN_PTR(MHN_staticFieldOffset)},
-+ {CC "staticFieldBase", CC "(" MEM ")" OBJ, FN_PTR(MHN_staticFieldBase)},
-+ {CC "getMemberVMInfo", CC "(" MEM ")" OBJ, FN_PTR(MHN_getMemberVMInfo)}
- };
-
- static JNINativeMethod MH_methods[] = {
- // UnsupportedOperationException throwers
-- {CC"invoke", CC"(["OBJ")"OBJ, FN_PTR(MH_invoke_UOE)},
-- {CC"invokeExact", CC"(["OBJ")"OBJ, FN_PTR(MH_invokeExact_UOE)}
-+ {CC"invoke", CC "([" OBJ ")" OBJ, FN_PTR(MH_invoke_UOE)},
-+ {CC"invokeExact", CC "([" OBJ ")" OBJ, FN_PTR(MH_invokeExact_UOE)}
- };
-
- /**
---- hotspot/src/share/vm/oops/objArrayKlass.cpp.orig 2015-09-02 13:19:26.000000000 +0200
-+++ hotspot/src/share/vm/oops/objArrayKlass.cpp 2015-09-02 13:22:11.000000000 +0200
-@@ -657,7 +657,7 @@
- if (i > max_objArray_print_length) {
- st->print("..."); break;
- }
-- st->print(" "INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i));
-+ st->print(" " INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i));
- }
- st->print(" }");
- }
---- hotspot/src/share/vm/oops/oop.cpp.orig 2015-09-02 13:19:26.000000000 +0200
-+++ hotspot/src/share/vm/oops/oop.cpp 2015-09-02 13:22:22.000000000 +0200
-@@ -46,7 +46,7 @@
-
- void oopDesc::print_address_on(outputStream* st) const {
- if (PrintOopAddress) {
-- st->print("{"INTPTR_FORMAT"}", this);
-+ st->print("{" INTPTR_FORMAT "}", this);
- }
- }
-
---- hotspot/src/os/posix/vm/os_posix.cpp.orig 2015-09-02 13:32:01.000000000 +0200
-+++ hotspot/src/os/posix/vm/os_posix.cpp 2015-09-02 13:33:42.000000000 +0200
-@@ -594,7 +594,7 @@
- strncpy(buffer, "none", size);
-
- const struct {
-- int i;
-+ unsigned i;
- const char* s;
- } flaginfo [] = {
- { SA_NOCLDSTOP, "SA_NOCLDSTOP" },
---- hotspot/src/share/vm/code/nmethod.cpp.orig 2015-09-02 13:19:26.000000000 +0200
-+++ hotspot/src/share/vm/code/nmethod.cpp 2015-09-02 13:27:23.000000000 +0200
-@@ -2303,7 +2303,7 @@
- void maybe_print(oop* p) {
- if (_print_nm == NULL) return;
- if (!_detected_scavenge_root) _print_nm->print_on(tty, "new scavenge root");
-- tty->print_cr(""PTR_FORMAT"[offset=%d] detected scavengable oop "PTR_FORMAT" (found at "PTR_FORMAT")",
-+ tty->print_cr("" PTR_FORMAT "[offset=%d] detected scavengable oop " PTR_FORMAT " (found at " PTR_FORMAT ")",
- _print_nm, (int)((intptr_t)p - (intptr_t)_print_nm),
- (void *)(*p), (intptr_t)p);
- (*p)->print();
-@@ -2684,7 +2684,7 @@
- _nm->print_nmethod(true);
- _ok = false;
- }
-- tty->print_cr("*** non-oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)",
-+ tty->print_cr("*** non-oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)",
- (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
- }
- virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
-@@ -2808,7 +2808,7 @@
- _nm->print_nmethod(true);
- _ok = false;
- }
-- tty->print_cr("*** scavengable oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)",
-+ tty->print_cr("*** scavengable oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)",
- (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
- (*p)->print();
- }
-@@ -2853,7 +2853,7 @@
- print_on(tty, NULL);
+- {CC"getMemberVMInfo", CC"("MEM")"OBJ, FN_PTR(MHN_getMemberVMInfo)}
++ {CC "getMembers", CC "(" CLS "" STRG "" STRG "I" CLS "I[" MEM ")I", FN_PTR(MHN_getMembers)},
++ {CC "objectFieldOffset", CC "(" MEM ")J", FN_PTR(MHN_objectFieldOffset)},
++ {CC "setCallSiteTargetNormal", CC "(" CS "" MH ")V", FN_PTR(MHN_setCallSiteTargetNormal)},
++ {CC "setCallSiteTargetVolatile", CC "(" CS "" MH ")V", FN_PTR(MHN_setCallSiteTargetVolatile)},
++ {CC "staticFieldOffset", CC "(" MEM ")J", FN_PTR(MHN_staticFieldOffset)},
++ {CC "staticFieldBase", CC "(" MEM ")" OBJ, FN_PTR(MHN_staticFieldBase)},
++ {CC "getMemberVMInfo", CC "(" MEM ")" OBJ, FN_PTR(MHN_getMemberVMInfo)}
+ };
- if (WizardMode) {
-- tty->print("((nmethod*) "INTPTR_FORMAT ") ", this);
-+ tty->print("((nmethod*) " INTPTR_FORMAT ") ", this);
- tty->print(" for method " INTPTR_FORMAT , (address)method());
- tty->print(" { ");
- if (is_in_use()) tty->print("in_use ");
---- hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp.orig 2015-09-02 13:28:16.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp 2015-09-02 13:31:09.000000000 +0200
-@@ -98,10 +98,10 @@
- if (_allocated == 0) {
- assert(_unused == 0,
- err_msg("Inconsistency in PLAB stats: "
-- "_allocated: "SIZE_FORMAT", "
-- "_wasted: "SIZE_FORMAT", "
-- "_unused: "SIZE_FORMAT", "
-- "_used : "SIZE_FORMAT,
-+ "_allocated: " SIZE_FORMAT ", "
-+ "_wasted: " SIZE_FORMAT ", "
-+ "_unused: " SIZE_FORMAT ", "
-+ "_used : " SIZE_FORMAT,
- _allocated, _wasted, _unused, _used));
+ static JNINativeMethod MH_methods[] = {
+ // UnsupportedOperationException throwers
+- {CC"invoke", CC"(["OBJ")"OBJ, FN_PTR(MH_invoke_UOE)},
+- {CC"invokeExact", CC"(["OBJ")"OBJ, FN_PTR(MH_invokeExact_UOE)}
++ {CC"invoke", CC "([" OBJ ")" OBJ, FN_PTR(MH_invoke_UOE)},
++ {CC"invokeExact", CC "([" OBJ ")" OBJ, FN_PTR(MH_invokeExact_UOE)}
+ };
- _allocated = 1;
---- hotspot/src/share/vm/utilities/ostream.cpp.orig 2015-09-02 13:28:16.000000000 +0200
-+++ hotspot/src/share/vm/utilities/ostream.cpp 2015-09-02 13:34:57.000000000 +0200
-@@ -277,7 +277,7 @@
- size_t limit = (len + 16) / 16 * 16;
- for (size_t i = 0; i < limit; ++i) {
- if (i % 16 == 0) {
-- indent().print(SIZE_FORMAT_HEX_W(07)":", i);
-+ indent().print(SIZE_FORMAT_HEX_W(07) ":", i);
- }
- if (i % 2 == 0) {
- print(" ");
-@@ -945,7 +945,7 @@
- // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if
- // we ever get round to introduce that method on the os class
- xs->head("hotspot_log version='%d %d'"
-- " process='%d' time_ms='"INT64_FORMAT"'",
-+ " process='%d' time_ms='" INT64_FORMAT "'",
- LOG_MAJOR_VERSION, LOG_MINOR_VERSION,
- os::current_process_id(), (int64_t)time_ms);
- // Write VM version header immediately.
---- hotspot/src/share/vm/prims/perf.cpp.orig 2015-09-02 13:36:01.000000000 +0200
-+++ hotspot/src/share/vm/prims/perf.cpp 2015-09-02 13:37:33.000000000 +0200
-@@ -290,17 +290,17 @@
+ /**
+diff --git hotspot/src/share/vm/prims/perf.cpp hotspot/src/share/vm/prims/perf.cpp
+index 9ad0f4c..342cb2f 100644
+--- hotspot/src/share/vm/prims/perf.cpp
++++ hotspot/src/share/vm/prims/perf.cpp
+@@ -290,17 +290,17 @@ PERF_END
#define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
#define BB "Ljava/nio/ByteBuffer;"
#define JLS "Ljava/lang/String;"
@@ -2148,105 +2254,11 @@
};
#undef CBA_ARGS
---- hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp.orig 2015-09-02 13:39:42.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2015-09-02 13:40:05.000000000 +0200
-@@ -669,7 +669,7 @@
- jlong ret_val = now - _time_of_last_gc;
- // XXX See note in genCollectedHeap::millis_since_last_gc().
- if (ret_val < 0) {
-- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
-+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);)
- return 0;
- }
- return ret_val;
---- hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.orig 2015-09-02 13:39:42.000000000 +0200
-+++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-09-02 13:40:50.000000000 +0200
-@@ -3292,7 +3292,7 @@
- jlong ret_val = now - _time_of_last_gc;
- // XXX See note in genCollectedHeap::millis_since_last_gc().
- if (ret_val < 0) {
-- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
-+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);)
- return 0;
- }
- return ret_val;
---- hotspot/src/share/vm/memory/referenceProcessor.cpp.orig 2015-09-02 13:42:24.000000000 +0200
-+++ hotspot/src/share/vm/memory/referenceProcessor.cpp 2015-09-02 13:42:55.000000000 +0200
-@@ -161,7 +161,7 @@
-
- NOT_PRODUCT(
- if (now < _soft_ref_timestamp_clock) {
-- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT,
-+ warning("time warp: " INT64_FORMAT " to " INT64_FORMAT,
- _soft_ref_timestamp_clock, now);
- }
- )
---- hotspot/src/share/vm/runtime/safepoint.cpp.orig 2015-09-02 14:51:21.000000000 +0200
-+++ hotspot/src/share/vm/runtime/safepoint.cpp 2015-09-02 14:52:56.000000000 +0200
-@@ -983,7 +983,7 @@
-
- case _running:
- default:
-- tty->print_cr("restart thread "INTPTR_FORMAT" with state %d",
-+ tty->print_cr("restart thread " INTPTR_FORMAT " with state %d",
- _thread, _type);
- _thread->print();
- ShouldNotReachHere();
-@@ -1340,14 +1340,14 @@
-
- for (int index = 0; index < VM_Operation::VMOp_Terminating; index++) {
- if (_safepoint_reasons[index] != 0) {
-- tty->print_cr("%-26s"UINT64_FORMAT_W(10), VM_Operation::name(index),
-+ tty->print_cr("%-26s" UINT64_FORMAT_W(10), VM_Operation::name(index),
- _safepoint_reasons[index]);
- }
- }
-
- tty->print_cr(UINT64_FORMAT_W(5)" VM operations coalesced during safepoint",
- _coalesced_vmop_count);
-- tty->print_cr("Maximum sync time "INT64_FORMAT_W(5)" ms",
-+ tty->print_cr("Maximum sync time " INT64_FORMAT_W(5) " ms",
- _max_sync_time / MICROUNITS);
- tty->print_cr("Maximum vm operation time (except for Exit VM operation) "
- INT64_FORMAT_W(5)" ms",
---- hotspot/src/share/vm/memory/tenuredGeneration.cpp.orig 2015-09-02 18:11:24.000000000 +0200
-+++ hotspot/src/share/vm/memory/tenuredGeneration.cpp 2015-09-02 18:11:32.000000000 +0200
-@@ -292,8 +292,8 @@
- bool res = (available >= av_promo) || (available >= max_promotion_in_bytes);
- if (PrintGC && Verbose) {
- gclog_or_tty->print_cr(
-- "Tenured: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT"),"
-- "max_promo("SIZE_FORMAT")",
-+ "Tenured: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT "),"
-+ "max_promo(" SIZE_FORMAT ")",
- res? "":" not", available, res? ">=":"<",
- av_promo, max_promotion_in_bytes);
- }
---- hotspot/src/share/vm/services/threadService.cpp.orig 2015-09-02 18:11:24.000000000 +0200
-+++ hotspot/src/share/vm/services/threadService.cpp 2015-09-02 18:11:32.000000000 +0200
-@@ -889,7 +889,7 @@
- st->print(" waiting to lock monitor " INTPTR_FORMAT, waitingToLockMonitor);
- oop obj = (oop)waitingToLockMonitor->object();
- if (obj != NULL) {
-- st->print(" (object "INTPTR_FORMAT ", a %s)", (address)obj,
-+ st->print(" (object " INTPTR_FORMAT ", a %s)", (address)obj,
- (InstanceKlass::cast(obj->klass()))->external_name());
-
- if (!currentThread->current_pending_monitor_is_from_java()) {
---- hotspot/src/share/vm/memory/universe.cpp.orig 2015-09-02 18:25:28.000000000 +0200
-+++ hotspot/src/share/vm/memory/universe.cpp 2015-09-02 18:26:04.000000000 +0200
-@@ -919,7 +919,7 @@
- // Reserve the Java heap, which is now the same for all GCs.
- ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
- assert(alignment <= Arguments::conservative_max_heap_alignment(),
-- err_msg("actual alignment "SIZE_FORMAT" must be within maximum heap alignment "SIZE_FORMAT,
-+ err_msg("actual alignment " SIZE_FORMAT " must be within maximum heap alignment " SIZE_FORMAT,
- alignment, Arguments::conservative_max_heap_alignment()));
- size_t total_reserved = align_size_up(heap_size, alignment);
- assert(!UseCompressedOops || (total_reserved <= (OopEncodingHeapMax - os::vm_page_size())),
---- hotspot/src/share/vm/prims/unsafe.cpp.orig 2015-09-02 18:25:32.000000000 +0200
-+++ hotspot/src/share/vm/prims/unsafe.cpp 2015-09-02 18:47:09.000000000 +0200
-@@ -977,7 +977,7 @@
+diff --git hotspot/src/share/vm/prims/unsafe.cpp hotspot/src/share/vm/prims/unsafe.cpp
+index 0846b20..5e61217 100644
+--- hotspot/src/share/vm/prims/unsafe.cpp
++++ hotspot/src/share/vm/prims/unsafe.cpp
+@@ -1009,7 +1009,7 @@ UNSAFE_ENTRY(jclass, Unsafe_DefineClass0(JNIEnv *env, jobject unsafe, jstring na
UNSAFE_END
@@ -2255,7 +2267,7 @@
// define a class but do not make it known to the class loader or system dictionary
// - host_class: supplies context for linkage, access control, protection domain, and class loader
// - data: bytes of a class file, a raw memory address (length gives the number of bytes)
-@@ -1337,47 +1337,47 @@
+@@ -1374,47 +1374,47 @@ UNSAFE_END
#define LANG "Ljava/lang/"
@@ -2323,7 +2335,7 @@
DECLARE_GETSETOOP_140(Boolean, Z),
DECLARE_GETSETOOP_140(Byte, B),
-@@ -1396,33 +1396,33 @@
+@@ -1433,33 +1433,33 @@ static JNINativeMethod methods_140[] = {
DECLARE_GETSETNATIVE(Float, F),
DECLARE_GETSETNATIVE(Double, D),
@@ -2335,16 +2347,15 @@
- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
--
++ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
++ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
++ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
+
- {CC"fieldOffset", CC"("FLD")I", FN_PTR(Unsafe_FieldOffset)},
- {CC"staticFieldBase", CC"("CLS")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)},
- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
-+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
-+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
-+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
-+
+ {CC"fieldOffset", CC"(" FLD ")I", FN_PTR(Unsafe_FieldOffset)},
+ {CC"staticFieldBase", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)},
+ {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)},
@@ -2376,7 +2387,7 @@
DECLARE_GETSETOOP_141(Boolean, Z),
DECLARE_GETSETOOP_141(Byte, B),
-@@ -1441,37 +1441,37 @@
+@@ -1478,37 +1478,37 @@ static JNINativeMethod methods_141[] = {
DECLARE_GETSETNATIVE(Float, F),
DECLARE_GETSETNATIVE(Double, D),
@@ -2388,17 +2399,16 @@
- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
--
++ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
++ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
++ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
+
- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
-+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
-+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
-+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
-+
+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
@@ -2436,7 +2446,7 @@
DECLARE_GETSETOOP(Boolean, Z),
-@@ -1491,42 +1491,42 @@
+@@ -1528,42 +1528,42 @@ static JNINativeMethod methods_15[] = {
DECLARE_GETSETNATIVE(Float, F),
DECLARE_GETSETNATIVE(Double, D),
@@ -2448,17 +2458,16 @@
- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
--
++ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
++ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
++ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
+
- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
-+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
-+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
-+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
-+
+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
@@ -2505,7 +2514,7 @@
DECLARE_GETSETOOP(Boolean, Z),
DECLARE_GETSETOOP(Byte, B),
-@@ -1545,45 +1545,45 @@
+@@ -1582,45 +1582,45 @@ static JNINativeMethod methods_16[] = {
DECLARE_GETSETNATIVE(Float, F),
DECLARE_GETSETNATIVE(Double, D),
@@ -2517,17 +2526,16 @@
- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
--
++ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
++ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
++ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
+
- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
-+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
-+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
-+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
-+
+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
@@ -2581,7 +2589,7 @@
DECLARE_GETSETOOP(Boolean, Z),
DECLARE_GETSETOOP(Byte, B),
-@@ -1602,36 +1602,36 @@
+@@ -1639,36 +1639,36 @@ static JNINativeMethod methods_18[] = {
DECLARE_GETSETNATIVE(Float, F),
DECLARE_GETSETNATIVE(Double, D),
@@ -2593,17 +2601,16 @@
- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
--
++ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
++ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
++ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
+
- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
-+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
-+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
-+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
-+
+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
@@ -2643,7 +2650,7 @@
};
JNINativeMethod loadavg_method[] = {
-@@ -1639,28 +1639,28 @@
+@@ -1676,28 +1676,28 @@ JNINativeMethod loadavg_method[] = {
};
JNINativeMethod prefetch_methods[] = {
@@ -2682,9 +2689,11 @@
};
JNINativeMethod fence_methods[] = {
---- hotspot/src/share/vm/prims/whitebox.cpp.orig 2015-09-02 18:55:43.000000000 +0200
-+++ hotspot/src/share/vm/prims/whitebox.cpp 2015-09-02 18:58:04.000000000 +0200
-@@ -157,8 +157,8 @@
+diff --git hotspot/src/share/vm/prims/whitebox.cpp hotspot/src/share/vm/prims/whitebox.cpp
+index c3e0688..fdf8649 100644
+--- hotspot/src/share/vm/prims/whitebox.cpp
++++ hotspot/src/share/vm/prims/whitebox.cpp
+@@ -166,8 +166,8 @@ WB_END
WB_ENTRY(void, WB_PrintHeapSizes(JNIEnv* env, jobject o)) {
CollectorPolicy * p = Universe::heap()->collector_policy();
@@ -2695,7 +2704,7 @@
p->min_heap_byte_size(), p->initial_heap_byte_size(), p->max_heap_byte_size(),
p->space_alignment(), p->heap_alignment());
}
-@@ -193,8 +193,8 @@
+@@ -202,8 +202,8 @@ WB_ENTRY(void, WB_ReadFromNoaccessArea(JNIEnv* env, jobject o))
Universe::narrow_oop_use_implicit_null_checks() )) {
tty->print_cr("WB_ReadFromNoaccessArea method is useless:\n "
"\tUseCompressedOops is %d\n"
@@ -2706,7 +2715,7 @@
"\tUniverse::narrow_oop_use_implicit_null_checks() is %d",
UseCompressedOops,
rhs.base(),
-@@ -247,8 +247,8 @@
+@@ -256,8 +256,8 @@ static jint wb_stress_virtual_space_resize(size_t reserved_space_size,
WB_ENTRY(jint, WB_StressVirtualSpaceResize(JNIEnv* env, jobject o,
jlong reserved_space_size, jlong magnitude, jlong iterations))
@@ -2717,14 +2726,114 @@
iterations);
if (reserved_space_size < 0 || magnitude < 0 || iterations < 0) {
tty->print_cr("One of variables printed above is negative. Can't proceed.\n");
---- hotspot/src/share/vm/oops/markOop.cpp.orig 2015-09-10 13:28:34.918039653 +0200
-+++ hotspot/src/share/vm/oops/markOop.cpp 2015-09-10 13:29:26.890039849 +0200
-@@ -49,7 +49,7 @@
- st->print("monitor=NULL");
- else {
- BasicLock * bl = (BasicLock *) mon->owner();
-- st->print("monitor={count="INTPTR_FORMAT",waiters="INTPTR_FORMAT",recursions="INTPTR_FORMAT",owner="INTPTR_FORMAT"}",
-+ st->print("monitor={count=" INTPTR_FORMAT ",waiters=" INTPTR_FORMAT ",recursions=" INTPTR_FORMAT ",owner=" INTPTR_FORMAT "}",
- mon->count(), mon->waiters(), mon->recursions(), p2i(bl));
- }
- } else {
+diff --git hotspot/src/share/vm/runtime/safepoint.cpp hotspot/src/share/vm/runtime/safepoint.cpp
+index 2f46a84..bbf0339 100644
+--- hotspot/src/share/vm/runtime/safepoint.cpp
++++ hotspot/src/share/vm/runtime/safepoint.cpp
+@@ -914,7 +914,7 @@ void ThreadSafepointState::restart() {
+
+ case _running:
+ default:
+- tty->print_cr("restart thread "INTPTR_FORMAT" with state %d",
++ tty->print_cr("restart thread " INTPTR_FORMAT " with state %d",
+ _thread, _type);
+ _thread->print();
+ ShouldNotReachHere();
+@@ -1271,14 +1271,14 @@ void SafepointSynchronize::print_stat_on_exit() {
+
+ for (int index = 0; index < VM_Operation::VMOp_Terminating; index++) {
+ if (_safepoint_reasons[index] != 0) {
+- tty->print_cr("%-26s"UINT64_FORMAT_W(10), VM_Operation::name(index),
++ tty->print_cr("%-26s" UINT64_FORMAT_W(10), VM_Operation::name(index),
+ _safepoint_reasons[index]);
+ }
+ }
+
+ tty->print_cr(UINT64_FORMAT_W(5)" VM operations coalesced during safepoint",
+ _coalesced_vmop_count);
+- tty->print_cr("Maximum sync time "INT64_FORMAT_W(5)" ms",
++ tty->print_cr("Maximum sync time " INT64_FORMAT_W(5) " ms",
+ _max_sync_time / MICROUNITS);
+ tty->print_cr("Maximum vm operation time (except for Exit VM operation) "
+ INT64_FORMAT_W(5)" ms",
+diff --git hotspot/src/share/vm/services/threadService.cpp hotspot/src/share/vm/services/threadService.cpp
+index 02156a2..be5acfd 100644
+--- hotspot/src/share/vm/services/threadService.cpp
++++ hotspot/src/share/vm/services/threadService.cpp
+@@ -889,7 +889,7 @@ void DeadlockCycle::print_on(outputStream* st) const {
+ st->print(" waiting to lock monitor " INTPTR_FORMAT, waitingToLockMonitor);
+ oop obj = (oop)waitingToLockMonitor->object();
+ if (obj != NULL) {
+- st->print(" (object "INTPTR_FORMAT ", a %s)", (address)obj,
++ st->print(" (object " INTPTR_FORMAT ", a %s)", (address)obj,
+ (InstanceKlass::cast(obj->klass()))->external_name());
+
+ if (!currentThread->current_pending_monitor_is_from_java()) {
+diff --git hotspot/src/share/vm/trace/traceStream.hpp hotspot/src/share/vm/trace/traceStream.hpp
+index 89911ea..e2c982a 100644
+--- hotspot/src/share/vm/trace/traceStream.hpp
++++ hotspot/src/share/vm/trace/traceStream.hpp
+@@ -40,31 +40,31 @@ class TraceStream : public StackObj {
+ TraceStream(outputStream& stream): _st(stream) {}
+
+ void print_val(const char* label, u1 val) {
+- _st.print("%s = "UINT32_FORMAT, label, val);
++ _st.print("%s = " UINT32_FORMAT, label, val);
+ }
+
+ void print_val(const char* label, u2 val) {
+- _st.print("%s = "UINT32_FORMAT, label, val);
++ _st.print("%s = " UINT32_FORMAT, label, val);
+ }
+
+ void print_val(const char* label, s2 val) {
+- _st.print("%s = "INT32_FORMAT, label, val);
++ _st.print("%s = " INT32_FORMAT, label, val);
+ }
+
+ void print_val(const char* label, u4 val) {
+- _st.print("%s = "UINT32_FORMAT, label, val);
++ _st.print("%s = " UINT32_FORMAT, label, val);
+ }
+
+ void print_val(const char* label, s4 val) {
+- _st.print("%s = "INT32_FORMAT, label, val);
++ _st.print("%s = " INT32_FORMAT, label, val);
+ }
+
+ void print_val(const char* label, u8 val) {
+- _st.print("%s = "UINT64_FORMAT, label, val);
++ _st.print("%s = " UINT64_FORMAT, label, val);
+ }
+
+ void print_val(const char* label, s8 val) {
+- _st.print("%s = "INT64_FORMAT, label, (int64_t) val);
++ _st.print("%s = " INT64_FORMAT, label, (int64_t) val);
+ }
+
+ void print_val(const char* label, bool val) {
+diff --git hotspot/src/share/vm/utilities/ostream.cpp hotspot/src/share/vm/utilities/ostream.cpp
+index 21bdd69..44ce683 100644
+--- hotspot/src/share/vm/utilities/ostream.cpp
++++ hotspot/src/share/vm/utilities/ostream.cpp
+@@ -277,7 +277,7 @@ void outputStream::print_data(void* data, size_t len, bool with_ascii) {
+ size_t limit = (len + 16) / 16 * 16;
+ for (size_t i = 0; i < limit; ++i) {
+ if (i % 16 == 0) {
+- indent().print(SIZE_FORMAT_HEX_W(07)":", i);
++ indent().print(SIZE_FORMAT_HEX_W(07) ":", i);
+ }
+ if (i % 2 == 0) {
+ print(" ");
+@@ -945,7 +945,7 @@ void defaultStream::start_log() {
+ // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if
+ // we ever get round to introduce that method on the os class
+ xs->head("hotspot_log version='%d %d'"
+- " process='%d' time_ms='"INT64_FORMAT"'",
++ " process='%d' time_ms='" INT64_FORMAT "'",
+ LOG_MAJOR_VERSION, LOG_MINOR_VERSION,
+ os::current_process_id(), (int64_t)time_ms);
+ // Write VM version header immediately.
+--
+2.7.4
+
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 @@
+# HG changeset patch
+# User aph
+# Date 1461121375 -3600
+# Wed Apr 20 04:02:55 2016 +0100
+# Node ID 6811f311f905409fe71d2b1c2fb34c3268758724
+# Parent c66e4cc0fce57664ab44c55c47fa1a2f1bf02638
+8154210: Zero: Better byte behaviour
+Summary: Complete support for 8132051 on Zero and fix failure on 64-bit big-endian systems
+Reviewed-by: andrew, chrisphi, coleenp
+
+Upstream-Status: Backport [Fixed in u112]
+
+diff --git hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+--- hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
++++ hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+@@ -220,9 +220,16 @@
+ // Push our result
+ for (int i = 0; i < result_slots; i++) {
+ // Adjust result to smaller
+- intptr_t res = result[-i];
++ union {
++ intptr_t res;
++ jint res_jint;
++ };
++ res = result[-i];
+ if (result_slots == 1) {
+- res = narrow(method->result_type(), res);
++ BasicType t = method->result_type();
++ if (is_subword_type(t)) {
++ res_jint = (jint)narrow(t, res_jint);
++ }
+ }
+ stack->push(res);
+ }
+diff --git hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
+--- hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
++++ hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
+@@ -593,8 +593,9 @@
+ /* 0xDC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
+
+ /* 0xE0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
+-/* 0xE4 */ &&opc_default, &&opc_fast_aldc, &&opc_fast_aldc_w, &&opc_return_register_finalizer,
+-/* 0xE8 */ &&opc_invokehandle,&&opc_default, &&opc_default, &&opc_default,
++/* 0xE4 */ &&opc_default, &&opc_default, &&opc_fast_aldc, &&opc_fast_aldc_w,
++/* 0xE8 */ &&opc_return_register_finalizer,
++ &&opc_invokehandle, &&opc_default, &&opc_default,
+ /* 0xEC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
+
+ /* 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 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1434121785 -3600
-# Node ID 6217fd2c767b467641bf7b41a9c37273e8fa0cbd
-# Parent ff0929a59ced0e144201aa05819ae2e47d6f2c61
-8087120: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms.
-Summary: Use __builtin_frame_address(0) rather than returning address of local variable.
-Reviewed-by: dholmes
-
-diff -r ff0929a59ced -r 6217fd2c767b src/os_cpu/linux_zero/vm/os_linux_zero.cpp
---- hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp.orig Thu Jun 11 20:19:26 2015 -0700
-+++ hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Fri Jun 12 16:09:45 2015 +0100
-@@ -59,8 +59,8 @@
- extern sigjmp_buf* get_jmp_buf_for_continuation();
-
- address os::current_stack_pointer() {
-- address dummy = (address) &dummy;
-- return dummy;
-+ // return the address of the current function
-+ return (address)__builtin_frame_address(0);
- }
-
- frame os::get_sender_for_C_frame(frame* fr) {
--
2.7.4
---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki
Business Identity Code: 0357606 - 4
Domiciled in Helsinki
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
More information about the Openembedded-devel
mailing list