summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2018-03-05 09:30:55 +0000
committerMaxin B. John <maxin.john@intel.com>2018-03-05 13:55:30 +0200
commit9520a8d47a679f7273f011450b15da5f4acd2313 (patch)
tree3543bcc6e0b4ebb490cad4498efc76446a1204b1
parent29c72c6dd6e836c2f55734626dbd780dd8db56a7 (diff)
downloadmeta-java-9520a8d47a679f7273f011450b15da5f4acd2313.tar.gz
openjdk-8: Upgrade to u162b12
- openjdk8-fix-zero-mode-crash.patch was a backport -> dropped - remaining patches -> refreshed - license checksum change due to address change in license file (see patch) Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat
-rw-r--r--recipes-core/openjdk/openjdk-8-common.inc2
-rw-r--r--recipes-core/openjdk/openjdk-8-cross.inc1
-rw-r--r--recipes-core/openjdk/openjdk-8-native_102b14.bb2
-rw-r--r--recipes-core/openjdk/openjdk-8-native_162b12.bb2
-rw-r--r--recipes-core/openjdk/openjdk-8-release-162b12.inc (renamed from recipes-core/openjdk/openjdk-8-release-102b14.inc)48
-rw-r--r--recipes-core/openjdk/openjdk-8_162b12.bb (renamed from recipes-core/openjdk/openjdk-8_102b14.bb)2
-rw-r--r--recipes-core/openjdk/openjre-8_162b12.bb (renamed from recipes-core/openjdk/openjre-8_102b14.bb)2
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/LICENSE6
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/dont-expect-fqpn-for-make.patch6
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/filter-aclocal-copy-too.patch6
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/handle_extra_output.patch6
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-find-compiler-fix-env-respect.patch36
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-assembler-flag-handling-in-makefile.patch2
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build.patch205
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-stdc++11.patch1008
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-zero-mode-crash.patch49
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-no-genx11-in-headless.patch10
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch44
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch12
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/remove-shell-variables-from-autoheader.patch10
20 files changed, 600 insertions, 859 deletions
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc
index 38a59f4..ab4c870 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Java runtime based upon the OpenJDK Project"
2HOMEPAGE = "http://http://openjdk.java.net/" 2HOMEPAGE = "http://http://openjdk.java.net/"
3LICENSE = "GPL-2.0-with-classpath-exception" 3LICENSE = "GPL-2.0-with-classpath-exception"
4 4
5LIC_FILES_CHKSUM = "file://LICENSE;md5=7b4baeedfe2d40cb03536573bc2c89b1" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=3e0b59f8fac05c3c03d4a26bbda13f8f"
6 6
7inherit java autotools gettext qemu pkgconfig 7inherit java autotools gettext qemu pkgconfig
8 8
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc
index ad3a44d..65e3a98 100644
--- a/recipes-core/openjdk/openjdk-8-cross.inc
+++ b/recipes-core/openjdk/openjdk-8-cross.inc
@@ -11,7 +11,6 @@ PATCHES_URI_append = "\
11 file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \ 11 file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;apply=no \
12 file://openjdk8-fix-adlc-flags.patch;apply=no \ 12 file://openjdk8-fix-adlc-flags.patch;apply=no \
13 file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \ 13 file://openjdk8-silence-d_fortify_source-warning.patch;apply=no \
14 file://openjdk8-fix-zero-mode-crash.patch;apply=no \
15 file://openjdk8-add-missing-linker-flags.patch;apply=no \ 14 file://openjdk8-add-missing-linker-flags.patch;apply=no \
16 file://openjdk8-fix-libpng-neon-build.patch;apply=no \ 15 file://openjdk8-fix-libpng-neon-build.patch;apply=no \
17" 16"
diff --git a/recipes-core/openjdk/openjdk-8-native_102b14.bb b/recipes-core/openjdk/openjdk-8-native_102b14.bb
deleted file mode 100644
index e33f84a..0000000
--- a/recipes-core/openjdk/openjdk-8-native_102b14.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1require openjdk-8-release-102b14.inc
2require openjdk-8-native.inc
diff --git a/recipes-core/openjdk/openjdk-8-native_162b12.bb b/recipes-core/openjdk/openjdk-8-native_162b12.bb
new file mode 100644
index 0000000..e7eb21c
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-8-native_162b12.bb
@@ -0,0 +1,2 @@
1require openjdk-8-release-${PV}.inc
2require openjdk-8-native.inc
diff --git a/recipes-core/openjdk/openjdk-8-release-102b14.inc b/recipes-core/openjdk/openjdk-8-release-162b12.inc
index fdeb771..c8f6ad1 100644
--- a/recipes-core/openjdk/openjdk-8-release-102b14.inc
+++ b/recipes-core/openjdk/openjdk-8-release-162b12.inc
@@ -22,37 +22,37 @@ CFLAGS_append = " -Wno-error=deprecated-declarations"
22# Enable zero mode for arm based builds, as normal hotspot fails to build 22# Enable zero mode for arm based builds, as normal hotspot fails to build
23PACKAGECONFIG_append_arm = " zero" 23PACKAGECONFIG_append_arm = " zero"
24 24
25CORBA_CHANGESET = "56b133772ec1" 25CORBA_CHANGESET = "f6b6ad6feb6e"
26SRC_URI[corba.md5sum] = "b67bd442400e6805ddb986e78adc2834" 26SRC_URI[corba.md5sum] = "0358300224b63f3deeba63d3de7d765c"
27SRC_URI[corba.sha256sum] = "d5aabb9b3681b0593dde1b9eee4ff9b4cbabe7568b041f9e63e6fa73ba11bb86" 27SRC_URI[corba.sha256sum] = "54da09fd0c76834094d9f167c03ff1ac2373f5e46fb26d24d0d018cdc59a2842"
28 28
29HOTSPOT_CHANGESET = "ac29c9c1193a" 29HOTSPOT_CHANGESET = "d2e3920d2fd0"
30SRC_URI[hotspot.md5sum] = "4383d833de07fc617595a01a78efd0fc" 30SRC_URI[hotspot.md5sum] = "17a1da8be42ad0c7778e7090ea5003c1"
31SRC_URI[hotspot.sha256sum] = "1e36c6d207ac1a7d6d08f28a61bf061188df0562d89baf606138d8245d690982" 31SRC_URI[hotspot.sha256sum] = "3f07ee7a49cb4258ef00a8a896b0f7f87e85f06dc31f6c0db698d8058926b365"
32 32
33JAXP_CHANGESET = "1f032000ff4b" 33JAXP_CHANGESET = "e8a1a2db69dc"
34SRC_URI[jaxp.md5sum] = "a4a46860d00f8b513a690166b9ae0b56" 34SRC_URI[jaxp.md5sum] = "9b344a6cf317ca485b8790e67ccc2467"
35SRC_URI[jaxp.sha256sum] = "dfa0098ca9b9f99cb9de4ee9f3c61b0ad28f968ecda770f09e603c6dd8f78df3" 35SRC_URI[jaxp.sha256sum] = "fbd0eaed48415c2918a47e7d76ce276416bab792e1959b1d3dee2b703aa76f5a"
36 36
37JAXWS_CHANGESET = "81f2d81a48d7" 37JAXWS_CHANGESET = "7b4329f78e52"
38SRC_URI[jaxws.md5sum] = "0077cb7f1d1b31ba882f910bd3c30050" 38SRC_URI[jaxws.md5sum] = "b1da20ee79382eb5bb72077eb02addd4"
39SRC_URI[jaxws.sha256sum] = "c28322d7a9805d06b6f3a49d316aa4746076dfc106431a952fe0d12b6690cbdc" 39SRC_URI[jaxws.sha256sum] = "ffd31d467c6fe7fc0956e801c08168d48ba02b4dea38b7dedbafc054092ca8f0"
40 40
41JDK_CHANGESET = "48c99b423839" 41JDK_CHANGESET = "d201d8b87f48"
42SRC_URI[jdk.md5sum] = "316fc871a823ff8f1db39a2fca51bd12" 42SRC_URI[jdk.md5sum] = "bced8a322e53083472b39f01e938b21a"
43SRC_URI[jdk.sha256sum] = "bca18458ba0a0b8d79639829b8a71cdf65dd788b5c28658102b6b4691a47a420" 43SRC_URI[jdk.sha256sum] = "6e057ceb02a7d8bb66233d52b23d246120b5c0d72e7a71cb6fb0ace84e8bb581"
44 44
45LANGTOOLS_CHANGESET = "0549bf2f507d" 45LANGTOOLS_CHANGESET = "034738d4f1d2"
46SRC_URI[langtools.md5sum] = "bff92b915d26afd0c9b7c4b9013ee424" 46SRC_URI[langtools.md5sum] = "fbc6faea65cfc248f93f54e634d7bf50"
47SRC_URI[langtools.sha256sum] = "4a918bab7a8f13b6705085be0d043b03e24afb4ff3c67ad98000c6b9fe577cb8" 47SRC_URI[langtools.sha256sum] = "91615ade480c706f58062e74ee112f95ab947e1c5366a29a7d9b2b6b0a2f72d3"
48 48
49NASHORN_CHANGESET = "0948e61a3722" 49NASHORN_CHANGESET = "81ce60cabe97"
50SRC_URI[nashorn.md5sum] = "19e79a31ad20b55b47d6b9f1b20eaac0" 50SRC_URI[nashorn.md5sum] = "318993c189f16894abe94db14a067618"
51SRC_URI[nashorn.sha256sum] = "caa1f648cfbe45c081460bc9c2d9a7b83910bb468c325d8acc2ee4417460915e" 51SRC_URI[nashorn.sha256sum] = "8df64026be98e6efad200ef8639e2f7e96a783e262b402afcb8045f46709e457"
52 52
53OPENJDK_CHANGESET = "bf0932d3e0f8" 53OPENJDK_CHANGESET = "4be07cb28b21"
54SRC_URI[openjdk.md5sum] = "2b52cc3d439fe0da2ecbb28671fbe5aa" 54SRC_URI[openjdk.md5sum] = "24d30b66aaaef51af9b598c8989c1c82"
55SRC_URI[openjdk.sha256sum] = "66fa6ecf3047b7d8a216c1372616babe96f0fb40e89cb51575b80bf602d9ba59" 55SRC_URI[openjdk.sha256sum] = "8f9ecc5fc5f9c6df671a2ef07949f86080823c89954b2b87f6727a82af679eca"
56 56
57OPENJDK_HG_U = "jdk8u" 57OPENJDK_HG_U = "jdk8u"
58OPENJDK_HG_URL = "http://hg.openjdk.java.net/jdk8u/${OPENJDK_HG_U}" 58OPENJDK_HG_URL = "http://hg.openjdk.java.net/jdk8u/${OPENJDK_HG_U}"
diff --git a/recipes-core/openjdk/openjdk-8_102b14.bb b/recipes-core/openjdk/openjdk-8_162b12.bb
index efed329..11208a1 100644
--- a/recipes-core/openjdk/openjdk-8_102b14.bb
+++ b/recipes-core/openjdk/openjdk-8_162b12.bb
@@ -1,4 +1,4 @@
1require openjdk-8-release-102b14.inc 1require openjdk-8-release-${PV}.inc
2require openjdk-8-cross.inc 2require openjdk-8-cross.inc
3 3
4do_install() { 4do_install() {
diff --git a/recipes-core/openjdk/openjre-8_102b14.bb b/recipes-core/openjdk/openjre-8_162b12.bb
index f47c62c..263091d 100644
--- a/recipes-core/openjdk/openjre-8_102b14.bb
+++ b/recipes-core/openjdk/openjre-8_162b12.bb
@@ -1,4 +1,4 @@
1require openjdk-8-release-102b14.inc 1require openjdk-8-release-${PV}.inc
2require openjdk-8-cross.inc 2require openjdk-8-cross.inc
3 3
4do_install() { 4do_install() {
diff --git a/recipes-core/openjdk/patches-openjdk-8/LICENSE b/recipes-core/openjdk/patches-openjdk-8/LICENSE
index b40a0f4..8b400c7 100644
--- a/recipes-core/openjdk/patches-openjdk-8/LICENSE
+++ b/recipes-core/openjdk/patches-openjdk-8/LICENSE
@@ -3,7 +3,7 @@ The GNU General Public License (GPL)
3Version 2, June 1991 3Version 2, June 1991
4 4
5Copyright (C) 1989, 1991 Free Software Foundation, Inc. 5Copyright (C) 1989, 1991 Free Software Foundation, Inc.
659 Temple Place, Suite 330, Boston, MA 02111-1307 USA 651 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
7 7
8Everyone is permitted to copy and distribute verbatim copies of this license 8Everyone is permitted to copy and distribute verbatim copies of this license
9document, but changing it is not allowed. 9document, but changing it is not allowed.
@@ -287,8 +287,8 @@ pointer to where the full notice is found.
287 more details. 287 more details.
288 288
289 You should have received a copy of the GNU General Public License along 289 You should have received a copy of the GNU General Public License along
290 with this program; if not, write to the Free Software Foundation, Inc., 59 290 with this program; if not, write to the Free Software Foundation, Inc.,
291 Temple Place, Suite 330, Boston, MA 02111-1307 USA 291 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
292 292
293Also add information on how to contact you by electronic and paper mail. 293Also add information on how to contact you by electronic and paper mail.
294 294
diff --git a/recipes-core/openjdk/patches-openjdk-8/dont-expect-fqpn-for-make.patch b/recipes-core/openjdk/patches-openjdk-8/dont-expect-fqpn-for-make.patch
index a8a9c1d..6454237 100644
--- a/recipes-core/openjdk/patches-openjdk-8/dont-expect-fqpn-for-make.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/dont-expect-fqpn-for-make.patch
@@ -1,6 +1,6 @@
1--- common/autoconf/basics.m4.orig 2015-08-17 19:05:13.122672019 +0200 1--- common/autoconf/basics.m4.orig
2+++ common/autoconf/basics.m4 2015-08-17 19:13:01.482673782 +0200 2+++ common/autoconf/basics.m4
3@@ -549,10 +549,12 @@ 3@@ -555,10 +555,12 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE],
4 # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky. 4 # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
5 if test "x$MAKE" != x; then 5 if test "x$MAKE" != x; then
6 # User has supplied a make, test it. 6 # User has supplied a make, test it.
diff --git a/recipes-core/openjdk/patches-openjdk-8/filter-aclocal-copy-too.patch b/recipes-core/openjdk/patches-openjdk-8/filter-aclocal-copy-too.patch
index 4679c9d..b901001 100644
--- a/recipes-core/openjdk/patches-openjdk-8/filter-aclocal-copy-too.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/filter-aclocal-copy-too.patch
@@ -1,6 +1,6 @@
1--- common/autoconf/basics.m4.orig 2015-08-17 18:31:50.598664481 +0200 1--- common/autoconf/basics.m4.orig
2+++ common/autoconf/basics.m4 2015-08-17 18:31:57.554664507 +0200 2+++ common/autoconf/basics.m4
3@@ -442,7 +442,7 @@ 3@@ -448,7 +448,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
4 files_present=`$LS $OUTPUT_ROOT` 4 files_present=`$LS $OUTPUT_ROOT`
5 # Configure has already touched config.log and confdefs.h in the current dir when this check 5 # Configure has already touched config.log and confdefs.h in the current dir when this check
6 # is performed. 6 # is performed.
diff --git a/recipes-core/openjdk/patches-openjdk-8/handle_extra_output.patch b/recipes-core/openjdk/patches-openjdk-8/handle_extra_output.patch
index 52aad95..a8d2786 100644
--- a/recipes-core/openjdk/patches-openjdk-8/handle_extra_output.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/handle_extra_output.patch
@@ -2,10 +2,8 @@ When adding the environment variable JAVA_TOOL_OPTIONS an extra line
2in the output from 'java -version' is produced. As this output is 2in the output from 'java -version' is produced. As this output is
3parsed by configure script the extra line has to be filtered out. 3parsed by configure script the extra line has to be filtered out.
4 4
5Index: jdk8u-e8bed1496ff2/common/autoconf/boot-jdk.m4 5--- jdk8u-4be07cb28b21.orig/common/autoconf/boot-jdk.m4
6=================================================================== 6+++ jdk8u-4be07cb28b21/common/autoconf/boot-jdk.m4
7--- jdk8u-e8bed1496ff2.orig/common/autoconf/boot-jdk.m4
8+++ jdk8u-e8bed1496ff2/common/autoconf/boot-jdk.m4
9@@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK], 7@@ -51,7 +51,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
10 BOOT_JDK_FOUND=no 8 BOOT_JDK_FOUND=no
11 else 9 else
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-find-compiler-fix-env-respect.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-find-compiler-fix-env-respect.patch
index 0750dac..91d258d 100644
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-find-compiler-fix-env-respect.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-find-compiler-fix-env-respect.patch
@@ -1,18 +1,18 @@
1--- common/autoconf/toolchain.m4.orig 2015-08-07 20:52:38.000000000 +0200 1--- common/autoconf/toolchain.m4.orig
2+++ common/autoconf/toolchain.m4 2015-10-27 13:57:19.708566525 +0100 2+++ common/autoconf/toolchain.m4
3@@ -27,7 +27,7 @@ 3@@ -77,7 +77,7 @@ AC_DEFUN([TOOLCHAIN_CHECK_COMPILER_VERSI
4 # $2 = human readable name of compiler (C or C++) 4 # $2 = human readable name of compiler (C or C++)
5 AC_DEFUN([TOOLCHAIN_CHECK_COMPILER_VERSION], 5 AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
6 [ 6 [
7- COMPILER=[$]$1 7- COMPILER=[$]$1
8+ COMPILER="[$]$1" 8+ COMPILER="[$]$1"
9 COMPILER_NAME=$2 9 COMPILER_NAME=$2
10 10
11 if test "x$OPENJDK_TARGET_OS" = xsolaris; then 11 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
12@@ -123,64 +123,37 @@ 12@@ -174,64 +174,37 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER],
13 [ 13 [
14 COMPILER_NAME=$2 14 COMPILER_NAME=$2
15 15
16- $1= 16- $1=
17+ FOUND_$1= 17+ FOUND_$1=
18+ 18+
@@ -31,7 +31,7 @@
31+ FOUND_$1=$TOOLS_DIR_$1 31+ FOUND_$1=$TOOLS_DIR_$1
32 PATH="$PATH_save" 32 PATH="$PATH_save"
33 fi 33 fi
34 34
35 # AC_PATH_PROGS can't be run multiple times with the same variable, 35 # AC_PATH_PROGS can't be run multiple times with the same variable,
36 # so create a new name for this run. 36 # so create a new name for this run.
37- if test "x[$]$1" = x; then 37- if test "x[$]$1" = x; then
@@ -40,7 +40,7 @@
40- $1=$POTENTIAL_$1 40- $1=$POTENTIAL_$1
41+ FOUND_$1=$POTENTIAL_$1 41+ FOUND_$1=$POTENTIAL_$1
42 fi 42 fi
43 43
44- if test "x[$]$1" = x; then 44- if test "x[$]$1" = x; then
45+ if test "x[$]FOUND_$1" = x; then 45+ if test "x[$]FOUND_$1" = x; then
46 HELP_MSG_MISSING_DEPENDENCY([devkit]) 46 HELP_MSG_MISSING_DEPENDENCY([devkit])
@@ -86,10 +86,10 @@
86+ TEST_COMPILER="[$]FOUND_$1" 86+ TEST_COMPILER="[$]FOUND_$1"
87+ 87+
88+ $1="$TEST_COMPILER" 88+ $1="$TEST_COMPILER"
89 TOOLCHAIN_CHECK_COMPILER_VERSION([$1], [$COMPILER_NAME]) 89 TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME])
90 ]) 90 ])
91 91
92@@ -214,12 +187,12 @@ 92@@ -265,12 +238,12 @@ AC_DEFUN([TOOLCHAIN_SETUP_PATHS],
93 # otherwise we might pick up cross-compilers which don't use standard naming. 93 # otherwise we might pick up cross-compilers which don't use standard naming.
94 # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have 94 # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have
95 # to wait until they are properly discovered. 95 # to wait until they are properly discovered.
@@ -108,12 +108,12 @@
108 fi 108 fi
109 AC_SUBST(BUILD_CC) 109 AC_SUBST(BUILD_CC)
110 AC_SUBST(BUILD_CXX) 110 AC_SUBST(BUILD_CXX)
111--- common/autoconf/basics.m4.orig 2015-08-31 15:03:54.942975387 +0200 111--- common/autoconf/basics.m4.orig
112+++ common/autoconf/basics.m4 2015-08-31 15:02:25.090975049 +0200 112+++ common/autoconf/basics.m4
113@@ -171,8 +171,15 @@ 113@@ -171,8 +171,15 @@ AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS],
114 fi 114 fi
115 fi 115 fi
116 116
117+ # First separate the path from the arguments. This will split at the first 117+ # First separate the path from the arguments. This will split at the first
118+ # space. 118+ # space.
119+ complete="[$]$1" 119+ complete="[$]$1"
@@ -127,7 +127,7 @@
127 else 127 else
128 # Save the current directory for restoring afterwards 128 # Save the current directory for restoring afterwards
129 STARTDIR=$PWD 129 STARTDIR=$PWD
130@@ -198,8 +205,9 @@ 130@@ -198,8 +205,9 @@ AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS],
131 let COUNTER=COUNTER+1 131 let COUNTER=COUNTER+1
132 done 132 done
133 cd $STARTDIR 133 cd $STARTDIR
@@ -137,4 +137,4 @@
137+ $1="$new_path ${arguments% *}" 137+ $1="$new_path ${arguments% *}"
138 fi 138 fi
139 ]) 139 ])
140 140
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-assembler-flag-handling-in-makefile.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-assembler-flag-handling-in-makefile.patch
index 5e02f28..3e4f156 100644
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-assembler-flag-handling-in-makefile.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-assembler-flag-handling-in-makefile.patch
@@ -9,7 +9,7 @@ Upstream-Status: Pending
9--- 9---
10--- make/common/NativeCompilation.gmk 10--- make/common/NativeCompilation.gmk
11+++ make/common/NativeCompilation.gmk 11+++ make/common/NativeCompilation.gmk
12@@ -372,7 +372,7 @@ define SetupNativeCompilation 12@@ -376,7 +376,7 @@ define SetupNativeCompilation
13 $$(foreach p,$$($1_SRCS), \ 13 $$(foreach p,$$($1_SRCS), \
14 $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \ 14 $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
15 $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \ 15 $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build.patch
index bc1abbd..f241361 100644
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-build.patch
@@ -1,6 +1,6 @@
1--- hotspot/make/Makefile.orig 2015-08-31 19:44:44.459038814 +0200 1--- hotspot/make/Makefile.orig
2+++ hotspot/make/Makefile 2015-08-31 19:44:58.511038867 +0200 2+++ hotspot/make/Makefile
3@@ -525,7 +525,7 @@ 3@@ -525,7 +525,7 @@ $(EXPORT_INCLUDE_DIR)/%: $(SHARK_BUILD
4 # Unix 4 # Unix
5 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_BUILD_DIR)/%.$(LIBRARY_SUFFIX) 5 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_BUILD_DIR)/%.$(LIBRARY_SUFFIX)
6 $(install-file) 6 $(install-file)
@@ -9,28 +9,28 @@
9 $(install-file) 9 $(install-file)
10 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz 10 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(SHARK_BUILD_DIR)/%.diz
11 $(install-file) 11 $(install-file)
12--- hotspot/src/share/vm/ci/ciTypeFlow.cpp.orig 2015-08-31 19:45:28.611038980 +0200 12--- hotspot/src/share/vm/ci/ciTypeFlow.cpp.orig
13+++ hotspot/src/share/vm/ci/ciTypeFlow.cpp 2015-08-31 19:47:17.539039390 +0200 13+++ hotspot/src/share/vm/ci/ciTypeFlow.cpp
14@@ -35,7 +35,9 @@ 14@@ -35,8 +35,10 @@
15 #include "interpreter/bytecode.hpp" 15 #include "interpreter/bytecode.hpp"
16 #include "interpreter/bytecodes.hpp" 16 #include "interpreter/bytecodes.hpp"
17 #include "memory/allocation.inline.hpp" 17 #include "memory/allocation.inline.hpp"
18-#include "opto/compile.hpp"
19+#ifdef COMPILER2 18+#ifdef COMPILER2
20+#include "opto/compile.hpp" 19 #include "opto/compile.hpp"
21 #include "opto/node.hpp" 20 #include "opto/node.hpp"
22+#endif 21+#endif
23 #include "runtime/deoptimization.hpp" 22 #include "runtime/deoptimization.hpp"
24 #include "utilities/growableArray.hpp" 23 #include "utilities/growableArray.hpp"
25@@ -2647,6 +2649,7 @@ 24
25@@ -2648,6 +2650,7 @@ void ciTypeFlow::df_flow_types(Block* st
26 assert (!blk->has_pre_order(), ""); 26 assert (!blk->has_pre_order(), "");
27 blk->set_next_pre_order(); 27 blk->set_next_pre_order();
28 28
29+#ifdef COMPILER2 29+#ifdef COMPILER2
30 if (_next_pre_order >= (int)Compile::current()->max_node_limit() / 2) { 30 if (_next_pre_order >= (int)Compile::current()->max_node_limit() / 2) {
31 // Too many basic blocks. Bail out. 31 // Too many basic blocks. Bail out.
32 // This can happen when try/finally constructs are nested to depth N, 32 // This can happen when try/finally constructs are nested to depth N,
33@@ -2656,6 +2659,7 @@ 33@@ -2657,6 +2660,7 @@ void ciTypeFlow::df_flow_types(Block* st
34 record_failure("too many basic blocks"); 34 record_failure("too many basic blocks");
35 return; 35 return;
36 } 36 }
@@ -38,9 +38,9 @@
38 if (do_flow) { 38 if (do_flow) {
39 flow_block(blk, temp_vector, temp_set); 39 flow_block(blk, temp_vector, temp_set);
40 if (failing()) return; // Watch for bailouts. 40 if (failing()) return; // Watch for bailouts.
41--- hotspot/src/share/vm/classfile/systemDictionary.cpp.orig 2015-08-31 19:50:00.367040003 +0200 41--- hotspot/src/share/vm/classfile/systemDictionary.cpp.orig
42+++ hotspot/src/share/vm/classfile/systemDictionary.cpp 2015-08-31 19:51:28.323040334 +0200 42+++ hotspot/src/share/vm/classfile/systemDictionary.cpp
43@@ -2276,6 +2276,7 @@ 43@@ -2289,6 +2289,7 @@ methodHandle SystemDictionary::find_meth
44 spe = NULL; 44 spe = NULL;
45 // Must create lots of stuff here, but outside of the SystemDictionary lock. 45 // Must create lots of stuff here, but outside of the SystemDictionary lock.
46 m = Method::make_method_handle_intrinsic(iid, signature, CHECK_(empty)); 46 m = Method::make_method_handle_intrinsic(iid, signature, CHECK_(empty));
@@ -48,7 +48,7 @@
48 if (!Arguments::is_interpreter_only()) { 48 if (!Arguments::is_interpreter_only()) {
49 // Generate a compiled form of the MH intrinsic. 49 // Generate a compiled form of the MH intrinsic.
50 AdapterHandlerLibrary::create_native_wrapper(m); 50 AdapterHandlerLibrary::create_native_wrapper(m);
51@@ -2285,6 +2286,7 @@ 51@@ -2298,6 +2299,7 @@ methodHandle SystemDictionary::find_meth
52 "out of space in CodeCache for method handle intrinsic", empty); 52 "out of space in CodeCache for method handle intrinsic", empty);
53 } 53 }
54 } 54 }
@@ -56,9 +56,9 @@
56 // Now grab the lock. We might have to throw away the new method, 56 // Now grab the lock. We might have to throw away the new method,
57 // if a racing thread has managed to install one at the same time. 57 // if a racing thread has managed to install one at the same time.
58 { 58 {
59@@ -2298,9 +2300,11 @@ 59@@ -2311,9 +2313,11 @@ methodHandle SystemDictionary::find_meth
60 } 60 }
61 61
62 assert(spe != NULL && spe->method() != NULL, ""); 62 assert(spe != NULL && spe->method() != NULL, "");
63+#ifndef SHARK 63+#ifndef SHARK
64 assert(Arguments::is_interpreter_only() || (spe->method()->has_compiled_code() && 64 assert(Arguments::is_interpreter_only() || (spe->method()->has_compiled_code() &&
@@ -67,13 +67,13 @@
67+#endif 67+#endif
68 return spe->method(); 68 return spe->method();
69 } 69 }
70 70
71--- hotspot/src/share/vm/runtime/handles.inline.hpp.orig 2015-08-31 20:01:39.295042634 +0200 71--- hotspot/src/share/vm/runtime/handles.inline.hpp.orig
72+++ hotspot/src/share/vm/runtime/handles.inline.hpp 2015-08-31 20:04:31.331043282 +0200 72+++ hotspot/src/share/vm/runtime/handles.inline.hpp
73@@ -51,6 +51,12 @@ 73@@ -51,6 +51,12 @@ inline Handle::Handle(Thread* thread, oo
74 } 74 }
75 #endif // ASSERT 75 #endif // ASSERT
76 76
77+#ifdef SHARK 77+#ifdef SHARK
78+#define assert_on_stack(expr) (void)(expr) 78+#define assert_on_stack(expr) (void)(expr)
79+#else 79+#else
@@ -83,7 +83,7 @@
83 // Constructors for metadata handles 83 // Constructors for metadata handles
84 #define DEF_METADATA_HANDLE_FN(name, type) \ 84 #define DEF_METADATA_HANDLE_FN(name, type) \
85 inline name##Handle::name##Handle(type* obj) : _value(obj), _thread(NULL) { \ 85 inline name##Handle::name##Handle(type* obj) : _value(obj), _thread(NULL) { \
86@@ -79,7 +85,7 @@ 86@@ -79,7 +85,7 @@ inline name##Handle::name##Handle(const
87 } else { \ 87 } else { \
88 _thread = Thread::current(); \ 88 _thread = Thread::current(); \
89 } \ 89 } \
@@ -92,12 +92,12 @@
92 _thread->metadata_handles()->push((Metadata*)_value); \ 92 _thread->metadata_handles()->push((Metadata*)_value); \
93 } else { \ 93 } else { \
94 _thread = NULL; \ 94 _thread = NULL; \
95--- hotspot/src/cpu/zero/vm/entry_zero.hpp.orig 2015-08-31 20:53:40.743054385 +0200 95--- hotspot/src/cpu/zero/vm/entry_zero.hpp.orig
96+++ hotspot/src/cpu/zero/vm/entry_zero.hpp 2015-08-31 20:53:54.459054436 +0200 96+++ hotspot/src/cpu/zero/vm/entry_zero.hpp
97@@ -26,6 +26,10 @@ 97@@ -26,6 +26,10 @@
98 #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP 98 #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP
99 #define CPU_ZERO_VM_ENTRY_ZERO_HPP 99 #define CPU_ZERO_VM_ENTRY_ZERO_HPP
100 100
101+#include "utilities/globalDefinitions.hpp" 101+#include "utilities/globalDefinitions.hpp"
102+#include "utilities/exceptions.hpp" 102+#include "utilities/exceptions.hpp"
103+#include "interpreter/cppInterpreter.hpp" 103+#include "interpreter/cppInterpreter.hpp"
@@ -105,22 +105,22 @@
105 class ZeroEntry { 105 class ZeroEntry {
106 public: 106 public:
107 ZeroEntry() { 107 ZeroEntry() {
108--- hotspot/src/share/vm/shark/sharkEntry.hpp.orig 2015-08-31 20:47:13.091052925 +0200 108--- hotspot/src/share/vm/shark/sharkEntry.hpp.orig
109+++ hotspot/src/share/vm/shark/sharkEntry.hpp 2015-08-31 20:49:42.755053489 +0200 109+++ hotspot/src/share/vm/shark/sharkEntry.hpp
110@@ -27,6 +27,7 @@ 110@@ -27,6 +27,7 @@
111 #define SHARE_VM_SHARK_SHARKENTRY_HPP 111 #define SHARE_VM_SHARK_SHARKENTRY_HPP
112 112
113 #include "shark/llvmHeaders.hpp" 113 #include "shark/llvmHeaders.hpp"
114+#include "entry_zero.hpp" 114+#include "entry_zero.hpp"
115 115
116 class SharkContext; 116 class SharkContext;
117 117
118--- hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp.orig 2015-08-31 21:01:14.847056094 +0200 118--- hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp.orig
119+++ hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp 2015-08-31 21:01:24.459056130 +0200 119+++ hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp
120@@ -30,6 +30,10 @@ 120@@ -30,6 +30,10 @@
121 121
122 #ifdef CC_INTERP 122 #ifdef CC_INTERP
123 123
124+#ifdef TARGET_ARCH_zero 124+#ifdef TARGET_ARCH_zero
125+#include "entry_zero.hpp" 125+#include "entry_zero.hpp"
126+#endif 126+#endif
@@ -128,8 +128,8 @@
128 class CppInterpreterGenerator: public AbstractInterpreterGenerator { 128 class CppInterpreterGenerator: public AbstractInterpreterGenerator {
129 protected: 129 protected:
130 // shared code sequences 130 // shared code sequences
131--- hotspot/src/cpu/zero/vm/nativeInst_zero.cpp.orig 2015-08-31 21:07:21.643057475 +0200 131--- hotspot/src/cpu/zero/vm/nativeInst_zero.cpp.orig
132+++ hotspot/src/cpu/zero/vm/nativeInst_zero.cpp 2015-08-31 21:14:49.019059159 +0200 132+++ hotspot/src/cpu/zero/vm/nativeInst_zero.cpp
133@@ -26,6 +26,9 @@ 133@@ -26,6 +26,9 @@
134 #include "precompiled.hpp" 134 #include "precompiled.hpp"
135 #include "assembler_zero.inline.hpp" 135 #include "assembler_zero.inline.hpp"
@@ -140,23 +140,23 @@
140 #include "nativeInst_zero.hpp" 140 #include "nativeInst_zero.hpp"
141 #include "oops/oop.inline.hpp" 141 #include "oops/oop.inline.hpp"
142 #include "runtime/handles.hpp" 142 #include "runtime/handles.hpp"
143--- hotspot/src/share/vm/shark/llvmHeaders.hpp.orig 2015-09-01 14:17:09.793868541 +0200 143--- hotspot/src/share/vm/shark/llvmHeaders.hpp.orig
144+++ hotspot/src/share/vm/shark/llvmHeaders.hpp 2015-09-01 16:20:25.653868618 +0200 144+++ hotspot/src/share/vm/shark/llvmHeaders.hpp
145@@ -35,7 +35,11 @@ 145@@ -35,7 +35,11 @@
146 #undef DEBUG 146 #undef DEBUG
147 #endif 147 #endif
148 148
149+#if SHARK_LLVM_VERSION <= 34 149+#if SHARK_LLVM_VERSION <= 34
150 #include <llvm/Analysis/Verifier.h> 150 #include <llvm/Analysis/Verifier.h>
151+#else 151+#else
152+#include <llvm-c/Analysis.h> 152+#include <llvm-c/Analysis.h>
153+#endif 153+#endif
154 #include <llvm/ExecutionEngine/ExecutionEngine.h> 154 #include <llvm/ExecutionEngine/ExecutionEngine.h>
155 155
156 // includes specific to each version 156 // includes specific to each version
157--- common/autoconf/libraries.m4.orig 2015-09-01 16:53:51.821868486 +0200 157--- common/autoconf/libraries.m4.orig
158+++ common/autoconf/libraries.m4 2015-09-01 16:55:27.653868542 +0200 158+++ common/autoconf/libraries.m4
159@@ -847,8 +847,9 @@ 159@@ -834,8 +834,9 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIB
160 fi 160 fi
161 fi 161 fi
162 done 162 done
@@ -164,23 +164,23 @@
164+ llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//; s/\..*$//') 164+ llvm_version=$("${LLVM_CONFIG}" --version | sed 's/\.//; s/svn.*//; s/\..*$//')
165 LLVM_CFLAGS="${LLVM_CFLAGS} -DSHARK_LLVM_VERSION=${llvm_version}" 165 LLVM_CFLAGS="${LLVM_CFLAGS} -DSHARK_LLVM_VERSION=${llvm_version}"
166+ AS_IF([test $llvm_version -ge 34], [LLVM_CFLAGS="${LLVM_CFLAGS} -std=gnu++11"]) 166+ AS_IF([test $llvm_version -ge 34], [LLVM_CFLAGS="${LLVM_CFLAGS} -std=gnu++11"])
167 167
168 unset LLVM_LDFLAGS 168 unset LLVM_LDFLAGS
169 for flag in $("${LLVM_CONFIG}" --ldflags); do 169 for flag in $("${LLVM_CONFIG}" --ldflags); do
170@@ -862,7 +862,7 @@ 170@@ -848,7 +849,7 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIB
171 done 171 done
172 172
173 unset LLVM_LIBS 173 unset LLVM_LIBS
174- for flag in $("${LLVM_CONFIG}" --libs ${llvm_components}); do 174- for flag in $("${LLVM_CONFIG}" --libs ${llvm_components}); do
175+ for flag in $("${LLVM_CONFIG}" --libs --system-libs ${llvm_components}); do 175+ for flag in $("${LLVM_CONFIG}" --libs --system-libs ${llvm_components}); do
176 if echo "${flag}" | grep -q '^-l'; then 176 if echo "${flag}" | grep -q '^-l'; then
177 if test "${LLVM_LIBS}" != ""; then 177 if test "${LLVM_LIBS}" != ""; then
178 LLVM_LIBS="${LLVM_LIBS} " 178 LLVM_LIBS="${LLVM_LIBS} "
179--- hotspot/src/share/vm/shark/sharkIntrinsics.cpp.orig 2015-09-02 16:58:17.000000000 +0200 179--- hotspot/src/share/vm/shark/sharkIntrinsics.cpp.orig
180+++ hotspot/src/share/vm/shark/sharkIntrinsics.cpp 2015-09-02 17:09:26.000000000 +0200 180+++ hotspot/src/share/vm/shark/sharkIntrinsics.cpp
181@@ -265,7 +265,11 @@ 181@@ -265,7 +265,11 @@ void SharkIntrinsics::do_Unsafe_compareA
182 "addr"); 182 "addr");
183 183
184 // Perform the operation 184 // Perform the operation
185+#if SHARK_LLVM_VERSION <= 34 185+#if SHARK_LLVM_VERSION <= 34
186 Value *result = builder()->CreateAtomicCmpXchg(addr, e, x, llvm::SequentiallyConsistent); 186 Value *result = builder()->CreateAtomicCmpXchg(addr, e, x, llvm::SequentiallyConsistent);
@@ -190,22 +190,22 @@
190 // Push the result 190 // Push the result
191 state()->push( 191 state()->push(
192 SharkValue::create_jint( 192 SharkValue::create_jint(
193--- hotspot/src/share/vm/shark/sharkRuntime.cpp.orig 2015-09-02 17:11:58.000000000 +0200 193--- hotspot/src/share/vm/shark/sharkRuntime.cpp.orig
194+++ hotspot/src/share/vm/shark/sharkRuntime.cpp 2015-09-02 17:12:57.000000000 +0200 194+++ hotspot/src/share/vm/shark/sharkRuntime.cpp
195@@ -32,6 +32,7 @@ 195@@ -32,6 +32,7 @@
196 #ifdef TARGET_ARCH_zero 196 #ifdef TARGET_ARCH_zero
197 # include "stack_zero.inline.hpp" 197 # include "stack_zero.inline.hpp"
198 #endif 198 #endif
199+#include "memory/oopFactory.hpp" 199+#include "memory/oopFactory.hpp"
200 200
201 using namespace llvm; 201 using namespace llvm;
202 202
203--- hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp.orig 2015-09-02 17:23:07.000000000 +0200 203--- hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp.orig
204+++ hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp 2015-09-02 17:43:20.000000000 +0200 204+++ hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
205@@ -1732,7 +1732,11 @@ 205@@ -1732,7 +1732,11 @@ void SharkTopLevelBlock::do_new() {
206 heap_object = builder()->CreateIntToPtr( 206 heap_object = builder()->CreateIntToPtr(
207 old_top, SharkType::oop_type(), "heap_object"); 207 old_top, SharkType::oop_type(), "heap_object");
208 208
209+#if SHARK_LLVM_VERSION <= 34 209+#if SHARK_LLVM_VERSION <= 34
210 Value *check = builder()->CreateAtomicCmpXchg(top_addr, old_top, new_top, llvm::SequentiallyConsistent); 210 Value *check = builder()->CreateAtomicCmpXchg(top_addr, old_top, new_top, llvm::SequentiallyConsistent);
211+#else 211+#else
@@ -214,8 +214,8 @@
214 builder()->CreateCondBr( 214 builder()->CreateCondBr(
215 builder()->CreateICmpEQ(old_top, check), 215 builder()->CreateICmpEQ(old_top, check),
216 initialize, retry); 216 initialize, retry);
217@@ -1933,7 +1937,11 @@ 217@@ -1933,7 +1937,11 @@ void SharkTopLevelBlock::acquire_lock(Va
218 218
219 Value *lock = builder()->CreatePtrToInt( 219 Value *lock = builder()->CreatePtrToInt(
220 monitor_header_addr, SharkType::intptr_type()); 220 monitor_header_addr, SharkType::intptr_type());
221+#if SHARK_LLVM_VERSION <= 34 221+#if SHARK_LLVM_VERSION <= 34
@@ -226,10 +226,10 @@
226 builder()->CreateCondBr( 226 builder()->CreateCondBr(
227 builder()->CreateICmpEQ(disp, check), 227 builder()->CreateICmpEQ(disp, check),
228 acquired_fast, try_recursive); 228 acquired_fast, try_recursive);
229@@ -2018,7 +2026,11 @@ 229@@ -2018,7 +2026,11 @@ void SharkTopLevelBlock::release_lock(in
230 PointerType::getUnqual(SharkType::intptr_type()), 230 PointerType::getUnqual(SharkType::intptr_type()),
231 "mark_addr"); 231 "mark_addr");
232 232
233+#if SHARK_LLVM_VERSION <= 34 233+#if SHARK_LLVM_VERSION <= 34
234 Value *check = builder()->CreateAtomicCmpXchg(mark_addr, lock, disp, llvm::Release); 234 Value *check = builder()->CreateAtomicCmpXchg(mark_addr, lock, disp, llvm::Release);
235+#else 235+#else
@@ -238,8 +238,8 @@
238 builder()->CreateCondBr( 238 builder()->CreateCondBr(
239 builder()->CreateICmpEQ(lock, check), 239 builder()->CreateICmpEQ(lock, check),
240 released_fast, slow_path); 240 released_fast, slow_path);
241--- hotspot/src/cpu/zero/vm/interpreter_zero.cpp.orig 2015-09-14 20:13:25.539432044 +0200 241--- hotspot/src/cpu/zero/vm/interpreter_zero.cpp.orig
242+++ hotspot/src/cpu/zero/vm/interpreter_zero.cpp 2015-09-14 20:13:46.107432122 +0200 242+++ hotspot/src/cpu/zero/vm/interpreter_zero.cpp
243@@ -49,7 +49,7 @@ 243@@ -49,7 +49,7 @@
244 #ifdef COMPILER1 244 #ifdef COMPILER1
245 #include "c1/c1_Runtime1.hpp" 245 #include "c1/c1_Runtime1.hpp"
@@ -248,21 +248,21 @@
248+#if defined(CC_INTERP) || defined(SHARK) 248+#if defined(CC_INTERP) || defined(SHARK)
249 #include "interpreter/cppInterpreter.hpp" 249 #include "interpreter/cppInterpreter.hpp"
250 #endif 250 #endif
251 251
252--- hotspot/src/share/vm/shark/sharkCompiler.hpp.orig 2015-08-31 20:08:44.723044236 +0200 252--- hotspot/src/share/vm/shark/sharkCompiler.hpp.orig
253+++ hotspot/src/share/vm/shark/sharkCompiler.hpp 2015-08-31 20:08:59.387044291 +0200 253+++ hotspot/src/share/vm/shark/sharkCompiler.hpp
254@@ -40,6 +40,8 @@ 254@@ -40,6 +40,8 @@ class SharkCompiler : public AbstractCom
255 // Creation 255 // Creation
256 SharkCompiler(); 256 SharkCompiler();
257 257
258+ void init_llvm(); 258+ void init_llvm();
259+ 259+
260 // Name of this compiler 260 // Name of this compiler
261 const char *name() { return "shark"; } 261 const char *name() { return "shark"; }
262 262
263--- hotspot/src/share/vm/shark/sharkCompiler.cpp.orig 2015-09-19 12:19:21.000000000 +0200 263--- hotspot/src/share/vm/shark/sharkCompiler.cpp.orig
264+++ hotspot/src/share/vm/shark/sharkCompiler.cpp 2015-09-19 12:27:17.000000000 +0200 264+++ hotspot/src/share/vm/shark/sharkCompiler.cpp
265@@ -61,11 +61,25 @@ 265@@ -61,11 +61,25 @@ SharkCompiler::SharkCompiler()
266 : AbstractCompiler() { 266 : AbstractCompiler() {
267 // Create the lock to protect the memory manager and execution engine 267 // Create the lock to protect the memory manager and execution engine
268 _execution_engine_lock = new Monitor(Mutex::leaf, "SharkExecutionEngineLock"); 268 _execution_engine_lock = new Monitor(Mutex::leaf, "SharkExecutionEngineLock");
@@ -274,7 +274,7 @@
274+ // All done 274+ // All done
275+ set_state(initialized); 275+ set_state(initialized);
276+} 276+}
277 277
278+void SharkCompiler::init_llvm() { 278+void SharkCompiler::init_llvm() {
279+ // with llvm 3.5, Multi-threading can only be enabled/disabled with the 279+ // with llvm 3.5, Multi-threading can only be enabled/disabled with the
280+ // compile time define LLVM_ENABLE_THREADS 280+ // compile time define LLVM_ENABLE_THREADS
@@ -286,19 +286,19 @@
286+ if (!llvm_is_multithreaded()) 286+ if (!llvm_is_multithreaded())
287+ fatal("llvm_is_multithreaded() tells no multithreading support in llvm"); 287+ fatal("llvm_is_multithreaded() tells no multithreading support in llvm");
288+#endif 288+#endif
289 289
290 // Initialize the native target 290 // Initialize the native target
291 InitializeNativeTarget(); 291 InitializeNativeTarget();
292@@ -83,7 +97,7 @@ 292@@ -83,7 +97,7 @@ SharkCompiler::SharkCompiler()
293 // Finetune LLVM for the current host CPU. 293 // Finetune LLVM for the current host CPU.
294 StringMap<bool> Features; 294 StringMap<bool> Features;
295 bool gotCpuFeatures = llvm::sys::getHostCPUFeatures(Features); 295 bool gotCpuFeatures = llvm::sys::getHostCPUFeatures(Features);
296- std::string cpu("-mcpu=" + llvm::sys::getHostCPUName()); 296- std::string cpu("-mcpu=" + llvm::sys::getHostCPUName());
297+ std::string cpu("-mcpu=" + std::string(llvm::sys::getHostCPUName())); 297+ std::string cpu("-mcpu=" + std::string(llvm::sys::getHostCPUName()));
298 298
299 std::vector<const char*> args; 299 std::vector<const char*> args;
300 args.push_back(""); // program name 300 args.push_back(""); // program name
301@@ -112,6 +126,9 @@ 301@@ -112,6 +126,9 @@ SharkCompiler::SharkCompiler()
302 builder.setMAttrs(MAttrs); 302 builder.setMAttrs(MAttrs);
303 builder.setJITMemoryManager(memory_manager()); 303 builder.setJITMemoryManager(memory_manager());
304 builder.setEngineKind(EngineKind::JIT); 304 builder.setEngineKind(EngineKind::JIT);
@@ -308,9 +308,10 @@
308 builder.setErrorStr(&ErrorMsg); 308 builder.setErrorStr(&ErrorMsg);
309 if (! fnmatch(SharkOptimizationLevel, "None", 0)) { 309 if (! fnmatch(SharkOptimizationLevel, "None", 0)) {
310 tty->print_cr("Shark optimization level set to: None"); 310 tty->print_cr("Shark optimization level set to: None");
311@@ -134,9 +151,10 @@ 311@@ -133,10 +150,11 @@ SharkCompiler::SharkCompiler()
312 exit(1);
312 } 313 }
313 314
314+#if SHARK_LLVM_VERSION > 34 315+#if SHARK_LLVM_VERSION > 34
315+ _native_context->execution_engine(_execution_engine); 316+ _native_context->execution_engine(_execution_engine);
316+ _normal_context->execution_engine(_execution_engine); 317+ _normal_context->execution_engine(_execution_engine);
@@ -320,19 +321,19 @@
320- // All done 321- // All done
321- set_state(initialized); 322- set_state(initialized);
322 } 323 }
323 324
324 void SharkCompiler::initialize() { 325 void SharkCompiler::initialize() {
325@@ -165,7 +179,7 @@ 326@@ -165,7 +183,7 @@ void SharkCompiler::compile_method(ciEnv
326 } 327 }
327 328
328 // Create the recorders 329 // Create the recorders
329- Arena arena; 330- Arena arena;
330+ Arena arena(mtCompiler); 331+ Arena arena(mtCompiler);
331 env->set_oop_recorder(new OopRecorder(&arena)); 332 env->set_oop_recorder(new OopRecorder(&arena));
332 OopMapSet oopmaps; 333 OopMapSet oopmaps;
333 env->set_debug_info(new DebugInformationRecorder(env->oop_recorder())); 334 env->set_debug_info(new DebugInformationRecorder(env->oop_recorder()));
334@@ -268,7 +282,12 @@ 335@@ -268,7 +286,12 @@ void SharkCompiler::generate_native_code
335 336
336 if (SharkVerifyFunction != NULL) { 337 if (SharkVerifyFunction != NULL) {
337 if (!fnmatch(SharkVerifyFunction, name, 0)) { 338 if (!fnmatch(SharkVerifyFunction, name, 0)) {
338+#if SHARK_LLVM_VERSION <= 34 339+#if SHARK_LLVM_VERSION <= 34
@@ -343,8 +344,8 @@
343+#endif 344+#endif
344 } 345 }
345 } 346 }
346 347
347@@ -298,7 +317,11 @@ 348@@ -298,7 +321,11 @@ void SharkCompiler::generate_native_code
348 #endif 349 #endif
349 #endif // !NDEBUG 350 #endif // !NDEBUG
350 memory_manager()->set_entry_for_function(function, entry); 351 memory_manager()->set_entry_for_function(function, entry);
@@ -356,11 +357,11 @@
356 } 357 }
357 assert(code != NULL, "code must be != NULL"); 358 assert(code != NULL, "code must be != NULL");
358 entry->set_entry_point(code); 359 entry->set_entry_point(code);
359--- hotspot/src/share/vm/shark/sharkContext.cpp.orig 2015-09-21 11:22:51.707813194 +0200 360--- hotspot/src/share/vm/shark/sharkContext.cpp.orig
360+++ hotspot/src/share/vm/shark/sharkContext.cpp 2015-09-21 13:47:56.243845961 +0200 361+++ hotspot/src/share/vm/shark/sharkContext.cpp
361@@ -34,8 +34,13 @@ 362@@ -34,8 +34,13 @@
362 using namespace llvm; 363 using namespace llvm;
363 364
364 SharkContext::SharkContext(const char* name) 365 SharkContext::SharkContext(const char* name)
365- : LLVMContext(), 366- : LLVMContext(),
366- _free_queue(NULL) { 367- _free_queue(NULL) {
@@ -373,32 +374,32 @@
373+{ 374+{
374 // Create a module to build our functions into 375 // Create a module to build our functions into
375 _module = new Module(name, *this); 376 _module = new Module(name, *this);
376 377
377--- hotspot/src/share/vm/shark/sharkContext.hpp.orig 2015-09-21 10:58:37.195807719 +0200 378--- hotspot/src/share/vm/shark/sharkContext.hpp.orig
378+++ hotspot/src/share/vm/shark/sharkContext.hpp 2015-09-21 13:50:48.459846609 +0200 379+++ hotspot/src/share/vm/shark/sharkContext.hpp
379@@ -29,6 +29,8 @@ 380@@ -29,6 +29,8 @@
380 #include "shark/llvmHeaders.hpp" 381 #include "shark/llvmHeaders.hpp"
381 #include "shark/sharkCompiler.hpp" 382 #include "shark/sharkCompiler.hpp"
382 383
383+#include <map> 384+#include <map>
384+ 385+
385 // The LLVMContext class allows multiple instances of LLVM to operate 386 // The LLVMContext class allows multiple instances of LLVM to operate
386 // independently of each other in a multithreaded context. We extend 387 // independently of each other in a multithreaded context. We extend
387 // this here to store things in Shark that are LLVMContext-specific. 388 // this here to store things in Shark that are LLVMContext-specific.
388@@ -41,12 +43,28 @@ 389@@ -41,12 +43,28 @@ class SharkContext : public llvm::LLVMCo
389 390
390 private: 391 private:
391 llvm::Module* _module; 392 llvm::Module* _module;
392+#if SHARK_LLVM_VERSION > 34 393+#if SHARK_LLVM_VERSION > 34
393+ llvm::ExecutionEngine *_ee; 394+ llvm::ExecutionEngine *_ee;
394+ std::map<std::string, llvm::Module *> func_mod_map; 395+ std::map<std::string, llvm::Module *> func_mod_map;
395+#endif 396+#endif
396 397
397 public: 398 public:
398 llvm::Module* module() const { 399 llvm::Module* module() const {
399 return _module; 400 return _module;
400 } 401 }
401 402
402+#if SHARK_LLVM_VERSION > 34 403+#if SHARK_LLVM_VERSION > 34
403+ llvm::ExecutionEngine *execution_engine(llvm::ExecutionEngine *ee) { 404+ llvm::ExecutionEngine *execution_engine(llvm::ExecutionEngine *ee) {
404+ llvm::ExecutionEngine *oee = _ee; 405+ llvm::ExecutionEngine *oee = _ee;
@@ -414,8 +415,8 @@
414 // Get this thread's SharkContext 415 // Get this thread's SharkContext
415 public: 416 public:
416 static SharkContext& current() { 417 static SharkContext& current() {
417@@ -55,12 +73,35 @@ 418@@ -55,12 +73,35 @@ class SharkContext : public llvm::LLVMCo
418 419
419 // Module accessors 420 // Module accessors
420 public: 421 public:
421- void add_function(llvm::Function* function) const { 422- void add_function(llvm::Function* function) const {
@@ -449,5 +450,5 @@
449+ } 450+ }
450+#endif 451+#endif
451 } 452 }
452 453
453 // Basic types 454 // Basic types
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 a1900b3..12fc17d 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,22 +1,18 @@
1diff --git hotspot/src/os/posix/vm/os_posix.cpp hotspot/src/os/posix/vm/os_posix.cpp 1--- hotspot/src/os/posix/vm/os_posix.cpp.orig
2index d1bf84f..a88417c 100644
3--- hotspot/src/os/posix/vm/os_posix.cpp
4+++ hotspot/src/os/posix/vm/os_posix.cpp 2+++ hotspot/src/os/posix/vm/os_posix.cpp
5@@ -594,7 +594,7 @@ const char* os::Posix::describe_sa_flags(int flags, char* buffer, size_t size) { 3@@ -594,7 +594,7 @@ const char* os::Posix::describe_sa_flags
6 strncpy(buffer, "none", size); 4 strncpy(buffer, "none", size);
7 5
8 const struct { 6 const struct {
9- int i; 7- int i;
10+ unsigned i; 8+ unsigned i;
11 const char* s; 9 const char* s;
12 } flaginfo [] = { 10 } flaginfo [] = {
13 { SA_NOCLDSTOP, "SA_NOCLDSTOP" }, 11 { SA_NOCLDSTOP, "SA_NOCLDSTOP" },
14diff --git hotspot/src/share/vm/classfile/dictionary.hpp hotspot/src/share/vm/classfile/dictionary.hpp 12--- hotspot/src/share/vm/classfile/dictionary.hpp.orig
15index 504e735..9ed0def 100644
16--- hotspot/src/share/vm/classfile/dictionary.hpp
17+++ hotspot/src/share/vm/classfile/dictionary.hpp 13+++ hotspot/src/share/vm/classfile/dictionary.hpp
18@@ -373,7 +373,7 @@ class SymbolPropertyEntry : public HashtableEntry<Symbol*, mtSymbol> { 14@@ -373,7 +373,7 @@ class SymbolPropertyEntry : public Hasht
19 15
20 void print_on(outputStream* st) const { 16 void print_on(outputStream* st) const {
21 symbol()->print_value_on(st); 17 symbol()->print_value_on(st);
22- st->print("/mode="INTX_FORMAT, symbol_mode()); 18- st->print("/mode="INTX_FORMAT, symbol_mode());
@@ -24,11 +20,9 @@ index 504e735..9ed0def 100644
24 st->print(" -> "); 20 st->print(" -> ");
25 bool printed = false; 21 bool printed = false;
26 if (method() != NULL) { 22 if (method() != NULL) {
27diff --git hotspot/src/share/vm/code/exceptionHandlerTable.cpp hotspot/src/share/vm/code/exceptionHandlerTable.cpp 23--- hotspot/src/share/vm/code/exceptionHandlerTable.cpp.orig
28index 511b84d..224e164 100644
29--- hotspot/src/share/vm/code/exceptionHandlerTable.cpp
30+++ hotspot/src/share/vm/code/exceptionHandlerTable.cpp 24+++ hotspot/src/share/vm/code/exceptionHandlerTable.cpp
31@@ -186,7 +186,7 @@ uint ImplicitExceptionTable::at( uint exec_off ) const { 25@@ -186,7 +186,7 @@ uint ImplicitExceptionTable::at( uint ex
32 void ImplicitExceptionTable::print(address base) const { 26 void ImplicitExceptionTable::print(address base) const {
33 tty->print("{"); 27 tty->print("{");
34 for( uint i=0; i<len(); i++ ) 28 for( uint i=0; i<len(); i++ )
@@ -36,12 +30,10 @@ index 511b84d..224e164 100644
36+ tty->print("< " INTPTR_FORMAT ", " INTPTR_FORMAT " > ",base + *adr(i), base + *(adr(i)+1)); 30+ tty->print("< " INTPTR_FORMAT ", " INTPTR_FORMAT " > ",base + *adr(i), base + *(adr(i)+1));
37 tty->print_cr("}"); 31 tty->print_cr("}");
38 } 32 }
39 33
40diff --git hotspot/src/share/vm/code/nmethod.cpp hotspot/src/share/vm/code/nmethod.cpp 34--- hotspot/src/share/vm/code/nmethod.cpp.orig
41index 6ea39ae..94a7eef 100644
42--- hotspot/src/share/vm/code/nmethod.cpp
43+++ hotspot/src/share/vm/code/nmethod.cpp 35+++ hotspot/src/share/vm/code/nmethod.cpp
44@@ -2319,7 +2319,7 @@ public: 36@@ -2344,7 +2344,7 @@ public:
45 void maybe_print(oop* p) { 37 void maybe_print(oop* p) {
46 if (_print_nm == NULL) return; 38 if (_print_nm == NULL) return;
47 if (!_detected_scavenge_root) _print_nm->print_on(tty, "new scavenge root"); 39 if (!_detected_scavenge_root) _print_nm->print_on(tty, "new scavenge root");
@@ -50,7 +42,7 @@ index 6ea39ae..94a7eef 100644
50 _print_nm, (int)((intptr_t)p - (intptr_t)_print_nm), 42 _print_nm, (int)((intptr_t)p - (intptr_t)_print_nm),
51 (void *)(*p), (intptr_t)p); 43 (void *)(*p), (intptr_t)p);
52 (*p)->print(); 44 (*p)->print();
53@@ -2700,7 +2700,7 @@ public: 45@@ -2725,7 +2725,7 @@ public:
54 _nm->print_nmethod(true); 46 _nm->print_nmethod(true);
55 _ok = false; 47 _ok = false;
56 } 48 }
@@ -59,7 +51,7 @@ index 6ea39ae..94a7eef 100644
59 (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm)); 51 (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
60 } 52 }
61 virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); } 53 virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
62@@ -2824,7 +2824,7 @@ public: 54@@ -2849,7 +2849,7 @@ public:
63 _nm->print_nmethod(true); 55 _nm->print_nmethod(true);
64 _ok = false; 56 _ok = false;
65 } 57 }
@@ -68,46 +60,40 @@ index 6ea39ae..94a7eef 100644
68 (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm)); 60 (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
69 (*p)->print(); 61 (*p)->print();
70 } 62 }
71@@ -2869,7 +2869,7 @@ void nmethod::print() const { 63@@ -2894,7 +2894,7 @@ void nmethod::print() const {
72 print_on(tty, NULL); 64 print_on(tty, NULL);
73 65
74 if (WizardMode) { 66 if (WizardMode) {
75- tty->print("((nmethod*) "INTPTR_FORMAT ") ", this); 67- tty->print("((nmethod*) "INTPTR_FORMAT ") ", this);
76+ tty->print("((nmethod*) " INTPTR_FORMAT ") ", this); 68+ tty->print("((nmethod*) " INTPTR_FORMAT ") ", this);
77 tty->print(" for method " INTPTR_FORMAT , (address)method()); 69 tty->print(" for method " INTPTR_FORMAT , (address)method());
78 tty->print(" { "); 70 tty->print(" { ");
79 if (is_in_use()) tty->print("in_use "); 71 if (is_in_use()) tty->print("in_use ");
80diff --git hotspot/src/share/vm/compiler/compileBroker.cpp hotspot/src/share/vm/compiler/compileBroker.cpp 72--- hotspot/src/share/vm/compiler/compileBroker.cpp.orig
81index dad99ec..81429cc 100644
82--- hotspot/src/share/vm/compiler/compileBroker.cpp
83+++ hotspot/src/share/vm/compiler/compileBroker.cpp 73+++ hotspot/src/share/vm/compiler/compileBroker.cpp
84@@ -203,7 +203,7 @@ class CompilationLog : public StringEventLog { 74@@ -203,7 +203,7 @@ class CompilationLog : public StringEven
85 } 75 }
86 76
87 void log_nmethod(JavaThread* thread, nmethod* nm) { 77 void log_nmethod(JavaThread* thread, nmethod* nm) {
88- log(thread, "nmethod %d%s " INTPTR_FORMAT " code ["INTPTR_FORMAT ", " INTPTR_FORMAT "]", 78- log(thread, "nmethod %d%s " INTPTR_FORMAT " code ["INTPTR_FORMAT ", " INTPTR_FORMAT "]",
89+ log(thread, "nmethod %d%s " INTPTR_FORMAT " code [" INTPTR_FORMAT ", " INTPTR_FORMAT "]", 79+ log(thread, "nmethod %d%s " INTPTR_FORMAT " code [" INTPTR_FORMAT ", " INTPTR_FORMAT "]",
90 nm->compile_id(), nm->is_osr_method() ? "%" : "", 80 nm->compile_id(), nm->is_osr_method() ? "%" : "",
91 p2i(nm), p2i(nm->code_begin()), p2i(nm->code_end())); 81 p2i(nm), p2i(nm->code_begin()), p2i(nm->code_end()));
92 } 82 }
93diff --git hotspot/src/share/vm/compiler/disassembler.cpp hotspot/src/share/vm/compiler/disassembler.cpp 83--- hotspot/src/share/vm/compiler/disassembler.cpp.orig
94index 3291360..93cd9e8 100644
95--- hotspot/src/share/vm/compiler/disassembler.cpp
96+++ hotspot/src/share/vm/compiler/disassembler.cpp 84+++ hotspot/src/share/vm/compiler/disassembler.cpp
97@@ -60,7 +60,7 @@ bool Disassembler::_tried_to_load_library = false; 85@@ -63,7 +63,7 @@ bool Disassembler::_tried_to_load
98 Disassembler::decode_func_virtual Disassembler::_decode_instructions_virtual = NULL; 86 Disassembler::decode_func_virtual Disassembler::_decode_instructions_virtual = NULL;
99 Disassembler::decode_func Disassembler::_decode_instructions = NULL; 87 Disassembler::decode_func Disassembler::_decode_instructions = NULL;
100 88
101-static const char hsdis_library_name[] = "hsdis-"HOTSPOT_LIB_ARCH; 89-static const char hsdis_library_name[] = "hsdis-"HOTSPOT_LIB_ARCH;
102+static const char hsdis_library_name[] = "hsdis-" HOTSPOT_LIB_ARCH; 90+static const char hsdis_library_name[] = "hsdis-" HOTSPOT_LIB_ARCH;
103 static const char decode_instructions_virtual_name[] = "decode_instructions_virtual"; 91 static const char decode_instructions_virtual_name[] = "decode_instructions_virtual";
104 static const char decode_instructions_name[] = "decode_instructions"; 92 static const char decode_instructions_name[] = "decode_instructions";
105 static bool use_new_version = true; 93 static bool use_new_version = true;
106diff --git hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 94--- hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.orig
107index 14f09d1..7427120 100644
108--- hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
109+++ hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 95+++ hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
110@@ -838,18 +838,18 @@ void ConcurrentMarkSweepGeneration::printOccupancy(const char *s) { 96@@ -838,18 +838,18 @@ void ConcurrentMarkSweepGeneration::prin
111 GenCollectedHeap* gch = GenCollectedHeap::heap(); 97 GenCollectedHeap* gch = GenCollectedHeap::heap();
112 if (PrintGCDetails) { 98 if (PrintGCDetails) {
113 if (Verbose) { 99 if (Verbose) {
@@ -130,7 +116,7 @@ index 14f09d1..7427120 100644
130 gch->used() / K, gch->capacity() / K); 116 gch->used() / K, gch->capacity() / K);
131 } 117 }
132 } 118 }
133@@ -879,8 +879,8 @@ bool ConcurrentMarkSweepGeneration::promotion_attempt_is_safe(size_t max_promoti 119@@ -879,8 +879,8 @@ bool ConcurrentMarkSweepGeneration::prom
134 bool res = (available >= av_promo) || (available >= max_promotion_in_bytes); 120 bool res = (available >= av_promo) || (available >= max_promotion_in_bytes);
135 if (Verbose && PrintGCDetails) { 121 if (Verbose && PrintGCDetails) {
136 gclog_or_tty->print_cr( 122 gclog_or_tty->print_cr(
@@ -141,7 +127,7 @@ index 14f09d1..7427120 100644
141 res? "":" not", available, res? ">=":"<", 127 res? "":" not", available, res? ">=":"<",
142 av_promo, max_promotion_in_bytes); 128 av_promo, max_promotion_in_bytes);
143 } 129 }
144@@ -966,8 +966,8 @@ void ConcurrentMarkSweepGeneration::compute_new_size_free_list() { 130@@ -966,8 +966,8 @@ void ConcurrentMarkSweepGeneration::comp
145 desired_free_percentage); 131 desired_free_percentage);
146 gclog_or_tty->print_cr(" Maximum free fraction %f", 132 gclog_or_tty->print_cr(" Maximum free fraction %f",
147 maximum_free_percentage); 133 maximum_free_percentage);
@@ -152,7 +138,7 @@ index 14f09d1..7427120 100644
152 desired_capacity/1000); 138 desired_capacity/1000);
153 int prev_level = level() - 1; 139 int prev_level = level() - 1;
154 if (prev_level >= 0) { 140 if (prev_level >= 0) {
155@@ -975,14 +975,14 @@ void ConcurrentMarkSweepGeneration::compute_new_size_free_list() { 141@@ -975,14 +975,14 @@ void ConcurrentMarkSweepGeneration::comp
156 GenCollectedHeap* gch = GenCollectedHeap::heap(); 142 GenCollectedHeap* gch = GenCollectedHeap::heap();
157 Generation* prev_gen = gch->_gens[prev_level]; 143 Generation* prev_gen = gch->_gens[prev_level];
158 prev_size = prev_gen->capacity(); 144 prev_size = prev_gen->capacity();
@@ -171,7 +157,7 @@ index 14f09d1..7427120 100644
171 expand_bytes); 157 expand_bytes);
172 } 158 }
173 // safe if expansion fails 159 // safe if expansion fails
174@@ -1513,8 +1513,8 @@ bool CMSCollector::shouldConcurrentCollect() { 160@@ -1513,8 +1513,8 @@ bool CMSCollector::shouldConcurrentColle
175 stats().print_on(gclog_or_tty); 161 stats().print_on(gclog_or_tty);
176 gclog_or_tty->print_cr("time_until_cms_gen_full %3.7f", 162 gclog_or_tty->print_cr("time_until_cms_gen_full %3.7f",
177 stats().time_until_cms_gen_full()); 163 stats().time_until_cms_gen_full());
@@ -182,7 +168,7 @@ index 14f09d1..7427120 100644
182 _cmsGen->contiguous_available()); 168 _cmsGen->contiguous_available());
183 gclog_or_tty->print_cr("promotion_rate=%g", stats().promotion_rate()); 169 gclog_or_tty->print_cr("promotion_rate=%g", stats().promotion_rate());
184 gclog_or_tty->print_cr("cms_allocation_rate=%g", stats().cms_allocation_rate()); 170 gclog_or_tty->print_cr("cms_allocation_rate=%g", stats().cms_allocation_rate());
185@@ -2792,7 +2792,7 @@ void ConcurrentMarkSweepGeneration::gc_prologue_work(bool full, 171@@ -2792,7 +2792,7 @@ void ConcurrentMarkSweepGeneration::gc_p
186 assert(_numObjectsPromoted == 0, "check"); 172 assert(_numObjectsPromoted == 0, "check");
187 assert(_numWordsPromoted == 0, "check"); 173 assert(_numWordsPromoted == 0, "check");
188 if (Verbose && PrintGC) { 174 if (Verbose && PrintGC) {
@@ -191,7 +177,7 @@ index 14f09d1..7427120 100644
191 SIZE_FORMAT" bytes concurrently", 177 SIZE_FORMAT" bytes concurrently",
192 _numObjectsAllocated, _numWordsAllocated*sizeof(HeapWord)); 178 _numObjectsAllocated, _numWordsAllocated*sizeof(HeapWord));
193 } 179 }
194@@ -2879,7 +2879,7 @@ void ConcurrentMarkSweepGeneration::gc_epilogue_work(bool full) { 180@@ -2879,7 +2879,7 @@ void ConcurrentMarkSweepGeneration::gc_e
195 assert(_numObjectsAllocated == 0, "check"); 181 assert(_numObjectsAllocated == 0, "check");
196 assert(_numWordsAllocated == 0, "check"); 182 assert(_numWordsAllocated == 0, "check");
197 if (Verbose && PrintGC) { 183 if (Verbose && PrintGC) {
@@ -200,7 +186,7 @@ index 14f09d1..7427120 100644
200 SIZE_FORMAT" bytes", 186 SIZE_FORMAT" bytes",
201 _numObjectsPromoted, _numWordsPromoted*sizeof(HeapWord)); 187 _numObjectsPromoted, _numWordsPromoted*sizeof(HeapWord));
202 } 188 }
203@@ -2890,7 +2890,7 @@ void ConcurrentMarkSweepGeneration::gc_epilogue_work(bool full) { 189@@ -2890,7 +2890,7 @@ void ConcurrentMarkSweepGeneration::gc_e
204 if (PrintGC && Verbose) { 190 if (PrintGC && Verbose) {
205 // Call down the chain in contiguous_available needs the freelistLock 191 // Call down the chain in contiguous_available needs the freelistLock
206 // so print this out before releasing the freeListLock. 192 // so print this out before releasing the freeListLock.
@@ -209,7 +195,7 @@ index 14f09d1..7427120 100644
209 contiguous_available()); 195 contiguous_available());
210 } 196 }
211 } 197 }
212@@ -2978,7 +2978,7 @@ class VerifyMarkedClosure: public BitMapClosure { 198@@ -2978,7 +2978,7 @@ class VerifyMarkedClosure: public BitMap
213 HeapWord* addr = _marks->offsetToHeapWord(offset); 199 HeapWord* addr = _marks->offsetToHeapWord(offset);
214 if (!_marks->isMarked(addr)) { 200 if (!_marks->isMarked(addr)) {
215 oop(addr)->print_on(gclog_or_tty); 201 oop(addr)->print_on(gclog_or_tty);
@@ -218,8 +204,8 @@ index 14f09d1..7427120 100644
218 _failed = true; 204 _failed = true;
219 } 205 }
220 return true; 206 return true;
221@@ -5039,7 +5039,7 @@ void CMSCollector::checkpointRootsFinal(bool asynch, 207@@ -5039,7 +5039,7 @@ void CMSCollector::checkpointRootsFinal(
222 208
223 SpecializationStats::clear(); 209 SpecializationStats::clear();
224 if (PrintGCDetails) { 210 if (PrintGCDetails) {
225- gclog_or_tty->print("[YG occupancy: "SIZE_FORMAT" K ("SIZE_FORMAT" K)]", 211- gclog_or_tty->print("[YG occupancy: "SIZE_FORMAT" K ("SIZE_FORMAT" K)]",
@@ -227,7 +213,7 @@ index 14f09d1..7427120 100644
227 _young_gen->used() / K, 213 _young_gen->used() / K,
228 _young_gen->capacity() / K); 214 _young_gen->capacity() / K);
229 } 215 }
230@@ -5172,8 +5172,8 @@ void CMSCollector::checkpointRootsFinalWork(bool asynch, 216@@ -5172,8 +5172,8 @@ void CMSCollector::checkpointRootsFinalW
231 if (ser_ovflw > 0) { 217 if (ser_ovflw > 0) {
232 if (PrintCMSStatistics != 0) { 218 if (PrintCMSStatistics != 0) {
233 gclog_or_tty->print_cr("Marking stack overflow (benign) " 219 gclog_or_tty->print_cr("Marking stack overflow (benign) "
@@ -238,7 +224,7 @@ index 14f09d1..7427120 100644
238 _ser_pmc_preclean_ovflw, _ser_pmc_remark_ovflw, 224 _ser_pmc_preclean_ovflw, _ser_pmc_remark_ovflw,
239 _ser_kac_ovflw, _ser_kac_preclean_ovflw); 225 _ser_kac_ovflw, _ser_kac_preclean_ovflw);
240 } 226 }
241@@ -5186,7 +5186,7 @@ void CMSCollector::checkpointRootsFinalWork(bool asynch, 227@@ -5186,7 +5186,7 @@ void CMSCollector::checkpointRootsFinalW
242 if (_par_pmc_remark_ovflw > 0 || _par_kac_ovflw > 0) { 228 if (_par_pmc_remark_ovflw > 0 || _par_kac_ovflw > 0) {
243 if (PrintCMSStatistics != 0) { 229 if (PrintCMSStatistics != 0) {
244 gclog_or_tty->print_cr("Work queue overflow (benign) " 230 gclog_or_tty->print_cr("Work queue overflow (benign) "
@@ -247,7 +233,7 @@ index 14f09d1..7427120 100644
247 _par_pmc_remark_ovflw, _par_kac_ovflw); 233 _par_pmc_remark_ovflw, _par_kac_ovflw);
248 } 234 }
249 _par_pmc_remark_ovflw = 0; 235 _par_pmc_remark_ovflw = 0;
250@@ -5194,12 +5194,12 @@ void CMSCollector::checkpointRootsFinalWork(bool asynch, 236@@ -5194,12 +5194,12 @@ void CMSCollector::checkpointRootsFinalW
251 } 237 }
252 if (PrintCMSStatistics != 0) { 238 if (PrintCMSStatistics != 0) {
253 if (_markStack._hit_limit > 0) { 239 if (_markStack._hit_limit > 0) {
@@ -263,7 +249,7 @@ index 14f09d1..7427120 100644
263 _markStack._failed_double, 249 _markStack._failed_double,
264 _markStack.capacity()); 250 _markStack.capacity());
265 } 251 }
266@@ -5963,7 +5963,7 @@ void CMSCollector::do_remark_non_parallel() { 252@@ -5963,7 +5963,7 @@ void CMSCollector::do_remark_non_paralle
267 &markFromDirtyCardsClosure); 253 &markFromDirtyCardsClosure);
268 verify_work_stacks_empty(); 254 verify_work_stacks_empty();
269 if (PrintCMSStatistics != 0) { 255 if (PrintCMSStatistics != 0) {
@@ -299,7 +285,7 @@ index 14f09d1..7427120 100644
299 * sizeof(HeapWord); 285 * sizeof(HeapWord);
300- gclog_or_tty->print_cr("Total sweep: "SIZE_FORMAT" bytes", totalBytes); 286- gclog_or_tty->print_cr("Total sweep: "SIZE_FORMAT" bytes", totalBytes);
301+ gclog_or_tty->print_cr("Total sweep: " SIZE_FORMAT " bytes", totalBytes); 287+ gclog_or_tty->print_cr("Total sweep: " SIZE_FORMAT " bytes", totalBytes);
302 288
303 if (PrintCMSStatistics && CMSVerifyReturnedBytes) { 289 if (PrintCMSStatistics && CMSVerifyReturnedBytes) {
304 size_t indexListReturnedBytes = _sp->sumIndexedFreeListArrayReturnedBytes(); 290 size_t indexListReturnedBytes = _sp->sumIndexedFreeListArrayReturnedBytes();
305 size_t dict_returned_bytes = _sp->dictionary()->sum_dict_returned_bytes(); 291 size_t dict_returned_bytes = _sp->dictionary()->sum_dict_returned_bytes();
@@ -314,7 +300,7 @@ index 14f09d1..7427120 100644
314 dict_returned_bytes); 300 dict_returned_bytes);
315 } 301 }
316 } 302 }
317@@ -8313,13 +8313,13 @@ size_t SweepClosure::do_blk_careful(HeapWord* addr) { 303@@ -8313,13 +8313,13 @@ size_t SweepClosure::do_blk_careful(Heap
318 // coalesced chunk to the appropriate free list. 304 // coalesced chunk to the appropriate free list.
319 if (inFreeRange()) { 305 if (inFreeRange()) {
320 assert(freeFinger() >= _sp->bottom() && freeFinger() < _limit, 306 assert(freeFinger() >= _sp->bottom() && freeFinger() < _limit,
@@ -331,9 +317,7 @@ index 14f09d1..7427120 100644
331 freeFinger(), pointer_delta(addr, freeFinger()), 317 freeFinger(), pointer_delta(addr, freeFinger()),
332 lastFreeRangeCoalesced()); 318 lastFreeRangeCoalesced());
333 } 319 }
334diff --git hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp 320--- hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp.orig
335index e177fd1..c36852e 100644
336--- hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
337+++ hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp 321+++ hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
338@@ -92,7 +92,7 @@ public: 322@@ -92,7 +92,7 @@ public:
339 regions_at_put(_curr_index, NULL); 323 regions_at_put(_curr_index, NULL);
@@ -344,9 +328,7 @@ index e177fd1..c36852e 100644
344 hr->reclaimable_bytes(), _remaining_reclaimable_bytes)); 328 hr->reclaimable_bytes(), _remaining_reclaimable_bytes));
345 _remaining_reclaimable_bytes -= hr->reclaimable_bytes(); 329 _remaining_reclaimable_bytes -= hr->reclaimable_bytes();
346 _curr_index += 1; 330 _curr_index += 1;
347diff --git hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 331--- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.orig
348index 9226191..29b4899 100644
349--- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
350+++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 332+++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
351@@ -284,7 +284,7 @@ void CMMarkStack::expand() { 333@@ -284,7 +284,7 @@ void CMMarkStack::expand() {
352 if (PrintGCDetails && Verbose) { 334 if (PrintGCDetails && Verbose) {
@@ -357,16 +339,16 @@ index 9226191..29b4899 100644
357 _capacity / K, new_capacity / K); 339 _capacity / K, new_capacity / K);
358 } 340 }
359 } 341 }
360@@ -581,7 +581,7 @@ ConcurrentMark::ConcurrentMark(G1CollectedHeap* g1h, G1RegionToSpaceMapper* prev 342@@ -581,7 +581,7 @@ ConcurrentMark::ConcurrentMark(G1Collect
361 _verbose_level = verbose_level; 343 _verbose_level = verbose_level;
362 344
363 if (verbose_low()) { 345 if (verbose_low()) {
364- gclog_or_tty->print_cr("[global] init, heap start = "PTR_FORMAT", " 346- gclog_or_tty->print_cr("[global] init, heap start = "PTR_FORMAT", "
365+ gclog_or_tty->print_cr("[global] init, heap start = " PTR_FORMAT ", " 347+ gclog_or_tty->print_cr("[global] init, heap start = " PTR_FORMAT ", "
366 "heap end = " INTPTR_FORMAT, p2i(_heap_start), p2i(_heap_end)); 348 "heap end = " INTPTR_FORMAT, p2i(_heap_start), p2i(_heap_end));
367 } 349 }
368 350
369@@ -838,7 +838,7 @@ void ConcurrentMark::set_concurrency_and_phase(uint active_tasks, bool concurren 351@@ -837,7 +837,7 @@ void ConcurrentMark::set_concurrency_and
370 // in a STW phase. 352 // in a STW phase.
371 assert(!concurrent_marking_in_progress(), "invariant"); 353 assert(!concurrent_marking_in_progress(), "invariant");
372 assert(out_of_regions(), 354 assert(out_of_regions(),
@@ -375,18 +357,18 @@ index 9226191..29b4899 100644
375 p2i(_finger), p2i(_heap_end))); 357 p2i(_finger), p2i(_heap_end)));
376 } 358 }
377 } 359 }
378@@ -1453,7 +1453,7 @@ public: 360@@ -1452,7 +1452,7 @@ public:
379 361
380 assert(start <= hr->end() && start <= ntams && ntams <= hr->end(), 362 assert(start <= hr->end() && start <= ntams && ntams <= hr->end(),
381 err_msg("Preconditions not met - " 363 err_msg("Preconditions not met - "
382- "start: "PTR_FORMAT", ntams: "PTR_FORMAT", end: "PTR_FORMAT, 364- "start: "PTR_FORMAT", ntams: "PTR_FORMAT", end: "PTR_FORMAT,
383+ "start: " PTR_FORMAT ", ntams: " PTR_FORMAT ", end: " PTR_FORMAT, 365+ "start: " PTR_FORMAT ", ntams: " PTR_FORMAT ", end: " PTR_FORMAT,
384 p2i(start), p2i(ntams), p2i(hr->end()))); 366 p2i(start), p2i(ntams), p2i(hr->end())));
385 367
386 // Find the first marked object at or after "start". 368 // Find the first marked object at or after "start".
387@@ -1770,10 +1770,10 @@ class FinalCountDataUpdateClosure: public CMCountDataClosureBase { 369@@ -1769,10 +1769,10 @@ class FinalCountDataUpdateClosure: publi
388 } 370 }
389 371
390 assert(end_idx <= _card_bm->size(), 372 assert(end_idx <= _card_bm->size(),
391- err_msg("oob: end_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT, 373- err_msg("oob: end_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT,
392+ err_msg("oob: end_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT, 374+ err_msg("oob: end_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT,
@@ -395,9 +377,9 @@ index 9226191..29b4899 100644
395- err_msg("oob: start_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT, 377- err_msg("oob: start_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT,
396+ err_msg("oob: start_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT, 378+ err_msg("oob: start_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT,
397 start_idx, _card_bm->size())); 379 start_idx, _card_bm->size()));
398 380
399 _cm->set_card_bitmap_range(_card_bm, start_idx, end_idx, true /* is_par */); 381 _cm->set_card_bitmap_range(_card_bm, start_idx, end_idx, true /* is_par */);
400@@ -2278,7 +2278,7 @@ class G1CMKeepAliveAndDrainClosure: public OopClosure { 382@@ -2277,7 +2277,7 @@ class G1CMKeepAliveAndDrainClosure: publ
401 oop obj = oopDesc::load_decode_heap_oop(p); 383 oop obj = oopDesc::load_decode_heap_oop(p);
402 if (_cm->verbose_high()) { 384 if (_cm->verbose_high()) {
403 gclog_or_tty->print_cr("\t[%u] we're looking at location " 385 gclog_or_tty->print_cr("\t[%u] we're looking at location "
@@ -405,26 +387,26 @@ index 9226191..29b4899 100644
405+ "*" PTR_FORMAT " = " PTR_FORMAT, 387+ "*" PTR_FORMAT " = " PTR_FORMAT,
406 _task->worker_id(), p2i(p), p2i((void*) obj)); 388 _task->worker_id(), p2i(p), p2i((void*) obj));
407 } 389 }
408 390
409@@ -2847,7 +2847,7 @@ public: 391@@ -2846,7 +2846,7 @@ public:
410 } 392 }
411 } 393 }
412 394
413- _out->print_cr(" "PTR_FORMAT": "PTR_FORMAT"%s%s", 395- _out->print_cr(" "PTR_FORMAT": "PTR_FORMAT"%s%s",
414+ _out->print_cr(" " PTR_FORMAT ": " PTR_FORMAT "%s%s", 396+ _out->print_cr(" " PTR_FORMAT ": " PTR_FORMAT "%s%s",
415 p2i(p), p2i((void*) obj), str, str2); 397 p2i(p), p2i((void*) obj), str, str2);
416 } 398 }
417 }; 399 };
418@@ -2874,7 +2874,7 @@ public: 400@@ -2873,7 +2873,7 @@ public:
419 bool print_it = _all || over_tams || marked; 401 bool print_it = _all || over_tams || marked;
420 402
421 if (print_it) { 403 if (print_it) {
422- _out->print_cr(" "PTR_FORMAT"%s", 404- _out->print_cr(" "PTR_FORMAT"%s",
423+ _out->print_cr(" " PTR_FORMAT "%s", 405+ _out->print_cr(" " PTR_FORMAT "%s",
424 p2i((void *)o), (over_tams) ? " >" : (marked) ? " M" : ""); 406 p2i((void *)o), (over_tams) ? " >" : (marked) ? " M" : "");
425 PrintReachableOopClosure oopCl(_out, _vo, _all); 407 PrintReachableOopClosure oopCl(_out, _vo, _all);
426 o->oop_iterate_no_header(&oopCl); 408 o->oop_iterate_no_header(&oopCl);
427@@ -2895,7 +2895,7 @@ public: 409@@ -2894,7 +2894,7 @@ public:
428 HeapWord* e = hr->end(); 410 HeapWord* e = hr->end();
429 HeapWord* t = hr->top(); 411 HeapWord* t = hr->top();
430 HeapWord* p = _g1h->top_at_mark_start(hr, _vo); 412 HeapWord* p = _g1h->top_at_mark_start(hr, _vo);
@@ -432,10 +414,10 @@ index 9226191..29b4899 100644
432+ _out->print_cr("** [" PTR_FORMAT ", " PTR_FORMAT "] top: " PTR_FORMAT " " 414+ _out->print_cr("** [" PTR_FORMAT ", " PTR_FORMAT "] top: " PTR_FORMAT " "
433 "TAMS: " PTR_FORMAT, p2i(b), p2i(e), p2i(t), p2i(p)); 415 "TAMS: " PTR_FORMAT, p2i(b), p2i(e), p2i(t), p2i(p));
434 _out->cr(); 416 _out->cr();
435 417
436@@ -3019,9 +3019,9 @@ ConcurrentMark::claim_region(uint worker_id) { 418@@ -3018,9 +3018,9 @@ ConcurrentMark::claim_region(uint worker
437 HeapWord* limit = curr_region->next_top_at_mark_start(); 419 HeapWord* limit = curr_region->next_top_at_mark_start();
438 420
439 if (verbose_low()) { 421 if (verbose_low()) {
440- gclog_or_tty->print_cr("[%u] curr_region = "PTR_FORMAT" " 422- gclog_or_tty->print_cr("[%u] curr_region = "PTR_FORMAT" "
441- "["PTR_FORMAT", "PTR_FORMAT"), " 423- "["PTR_FORMAT", "PTR_FORMAT"), "
@@ -445,9 +427,9 @@ index 9226191..29b4899 100644
445+ "limit = " PTR_FORMAT, 427+ "limit = " PTR_FORMAT,
446 worker_id, p2i(curr_region), p2i(bottom), p2i(end), p2i(limit)); 428 worker_id, p2i(curr_region), p2i(bottom), p2i(end), p2i(limit));
447 } 429 }
448 430
449@@ -3036,7 +3036,7 @@ ConcurrentMark::claim_region(uint worker_id) { 431@@ -3035,7 +3035,7 @@ ConcurrentMark::claim_region(uint worker
450 432
451 if (limit > bottom) { 433 if (limit > bottom) {
452 if (verbose_low()) { 434 if (verbose_low()) {
453- gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is not empty, " 435- gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is not empty, "
@@ -455,7 +437,7 @@ index 9226191..29b4899 100644
455 "returning it ", worker_id, p2i(curr_region)); 437 "returning it ", worker_id, p2i(curr_region));
456 } 438 }
457 return curr_region; 439 return curr_region;
458@@ -3044,7 +3044,7 @@ ConcurrentMark::claim_region(uint worker_id) { 440@@ -3043,7 +3043,7 @@ ConcurrentMark::claim_region(uint worker
459 assert(limit == bottom, 441 assert(limit == bottom,
460 "the region limit should be at bottom"); 442 "the region limit should be at bottom");
461 if (verbose_low()) { 443 if (verbose_low()) {
@@ -464,7 +446,7 @@ index 9226191..29b4899 100644
464 "returning NULL", worker_id, p2i(curr_region)); 446 "returning NULL", worker_id, p2i(curr_region));
465 } 447 }
466 // we return NULL and the caller should try calling 448 // we return NULL and the caller should try calling
467@@ -3056,13 +3056,13 @@ ConcurrentMark::claim_region(uint worker_id) { 449@@ -3055,13 +3055,13 @@ ConcurrentMark::claim_region(uint worker
468 if (verbose_low()) { 450 if (verbose_low()) {
469 if (curr_region == NULL) { 451 if (curr_region == NULL) {
470 gclog_or_tty->print_cr("[%u] found uncommitted region, moving finger, " 452 gclog_or_tty->print_cr("[%u] found uncommitted region, moving finger, "
@@ -482,16 +464,16 @@ index 9226191..29b4899 100644
482 worker_id, p2i(_finger), p2i(finger)); 464 worker_id, p2i(_finger), p2i(finger));
483 } 465 }
484 } 466 }
485@@ -3098,7 +3098,7 @@ private: 467@@ -3097,7 +3097,7 @@ private:
486 468
487 void do_object_work(oop obj) { 469 void do_object_work(oop obj) {
488 guarantee(!_g1h->obj_in_cs(obj), 470 guarantee(!_g1h->obj_in_cs(obj),
489- err_msg("obj: "PTR_FORMAT" in CSet, phase: %s, info: %d", 471- err_msg("obj: "PTR_FORMAT" in CSet, phase: %s, info: %d",
490+ err_msg("obj: " PTR_FORMAT " in CSet, phase: %s, info: %d", 472+ err_msg("obj: " PTR_FORMAT " in CSet, phase: %s, info: %d",
491 p2i((void*) obj), phase_str(), _info)); 473 p2i((void*) obj), phase_str(), _info));
492 } 474 }
493 475
494@@ -3159,7 +3159,7 @@ void ConcurrentMark::verify_no_cset_oops() { 476@@ -3158,7 +3158,7 @@ void ConcurrentMark::verify_no_cset_oops
495 // here. 477 // here.
496 HeapRegion* global_hr = _g1h->heap_region_containing_raw(global_finger); 478 HeapRegion* global_hr = _g1h->heap_region_containing_raw(global_finger);
497 guarantee(global_hr == NULL || global_finger == global_hr->bottom(), 479 guarantee(global_hr == NULL || global_finger == global_hr->bottom(),
@@ -499,8 +481,8 @@ index 9226191..29b4899 100644
499+ err_msg("global finger: " PTR_FORMAT " region: " HR_FORMAT, 481+ err_msg("global finger: " PTR_FORMAT " region: " HR_FORMAT,
500 p2i(global_finger), HR_FORMAT_PARAMS(global_hr))); 482 p2i(global_finger), HR_FORMAT_PARAMS(global_hr)));
501 } 483 }
502 484
503@@ -3173,7 +3173,7 @@ void ConcurrentMark::verify_no_cset_oops() { 485@@ -3172,7 +3172,7 @@ void ConcurrentMark::verify_no_cset_oops
504 HeapRegion* task_hr = _g1h->heap_region_containing_raw(task_finger); 486 HeapRegion* task_hr = _g1h->heap_region_containing_raw(task_finger);
505 guarantee(task_hr == NULL || task_finger == task_hr->bottom() || 487 guarantee(task_hr == NULL || task_finger == task_hr->bottom() ||
506 !task_hr->in_collection_set(), 488 !task_hr->in_collection_set(),
@@ -509,8 +491,8 @@ index 9226191..29b4899 100644
509 p2i(task_finger), HR_FORMAT_PARAMS(task_hr))); 491 p2i(task_finger), HR_FORMAT_PARAMS(task_hr)));
510 } 492 }
511 } 493 }
512@@ -3215,8 +3215,8 @@ class AggregateCountDataHRClosure: public HeapRegionClosure { 494@@ -3214,8 +3214,8 @@ class AggregateCountDataHRClosure: publi
513 495
514 assert(start <= limit && limit <= hr->top() && hr->top() <= hr->end(), 496 assert(start <= limit && limit <= hr->top() && hr->top() <= hr->end(),
515 err_msg("Preconditions not met - " 497 err_msg("Preconditions not met - "
516- "start: "PTR_FORMAT", limit: "PTR_FORMAT", " 498- "start: "PTR_FORMAT", limit: "PTR_FORMAT", "
@@ -518,9 +500,9 @@ index 9226191..29b4899 100644
518+ "start: " PTR_FORMAT ", limit: " PTR_FORMAT ", " 500+ "start: " PTR_FORMAT ", limit: " PTR_FORMAT ", "
519+ "top: " PTR_FORMAT ", end: " PTR_FORMAT, 501+ "top: " PTR_FORMAT ", end: " PTR_FORMAT,
520 p2i(start), p2i(limit), p2i(hr->top()), p2i(hr->end()))); 502 p2i(start), p2i(limit), p2i(hr->top()), p2i(hr->end())));
521 503
522 assert(hr->next_marked_bytes() == 0, "Precondition"); 504 assert(hr->next_marked_bytes() == 0, "Precondition");
523@@ -3495,7 +3495,7 @@ bool ConcurrentMark::do_yield_check(uint worker_id) { 505@@ -3494,7 +3494,7 @@ bool ConcurrentMark::do_yield_check(uint
524 #ifndef PRODUCT 506 #ifndef PRODUCT
525 // for debugging purposes 507 // for debugging purposes
526 void ConcurrentMark::print_finger() { 508 void ConcurrentMark::print_finger() {
@@ -529,16 +511,16 @@ index 9226191..29b4899 100644
529 p2i(_heap_start), p2i(_heap_end), p2i(_finger)); 511 p2i(_heap_start), p2i(_heap_end), p2i(_finger));
530 for (uint i = 0; i < _max_worker_id; ++i) { 512 for (uint i = 0; i < _max_worker_id; ++i) {
531 gclog_or_tty->print(" %u: " PTR_FORMAT, i, p2i(_tasks[i]->finger())); 513 gclog_or_tty->print(" %u: " PTR_FORMAT, i, p2i(_tasks[i]->finger()));
532@@ -3580,7 +3580,7 @@ void CMTask::setup_for_region(HeapRegion* hr) { 514@@ -3579,7 +3579,7 @@ void CMTask::setup_for_region(HeapRegion
533 "claim_region() should have filtered out continues humongous regions"); 515 "claim_region() should have filtered out continues humongous regions");
534 516
535 if (_cm->verbose_low()) { 517 if (_cm->verbose_low()) {
536- gclog_or_tty->print_cr("[%u] setting up for region "PTR_FORMAT, 518- gclog_or_tty->print_cr("[%u] setting up for region "PTR_FORMAT,
537+ gclog_or_tty->print_cr("[%u] setting up for region " PTR_FORMAT, 519+ gclog_or_tty->print_cr("[%u] setting up for region " PTR_FORMAT,
538 _worker_id, p2i(hr)); 520 _worker_id, p2i(hr));
539 } 521 }
540 522
541@@ -3597,7 +3597,7 @@ void CMTask::update_region_limit() { 523@@ -3596,7 +3596,7 @@ void CMTask::update_region_limit() {
542 if (limit == bottom) { 524 if (limit == bottom) {
543 if (_cm->verbose_low()) { 525 if (_cm->verbose_low()) {
544 gclog_or_tty->print_cr("[%u] found an empty region " 526 gclog_or_tty->print_cr("[%u] found an empty region "
@@ -547,7 +529,7 @@ index 9226191..29b4899 100644
547 _worker_id, p2i(bottom), p2i(limit)); 529 _worker_id, p2i(bottom), p2i(limit));
548 } 530 }
549 // The region was collected underneath our feet. 531 // The region was collected underneath our feet.
550@@ -3629,7 +3629,7 @@ void CMTask::update_region_limit() { 532@@ -3628,7 +3628,7 @@ void CMTask::update_region_limit() {
551 void CMTask::giveup_current_region() { 533 void CMTask::giveup_current_region() {
552 assert(_curr_region != NULL, "invariant"); 534 assert(_curr_region != NULL, "invariant");
553 if (_cm->verbose_low()) { 535 if (_cm->verbose_low()) {
@@ -556,8 +538,8 @@ index 9226191..29b4899 100644
556 _worker_id, p2i(_curr_region)); 538 _worker_id, p2i(_curr_region));
557 } 539 }
558 clear_region_fields(); 540 clear_region_fields();
559@@ -3751,7 +3751,7 @@ void CMTask::regular_clock_call() { 541@@ -3750,7 +3750,7 @@ void CMTask::regular_clock_call() {
560 542
561 if (_cm->verbose_medium()) { 543 if (_cm->verbose_medium()) {
562 gclog_or_tty->print_cr("[%u] regular clock, interval = %1.2lfms, " 544 gclog_or_tty->print_cr("[%u] regular clock, interval = %1.2lfms, "
563- "scanned = "SIZE_FORMAT"%s, refs reached = "SIZE_FORMAT"%s", 545- "scanned = "SIZE_FORMAT"%s, refs reached = "SIZE_FORMAT"%s",
@@ -565,17 +547,17 @@ index 9226191..29b4899 100644
565 _worker_id, last_interval_ms, 547 _worker_id, last_interval_ms,
566 _words_scanned, 548 _words_scanned,
567 (_words_scanned >= _words_scanned_limit) ? " (*)" : "", 549 (_words_scanned >= _words_scanned_limit) ? " (*)" : "",
568@@ -3920,7 +3920,7 @@ void CMTask::drain_local_queue(bool partially) { 550@@ -3919,7 +3919,7 @@ void CMTask::drain_local_queue(bool part
569 statsOnly( ++_local_pops ); 551 statsOnly( ++_local_pops );
570 552
571 if (_cm->verbose_high()) { 553 if (_cm->verbose_high()) {
572- gclog_or_tty->print_cr("[%u] popped "PTR_FORMAT, _worker_id, 554- gclog_or_tty->print_cr("[%u] popped "PTR_FORMAT, _worker_id,
573+ gclog_or_tty->print_cr("[%u] popped " PTR_FORMAT, _worker_id, 555+ gclog_or_tty->print_cr("[%u] popped " PTR_FORMAT, _worker_id,
574 p2i((void*) obj)); 556 p2i((void*) obj));
575 } 557 }
576 558
577@@ -4273,8 +4273,8 @@ void CMTask::do_marking_step(double time_target_ms, 559@@ -4272,8 +4272,8 @@ void CMTask::do_marking_step(double time
578 560
579 if (_cm->verbose_low()) { 561 if (_cm->verbose_low()) {
580 gclog_or_tty->print_cr("[%u] we're scanning part " 562 gclog_or_tty->print_cr("[%u] we're scanning part "
581- "["PTR_FORMAT", "PTR_FORMAT") " 563- "["PTR_FORMAT", "PTR_FORMAT") "
@@ -585,34 +567,34 @@ index 9226191..29b4899 100644
585 _worker_id, p2i(_finger), p2i(_region_limit), 567 _worker_id, p2i(_finger), p2i(_region_limit),
586 HR_FORMAT_PARAMS(_curr_region)); 568 HR_FORMAT_PARAMS(_curr_region));
587 } 569 }
588@@ -4361,7 +4361,7 @@ void CMTask::do_marking_step(double time_target_ms, 570@@ -4360,7 +4360,7 @@ void CMTask::do_marking_step(double time
589 571
590 if (_cm->verbose_low()) { 572 if (_cm->verbose_low()) {
591 gclog_or_tty->print_cr("[%u] we successfully claimed " 573 gclog_or_tty->print_cr("[%u] we successfully claimed "
592- "region "PTR_FORMAT, 574- "region "PTR_FORMAT,
593+ "region " PTR_FORMAT, 575+ "region " PTR_FORMAT,
594 _worker_id, p2i(claimed_region)); 576 _worker_id, p2i(claimed_region));
595 } 577 }
596 578
597@@ -4422,7 +4422,7 @@ void CMTask::do_marking_step(double time_target_ms, 579@@ -4421,7 +4421,7 @@ void CMTask::do_marking_step(double time
598 580
599 if (_cm->try_stealing(_worker_id, &_hash_seed, obj)) { 581 if (_cm->try_stealing(_worker_id, &_hash_seed, obj)) {
600 if (_cm->verbose_medium()) { 582 if (_cm->verbose_medium()) {
601- gclog_or_tty->print_cr("[%u] stolen "PTR_FORMAT" successfully", 583- gclog_or_tty->print_cr("[%u] stolen "PTR_FORMAT" successfully",
602+ gclog_or_tty->print_cr("[%u] stolen " PTR_FORMAT " successfully", 584+ gclog_or_tty->print_cr("[%u] stolen " PTR_FORMAT " successfully",
603 _worker_id, p2i((void*) obj)); 585 _worker_id, p2i((void*) obj));
604 } 586 }
605 587
606@@ -4630,7 +4630,7 @@ CMTask::CMTask(uint worker_id, 588@@ -4629,7 +4629,7 @@ CMTask::CMTask(uint worker_id,
607 // identify them easily in a large log file. 589 // identify them easily in a large log file.
608 #define G1PPRL_LINE_PREFIX "###" 590 #define G1PPRL_LINE_PREFIX "###"
609 591
610-#define G1PPRL_ADDR_BASE_FORMAT " "PTR_FORMAT"-"PTR_FORMAT 592-#define G1PPRL_ADDR_BASE_FORMAT " "PTR_FORMAT"-"PTR_FORMAT
611+#define G1PPRL_ADDR_BASE_FORMAT " " PTR_FORMAT "-" PTR_FORMAT 593+#define G1PPRL_ADDR_BASE_FORMAT " " PTR_FORMAT "-" PTR_FORMAT
612 #ifdef _LP64 594 #ifdef _LP64
613 #define G1PPRL_ADDR_BASE_H_FORMAT " %37s" 595 #define G1PPRL_ADDR_BASE_H_FORMAT " %37s"
614 #else // _LP64 596 #else // _LP64
615@@ -4640,16 +4640,16 @@ CMTask::CMTask(uint worker_id, 597@@ -4639,16 +4639,16 @@ CMTask::CMTask(uint worker_id,
616 // For per-region info 598 // For per-region info
617 #define G1PPRL_TYPE_FORMAT " %-4s" 599 #define G1PPRL_TYPE_FORMAT " %-4s"
618 #define G1PPRL_TYPE_H_FORMAT " %4s" 600 #define G1PPRL_TYPE_H_FORMAT " %4s"
@@ -621,7 +603,7 @@ index 9226191..29b4899 100644
621 #define G1PPRL_BYTE_H_FORMAT " %9s" 603 #define G1PPRL_BYTE_H_FORMAT " %9s"
622 #define G1PPRL_DOUBLE_FORMAT " %14.1f" 604 #define G1PPRL_DOUBLE_FORMAT " %14.1f"
623 #define G1PPRL_DOUBLE_H_FORMAT " %14s" 605 #define G1PPRL_DOUBLE_H_FORMAT " %14s"
624 606
625 // For summary info 607 // For summary info
626-#define G1PPRL_SUM_ADDR_FORMAT(tag) " "tag":"G1PPRL_ADDR_BASE_FORMAT 608-#define G1PPRL_SUM_ADDR_FORMAT(tag) " "tag":"G1PPRL_ADDR_BASE_FORMAT
627-#define G1PPRL_SUM_BYTE_FORMAT(tag) " "tag": "SIZE_FORMAT 609-#define G1PPRL_SUM_BYTE_FORMAT(tag) " "tag": "SIZE_FORMAT
@@ -631,14 +613,12 @@ index 9226191..29b4899 100644
631+#define G1PPRL_SUM_BYTE_FORMAT(tag) " " tag ": " SIZE_FORMAT 613+#define G1PPRL_SUM_BYTE_FORMAT(tag) " " tag ": " SIZE_FORMAT
632+#define G1PPRL_SUM_MB_FORMAT(tag) " " tag ": %1.2f MB" 614+#define G1PPRL_SUM_MB_FORMAT(tag) " " tag ": %1.2f MB"
633+#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag) " / %1.2f %%" 615+#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag) " / %1.2f %%"
634 616
635 G1PrintRegionLivenessInfoClosure:: 617 G1PrintRegionLivenessInfoClosure::
636 G1PrintRegionLivenessInfoClosure(outputStream* out, const char* phase_name) 618 G1PrintRegionLivenessInfoClosure(outputStream* out, const char* phase_name)
637diff --git hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp 619--- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp.orig
638index 4e84d49..46ab546 100644
639--- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
640+++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp 620+++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
641@@ -196,8 +196,8 @@ inline bool CMBitMapRO::iterate(BitMapClosure* cl) { 621@@ -196,8 +196,8 @@ inline bool CMBitMapRO::iterate(BitMapCl
642 assert(_bmStartWord <= (addr) && (addr) < (_bmStartWord + _bmWordSize), \ 622 assert(_bmStartWord <= (addr) && (addr) < (_bmStartWord + _bmWordSize), \
643 "outside underlying space?"); \ 623 "outside underlying space?"); \
644 assert(G1CollectedHeap::heap()->is_in_exact(addr), \ 624 assert(G1CollectedHeap::heap()->is_in_exact(addr), \
@@ -647,18 +627,18 @@ index 4e84d49..46ab546 100644
647+ err_msg("Trying to access not available bitmap " PTR_FORMAT \ 627+ err_msg("Trying to access not available bitmap " PTR_FORMAT \
648+ " corresponding to " PTR_FORMAT " (%u)", \ 628+ " corresponding to " PTR_FORMAT " (%u)", \
649 p2i(this), p2i(addr), G1CollectedHeap::heap()->addr_to_region(addr))); 629 p2i(this), p2i(addr), G1CollectedHeap::heap()->addr_to_region(addr)));
650 630
651 inline void CMBitMap::mark(HeapWord* addr) { 631 inline void CMBitMap::mark(HeapWord* addr) {
652@@ -343,7 +343,7 @@ inline void CMTask::make_reference_grey(oop obj, HeapRegion* hr) { 632@@ -343,7 +343,7 @@ inline void CMTask::make_reference_grey(
653 633
654 inline void CMTask::deal_with_reference(oop obj) { 634 inline void CMTask::deal_with_reference(oop obj) {
655 if (_cm->verbose_high()) { 635 if (_cm->verbose_high()) {
656- gclog_or_tty->print_cr("[%u] we're dealing with reference = "PTR_FORMAT, 636- gclog_or_tty->print_cr("[%u] we're dealing with reference = "PTR_FORMAT,
657+ gclog_or_tty->print_cr("[%u] we're dealing with reference = " PTR_FORMAT, 637+ gclog_or_tty->print_cr("[%u] we're dealing with reference = " PTR_FORMAT,
658 _worker_id, p2i((void*) obj)); 638 _worker_id, p2i((void*) obj));
659 } 639 }
660 640
661@@ -392,7 +392,7 @@ inline void ConcurrentMark::grayRoot(oop obj, size_t word_size, 641@@ -392,7 +392,7 @@ inline void ConcurrentMark::grayRoot(oop
662 // assert that word_size is under an upper bound which is its 642 // assert that word_size is under an upper bound which is its
663 // containing region's capacity. 643 // containing region's capacity.
664 assert(word_size * HeapWordSize <= hr->capacity(), 644 assert(word_size * HeapWordSize <= hr->capacity(),
@@ -666,22 +646,20 @@ index 4e84d49..46ab546 100644
666+ err_msg("size: " SIZE_FORMAT " capacity: " SIZE_FORMAT " " HR_FORMAT, 646+ err_msg("size: " SIZE_FORMAT " capacity: " SIZE_FORMAT " " HR_FORMAT,
667 word_size * HeapWordSize, hr->capacity(), 647 word_size * HeapWordSize, hr->capacity(),
668 HR_FORMAT_PARAMS(hr))); 648 HR_FORMAT_PARAMS(hr)));
669 649
670diff --git hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp 650--- hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp.orig
671index 697a402..f92ae11 100644
672--- hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp
673+++ hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp 651+++ hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp
674@@ -140,7 +140,7 @@ HeapWord* G1AllocRegion::new_alloc_region_and_allocate(size_t word_size, 652@@ -140,7 +140,7 @@ HeapWord* G1AllocRegion::new_alloc_regio
675 } 653 }
676 654
677 void G1AllocRegion::fill_in_ext_msg(ar_ext_msg* msg, const char* message) { 655 void G1AllocRegion::fill_in_ext_msg(ar_ext_msg* msg, const char* message) {
678- msg->append("[%s] %s c: %u b: %s r: "PTR_FORMAT" u: "SIZE_FORMAT, 656- msg->append("[%s] %s c: %u b: %s r: "PTR_FORMAT" u: "SIZE_FORMAT,
679+ msg->append("[%s] %s c: %u b: %s r: " PTR_FORMAT " u: " SIZE_FORMAT, 657+ msg->append("[%s] %s c: %u b: %s r: " PTR_FORMAT " u: " SIZE_FORMAT,
680 _name, message, _count, BOOL_TO_STR(_bot_updates), 658 _name, message, _count, BOOL_TO_STR(_bot_updates),
681 p2i(_alloc_region), _used_bytes_before); 659 p2i(_alloc_region), _used_bytes_before);
682 } 660 }
683@@ -217,7 +217,7 @@ void G1AllocRegion::trace(const char* str, size_t word_size, HeapWord* result) { 661@@ -217,7 +217,7 @@ void G1AllocRegion::trace(const char* st
684 662
685 if (G1_ALLOC_REGION_TRACING > 1) { 663 if (G1_ALLOC_REGION_TRACING > 1) {
686 if (result != NULL) { 664 if (result != NULL) {
687- jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT" "PTR_FORMAT, 665- jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT" "PTR_FORMAT,
@@ -689,12 +667,10 @@ index 697a402..f92ae11 100644
689 word_size, result); 667 word_size, result);
690 } else if (word_size != 0) { 668 } else if (word_size != 0) {
691 jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT, word_size); 669 jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT, word_size);
692diff --git hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp 670--- hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp.orig
693index b32a419..04628b7 100644
694--- hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp
695+++ hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp 671+++ hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp
696@@ -73,7 +73,7 @@ public: 672@@ -73,7 +73,7 @@ public:
697 673
698 void decrease_used(size_t bytes) { 674 void decrease_used(size_t bytes) {
699 assert(_summary_bytes_used >= bytes, 675 assert(_summary_bytes_used >= bytes,
700- err_msg("invariant: _summary_bytes_used: "SIZE_FORMAT" should be >= bytes: "SIZE_FORMAT, 676- err_msg("invariant: _summary_bytes_used: "SIZE_FORMAT" should be >= bytes: "SIZE_FORMAT,
@@ -702,11 +678,9 @@ index b32a419..04628b7 100644
702 _summary_bytes_used, bytes)); 678 _summary_bytes_used, bytes));
703 _summary_bytes_used -= bytes; 679 _summary_bytes_used -= bytes;
704 } 680 }
705diff --git hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp 681--- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp.orig
706index 44f0d58..f6ef670 100644
707--- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp
708+++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp 682+++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp
709@@ -385,11 +385,11 @@ G1BlockOffsetArray::verify_for_object(HeapWord* obj_start, 683@@ -385,11 +385,11 @@ G1BlockOffsetArray::verify_for_object(He
710 HeapWord* card_addr = _array->address_for_index(card); 684 HeapWord* card_addr = _array->address_for_index(card);
711 HeapWord* block_start = block_start_const(card_addr); 685 HeapWord* block_start = block_start_const(card_addr);
712 if (block_start != obj_start) { 686 if (block_start != obj_start) {
@@ -738,7 +712,7 @@ index 44f0d58..f6ef670 100644
738 i, _array->address_for_index(i), 712 i, _array->address_for_index(i),
739 (uint) _array->offset_array(i)); 713 (uint) _array->offset_array(i));
740 } 714 }
741@@ -488,7 +488,7 @@ G1BlockOffsetArrayContigSpace::set_for_starts_humongous(HeapWord* new_top) { 715@@ -488,7 +488,7 @@ G1BlockOffsetArrayContigSpace::set_for_s
742 void 716 void
743 G1BlockOffsetArrayContigSpace::print_on(outputStream* out) { 717 G1BlockOffsetArrayContigSpace::print_on(outputStream* out) {
744 G1BlockOffsetArray::print_on(out); 718 G1BlockOffsetArray::print_on(out);
@@ -748,14 +722,12 @@ index 44f0d58..f6ef670 100644
748+ out->print_cr(" next offset index: " SIZE_FORMAT, _next_offset_index); 722+ out->print_cr(" next offset index: " SIZE_FORMAT, _next_offset_index);
749 } 723 }
750 #endif // !PRODUCT 724 #endif // !PRODUCT
751diff --git hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp 725--- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp.orig
752index be5cf30..ca424d3 100644
753--- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp
754+++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp 726+++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp
755@@ -47,15 +47,15 @@ G1BlockOffsetTable::block_start_const(const void* addr) const { 727@@ -47,15 +47,15 @@ G1BlockOffsetTable::block_start_const(co
756 } 728 }
757 } 729 }
758 730
759-#define check_index(index, msg) \ 731-#define check_index(index, msg) \
760- assert((index) < (_reserved.word_size() >> LogN_words), \ 732- assert((index) < (_reserved.word_size() >> LogN_words), \
761- err_msg("%s - index: "SIZE_FORMAT", _vs.committed_size: "SIZE_FORMAT, \ 733- err_msg("%s - index: "SIZE_FORMAT", _vs.committed_size: "SIZE_FORMAT, \
@@ -775,13 +747,11 @@ index be5cf30..ca424d3 100644
775+ (index), \ 747+ (index), \
776+ p2i(address_for_index_raw(index)), \ 748+ p2i(address_for_index_raw(index)), \
777 G1CollectedHeap::heap()->addr_to_region(address_for_index_raw(index)))); 749 G1CollectedHeap::heap()->addr_to_region(address_for_index_raw(index))));
778 750
779 u_char G1BlockOffsetSharedArray::offset_array(size_t index) const { 751 u_char G1BlockOffsetSharedArray::offset_array(size_t index) const {
780diff --git hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp 752--- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp.orig
781index 76bf850..0023998 100644
782--- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp
783+++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp 753+++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp
784@@ -44,7 +44,7 @@ void G1CardCountsMappingChangedListener::on_commit(uint start_idx, size_t num_re 754@@ -44,7 +44,7 @@ void G1CardCountsMappingChangedListener:
785 void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) { 755 void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) {
786 if (has_count_table()) { 756 if (has_count_table()) {
787 assert(from_card_num < to_card_num, 757 assert(from_card_num < to_card_num,
@@ -790,7 +760,7 @@ index 76bf850..0023998 100644
790 from_card_num, to_card_num)); 760 from_card_num, to_card_num));
791 Copy::fill_to_bytes(&_card_counts[from_card_num], (to_card_num - from_card_num)); 761 Copy::fill_to_bytes(&_card_counts[from_card_num], (to_card_num - from_card_num));
792 } 762 }
793@@ -87,7 +87,7 @@ uint G1CardCounts::add_card_count(jbyte* card_ptr) { 763@@ -87,7 +87,7 @@ uint G1CardCounts::add_card_count(jbyte*
794 if (has_count_table()) { 764 if (has_count_table()) {
795 size_t card_num = ptr_2_card_num(card_ptr); 765 size_t card_num = ptr_2_card_num(card_ptr);
796 assert(card_num < _reserved_max_card_num, 766 assert(card_num < _reserved_max_card_num,
@@ -799,24 +769,20 @@ index 76bf850..0023998 100644
799 card_num, _reserved_max_card_num)); 769 card_num, _reserved_max_card_num));
800 count = (uint) _card_counts[card_num]; 770 count = (uint) _card_counts[card_num];
801 if (count < G1ConcRSHotCardLimit) { 771 if (count < G1ConcRSHotCardLimit) {
802diff --git hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp 772--- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp.orig
803index 7dcad45..b2ab012 100644
804--- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp
805+++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp 773+++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp
806@@ -91,7 +91,7 @@ class G1CardCounts: public CHeapObj<mtGC> { 774@@ -91,7 +91,7 @@ class G1CardCounts: public CHeapObj<mtGC
807 775
808 jbyte* card_num_2_ptr(size_t card_num) { 776 jbyte* card_num_2_ptr(size_t card_num) {
809 assert(card_num >= 0 && card_num < _reserved_max_card_num, 777 assert(card_num >= 0 && card_num < _reserved_max_card_num,
810- err_msg("card num out of range: "SIZE_FORMAT, card_num)); 778- err_msg("card num out of range: "SIZE_FORMAT, card_num));
811+ err_msg("card num out of range: " SIZE_FORMAT, card_num)); 779+ err_msg("card num out of range: " SIZE_FORMAT, card_num));
812 return (jbyte*) (_ct_bot + card_num); 780 return (jbyte*) (_ct_bot + card_num);
813 } 781 }
814 782
815diff --git hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 783--- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.orig
816index 76bfcd6..aed811b 100644
817--- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
818+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 784+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
819@@ -230,7 +230,7 @@ bool YoungList::check_list_well_formed() { 785@@ -230,7 +230,7 @@ bool YoungList::check_list_well_formed()
820 HeapRegion* last = NULL; 786 HeapRegion* last = NULL;
821 while (curr != NULL) { 787 while (curr != NULL) {
822 if (!curr->is_young()) { 788 if (!curr->is_young()) {
@@ -834,16 +800,16 @@ index 76bfcd6..aed811b 100644
834 HR_FORMAT_PARAMS(curr), 800 HR_FORMAT_PARAMS(curr),
835 curr->prev_top_at_mark_start(), 801 curr->prev_top_at_mark_start(),
836 curr->next_top_at_mark_start(), 802 curr->next_top_at_mark_start(),
837@@ -490,7 +490,7 @@ void G1CollectedHeap::check_ct_logs_at_safepoint() { 803@@ -490,7 +490,7 @@ void G1CollectedHeap::check_ct_logs_at_s
838 gclog_or_tty->print_cr("Log entries = %d, dirty cards = %d.", 804 gclog_or_tty->print_cr("Log entries = %d, dirty cards = %d.",
839 clear.num_processed(), orig_count); 805 clear.num_processed(), orig_count);
840 guarantee(redirty.num_processed() == clear.num_processed(), 806 guarantee(redirty.num_processed() == clear.num_processed(),
841- err_msg("Redirtied "SIZE_FORMAT" cards, bug cleared "SIZE_FORMAT, 807- err_msg("Redirtied "SIZE_FORMAT" cards, bug cleared "SIZE_FORMAT,
842+ err_msg("Redirtied " SIZE_FORMAT " cards, bug cleared " SIZE_FORMAT, 808+ err_msg("Redirtied " SIZE_FORMAT " cards, bug cleared " SIZE_FORMAT,
843 redirty.num_processed(), clear.num_processed())); 809 redirty.num_processed(), clear.num_processed()));
844 810
845 CountNonCleanMemRegionClosure count3(this); 811 CountNonCleanMemRegionClosure count3(this);
846@@ -528,7 +528,7 @@ G1CollectedHeap::new_region_try_secondary_free_list(bool is_old) { 812@@ -528,7 +528,7 @@ G1CollectedHeap::new_region_try_secondar
847 HeapRegion* res = _hrm.allocate_free_region(is_old); 813 HeapRegion* res = _hrm.allocate_free_region(is_old);
848 if (G1ConcRegionFreeingVerbose) { 814 if (G1ConcRegionFreeingVerbose) {
849 gclog_or_tty->print_cr("G1ConcRegionFreeing [region alloc] : " 815 gclog_or_tty->print_cr("G1ConcRegionFreeing [region alloc] : "
@@ -852,7 +818,7 @@ index 76bfcd6..aed811b 100644
852 HR_FORMAT_PARAMS(res)); 818 HR_FORMAT_PARAMS(res));
853 } 819 }
854 return res; 820 return res;
855@@ -1597,8 +1597,8 @@ resize_if_necessary_after_full_collection(size_t word_size) { 821@@ -1597,8 +1597,8 @@ resize_if_necessary_after_full_collectio
856 // This assert only makes sense here, before we adjust them 822 // This assert only makes sense here, before we adjust them
857 // with respect to the min and max heap size. 823 // with respect to the min and max heap size.
858 assert(minimum_desired_capacity <= maximum_desired_capacity, 824 assert(minimum_desired_capacity <= maximum_desired_capacity,
@@ -861,7 +827,7 @@ index 76bfcd6..aed811b 100644
861+ err_msg("minimum_desired_capacity = " SIZE_FORMAT ", " 827+ err_msg("minimum_desired_capacity = " SIZE_FORMAT ", "
862+ "maximum_desired_capacity = " SIZE_FORMAT, 828+ "maximum_desired_capacity = " SIZE_FORMAT,
863 minimum_desired_capacity, maximum_desired_capacity)); 829 minimum_desired_capacity, maximum_desired_capacity));
864 830
865 // Should not be greater than the heap max size. No need to adjust 831 // Should not be greater than the heap max size. No need to adjust
866@@ -2256,7 +2256,7 @@ public: 832@@ -2256,7 +2256,7 @@ public:
867 virtual bool doHeapRegion(HeapRegion* hr) { 833 virtual bool doHeapRegion(HeapRegion* hr) {
@@ -895,7 +861,7 @@ index 76bfcd6..aed811b 100644
895 } 861 }
896 obj->print_on(gclog_or_tty); 862 obj->print_on(gclog_or_tty);
897 _failures = true; 863 _failures = true;
898@@ -3041,9 +3041,9 @@ class G1VerifyCodeRootOopClosure: public OopClosure { 864@@ -3041,9 +3041,9 @@ class G1VerifyCodeRootOopClosure: public
899 // Verify that the strong code root list for this region 865 // Verify that the strong code root list for this region
900 // contains the nmethod 866 // contains the nmethod
901 if (!hrrs->strong_code_roots_list_contains(_nm)) { 867 if (!hrrs->strong_code_roots_list_contains(_nm)) {
@@ -942,7 +908,7 @@ index 76bfcd6..aed811b 100644
942@@ -3533,7 +3533,7 @@ public: 908@@ -3533,7 +3533,7 @@ public:
943 size_t occupied = hrrs->occupied(); 909 size_t occupied = hrrs->occupied();
944 _occupied_sum += occupied; 910 _occupied_sum += occupied;
945 911
946- gclog_or_tty->print_cr("Printing RSet for region "HR_FORMAT, 912- gclog_or_tty->print_cr("Printing RSet for region "HR_FORMAT,
947+ gclog_or_tty->print_cr("Printing RSet for region " HR_FORMAT, 913+ gclog_or_tty->print_cr("Printing RSet for region " HR_FORMAT,
948 HR_FORMAT_PARAMS(r)); 914 HR_FORMAT_PARAMS(r));
@@ -950,7 +916,7 @@ index 76bfcd6..aed811b 100644
950 gclog_or_tty->print_cr(" RSet is empty"); 916 gclog_or_tty->print_cr(" RSet is empty");
951@@ -3552,7 +3552,7 @@ public: 917@@ -3552,7 +3552,7 @@ public:
952 } 918 }
953 919
954 ~PrintRSetsClosure() { 920 ~PrintRSetsClosure() {
955- gclog_or_tty->print_cr("Occupied Sum: "SIZE_FORMAT, _occupied_sum); 921- gclog_or_tty->print_cr("Occupied Sum: "SIZE_FORMAT, _occupied_sum);
956+ gclog_or_tty->print_cr("Occupied Sum: " SIZE_FORMAT, _occupied_sum); 922+ gclog_or_tty->print_cr("Occupied Sum: " SIZE_FORMAT, _occupied_sum);
@@ -966,7 +932,7 @@ index 76bfcd6..aed811b 100644
966 (HeapWord*) old)); 932 (HeapWord*) old));
967 markOop m = old->mark(); 933 markOop m = old->mark();
968 oop forward_ptr = old->forward_to_atomic(old); 934 oop forward_ptr = old->forward_to_atomic(old);
969@@ -4450,7 +4450,7 @@ G1CollectedHeap::handle_evacuation_failure_par(G1ParScanThreadState* _par_scan_s 935@@ -4450,7 +4450,7 @@ G1CollectedHeap::handle_evacuation_failu
970 // space for this object (old != forward_ptr) or they beat us in 936 // space for this object (old != forward_ptr) or they beat us in
971 // self-forwarding it (old == forward_ptr). 937 // self-forwarding it (old == forward_ptr).
972 assert(old == forward_ptr || !obj_in_cs(forward_ptr), 938 assert(old == forward_ptr || !obj_in_cs(forward_ptr),
@@ -976,7 +942,7 @@ index 76bfcd6..aed811b 100644
976 (HeapWord*) old, (HeapWord*) forward_ptr)); 942 (HeapWord*) old, (HeapWord*) forward_ptr));
977 return forward_ptr; 943 return forward_ptr;
978@@ -4837,16 +4837,16 @@ public: 944@@ -4837,16 +4837,16 @@ public:
979 945
980 ~G1StringSymbolTableUnlinkTask() { 946 ~G1StringSymbolTableUnlinkTask() {
981 guarantee(!_process_strings || !_do_in_parallel || StringTable::parallel_claimed_index() >= _initial_string_table_size, 947 guarantee(!_process_strings || !_do_in_parallel || StringTable::parallel_claimed_index() >= _initial_string_table_size,
982- err_msg("claim value "INT32_FORMAT" after unlink less than initial string table size "INT32_FORMAT, 948- err_msg("claim value "INT32_FORMAT" after unlink less than initial string table size "INT32_FORMAT,
@@ -986,7 +952,7 @@ index 76bfcd6..aed811b 100644
986- err_msg("claim value "INT32_FORMAT" after unlink less than initial symbol table size "INT32_FORMAT, 952- err_msg("claim value "INT32_FORMAT" after unlink less than initial symbol table size "INT32_FORMAT,
987+ err_msg("claim value " INT32_FORMAT " after unlink less than initial symbol table size " INT32_FORMAT, 953+ err_msg("claim value " INT32_FORMAT " after unlink less than initial symbol table size " INT32_FORMAT,
988 SymbolTable::parallel_claimed_index(), _initial_symbol_table_size)); 954 SymbolTable::parallel_claimed_index(), _initial_symbol_table_size));
989 955
990 if (G1TraceStringSymbolTableScrubbing) { 956 if (G1TraceStringSymbolTableScrubbing) {
991 gclog_or_tty->print_cr("Cleaned string and symbol table, " 957 gclog_or_tty->print_cr("Cleaned string and symbol table, "
992- "strings: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed, " 958- "strings: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed, "
@@ -996,7 +962,7 @@ index 76bfcd6..aed811b 100644
996 strings_processed(), strings_removed(), 962 strings_processed(), strings_removed(),
997 symbols_processed(), symbols_removed()); 963 symbols_processed(), symbols_removed());
998 } 964 }
999@@ -6029,13 +6029,13 @@ void G1CollectedHeap::verify_dirty_young_regions() { 965@@ -6029,13 +6029,13 @@ void G1CollectedHeap::verify_dirty_young
1000 bool G1CollectedHeap::verify_no_bits_over_tams(const char* bitmap_name, CMBitMapRO* bitmap, 966 bool G1CollectedHeap::verify_no_bits_over_tams(const char* bitmap_name, CMBitMapRO* bitmap,
1001 HeapWord* tams, HeapWord* end) { 967 HeapWord* tams, HeapWord* end) {
1002 guarantee(tams <= end, 968 guarantee(tams <= end,
@@ -1013,7 +979,7 @@ index 76bfcd6..aed811b 100644
1013 bitmap_name, tams, end); 979 bitmap_name, tams, end);
1014 return false; 980 return false;
1015 } 981 }
1016@@ -6061,7 +6061,7 @@ bool G1CollectedHeap::verify_bitmaps(const char* caller, HeapRegion* hr) { 982@@ -6061,7 +6061,7 @@ bool G1CollectedHeap::verify_bitmaps(con
1017 res_n = verify_no_bits_over_tams("next", next_bitmap, ntams, end); 983 res_n = verify_no_bits_over_tams("next", next_bitmap, ntams, end);
1018 } 984 }
1019 if (!res_p || !res_n) { 985 if (!res_p || !res_n) {
@@ -1022,18 +988,18 @@ index 76bfcd6..aed811b 100644
1022 HR_FORMAT_PARAMS(hr)); 988 HR_FORMAT_PARAMS(hr));
1023 gclog_or_tty->print_cr("#### Caller: %s", caller); 989 gclog_or_tty->print_cr("#### Caller: %s", caller);
1024 return false; 990 return false;
1025@@ -6373,7 +6373,7 @@ class G1FreeHumongousRegionClosure : public HeapRegionClosure { 991@@ -6373,7 +6373,7 @@ class G1FreeHumongousRegionClosure : pub
1026 !r->rem_set()->is_empty()) { 992 !r->rem_set()->is_empty()) {
1027 993
1028 if (G1TraceEagerReclaimHumongousObjects) { 994 if (G1TraceEagerReclaimHumongousObjects) {
1029- gclog_or_tty->print_cr("Live humongous region %u size "SIZE_FORMAT" start "PTR_FORMAT" length "UINT32_FORMAT" with remset "SIZE_FORMAT" code roots "SIZE_FORMAT" is marked %d reclaim candidate %d type array %d", 995- gclog_or_tty->print_cr("Live humongous region %u size "SIZE_FORMAT" start "PTR_FORMAT" length "UINT32_FORMAT" with remset "SIZE_FORMAT" code roots "SIZE_FORMAT" is marked %d reclaim candidate %d type array %d",
1030+ gclog_or_tty->print_cr("Live humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length " UINT32_FORMAT " with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d", 996+ gclog_or_tty->print_cr("Live humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length " UINT32_FORMAT " with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d",
1031 region_idx, 997 region_idx,
1032 obj->size()*HeapWordSize, 998 obj->size()*HeapWordSize,
1033 r->bottom(), 999 r->bottom(),
1034@@ -6395,7 +6395,7 @@ class G1FreeHumongousRegionClosure : public HeapRegionClosure { 1000@@ -6395,7 +6395,7 @@ class G1FreeHumongousRegionClosure : pub
1035 r->bottom())); 1001 r->bottom()));
1036 1002
1037 if (G1TraceEagerReclaimHumongousObjects) { 1003 if (G1TraceEagerReclaimHumongousObjects) {
1038- gclog_or_tty->print_cr("Dead humongous region %u size "SIZE_FORMAT" start "PTR_FORMAT" length "UINT32_FORMAT" with remset "SIZE_FORMAT" code roots "SIZE_FORMAT" is marked %d reclaim candidate %d type array %d", 1004- gclog_or_tty->print_cr("Dead humongous region %u size "SIZE_FORMAT" start "PTR_FORMAT" length "UINT32_FORMAT" with remset "SIZE_FORMAT" code roots "SIZE_FORMAT" is marked %d reclaim candidate %d type array %d",
1039+ gclog_or_tty->print_cr("Dead humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length " UINT32_FORMAT " with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d", 1005+ gclog_or_tty->print_cr("Dead humongous region %u size " SIZE_FORMAT " start " PTR_FORMAT " length " UINT32_FORMAT " with remset " SIZE_FORMAT " code roots " SIZE_FORMAT " is marked %d reclaim candidate %d type array %d",
@@ -1049,7 +1015,7 @@ index 76bfcd6..aed811b 100644
1049 r->bottom(), r->end()); 1015 r->bottom(), r->end());
1050 _success = false; 1016 _success = false;
1051 } 1017 }
1052@@ -6680,7 +6680,7 @@ void G1CollectedHeap::rebuild_region_sets(bool free_list_only) { 1018@@ -6680,7 +6680,7 @@ void G1CollectedHeap::rebuild_region_set
1053 } 1019 }
1054 assert(_allocator->used_unlocked() == recalculate_used(), 1020 assert(_allocator->used_unlocked() == recalculate_used(),
1055 err_msg("inconsistent _allocator->used_unlocked(), " 1021 err_msg("inconsistent _allocator->used_unlocked(), "
@@ -1057,8 +1023,8 @@ index 76bfcd6..aed811b 100644
1057+ "value: " SIZE_FORMAT " recalculated: " SIZE_FORMAT, 1023+ "value: " SIZE_FORMAT " recalculated: " SIZE_FORMAT,
1058 _allocator->used_unlocked(), recalculate_used())); 1024 _allocator->used_unlocked(), recalculate_used()));
1059 } 1025 }
1060 1026
1061@@ -6901,8 +6901,8 @@ class RegisterNMethodOopClosure: public OopClosure { 1027@@ -6901,8 +6901,8 @@ class RegisterNMethodOopClosure: public
1062 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); 1028 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
1063 HeapRegion* hr = _g1h->heap_region_containing(obj); 1029 HeapRegion* hr = _g1h->heap_region_containing(obj);
1064 assert(!hr->continuesHumongous(), 1030 assert(!hr->continuesHumongous(),
@@ -1067,9 +1033,9 @@ index 76bfcd6..aed811b 100644
1067+ err_msg("trying to add code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT 1033+ err_msg("trying to add code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT
1068+ " starting at " HR_FORMAT, 1034+ " starting at " HR_FORMAT,
1069 _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()))); 1035 _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
1070 1036
1071 // HeapRegion::add_strong_code_root_locked() avoids adding duplicate entries. 1037 // HeapRegion::add_strong_code_root_locked() avoids adding duplicate entries.
1072@@ -6928,8 +6928,8 @@ class UnregisterNMethodOopClosure: public OopClosure { 1038@@ -6928,8 +6928,8 @@ class UnregisterNMethodOopClosure: publi
1073 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); 1039 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
1074 HeapRegion* hr = _g1h->heap_region_containing(obj); 1040 HeapRegion* hr = _g1h->heap_region_containing(obj);
1075 assert(!hr->continuesHumongous(), 1041 assert(!hr->continuesHumongous(),
@@ -1078,14 +1044,12 @@ index 76bfcd6..aed811b 100644
1078+ err_msg("trying to remove code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT 1044+ err_msg("trying to remove code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT
1079+ " starting at " HR_FORMAT, 1045+ " starting at " HR_FORMAT,
1080 _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()))); 1046 _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
1081 1047
1082 hr->remove_strong_code_root(_nm); 1048 hr->remove_strong_code_root(_nm);
1083diff --git hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp 1049--- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp.orig
1084index 0fd2786..7b26fdb 100644
1085--- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
1086+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp 1050+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
1087@@ -81,7 +81,7 @@ inline HeapRegion* G1CollectedHeap::region_at(uint index) const { return _hrm.at 1051@@ -81,7 +81,7 @@ inline HeapRegion* G1CollectedHeap::regi
1088 1052
1089 inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const { 1053 inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const {
1090 assert(is_in_reserved(addr), 1054 assert(is_in_reserved(addr),
1091- err_msg("Cannot calculate region index for address "PTR_FORMAT" that is outside of the heap ["PTR_FORMAT", "PTR_FORMAT")", 1055- err_msg("Cannot calculate region index for address "PTR_FORMAT" that is outside of the heap ["PTR_FORMAT", "PTR_FORMAT")",
@@ -1102,9 +1066,7 @@ index 0fd2786..7b26fdb 100644
1102 p2i((void*)addr), p2i(g1_reserved().start()), p2i(g1_reserved().end()))); 1066 p2i((void*)addr), p2i(g1_reserved().start()), p2i(g1_reserved().end())));
1103 return _hrm.addr_to_region((HeapWord*) addr); 1067 return _hrm.addr_to_region((HeapWord*) addr);
1104 } 1068 }
1105diff --git hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 1069--- hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp.orig
1106index ea80c44..c4463f5 100644
1107--- hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
1108+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 1070+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
1109@@ -199,7 +199,7 @@ G1CollectorPolicy::G1CollectorPolicy() : 1071@@ -199,7 +199,7 @@ G1CollectorPolicy::G1CollectorPolicy() :
1110 const size_t region_size = HeapRegion::GrainWords; 1072 const size_t region_size = HeapRegion::GrainWords;
@@ -1115,18 +1077,18 @@ index ea80c44..c4463f5 100644
1115 OldPLABSize > region_size ? "Old" : "Young", region_size); 1077 OldPLABSize > region_size ? "Old" : "Young", region_size);
1116 vm_exit_during_initialization(buffer); 1078 vm_exit_during_initialization(buffer);
1117 } 1079 }
1118@@ -846,7 +846,7 @@ void G1CollectorPolicy::record_collection_pause_start(double start_time_sec) { 1080@@ -846,7 +846,7 @@ void G1CollectorPolicy::record_collectio
1119 update_survivors_policy(); 1081 update_survivors_policy();
1120 1082
1121 assert(_g1->used() == _g1->recalculate_used(), 1083 assert(_g1->used() == _g1->recalculate_used(),
1122- err_msg("sanity, used: "SIZE_FORMAT" recalculate_used: "SIZE_FORMAT, 1084- err_msg("sanity, used: "SIZE_FORMAT" recalculate_used: "SIZE_FORMAT,
1123+ err_msg("sanity, used: " SIZE_FORMAT " recalculate_used: " SIZE_FORMAT, 1085+ err_msg("sanity, used: " SIZE_FORMAT " recalculate_used: " SIZE_FORMAT,
1124 _g1->used(), _g1->recalculate_used())); 1086 _g1->used(), _g1->recalculate_used()));
1125 1087
1126 double s_w_t_ms = (start_time_sec - _stop_world_start) * 1000.0; 1088 double s_w_t_ms = (start_time_sec - _stop_world_start) * 1000.0;
1127@@ -1231,10 +1231,10 @@ void G1CollectorPolicy::print_detailed_heap_transition(bool full) { 1089@@ -1231,10 +1231,10 @@ void G1CollectorPolicy::print_detailed_h
1128 (_young_list_target_length * HeapRegion::GrainBytes) - survivor_used_bytes_after_gc; 1090 (_young_list_target_length * HeapRegion::GrainBytes) - survivor_used_bytes_after_gc;
1129 1091
1130 gclog_or_tty->print( 1092 gclog_or_tty->print(
1131- " [Eden: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT") " 1093- " [Eden: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT") "
1132- "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" " 1094- "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" "
@@ -1139,7 +1101,7 @@ index ea80c44..c4463f5 100644
1139 EXT_SIZE_PARAMS(_eden_used_bytes_before_gc), 1101 EXT_SIZE_PARAMS(_eden_used_bytes_before_gc),
1140 EXT_SIZE_PARAMS(_eden_capacity_bytes_before_gc), 1102 EXT_SIZE_PARAMS(_eden_capacity_bytes_before_gc),
1141 EXT_SIZE_PARAMS(eden_used_bytes_after_gc), 1103 EXT_SIZE_PARAMS(eden_used_bytes_after_gc),
1142@@ -1851,7 +1851,7 @@ void G1CollectorPolicy::print_collection_set(HeapRegion* list_head, outputStream 1104@@ -1851,7 +1851,7 @@ void G1CollectorPolicy::print_collection
1143 while (csr != NULL) { 1105 while (csr != NULL) {
1144 HeapRegion* next = csr->next_in_collection_set(); 1106 HeapRegion* next = csr->next_in_collection_set();
1145 assert(csr->in_collection_set(), "bad CS"); 1107 assert(csr->in_collection_set(), "bad CS");
@@ -1148,9 +1110,7 @@ index ea80c44..c4463f5 100644
1148 HR_FORMAT_PARAMS(csr), 1110 HR_FORMAT_PARAMS(csr),
1149 csr->prev_top_at_mark_start(), csr->next_top_at_mark_start(), 1111 csr->prev_top_at_mark_start(), csr->next_top_at_mark_start(),
1150 csr->age_in_surv_rate_group_cond()); 1112 csr->age_in_surv_rate_group_cond());
1151diff --git hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp 1113--- hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp.orig
1152index eff1196..fff1663 100644
1153--- hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
1154+++ hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp 1114+++ hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
1155@@ -121,15 +121,15 @@ public: 1115@@ -121,15 +121,15 @@ public:
1156 // Single parameter format strings 1116 // Single parameter format strings
@@ -1163,42 +1123,38 @@ index eff1196..fff1663 100644
1163 #define ergo_format_ms(_name_) ", " _name_ ": %1.2f ms" 1123 #define ergo_format_ms(_name_) ", " _name_ ": %1.2f ms"
1164-#define ergo_format_size(_name_) ", " _name_ ": "SIZE_FORMAT 1124-#define ergo_format_size(_name_) ", " _name_ ": "SIZE_FORMAT
1165+#define ergo_format_size(_name_) ", " _name_ ": " SIZE_FORMAT 1125+#define ergo_format_size(_name_) ", " _name_ ": " SIZE_FORMAT
1166 1126
1167 // Double parameter format strings 1127 // Double parameter format strings
1168 #define ergo_format_byte_perc(_name_) \ 1128 #define ergo_format_byte_perc(_name_) \
1169- ", " _name_ ": "SIZE_FORMAT" bytes (%1.2f %%)" 1129- ", " _name_ ": "SIZE_FORMAT" bytes (%1.2f %%)"
1170+ ", " _name_ ": " SIZE_FORMAT " bytes (%1.2f %%)" 1130+ ", " _name_ ": " SIZE_FORMAT " bytes (%1.2f %%)"
1171 1131
1172 // Generates the format string 1132 // Generates the format string
1173 #define ergo_format(_extra_format_) \ 1133 #define ergo_format(_extra_format_) \
1174diff --git hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp 1134--- hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp.orig
1175index c037110..af0bdb9 100644
1176--- hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp
1177+++ hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp 1135+++ hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp
1178@@ -332,7 +332,7 @@ void G1GCPhaseTimes::print_stats(int level, const char* str, double value) { 1136@@ -332,7 +332,7 @@ void G1GCPhaseTimes::print_stats(int lev
1179 } 1137 }
1180 1138
1181 void G1GCPhaseTimes::print_stats(int level, const char* str, size_t value) { 1139 void G1GCPhaseTimes::print_stats(int level, const char* str, size_t value) {
1182- LineBuffer(level).append_and_print_cr("[%s: "SIZE_FORMAT"]", str, value); 1140- LineBuffer(level).append_and_print_cr("[%s: "SIZE_FORMAT"]", str, value);
1183+ LineBuffer(level).append_and_print_cr("[%s: " SIZE_FORMAT "]", str, value); 1141+ LineBuffer(level).append_and_print_cr("[%s: " SIZE_FORMAT "]", str, value);
1184 } 1142 }
1185 1143
1186 void G1GCPhaseTimes::print_stats(int level, const char* str, double value, uint workers) { 1144 void G1GCPhaseTimes::print_stats(int level, const char* str, double value, uint workers) {
1187@@ -452,7 +452,7 @@ class G1GCParPhasePrinter : public StackObj { 1145@@ -452,7 +452,7 @@ class G1GCParPhasePrinter : public Stack
1188 1146
1189 if (phase->_thread_work_items != NULL) { 1147 if (phase->_thread_work_items != NULL) {
1190 LineBuffer buf2(phase->_thread_work_items->_indent_level); 1148 LineBuffer buf2(phase->_thread_work_items->_indent_level);
1191- buf2.append_and_print_cr("[%s: "SIZE_FORMAT"]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id)); 1149- buf2.append_and_print_cr("[%s: "SIZE_FORMAT"]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id));
1192+ buf2.append_and_print_cr("[%s: " SIZE_FORMAT "]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id)); 1150+ buf2.append_and_print_cr("[%s: " SIZE_FORMAT "]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id));
1193 } 1151 }
1194 } 1152 }
1195 1153
1196diff --git hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp 1154--- hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp.orig
1197index 8139048..9cc752a 100644
1198--- hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp
1199+++ hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp 1155+++ hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp
1200@@ -84,18 +84,18 @@ void G1HRPrinter::print(ActionType action, RegionType type, 1156@@ -84,18 +84,18 @@ void G1HRPrinter::print(ActionType actio
1201 1157
1202 if (type_str != NULL) { 1158 if (type_str != NULL) {
1203 if (top != NULL) { 1159 if (top != NULL) {
1204- gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT" "PTR_FORMAT, 1160- gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT" "PTR_FORMAT,
@@ -1220,25 +1176,23 @@ index 8139048..9cc752a 100644
1220 action_str, bottom); 1176 action_str, bottom);
1221 } 1177 }
1222 } 1178 }
1223@@ -104,11 +104,11 @@ void G1HRPrinter::print(ActionType action, RegionType type, 1179@@ -104,11 +104,11 @@ void G1HRPrinter::print(ActionType actio
1224 void G1HRPrinter::print(ActionType action, HeapWord* bottom, HeapWord* end) { 1180 void G1HRPrinter::print(ActionType action, HeapWord* bottom, HeapWord* end) {
1225 const char* action_str = action_name(action); 1181 const char* action_str = action_name(action);
1226 1182
1227- gclog_or_tty->print_cr(G1HR_PREFIX" %s ["PTR_FORMAT","PTR_FORMAT"]", 1183- gclog_or_tty->print_cr(G1HR_PREFIX" %s ["PTR_FORMAT","PTR_FORMAT"]",
1228+ gclog_or_tty->print_cr(G1HR_PREFIX" %s [" PTR_FORMAT "," PTR_FORMAT "]", 1184+ gclog_or_tty->print_cr(G1HR_PREFIX" %s [" PTR_FORMAT "," PTR_FORMAT "]",
1229 action_str, bottom, end); 1185 action_str, bottom, end);
1230 } 1186 }
1231 1187
1232 void G1HRPrinter::print(PhaseType phase, size_t phase_num) { 1188 void G1HRPrinter::print(PhaseType phase, size_t phase_num) {
1233 const char* phase_str = phase_name(phase); 1189 const char* phase_str = phase_name(phase);
1234- gclog_or_tty->print_cr(G1HR_PREFIX" #%s "SIZE_FORMAT, phase_str, phase_num); 1190- gclog_or_tty->print_cr(G1HR_PREFIX" #%s "SIZE_FORMAT, phase_str, phase_num);
1235+ gclog_or_tty->print_cr(G1HR_PREFIX" #%s " SIZE_FORMAT, phase_str, phase_num); 1191+ gclog_or_tty->print_cr(G1HR_PREFIX" #%s " SIZE_FORMAT, phase_str, phase_num);
1236 } 1192 }
1237diff --git hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp 1193--- hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp.orig
1238index a00cd7a..0385f66 100644
1239--- hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
1240+++ hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp 1194+++ hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
1241@@ -118,7 +118,7 @@ inline void G1CMOopClosure::do_oop_nv(T* p) { 1195@@ -118,7 +118,7 @@ inline void G1CMOopClosure::do_oop_nv(T*
1242 oop obj = oopDesc::load_decode_heap_oop(p); 1196 oop obj = oopDesc::load_decode_heap_oop(p);
1243 if (_cm->verbose_high()) { 1197 if (_cm->verbose_high()) {
1244 gclog_or_tty->print_cr("[%u] we're looking at location " 1198 gclog_or_tty->print_cr("[%u] we're looking at location "
@@ -1247,11 +1201,9 @@ index a00cd7a..0385f66 100644
1247 _task->worker_id(), p2i(p), p2i((void*) obj)); 1201 _task->worker_id(), p2i(p), p2i((void*) obj));
1248 } 1202 }
1249 _task->deal_with_reference(obj); 1203 _task->deal_with_reference(obj);
1250diff --git hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp 1204--- hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp.orig
1251index ca714dc..da4d632 100644
1252--- hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
1253+++ hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp 1205+++ hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
1254@@ -442,7 +442,7 @@ G1UpdateRSOrPushRefOopClosure(G1CollectedHeap* g1h, 1206@@ -442,7 +442,7 @@ G1UpdateRSOrPushRefOopClosure(G1Collecte
1255 bool G1RemSet::refine_card(jbyte* card_ptr, uint worker_i, 1207 bool G1RemSet::refine_card(jbyte* card_ptr, uint worker_i,
1256 bool check_for_refs_into_cset) { 1208 bool check_for_refs_into_cset) {
1257 assert(_g1->is_in_exact(_ct_bs->addr_for(card_ptr)), 1209 assert(_g1->is_in_exact(_ct_bs->addr_for(card_ptr)),
@@ -1260,102 +1212,10 @@ index ca714dc..da4d632 100644
1260 p2i(card_ptr), 1212 p2i(card_ptr),
1261 _ct_bs->index_for(_ct_bs->addr_for(card_ptr)), 1213 _ct_bs->index_for(_ct_bs->addr_for(card_ptr)),
1262 _ct_bs->addr_for(card_ptr), 1214 _ct_bs->addr_for(card_ptr),
1263diff --git hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 1215--- hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp.orig
1264index c55165b..8d654dc 100644
1265--- hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp
1266+++ hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 1216+++ hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp
1267@@ -187,22 +187,22 @@ public: 1217@@ -344,16 +344,16 @@ public:
1268 size_t code_root_elems() const { return _code_root_elems; } 1218
1269
1270 void print_rs_mem_info_on(outputStream * out, size_t total) {
1271- out->print_cr(" "SIZE_FORMAT_W(8)"K (%5.1f%%) by "SIZE_FORMAT" %s regions",
1272+ out->print_cr(" " SIZE_FORMAT_W(8) "K (%5.1f%%) by " SIZE_FORMAT " %s regions",
1273 round_to_K(rs_mem_size()), rs_mem_size_percent_of(total), amount(), _name);
1274 }
1275
1276 void print_cards_occupied_info_on(outputStream * out, size_t total) {
1277- out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) entries by "SIZE_FORMAT" %s regions",
1278+ out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) entries by " SIZE_FORMAT " %s regions",
1279 cards_occupied(), cards_occupied_percent_of(total), amount(), _name);
1280 }
1281
1282 void print_code_root_mem_info_on(outputStream * out, size_t total) {
1283- out->print_cr(" "SIZE_FORMAT_W(8)"K (%5.1f%%) by "SIZE_FORMAT" %s regions",
1284+ out->print_cr(" " SIZE_FORMAT_W(8) "K (%5.1f%%) by " SIZE_FORMAT " %s regions",
1285 round_to_K(code_root_mem_size()), code_root_mem_size_percent_of(total), amount(), _name);
1286 }
1287
1288 void print_code_root_elems_info_on(outputStream * out, size_t total) {
1289- out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) elements by "SIZE_FORMAT" %s regions",
1290+ out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) elements by " SIZE_FORMAT " %s regions",
1291 code_root_elems(), code_root_elems_percent_of(total), amount(), _name);
1292 }
1293 };
1294@@ -280,19 +280,19 @@ public:
1295 RegionTypeCounter* counters[] = { &_young, &_humonguous, &_free, &_old, NULL };
1296
1297 out->print_cr("\n Current rem set statistics");
1298- out->print_cr(" Total per region rem sets sizes = "SIZE_FORMAT"K."
1299- " Max = "SIZE_FORMAT"K.",
1300+ out->print_cr(" Total per region rem sets sizes = " SIZE_FORMAT "K."
1301+ " Max = " SIZE_FORMAT "K.",
1302 round_to_K(total_rs_mem_sz()), round_to_K(max_rs_mem_sz()));
1303 for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
1304 (*current)->print_rs_mem_info_on(out, total_rs_mem_sz());
1305 }
1306
1307- out->print_cr(" Static structures = "SIZE_FORMAT"K,"
1308- " free_lists = "SIZE_FORMAT"K.",
1309+ out->print_cr(" Static structures = " SIZE_FORMAT "K,"
1310+ " free_lists = " SIZE_FORMAT "K.",
1311 round_to_K(HeapRegionRemSet::static_mem_size()),
1312 round_to_K(HeapRegionRemSet::fl_mem_size()));
1313
1314- out->print_cr(" "SIZE_FORMAT" occupied cards represented.",
1315+ out->print_cr(" " SIZE_FORMAT " occupied cards represented.",
1316 total_cards_occupied());
1317 for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
1318 (*current)->print_cards_occupied_info_on(out, total_cards_occupied());
1319@@ -300,30 +300,30 @@ public:
1320
1321 // Largest sized rem set region statistics
1322 HeapRegionRemSet* rem_set = max_rs_mem_sz_region()->rem_set();
1323- out->print_cr(" Region with largest rem set = "HR_FORMAT", "
1324- "size = "SIZE_FORMAT "K, occupied = "SIZE_FORMAT"K.",
1325+ out->print_cr(" Region with largest rem set = " HR_FORMAT ", "
1326+ "size = " SIZE_FORMAT "K, occupied = " SIZE_FORMAT "K.",
1327 HR_FORMAT_PARAMS(max_rs_mem_sz_region()),
1328 round_to_K(rem_set->mem_size()),
1329 round_to_K(rem_set->occupied()));
1330
1331 // Strong code root statistics
1332 HeapRegionRemSet* max_code_root_rem_set = max_code_root_mem_sz_region()->rem_set();
1333- out->print_cr(" Total heap region code root sets sizes = "SIZE_FORMAT"K."
1334- " Max = "SIZE_FORMAT"K.",
1335+ out->print_cr(" Total heap region code root sets sizes = " SIZE_FORMAT "K."
1336+ " Max = " SIZE_FORMAT "K.",
1337 round_to_K(total_code_root_mem_sz()),
1338 round_to_K(max_code_root_rem_set->strong_code_roots_mem_size()));
1339 for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
1340 (*current)->print_code_root_mem_info_on(out, total_code_root_mem_sz());
1341 }
1342
1343- out->print_cr(" "SIZE_FORMAT" code roots represented.",
1344+ out->print_cr(" " SIZE_FORMAT " code roots represented.",
1345 total_code_root_elems());
1346 for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) {
1347 (*current)->print_code_root_elems_info_on(out, total_code_root_elems());
1348 }
1349
1350- out->print_cr(" Region with largest amount of code roots = "HR_FORMAT", "
1351- "size = "SIZE_FORMAT "K, num_elems = "SIZE_FORMAT".",
1352+ out->print_cr(" Region with largest amount of code roots = " HR_FORMAT ", "
1353+ "size = " SIZE_FORMAT "K, num_elems = " SIZE_FORMAT ".",
1354 HR_FORMAT_PARAMS(max_code_root_mem_sz_region()),
1355 round_to_K(max_code_root_rem_set->strong_code_roots_mem_size()),
1356 round_to_K(max_code_root_rem_set->strong_code_roots_list_length()));
1357@@ -332,16 +332,16 @@ public:
1358
1359 void G1RemSetSummary::print_on(outputStream* out) { 1219 void G1RemSetSummary::print_on(outputStream* out) {
1360 out->print_cr("\n Recent concurrent refinement statistics"); 1220 out->print_cr("\n Recent concurrent refinement statistics");
1361- out->print_cr(" Processed "SIZE_FORMAT" cards", 1221- out->print_cr(" Processed "SIZE_FORMAT" cards",
@@ -1376,24 +1236,20 @@ index c55165b..8d654dc 100644
1376 out->print_cr(" Concurrent RS threads times (s)"); 1236 out->print_cr(" Concurrent RS threads times (s)");
1377 out->print(" "); 1237 out->print(" ");
1378 for (uint i = 0; i < _num_vtimes; i++) { 1238 for (uint i = 0; i < _num_vtimes; i++) {
1379diff --git hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 1239--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp.orig
1380index 8ae53e3..747f61b 100644
1381--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
1382+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 1240+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
1383@@ -151,7 +151,7 @@ void G1StringDedupQueue::unlink_or_oops_do(G1StringDedupUnlinkOrOopsDoClosure* c 1241@@ -151,7 +151,7 @@ void G1StringDedupQueue::unlink_or_oops_
1384 void G1StringDedupQueue::print_statistics(outputStream* st) { 1242 void G1StringDedupQueue::print_statistics(outputStream* st) {
1385 st->print_cr( 1243 st->print_cr(
1386 " [Queue]\n" 1244 " [Queue]\n"
1387- " [Dropped: "UINTX_FORMAT"]", _queue->_dropped); 1245- " [Dropped: "UINTX_FORMAT"]", _queue->_dropped);
1388+ " [Dropped: " UINTX_FORMAT "]", _queue->_dropped); 1246+ " [Dropped: " UINTX_FORMAT "]", _queue->_dropped);
1389 } 1247 }
1390 1248
1391 void G1StringDedupQueue::verify() { 1249 void G1StringDedupQueue::verify() {
1392diff --git hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp 1250--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp.orig
1393index 2d5523c..f9700e1 100644
1394--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp
1395+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp 1251+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp
1396@@ -80,8 +80,8 @@ void G1StringDedupStat::print_summary(outputStream* st, const G1StringDedupStat& 1252@@ -80,8 +80,8 @@ void G1StringDedupStat::print_summary(ou
1397 st->stamp(PrintGCTimeStamps); 1253 st->stamp(PrintGCTimeStamps);
1398 st->print_cr( 1254 st->print_cr(
1399 "[GC concurrent-string-deduplication, " 1255 "[GC concurrent-string-deduplication, "
@@ -1404,8 +1260,8 @@ index 2d5523c..f9700e1 100644
1404 G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes), 1260 G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes),
1405 G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes - last_stat._deduped_bytes), 1261 G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes - last_stat._deduped_bytes),
1406 G1_STRDEDUP_BYTES_PARAM(last_stat._deduped_bytes), 1262 G1_STRDEDUP_BYTES_PARAM(last_stat._deduped_bytes),
1407@@ -135,22 +135,22 @@ void G1StringDedupStat::print_statistics(outputStream* st, const G1StringDedupSt 1263@@ -135,22 +135,22 @@ void G1StringDedupStat::print_statistics
1408 1264
1409 if (total) { 1265 if (total) {
1410 st->print_cr( 1266 st->print_cr(
1411- " [Total Exec: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT", Idle: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT", Blocked: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT"]", 1267- " [Total Exec: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT", Idle: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT", Blocked: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT"]",
@@ -1437,11 +1293,9 @@ index 2d5523c..f9700e1 100644
1437 stat._inspected, 1293 stat._inspected,
1438 stat._skipped, skipped_percent, 1294 stat._skipped, skipped_percent,
1439 stat._hashed, hashed_percent, 1295 stat._hashed, hashed_percent,
1440diff --git hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 1296--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp.orig
1441index 2b41688..39a3306 100644
1442--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
1443+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 1297+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
1444@@ -554,12 +554,12 @@ void G1StringDedupTable::trim_entry_cache() { 1298@@ -596,12 +596,12 @@ void G1StringDedupTable::clean_entry_cac
1445 void G1StringDedupTable::print_statistics(outputStream* st) { 1299 void G1StringDedupTable::print_statistics(outputStream* st) {
1446 st->print_cr( 1300 st->print_cr(
1447 " [Table]\n" 1301 " [Table]\n"
@@ -1460,11 +1314,9 @@ index 2b41688..39a3306 100644
1460 G1_STRDEDUP_BYTES_PARAM(_table->_size * sizeof(G1StringDedupEntry*) + (_table->_entries + _entry_cache->size()) * sizeof(G1StringDedupEntry)), 1314 G1_STRDEDUP_BYTES_PARAM(_table->_size * sizeof(G1StringDedupEntry*) + (_table->_entries + _entry_cache->size()) * sizeof(G1StringDedupEntry)),
1461 _table->_size, _min_size, _max_size, 1315 _table->_size, _min_size, _max_size,
1462 _table->_entries, (double)_table->_entries / (double)_table->_size * 100.0, _entry_cache->size(), _entries_added, _entries_removed, 1316 _table->_entries, (double)_table->_entries / (double)_table->_size * 100.0, _entry_cache->size(), _entries_added, _entries_removed,
1463diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 1317--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp.orig
1464index ef5b437..eefa1c9 100644
1465--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
1466+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 1318+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
1467@@ -333,7 +333,7 @@ void HeapRegion::note_self_forwarding_removal_end(bool during_initial_mark, 1319@@ -333,7 +333,7 @@ void HeapRegion::note_self_forwarding_re
1468 bool during_conc_mark, 1320 bool during_conc_mark,
1469 size_t marked_bytes) { 1321 size_t marked_bytes) {
1470 assert(0 <= marked_bytes && marked_bytes <= used(), 1322 assert(0 <= marked_bytes && marked_bytes <= used(),
@@ -1473,7 +1325,7 @@ index ef5b437..eefa1c9 100644
1473 marked_bytes, used())); 1325 marked_bytes, used()));
1474 _prev_top_at_mark_start = top(); 1326 _prev_top_at_mark_start = top();
1475 _prev_marked_bytes = marked_bytes; 1327 _prev_marked_bytes = marked_bytes;
1476@@ -514,9 +514,9 @@ class VerifyStrongCodeRootOopClosure: public OopClosure { 1328@@ -514,9 +514,9 @@ class VerifyStrongCodeRootOopClosure: pu
1477 // Object is in the region. Check that its less than top 1329 // Object is in the region. Check that its less than top
1478 if (_hr->top() <= (HeapWord*)obj) { 1330 if (_hr->top() <= (HeapWord*)obj) {
1479 // Object is above top 1331 // Object is above top
@@ -1515,7 +1367,7 @@ index ef5b437..eefa1c9 100644
1515 _hr->bottom(), _hr->end(), nm); 1367 _hr->bottom(), _hr->end(), nm);
1516 _failures = true; 1368 _failures = true;
1517 } 1369 }
1518@@ -599,8 +599,8 @@ void HeapRegion::verify_strong_code_roots(VerifyOption vo, bool* failures) const 1370@@ -599,8 +599,8 @@ void HeapRegion::verify_strong_code_root
1519 // on its strong code root list 1371 // on its strong code root list
1520 if (is_empty()) { 1372 if (is_empty()) {
1521 if (strong_code_roots_length > 0) { 1373 if (strong_code_roots_length > 0) {
@@ -1526,8 +1378,8 @@ index ef5b437..eefa1c9 100644
1526 bottom(), end(), strong_code_roots_length); 1378 bottom(), end(), strong_code_roots_length);
1527 *failures = true; 1379 *failures = true;
1528 } 1380 }
1529@@ -609,8 +609,8 @@ void HeapRegion::verify_strong_code_roots(VerifyOption vo, bool* failures) const 1381@@ -609,8 +609,8 @@ void HeapRegion::verify_strong_code_root
1530 1382
1531 if (continuesHumongous()) { 1383 if (continuesHumongous()) {
1532 if (strong_code_roots_length > 0) { 1384 if (strong_code_roots_length > 0) {
1533- gclog_or_tty->print_cr("region "HR_FORMAT" is a continuation of a humongous " 1385- gclog_or_tty->print_cr("region "HR_FORMAT" is a continuation of a humongous "
@@ -1537,7 +1389,7 @@ index ef5b437..eefa1c9 100644
1537 HR_FORMAT_PARAMS(this), strong_code_roots_length); 1389 HR_FORMAT_PARAMS(this), strong_code_roots_length);
1538 *failures = true; 1390 *failures = true;
1539 } 1391 }
1540@@ -634,7 +634,7 @@ void HeapRegion::print_on(outputStream* st) const { 1392@@ -634,7 +634,7 @@ void HeapRegion::print_on(outputStream*
1541 else 1393 else
1542 st->print(" "); 1394 st->print(" ");
1543 st->print(" TS %5d", _gc_time_stamp); 1395 st->print(" TS %5d", _gc_time_stamp);
@@ -1602,7 +1454,7 @@ index ef5b437..eefa1c9 100644
1602 HR_FORMAT_PARAMS(to)); 1454 HR_FORMAT_PARAMS(to));
1603 if (obj->is_oop()) { 1455 if (obj->is_oop()) {
1604@@ -830,8 +830,8 @@ void HeapRegion::verify(VerifyOption vo, 1456@@ -830,8 +830,8 @@ void HeapRegion::verify(VerifyOption vo,
1605 1457
1606 if (is_humongous != g1->isHumongous(obj_size) && 1458 if (is_humongous != g1->isHumongous(obj_size) &&
1607 !g1->is_obj_dead(obj, this)) { // Dead objects may have bigger block_size since they span several objects. 1459 !g1->is_obj_dead(obj, this)) { // Dead objects may have bigger block_size since they span several objects.
1608- gclog_or_tty->print_cr("obj "PTR_FORMAT" is of %shumongous size (" 1460- gclog_or_tty->print_cr("obj "PTR_FORMAT" is of %shumongous size ("
@@ -1638,7 +1490,7 @@ index ef5b437..eefa1c9 100644
1638 } 1490 }
1639@@ -901,8 +901,8 @@ void HeapRegion::verify(VerifyOption vo, 1491@@ -901,8 +901,8 @@ void HeapRegion::verify(VerifyOption vo,
1640 } 1492 }
1641 1493
1642 if (p != top()) { 1494 if (p != top()) {
1643- gclog_or_tty->print_cr("end of last object "PTR_FORMAT" " 1495- gclog_or_tty->print_cr("end of last object "PTR_FORMAT" "
1644- "does not match top "PTR_FORMAT, p, top()); 1496- "does not match top "PTR_FORMAT, p, top());
@@ -1693,7 +1545,7 @@ index ef5b437..eefa1c9 100644
1693 return; 1545 return;
1694@@ -964,8 +964,8 @@ void HeapRegion::verify(VerifyOption vo, 1546@@ -964,8 +964,8 @@ void HeapRegion::verify(VerifyOption vo,
1695 } 1547 }
1696 1548
1697 if (is_humongous && object_num > 1) { 1549 if (is_humongous && object_num > 1) {
1698- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is humongous " 1550- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is humongous "
1699- "but has "SIZE_FORMAT", objects", 1551- "but has "SIZE_FORMAT", objects",
@@ -1702,20 +1554,18 @@ index ef5b437..eefa1c9 100644
1702 bottom(), end(), object_num); 1554 bottom(), end(), object_num);
1703 *failures = true; 1555 *failures = true;
1704 return; 1556 return;
1705diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp 1557--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp.orig
1706index e62a2ab..76627e7 100644
1707--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
1708+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp 1558+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
1709@@ -52,7 +52,7 @@ class HeapRegion; 1559@@ -52,7 +52,7 @@ class HeapRegion;
1710 class HeapRegionSetBase; 1560 class HeapRegionSetBase;
1711 class nmethod; 1561 class nmethod;
1712 1562
1713-#define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]" 1563-#define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]"
1714+#define HR_FORMAT "%u:(%s)[" PTR_FORMAT "," PTR_FORMAT "," PTR_FORMAT "]" 1564+#define HR_FORMAT "%u:(%s)[" PTR_FORMAT "," PTR_FORMAT "," PTR_FORMAT "]"
1715 #define HR_FORMAT_PARAMS(_hr_) \ 1565 #define HR_FORMAT_PARAMS(_hr_) \
1716 (_hr_)->hrm_index(), \ 1566 (_hr_)->hrm_index(), \
1717 (_hr_)->get_short_type_str(), \ 1567 (_hr_)->get_short_type_str(), \
1718@@ -534,8 +534,8 @@ class HeapRegion: public G1OffsetTableContigSpace { 1568@@ -534,8 +534,8 @@ class HeapRegion: public G1OffsetTableCo
1719 void set_containing_set(HeapRegionSetBase* containing_set) { 1569 void set_containing_set(HeapRegionSetBase* containing_set) {
1720 assert((containing_set == NULL && _containing_set != NULL) || 1570 assert((containing_set == NULL && _containing_set != NULL) ||
1721 (containing_set != NULL && _containing_set == NULL), 1571 (containing_set != NULL && _containing_set == NULL),
@@ -1724,24 +1574,20 @@ index e62a2ab..76627e7 100644
1724+ err_msg("containing_set: " PTR_FORMAT " " 1574+ err_msg("containing_set: " PTR_FORMAT " "
1725+ "_containing_set: " PTR_FORMAT, 1575+ "_containing_set: " PTR_FORMAT,
1726 p2i(containing_set), p2i(_containing_set))); 1576 p2i(containing_set), p2i(_containing_set)));
1727 1577
1728 _containing_set = containing_set; 1578 _containing_set = containing_set;
1729diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp 1579--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp.orig
1730index 62ae230..46e8b00 100644
1731--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
1732+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp 1580+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
1733@@ -112,7 +112,7 @@ HeapRegion::block_size(const HeapWord *addr) const { 1581@@ -112,7 +112,7 @@ HeapRegion::block_size(const HeapWord *a
1734 1582
1735 assert(ClassUnloadingWithConcurrentMark, 1583 assert(ClassUnloadingWithConcurrentMark,
1736 err_msg("All blocks should be objects if G1 Class Unloading isn't used. " 1584 err_msg("All blocks should be objects if G1 Class Unloading isn't used. "
1737- "HR: ["PTR_FORMAT", "PTR_FORMAT", "PTR_FORMAT") " 1585- "HR: ["PTR_FORMAT", "PTR_FORMAT", "PTR_FORMAT") "
1738+ "HR: [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ") " 1586+ "HR: [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ") "
1739 "addr: " PTR_FORMAT, 1587 "addr: " PTR_FORMAT,
1740 p2i(bottom()), p2i(top()), p2i(end()), p2i(addr))); 1588 p2i(bottom()), p2i(top()), p2i(end()), p2i(addr)));
1741 1589
1742diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp 1590--- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp.orig
1743index 020eb08..14673df 100644
1744--- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
1745+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp 1591+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
1746@@ -432,7 +432,7 @@ void HeapRegionManager::verify() { 1592@@ -432,7 +432,7 @@ void HeapRegionManager::verify() {
1747 HeapRegion* hr = _regions.get_by_index(i); 1593 HeapRegion* hr = _regions.get_by_index(i);
@@ -1752,12 +1598,10 @@ index 020eb08..14673df 100644
1752 i, HR_FORMAT_PARAMS(hr), p2i(prev_end))); 1598 i, HR_FORMAT_PARAMS(hr), p2i(prev_end)));
1753 guarantee(hr->hrm_index() == i, 1599 guarantee(hr->hrm_index() == i,
1754 err_msg("invariant: i: %u hrm_index(): %u", i, hr->hrm_index())); 1600 err_msg("invariant: i: %u hrm_index(): %u", i, hr->hrm_index()));
1755diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp 1601--- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp.orig
1756index 96bc92f..68840d6 100644
1757--- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp
1758+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp 1602+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp
1759@@ -31,9 +31,9 @@ 1603@@ -31,9 +31,9 @@
1760 1604
1761 inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const { 1605 inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const {
1762 assert(addr < heap_end(), 1606 assert(addr < heap_end(),
1763- err_msg("addr: "PTR_FORMAT" end: "PTR_FORMAT, p2i(addr), p2i(heap_end()))); 1607- err_msg("addr: "PTR_FORMAT" end: "PTR_FORMAT, p2i(addr), p2i(heap_end())));
@@ -1765,24 +1609,22 @@ index 96bc92f..68840d6 100644
1765 assert(addr >= heap_bottom(), 1609 assert(addr >= heap_bottom(),
1766- err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT, p2i(addr), p2i(heap_bottom()))); 1610- err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT, p2i(addr), p2i(heap_bottom())));
1767+ err_msg("addr: " PTR_FORMAT " bottom: " PTR_FORMAT, p2i(addr), p2i(heap_bottom()))); 1611+ err_msg("addr: " PTR_FORMAT " bottom: " PTR_FORMAT, p2i(addr), p2i(heap_bottom())));
1768 1612
1769 HeapRegion* hr = _regions.get_by_address(addr); 1613 HeapRegion* hr = _regions.get_by_address(addr);
1770 return hr; 1614 return hr;
1771diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 1615--- hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.orig
1772index 662f4f1..6659960 100644
1773--- hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
1774+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 1616+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
1775@@ -91,7 +91,7 @@ protected: 1617@@ -91,7 +91,7 @@ protected:
1776 // concurrency. 1618 // concurrency.
1777 1619
1778 if (G1TraceHeapRegionRememberedSet) { 1620 if (G1TraceHeapRegionRememberedSet) {
1779- gclog_or_tty->print_cr(" PRT::Add_reference_work(" PTR_FORMAT "->" PTR_FORMAT").", 1621- gclog_or_tty->print_cr(" PRT::Add_reference_work(" PTR_FORMAT "->" PTR_FORMAT").",
1780+ gclog_or_tty->print_cr(" PRT::Add_reference_work(" PTR_FORMAT "->" PTR_FORMAT ").", 1622+ gclog_or_tty->print_cr(" PRT::Add_reference_work(" PTR_FORMAT "->" PTR_FORMAT ").",
1781 from, 1623 from,
1782 UseCompressedOops 1624 UseCompressedOops
1783 ? (void *)oopDesc::load_decode_heap_oop((narrowOop*)from) 1625 ? (void *)oopDesc::load_decode_heap_oop((narrowOop*)from)
1784@@ -381,7 +381,7 @@ void FromCardCache::initialize(uint n_par_rs, uint max_num_regions) { 1626@@ -381,7 +381,7 @@ void FromCardCache::initialize(uint n_pa
1785 1627
1786 void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) { 1628 void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) {
1787 guarantee((size_t)start_idx + new_num_regions <= max_uintx, 1629 guarantee((size_t)start_idx + new_num_regions <= max_uintx,
1788- err_msg("Trying to invalidate beyond maximum region, from %u size "SIZE_FORMAT, 1630- err_msg("Trying to invalidate beyond maximum region, from %u size "SIZE_FORMAT,
@@ -1790,7 +1632,7 @@ index 662f4f1..6659960 100644
1790 start_idx, new_num_regions)); 1632 start_idx, new_num_regions));
1791 for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) { 1633 for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) {
1792 uint end_idx = (start_idx + (uint)new_num_regions); 1634 uint end_idx = (start_idx + (uint)new_num_regions);
1793@@ -396,7 +396,7 @@ void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) { 1635@@ -396,7 +396,7 @@ void FromCardCache::invalidate(uint star
1794 void FromCardCache::print(outputStream* out) { 1636 void FromCardCache::print(outputStream* out) {
1795 for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) { 1637 for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) {
1796 for (uint j = 0; j < _max_regions; j++) { 1638 for (uint j = 0; j < _max_regions; j++) {
@@ -1799,17 +1641,17 @@ index 662f4f1..6659960 100644
1799 i, j, at(i, j)); 1641 i, j, at(i, j));
1800 } 1642 }
1801 } 1643 }
1802@@ -436,7 +436,7 @@ void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, int tid) { 1644@@ -436,7 +436,7 @@ void OtherRegionsTable::add_reference(Oo
1803 int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift); 1645 int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift);
1804 1646
1805 if (G1TraceHeapRegionRememberedSet) { 1647 if (G1TraceHeapRegionRememberedSet) {
1806- gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = "INT32_FORMAT")", 1648- gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = "INT32_FORMAT")",
1807+ gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = " INT32_FORMAT ")", 1649+ gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = " INT32_FORMAT ")",
1808 hr()->bottom(), from_card, 1650 hr()->bottom(), from_card,
1809 FromCardCache::at((uint)tid, cur_hrm_ind)); 1651 FromCardCache::at((uint)tid, cur_hrm_ind));
1810 } 1652 }
1811@@ -642,13 +642,13 @@ void OtherRegionsTable::scrub(CardTableModRefBS* ctbs, 1653@@ -642,13 +642,13 @@ void OtherRegionsTable::scrub(CardTableM
1812 1654
1813 assert(_coarse_map.size() == region_bm->size(), "Precondition"); 1655 assert(_coarse_map.size() == region_bm->size(), "Precondition");
1814 if (G1RSScrubVerbose) { 1656 if (G1RSScrubVerbose) {
1815- gclog_or_tty->print(" Coarse map: before = "SIZE_FORMAT"...", 1657- gclog_or_tty->print(" Coarse map: before = "SIZE_FORMAT"...",
@@ -1822,19 +1664,19 @@ index 662f4f1..6659960 100644
1822- gclog_or_tty->print_cr(" after = "SIZE_FORMAT".", _n_coarse_entries); 1664- gclog_or_tty->print_cr(" after = "SIZE_FORMAT".", _n_coarse_entries);
1823+ gclog_or_tty->print_cr(" after = " SIZE_FORMAT ".", _n_coarse_entries); 1665+ gclog_or_tty->print_cr(" after = " SIZE_FORMAT ".", _n_coarse_entries);
1824 } 1666 }
1825 1667
1826 // Now do the fine-grained maps. 1668 // Now do the fine-grained maps.
1827@@ -1044,7 +1044,7 @@ bool HeapRegionRemSetIterator::fine_has_next(size_t& card_index) { 1669@@ -1044,7 +1044,7 @@ bool HeapRegionRemSetIterator::fine_has_
1828 1670
1829 card_index = _cur_region_card_offset + _cur_card_in_prt; 1671 card_index = _cur_region_card_offset + _cur_card_in_prt;
1830 guarantee(_cur_card_in_prt < HeapRegion::CardsPerRegion, 1672 guarantee(_cur_card_in_prt < HeapRegion::CardsPerRegion,
1831- err_msg("Card index "SIZE_FORMAT" must be within the region", _cur_card_in_prt)); 1673- err_msg("Card index "SIZE_FORMAT" must be within the region", _cur_card_in_prt));
1832+ err_msg("Card index " SIZE_FORMAT " must be within the region", _cur_card_in_prt)); 1674+ err_msg("Card index " SIZE_FORMAT " must be within the region", _cur_card_in_prt));
1833 return true; 1675 return true;
1834 } 1676 }
1835 1677
1836@@ -1213,8 +1213,8 @@ void PerRegionTable::test_fl_mem_size() { 1678@@ -1213,8 +1213,8 @@ void PerRegionTable::test_fl_mem_size()
1837 1679
1838 size_t min_prt_size = sizeof(void*) + dummy->bm()->size_in_words() * HeapWordSize; 1680 size_t min_prt_size = sizeof(void*) + dummy->bm()->size_in_words() * HeapWordSize;
1839 assert(dummy->mem_size() > min_prt_size, 1681 assert(dummy->mem_size() > min_prt_size,
1840- err_msg("PerRegionTable memory usage is suspiciously small, only has "SIZE_FORMAT" bytes. " 1682- err_msg("PerRegionTable memory usage is suspiciously small, only has "SIZE_FORMAT" bytes. "
@@ -1844,13 +1686,11 @@ index 662f4f1..6659960 100644
1844 free(dummy); 1686 free(dummy);
1845 guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size"); 1687 guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size");
1846 // try to reset the state 1688 // try to reset the state
1847diff --git hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp 1689--- hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp.orig
1848index b654430..9ffb46f 100644
1849--- hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp
1850+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp 1690+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp
1851@@ -32,7 +32,7 @@ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC 1691@@ -32,7 +32,7 @@ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
1852 uint FreeRegionList::_unrealistically_long_length = 0; 1692 uint FreeRegionList::_unrealistically_long_length = 0;
1853 1693
1854 void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) { 1694 void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) {
1855- msg->append("[%s] %s ln: %u cy: "SIZE_FORMAT, 1695- msg->append("[%s] %s ln: %u cy: "SIZE_FORMAT,
1856+ msg->append("[%s] %s ln: %u cy: " SIZE_FORMAT, 1696+ msg->append("[%s] %s ln: %u cy: " SIZE_FORMAT,
@@ -1858,7 +1698,7 @@ index b654430..9ffb46f 100644
1858 fill_in_ext_msg_extra(msg); 1698 fill_in_ext_msg_extra(msg);
1859 } 1699 }
1860@@ -84,13 +84,13 @@ void HeapRegionSetBase::verify_end() { 1700@@ -84,13 +84,13 @@ void HeapRegionSetBase::verify_end() {
1861 1701
1862 void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) { 1702 void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) {
1863 out->cr(); 1703 out->cr();
1864- out->print_cr("Set: %s ("PTR_FORMAT")", name(), this); 1704- out->print_cr("Set: %s ("PTR_FORMAT")", name(), this);
@@ -1872,15 +1712,15 @@ index b654430..9ffb46f 100644
1872+ out->print_cr(" total capacity : " SIZE_FORMAT_W(14) " bytes", 1712+ out->print_cr(" total capacity : " SIZE_FORMAT_W(14) " bytes",
1873 total_capacity_bytes()); 1713 total_capacity_bytes());
1874 } 1714 }
1875 1715
1876@@ -106,7 +106,7 @@ void FreeRegionList::set_unrealistically_long_length(uint len) { 1716@@ -106,7 +106,7 @@ void FreeRegionList::set_unrealistically
1877 } 1717 }
1878 1718
1879 void FreeRegionList::fill_in_ext_msg_extra(hrs_ext_msg* msg) { 1719 void FreeRegionList::fill_in_ext_msg_extra(hrs_ext_msg* msg) {
1880- msg->append(" hd: "PTR_FORMAT" tl: "PTR_FORMAT, _head, _tail); 1720- msg->append(" hd: "PTR_FORMAT" tl: "PTR_FORMAT, _head, _tail);
1881+ msg->append(" hd: " PTR_FORMAT " tl: " PTR_FORMAT, _head, _tail); 1721+ msg->append(" hd: " PTR_FORMAT " tl: " PTR_FORMAT, _head, _tail);
1882 } 1722 }
1883 1723
1884 void FreeRegionList::remove_all() { 1724 void FreeRegionList::remove_all() {
1885@@ -277,8 +277,8 @@ void FreeRegionList::clear() { 1725@@ -277,8 +277,8 @@ void FreeRegionList::clear() {
1886 void FreeRegionList::print_on(outputStream* out, bool print_contents) { 1726 void FreeRegionList::print_on(outputStream* out, bool print_contents) {
@@ -1890,23 +1730,21 @@ index b654430..9ffb46f 100644
1890- out->print_cr(" tail : "PTR_FORMAT, _tail); 1730- out->print_cr(" tail : "PTR_FORMAT, _tail);
1891+ out->print_cr(" head : " PTR_FORMAT, _head); 1731+ out->print_cr(" head : " PTR_FORMAT, _head);
1892+ out->print_cr(" tail : " PTR_FORMAT, _tail); 1732+ out->print_cr(" tail : " PTR_FORMAT, _tail);
1893 1733
1894 if (print_contents) { 1734 if (print_contents) {
1895 out->print_cr(" Contents"); 1735 out->print_cr(" Contents");
1896@@ -306,7 +306,7 @@ void FreeRegionList::verify_list() { 1736@@ -306,7 +306,7 @@ void FreeRegionList::verify_list() {
1897 1737
1898 count++; 1738 count++;
1899 guarantee(count < _unrealistically_long_length, 1739 guarantee(count < _unrealistically_long_length,
1900- hrs_err_msg("[%s] the calculated length: %u seems very long, is there maybe a cycle? curr: "PTR_FORMAT" prev0: "PTR_FORMAT" " "prev1: "PTR_FORMAT" length: %u", name(), count, curr, prev0, prev1, length())); 1740- hrs_err_msg("[%s] the calculated length: %u seems very long, is there maybe a cycle? curr: "PTR_FORMAT" prev0: "PTR_FORMAT" " "prev1: "PTR_FORMAT" length: %u", name(), count, curr, prev0, prev1, length()));
1901+ hrs_err_msg("[%s] the calculated length: %u seems very long, is there maybe a cycle? curr: " PTR_FORMAT " prev0: " PTR_FORMAT " " "prev1: " PTR_FORMAT " length: %u", name(), count, curr, prev0, prev1, length())); 1741+ hrs_err_msg("[%s] the calculated length: %u seems very long, is there maybe a cycle? curr: " PTR_FORMAT " prev0: " PTR_FORMAT " " "prev1: " PTR_FORMAT " length: %u", name(), count, curr, prev0, prev1, length()));
1902 1742
1903 if (curr->next() != NULL) { 1743 if (curr->next() != NULL) {
1904 guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up"); 1744 guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up");
1905diff --git hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 1745--- hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp.orig
1906index 114d39d..c877400 100644
1907--- hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
1908+++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 1746+++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
1909@@ -668,7 +668,7 @@ jlong PSMarkSweep::millis_since_last_gc() { 1747@@ -668,7 +668,7 @@ jlong PSMarkSweep::millis_since_last_gc(
1910 jlong ret_val = now - _time_of_last_gc; 1748 jlong ret_val = now - _time_of_last_gc;
1911 // XXX See note in genCollectedHeap::millis_since_last_gc(). 1749 // XXX See note in genCollectedHeap::millis_since_last_gc().
1912 if (ret_val < 0) { 1750 if (ret_val < 0) {
@@ -1915,11 +1753,9 @@ index 114d39d..c877400 100644
1915 return 0; 1753 return 0;
1916 } 1754 }
1917 return ret_val; 1755 return ret_val;
1918diff --git hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 1756--- hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.orig
1919index 8175ded..dd02250 100644
1920--- hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
1921+++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 1757+++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
1922@@ -3291,7 +3291,7 @@ jlong PSParallelCompact::millis_since_last_gc() { 1758@@ -3291,7 +3291,7 @@ jlong PSParallelCompact::millis_since_la
1923 jlong ret_val = now - _time_of_last_gc; 1759 jlong ret_val = now - _time_of_last_gc;
1924 // XXX See note in genCollectedHeap::millis_since_last_gc(). 1760 // XXX See note in genCollectedHeap::millis_since_last_gc().
1925 if (ret_val < 0) { 1761 if (ret_val < 0) {
@@ -1928,11 +1764,9 @@ index 8175ded..dd02250 100644
1928 return 0; 1764 return 0;
1929 } 1765 }
1930 return ret_val; 1766 return ret_val;
1931diff --git hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 1767--- hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp.orig
1932index 9a9ed05..39a370c 100644
1933--- hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
1934+++ hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 1768+++ hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
1935@@ -86,7 +86,7 @@ void MutableNUMASpace::ensure_parsability() { 1769@@ -86,7 +86,7 @@ void MutableNUMASpace::ensure_parsabilit
1936 while (words_left_to_fill > 0) { 1770 while (words_left_to_fill > 0) {
1937 size_t words_to_fill = MIN2(words_left_to_fill, CollectedHeap::filler_array_max_size()); 1771 size_t words_to_fill = MIN2(words_left_to_fill, CollectedHeap::filler_array_max_size());
1938 assert(words_to_fill >= CollectedHeap::min_fill_size(), 1772 assert(words_to_fill >= CollectedHeap::min_fill_size(),
@@ -1941,11 +1775,9 @@ index 9a9ed05..39a370c 100644
1941 words_to_fill, words_left_to_fill, CollectedHeap::filler_array_max_size())); 1775 words_to_fill, words_left_to_fill, CollectedHeap::filler_array_max_size()));
1942 CollectedHeap::fill_with_object((HeapWord*)cur_top, words_to_fill); 1776 CollectedHeap::fill_with_object((HeapWord*)cur_top, words_to_fill);
1943 if (!os::numa_has_static_binding()) { 1777 if (!os::numa_has_static_binding()) {
1944diff --git hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp 1778--- hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp.orig
1945index bddf14b..923c34e 100644
1946--- hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp
1947+++ hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp 1779+++ hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp
1948@@ -98,10 +98,10 @@ void PLABStats::adjust_desired_plab_sz(uint no_of_gc_workers) { 1780@@ -98,10 +98,10 @@ void PLABStats::adjust_desired_plab_sz(u
1949 if (_allocated == 0) { 1781 if (_allocated == 0) {
1950 assert(_unused == 0, 1782 assert(_unused == 0,
1951 err_msg("Inconsistency in PLAB stats: " 1783 err_msg("Inconsistency in PLAB stats: "
@@ -1958,13 +1790,11 @@ index bddf14b..923c34e 100644
1958+ "_unused: " SIZE_FORMAT ", " 1790+ "_unused: " SIZE_FORMAT ", "
1959+ "_used : " SIZE_FORMAT, 1791+ "_used : " SIZE_FORMAT,
1960 _allocated, _wasted, _unused, _used)); 1792 _allocated, _wasted, _unused, _used));
1961 1793
1962 _allocated = 1; 1794 _allocated = 1;
1963diff --git hotspot/src/share/vm/memory/cardTableModRefBS.hpp hotspot/src/share/vm/memory/cardTableModRefBS.hpp 1795--- hotspot/src/share/vm/memory/cardTableModRefBS.hpp.orig
1964index c824e61..f08d7e2 100644
1965--- hotspot/src/share/vm/memory/cardTableModRefBS.hpp
1966+++ hotspot/src/share/vm/memory/cardTableModRefBS.hpp 1796+++ hotspot/src/share/vm/memory/cardTableModRefBS.hpp
1967@@ -158,8 +158,8 @@ class CardTableModRefBS: public ModRefBarrierSet { 1797@@ -158,8 +158,8 @@ class CardTableModRefBS: public ModRefBa
1968 // Mapping from address to card marking array entry 1798 // Mapping from address to card marking array entry
1969 jbyte* byte_for(const void* p) const { 1799 jbyte* byte_for(const void* p) const {
1970 assert(_whole_heap.contains(p), 1800 assert(_whole_heap.contains(p),
@@ -1997,11 +1827,9 @@ index c824e61..f08d7e2 100644
1997 p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end()))); 1827 p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
1998 return byte_for(p) - _byte_map; 1828 return byte_for(p) - _byte_map;
1999 } 1829 }
2000diff --git hotspot/src/share/vm/memory/genCollectedHeap.cpp hotspot/src/share/vm/memory/genCollectedHeap.cpp 1830--- hotspot/src/share/vm/memory/genCollectedHeap.cpp.orig
2001index f7c9591..f1852e6 100644
2002--- hotspot/src/share/vm/memory/genCollectedHeap.cpp
2003+++ hotspot/src/share/vm/memory/genCollectedHeap.cpp 1831+++ hotspot/src/share/vm/memory/genCollectedHeap.cpp
2004@@ -1403,7 +1403,7 @@ jlong GenCollectedHeap::millis_since_last_gc() { 1832@@ -1403,7 +1403,7 @@ jlong GenCollectedHeap::millis_since_las
2005 // back a time later than 'now'. 1833 // back a time later than 'now'.
2006 jlong retVal = now - tolgc_cl.time(); 1834 jlong retVal = now - tolgc_cl.time();
2007 if (retVal < 0) { 1835 if (retVal < 0) {
@@ -2010,11 +1838,9 @@ index f7c9591..f1852e6 100644
2010 return 0; 1838 return 0;
2011 } 1839 }
2012 return retVal; 1840 return retVal;
2013diff --git hotspot/src/share/vm/memory/generation.cpp hotspot/src/share/vm/memory/generation.cpp 1841--- hotspot/src/share/vm/memory/generation.cpp.orig
2014index d52f325..3c45a91 100644
2015--- hotspot/src/share/vm/memory/generation.cpp
2016+++ hotspot/src/share/vm/memory/generation.cpp 1842+++ hotspot/src/share/vm/memory/generation.cpp
2017@@ -187,7 +187,7 @@ bool Generation::promotion_attempt_is_safe(size_t max_promotion_in_bytes) const 1843@@ -187,7 +187,7 @@ bool Generation::promotion_attempt_is_sa
2018 bool res = (available >= max_promotion_in_bytes); 1844 bool res = (available >= max_promotion_in_bytes);
2019 if (PrintGC && Verbose) { 1845 if (PrintGC && Verbose) {
2020 gclog_or_tty->print_cr( 1846 gclog_or_tty->print_cr(
@@ -2023,11 +1849,9 @@ index d52f325..3c45a91 100644
2023 res? "":" not", available, res? ">=":"<", 1849 res? "":" not", available, res? ">=":"<",
2024 max_promotion_in_bytes); 1850 max_promotion_in_bytes);
2025 } 1851 }
2026diff --git hotspot/src/share/vm/memory/generation.hpp hotspot/src/share/vm/memory/generation.hpp 1852--- hotspot/src/share/vm/memory/generation.hpp.orig
2027index 63dccb7..c23295a 100644
2028--- hotspot/src/share/vm/memory/generation.hpp
2029+++ hotspot/src/share/vm/memory/generation.hpp 1853+++ hotspot/src/share/vm/memory/generation.hpp
2030@@ -422,7 +422,7 @@ class Generation: public CHeapObj<mtGC> { 1854@@ -422,7 +422,7 @@ class Generation: public CHeapObj<mtGC>
2031 // have to guard against non-monotonicity. 1855 // have to guard against non-monotonicity.
2032 NOT_PRODUCT( 1856 NOT_PRODUCT(
2033 if (now < _time_of_last_gc) { 1857 if (now < _time_of_last_gc) {
@@ -2036,12 +1860,10 @@ index 63dccb7..c23295a 100644
2036 } 1860 }
2037 ) 1861 )
2038 return _time_of_last_gc; 1862 return _time_of_last_gc;
2039diff --git hotspot/src/share/vm/memory/referenceProcessor.cpp hotspot/src/share/vm/memory/referenceProcessor.cpp 1863--- hotspot/src/share/vm/memory/referenceProcessor.cpp.orig
2040index 3c776f4..d851886 100644
2041--- hotspot/src/share/vm/memory/referenceProcessor.cpp
2042+++ hotspot/src/share/vm/memory/referenceProcessor.cpp 1864+++ hotspot/src/share/vm/memory/referenceProcessor.cpp
2043@@ -161,7 +161,7 @@ void ReferenceProcessor::update_soft_ref_master_clock() { 1865@@ -161,7 +161,7 @@ void ReferenceProcessor::update_soft_ref
2044 1866
2045 NOT_PRODUCT( 1867 NOT_PRODUCT(
2046 if (now < _soft_ref_timestamp_clock) { 1868 if (now < _soft_ref_timestamp_clock) {
2047- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, 1869- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT,
@@ -2049,11 +1871,9 @@ index 3c776f4..d851886 100644
2049 _soft_ref_timestamp_clock, now); 1871 _soft_ref_timestamp_clock, now);
2050 } 1872 }
2051 ) 1873 )
2052diff --git hotspot/src/share/vm/memory/tenuredGeneration.cpp hotspot/src/share/vm/memory/tenuredGeneration.cpp 1874--- hotspot/src/share/vm/memory/tenuredGeneration.cpp.orig
2053index d7432ba..cdc51ee 100644
2054--- hotspot/src/share/vm/memory/tenuredGeneration.cpp
2055+++ hotspot/src/share/vm/memory/tenuredGeneration.cpp 1875+++ hotspot/src/share/vm/memory/tenuredGeneration.cpp
2056@@ -294,8 +294,8 @@ bool TenuredGeneration::promotion_attempt_is_safe(size_t max_promotion_in_bytes) 1876@@ -294,8 +294,8 @@ bool TenuredGeneration::promotion_attemp
2057 bool res = (available >= av_promo) || (available >= max_promotion_in_bytes); 1877 bool res = (available >= av_promo) || (available >= max_promotion_in_bytes);
2058 if (PrintGC && Verbose) { 1878 if (PrintGC && Verbose) {
2059 gclog_or_tty->print_cr( 1879 gclog_or_tty->print_cr(
@@ -2064,12 +1884,10 @@ index d7432ba..cdc51ee 100644
2064 res? "":" not", available, res? ">=":"<", 1884 res? "":" not", available, res? ">=":"<",
2065 av_promo, max_promotion_in_bytes); 1885 av_promo, max_promotion_in_bytes);
2066 } 1886 }
2067diff --git hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp 1887--- hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp.orig
2068index cf3fefb..b19bd93 100644
2069--- hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp
2070+++ hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp 1888+++ hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp
2071@@ -94,10 +94,10 @@ void ThreadLocalAllocBuffer::record_slow_allocation(size_t obj_size) { 1889@@ -94,10 +94,10 @@ void ThreadLocalAllocBuffer::record_slow
2072 1890
2073 if (PrintTLAB && Verbose) { 1891 if (PrintTLAB && Verbose) {
2074 Thread* thrd = myThread(); 1892 Thread* thrd = myThread();
2075- gclog_or_tty->print("TLAB: %s thread: "INTPTR_FORMAT" [id: %2d]" 1893- gclog_or_tty->print("TLAB: %s thread: "INTPTR_FORMAT" [id: %2d]"
@@ -2083,11 +1901,9 @@ index cf3fefb..b19bd93 100644
2083 "slow", p2i(thrd), thrd->osthread()->thread_id(), 1901 "slow", p2i(thrd), thrd->osthread()->thread_id(),
2084 obj_size, free(), refill_waste_limit()); 1902 obj_size, free(), refill_waste_limit());
2085 } 1903 }
2086diff --git hotspot/src/share/vm/memory/universe.cpp hotspot/src/share/vm/memory/universe.cpp 1904--- hotspot/src/share/vm/memory/universe.cpp.orig
2087index 2e1e90f..bfbe2ec 100644
2088--- hotspot/src/share/vm/memory/universe.cpp
2089+++ hotspot/src/share/vm/memory/universe.cpp 1905+++ hotspot/src/share/vm/memory/universe.cpp
2090@@ -926,7 +926,7 @@ void Universe::print_compressed_oops_mode() { 1906@@ -926,7 +926,7 @@ void Universe::print_compressed_oops_mod
2091 // Reserve the Java heap, which is now the same for all GCs. 1907 // Reserve the Java heap, which is now the same for all GCs.
2092 ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) { 1908 ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
2093 assert(alignment <= Arguments::conservative_max_heap_alignment(), 1909 assert(alignment <= Arguments::conservative_max_heap_alignment(),
@@ -2096,11 +1912,9 @@ index 2e1e90f..bfbe2ec 100644
2096 alignment, Arguments::conservative_max_heap_alignment())); 1912 alignment, Arguments::conservative_max_heap_alignment()));
2097 size_t total_reserved = align_size_up(heap_size, alignment); 1913 size_t total_reserved = align_size_up(heap_size, alignment);
2098 assert(!UseCompressedOops || (total_reserved <= (OopEncodingHeapMax - os::vm_page_size())), 1914 assert(!UseCompressedOops || (total_reserved <= (OopEncodingHeapMax - os::vm_page_size())),
2099diff --git hotspot/src/share/vm/oops/constantPool.cpp hotspot/src/share/vm/oops/constantPool.cpp 1915--- hotspot/src/share/vm/oops/constantPool.cpp.orig
2100index a9685b2..b76435f 100644
2101--- hotspot/src/share/vm/oops/constantPool.cpp
2102+++ hotspot/src/share/vm/oops/constantPool.cpp 1916+++ hotspot/src/share/vm/oops/constantPool.cpp
2103@@ -1494,7 +1494,7 @@ static void print_cpool_bytes(jint cnt, u1 *bytes) { 1917@@ -1494,7 +1494,7 @@ static void print_cpool_bytes(jint cnt,
2104 } 1918 }
2105 case JVM_CONSTANT_Long: { 1919 case JVM_CONSTANT_Long: {
2106 u8 val = Bytes::get_Java_u8(bytes); 1920 u8 val = Bytes::get_Java_u8(bytes);
@@ -2109,20 +1923,18 @@ index a9685b2..b76435f 100644
2109 ent_size = 8; 1923 ent_size = 8;
2110 idx++; // Long takes two cpool slots 1924 idx++; // Long takes two cpool slots
2111 break; 1925 break;
2112diff --git hotspot/src/share/vm/oops/cpCache.cpp hotspot/src/share/vm/oops/cpCache.cpp 1926--- hotspot/src/share/vm/oops/cpCache.cpp.orig
2113index d0c7750..e0f396d 100644
2114--- hotspot/src/share/vm/oops/cpCache.cpp
2115+++ hotspot/src/share/vm/oops/cpCache.cpp 1927+++ hotspot/src/share/vm/oops/cpCache.cpp
2116@@ -305,7 +305,7 @@ void ConstantPoolCacheEntry::set_method_handle_common(constantPoolHandle cpool, 1928@@ -315,7 +315,7 @@ void ConstantPoolCacheEntry::set_method_
2117 adapter->size_of_parameters()); 1929 adapter->size_of_parameters());
2118 1930
2119 if (TraceInvokeDynamic) { 1931 if (TraceInvokeDynamic) {
2120- tty->print_cr("set_method_handle bc=%d appendix="PTR_FORMAT"%s method_type="PTR_FORMAT"%s method="PTR_FORMAT" ", 1932- tty->print_cr("set_method_handle bc=%d appendix="PTR_FORMAT"%s method_type="PTR_FORMAT"%s method="PTR_FORMAT" ",
2121+ tty->print_cr("set_method_handle bc=%d appendix=" PTR_FORMAT "%s method_type=" PTR_FORMAT "%s method=" PTR_FORMAT " ", 1933+ tty->print_cr("set_method_handle bc=%d appendix=" PTR_FORMAT "%s method_type=" PTR_FORMAT "%s method=" PTR_FORMAT " ",
2122 invoke_code, 1934 invoke_code,
2123 (void *)appendix(), (has_appendix ? "" : " (unused)"), 1935 (void *)appendix(), (has_appendix ? "" : " (unused)"),
2124 (void *)method_type(), (has_method_type ? "" : " (unused)"), 1936 (void *)method_type(), (has_method_type ? "" : " (unused)"),
2125@@ -536,12 +536,12 @@ void ConstantPoolCacheEntry::print(outputStream* st, int index) const { 1937@@ -529,12 +529,12 @@ void ConstantPoolCacheEntry::print(outpu
2126 // print separator 1938 // print separator
2127 if (index == 0) st->print_cr(" -------------"); 1939 if (index == 0) st->print_cr(" -------------");
2128 // print entry 1940 // print entry
@@ -2138,12 +1950,10 @@ index d0c7750..e0f396d 100644
2138+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_flags); 1950+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_flags);
2139 st->print_cr(" -------------"); 1951 st->print_cr(" -------------");
2140 } 1952 }
2141 1953
2142diff --git hotspot/src/share/vm/oops/markOop.cpp hotspot/src/share/vm/oops/markOop.cpp 1954--- hotspot/src/share/vm/oops/markOop.cpp.orig
2143index 1cc8a19..9bca601 100644
2144--- hotspot/src/share/vm/oops/markOop.cpp
2145+++ hotspot/src/share/vm/oops/markOop.cpp 1955+++ hotspot/src/share/vm/oops/markOop.cpp
2146@@ -49,7 +49,7 @@ void markOopDesc::print_on(outputStream* st) const { 1956@@ -49,7 +49,7 @@ void markOopDesc::print_on(outputStream*
2147 st->print("monitor=NULL"); 1957 st->print("monitor=NULL");
2148 else { 1958 else {
2149 BasicLock * bl = (BasicLock *) mon->owner(); 1959 BasicLock * bl = (BasicLock *) mon->owner();
@@ -2152,11 +1962,9 @@ index 1cc8a19..9bca601 100644
2152 mon->count(), mon->waiters(), mon->recursions(), p2i(bl)); 1962 mon->count(), mon->waiters(), mon->recursions(), p2i(bl));
2153 } 1963 }
2154 } else { 1964 } else {
2155diff --git hotspot/src/share/vm/oops/objArrayKlass.cpp hotspot/src/share/vm/oops/objArrayKlass.cpp 1965--- hotspot/src/share/vm/oops/objArrayKlass.cpp.orig
2156index a4c51d0..4f637f4 100644
2157--- hotspot/src/share/vm/oops/objArrayKlass.cpp
2158+++ hotspot/src/share/vm/oops/objArrayKlass.cpp 1966+++ hotspot/src/share/vm/oops/objArrayKlass.cpp
2159@@ -657,7 +657,7 @@ void ObjArrayKlass::oop_print_value_on(oop obj, outputStream* st) { 1967@@ -657,7 +657,7 @@ void ObjArrayKlass::oop_print_value_on(o
2160 if (i > max_objArray_print_length) { 1968 if (i > max_objArray_print_length) {
2161 st->print("..."); break; 1969 st->print("..."); break;
2162 } 1970 }
@@ -2165,25 +1973,21 @@ index a4c51d0..4f637f4 100644
2165 } 1973 }
2166 st->print(" }"); 1974 st->print(" }");
2167 } 1975 }
2168diff --git hotspot/src/share/vm/oops/oop.cpp hotspot/src/share/vm/oops/oop.cpp 1976--- hotspot/src/share/vm/oops/oop.cpp.orig
2169index 1be5781..3df79d4 100644
2170--- hotspot/src/share/vm/oops/oop.cpp
2171+++ hotspot/src/share/vm/oops/oop.cpp 1977+++ hotspot/src/share/vm/oops/oop.cpp
2172@@ -46,7 +46,7 @@ void oopDesc::print_on(outputStream* st) const { 1978@@ -46,7 +46,7 @@ void oopDesc::print_on(outputStream* st)
2173 1979
2174 void oopDesc::print_address_on(outputStream* st) const { 1980 void oopDesc::print_address_on(outputStream* st) const {
2175 if (PrintOopAddress) { 1981 if (PrintOopAddress) {
2176- st->print("{"INTPTR_FORMAT"}", this); 1982- st->print("{"INTPTR_FORMAT"}", this);
2177+ st->print("{" INTPTR_FORMAT "}", this); 1983+ st->print("{" INTPTR_FORMAT "}", this);
2178 } 1984 }
2179 } 1985 }
2180 1986
2181diff --git hotspot/src/share/vm/prims/methodHandles.cpp hotspot/src/share/vm/prims/methodHandles.cpp 1987--- hotspot/src/share/vm/prims/methodHandles.cpp.orig
2182index 62aece7..0a2f76e 100644
2183--- hotspot/src/share/vm/prims/methodHandles.cpp
2184+++ hotspot/src/share/vm/prims/methodHandles.cpp 1988+++ hotspot/src/share/vm/prims/methodHandles.cpp
2185@@ -1321,27 +1321,27 @@ JVM_END 1989@@ -1342,27 +1342,27 @@ JVM_END
2186 1990
2187 // These are the native methods on java.lang.invoke.MethodHandleNatives. 1991 // These are the native methods on java.lang.invoke.MethodHandleNatives.
2188 static JNINativeMethod MHN_methods[] = { 1992 static JNINativeMethod MHN_methods[] = {
2189- {CC"init", CC"("MEM""OBJ")V", FN_PTR(MHN_init_Mem)}, 1993- {CC"init", CC"("MEM""OBJ")V", FN_PTR(MHN_init_Mem)},
@@ -2214,7 +2018,7 @@ index 62aece7..0a2f76e 100644
2214+ {CC "staticFieldBase", CC "(" MEM ")" OBJ, FN_PTR(MHN_staticFieldBase)}, 2018+ {CC "staticFieldBase", CC "(" MEM ")" OBJ, FN_PTR(MHN_staticFieldBase)},
2215+ {CC "getMemberVMInfo", CC "(" MEM ")" OBJ, FN_PTR(MHN_getMemberVMInfo)} 2019+ {CC "getMemberVMInfo", CC "(" MEM ")" OBJ, FN_PTR(MHN_getMemberVMInfo)}
2216 }; 2020 };
2217 2021
2218 static JNINativeMethod MH_methods[] = { 2022 static JNINativeMethod MH_methods[] = {
2219 // UnsupportedOperationException throwers 2023 // UnsupportedOperationException throwers
2220- {CC"invoke", CC"(["OBJ")"OBJ, FN_PTR(MH_invoke_UOE)}, 2024- {CC"invoke", CC"(["OBJ")"OBJ, FN_PTR(MH_invoke_UOE)},
@@ -2222,11 +2026,9 @@ index 62aece7..0a2f76e 100644
2222+ {CC"invoke", CC "([" OBJ ")" OBJ, FN_PTR(MH_invoke_UOE)}, 2026+ {CC"invoke", CC "([" OBJ ")" OBJ, FN_PTR(MH_invoke_UOE)},
2223+ {CC"invokeExact", CC "([" OBJ ")" OBJ, FN_PTR(MH_invokeExact_UOE)} 2027+ {CC"invokeExact", CC "([" OBJ ")" OBJ, FN_PTR(MH_invokeExact_UOE)}
2224 }; 2028 };
2225 2029
2226 /** 2030 /**
2227diff --git hotspot/src/share/vm/prims/perf.cpp hotspot/src/share/vm/prims/perf.cpp 2031--- hotspot/src/share/vm/prims/perf.cpp.orig
2228index 9ad0f4c..342cb2f 100644
2229--- hotspot/src/share/vm/prims/perf.cpp
2230+++ hotspot/src/share/vm/prims/perf.cpp 2032+++ hotspot/src/share/vm/prims/perf.cpp
2231@@ -290,17 +290,17 @@ PERF_END 2033@@ -290,17 +290,17 @@ PERF_END
2232 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f) 2034 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
@@ -2236,9 +2038,9 @@ index 9ad0f4c..342cb2f 100644
2236-#define CBA_ARGS CC"("JLS"II[BI)"BB 2038-#define CBA_ARGS CC"("JLS"II[BI)"BB
2237+#define CL_ARGS CC "(" JLS "IIJ)" BB 2039+#define CL_ARGS CC "(" JLS "IIJ)" BB
2238+#define CBA_ARGS CC "(" JLS "II[BI)" BB 2040+#define CBA_ARGS CC "(" JLS "II[BI)" BB
2239 2041
2240 static JNINativeMethod perfmethods[] = { 2042 static JNINativeMethod perfmethods[] = {
2241 2043
2242- {CC"attach", CC"("JLS"II)"BB, FN_PTR(Perf_Attach)}, 2044- {CC"attach", CC"("JLS"II)"BB, FN_PTR(Perf_Attach)},
2243- {CC"detach", CC"("BB")V", FN_PTR(Perf_Detach)}, 2045- {CC"detach", CC"("BB")V", FN_PTR(Perf_Detach)},
2244- {CC"createLong", CL_ARGS, FN_PTR(Perf_CreateLong)}, 2046- {CC"createLong", CL_ARGS, FN_PTR(Perf_CreateLong)},
@@ -2252,25 +2054,23 @@ index 9ad0f4c..342cb2f 100644
2252+ {CC"highResCounter", CC "()J", FN_PTR(Perf_HighResCounter)}, 2054+ {CC"highResCounter", CC "()J", FN_PTR(Perf_HighResCounter)},
2253+ {CC"highResFrequency", CC "()J", FN_PTR(Perf_HighResFrequency)} 2055+ {CC"highResFrequency", CC "()J", FN_PTR(Perf_HighResFrequency)}
2254 }; 2056 };
2255 2057
2256 #undef CBA_ARGS 2058 #undef CBA_ARGS
2257diff --git hotspot/src/share/vm/prims/unsafe.cpp hotspot/src/share/vm/prims/unsafe.cpp 2059--- hotspot/src/share/vm/prims/unsafe.cpp.orig
2258index 0846b20..5e61217 100644
2259--- hotspot/src/share/vm/prims/unsafe.cpp
2260+++ hotspot/src/share/vm/prims/unsafe.cpp 2060+++ hotspot/src/share/vm/prims/unsafe.cpp
2261@@ -1009,7 +1009,7 @@ UNSAFE_ENTRY(jclass, Unsafe_DefineClass0(JNIEnv *env, jobject unsafe, jstring na 2061@@ -1001,7 +1001,7 @@ UNSAFE_ENTRY(jclass, Unsafe_DefineClass0
2262 UNSAFE_END 2062 UNSAFE_END
2263 2063
2264 2064
2265-#define DAC_Args CLS"[B["OBJ 2065-#define DAC_Args CLS"[B["OBJ
2266+#define DAC_Args CLS "[B[" OBJ 2066+#define DAC_Args CLS "[B[" OBJ
2267 // define a class but do not make it known to the class loader or system dictionary 2067 // define a class but do not make it known to the class loader or system dictionary
2268 // - host_class: supplies context for linkage, access control, protection domain, and class loader 2068 // - host_class: supplies context for linkage, access control, protection domain, and class loader
2269 // - data: bytes of a class file, a raw memory address (length gives the number of bytes) 2069 // - data: bytes of a class file, a raw memory address (length gives the number of bytes)
2270@@ -1374,47 +1374,47 @@ UNSAFE_END 2070@@ -1366,47 +1366,47 @@ UNSAFE_END
2271 2071
2272 #define LANG "Ljava/lang/" 2072 #define LANG "Ljava/lang/"
2273 2073
2274-#define OBJ LANG"Object;" 2074-#define OBJ LANG"Object;"
2275-#define CLS LANG"Class;" 2075-#define CLS LANG"Class;"
2276-#define CTR LANG"reflect/Constructor;" 2076-#define CTR LANG"reflect/Constructor;"
@@ -2283,29 +2083,29 @@ index 0846b20..5e61217 100644
2283+#define FLD LANG "reflect/Field;" 2083+#define FLD LANG "reflect/Field;"
2284+#define MTH LANG "reflect/Method;" 2084+#define MTH LANG "reflect/Method;"
2285+#define THR LANG "Throwable;" 2085+#define THR LANG "Throwable;"
2286 2086
2287-#define DC0_Args LANG"String;[BII" 2087-#define DC0_Args LANG"String;[BII"
2288-#define DC_Args DC0_Args LANG"ClassLoader;" "Ljava/security/ProtectionDomain;" 2088-#define DC_Args DC0_Args LANG"ClassLoader;" "Ljava/security/ProtectionDomain;"
2289+#define DC0_Args LANG "String;[BII" 2089+#define DC0_Args LANG "String;[BII"
2290+#define DC_Args DC0_Args LANG "ClassLoader;" "Ljava/security/ProtectionDomain;" 2090+#define DC_Args DC0_Args LANG "ClassLoader;" "Ljava/security/ProtectionDomain;"
2291 2091
2292 #define CC (char*) /*cast a literal from (const char*)*/ 2092 #define CC (char*) /*cast a literal from (const char*)*/
2293 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f) 2093 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
2294 2094
2295 // define deprecated accessors for compabitility with 1.4.0 2095 // define deprecated accessors for compabitility with 1.4.0
2296 #define DECLARE_GETSETOOP_140(Boolean, Z) \ 2096 #define DECLARE_GETSETOOP_140(Boolean, Z) \
2297- {CC"get"#Boolean, CC"("OBJ"I)"#Z, FN_PTR(Unsafe_Get##Boolean##140)}, \ 2097- {CC"get"#Boolean, CC"("OBJ"I)"#Z, FN_PTR(Unsafe_Get##Boolean##140)}, \
2298- {CC"put"#Boolean, CC"("OBJ"I"#Z")V", FN_PTR(Unsafe_Set##Boolean##140)} 2098- {CC"put"#Boolean, CC"("OBJ"I"#Z")V", FN_PTR(Unsafe_Set##Boolean##140)}
2299+ {CC"get"#Boolean, CC"(" OBJ "I)" #Z, FN_PTR(Unsafe_Get##Boolean##140)}, \ 2099+ {CC"get"#Boolean, CC"(" OBJ "I)" #Z, FN_PTR(Unsafe_Get##Boolean##140)}, \
2300+ {CC"put"#Boolean, CC"(" OBJ "I" #Z ")V", FN_PTR(Unsafe_Set##Boolean##140)} 2100+ {CC"put"#Boolean, CC"(" OBJ "I" #Z ")V", FN_PTR(Unsafe_Set##Boolean##140)}
2301 2101
2302 // Note: In 1.4.1, getObject and kin take both int and long offsets. 2102 // Note: In 1.4.1, getObject and kin take both int and long offsets.
2303 #define DECLARE_GETSETOOP_141(Boolean, Z) \ 2103 #define DECLARE_GETSETOOP_141(Boolean, Z) \
2304- {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \ 2104- {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \
2305- {CC"put"#Boolean, CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)} 2105- {CC"put"#Boolean, CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)}
2306+ {CC"get"#Boolean, CC"(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean)}, \ 2106+ {CC"get"#Boolean, CC"(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean)}, \
2307+ {CC"put"#Boolean, CC"(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean)} 2107+ {CC"put"#Boolean, CC"(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean)}
2308 2108
2309 // Note: In 1.5.0, there are volatile versions too 2109 // Note: In 1.5.0, there are volatile versions too
2310 #define DECLARE_GETSETOOP(Boolean, Z) \ 2110 #define DECLARE_GETSETOOP(Boolean, Z) \
2311- {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \ 2111- {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \
@@ -2316,46 +2116,47 @@ index 0846b20..5e61217 100644
2316+ {CC"put"#Boolean, CC"(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean)}, \ 2116+ {CC"put"#Boolean, CC"(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean)}, \
2317+ {CC"get"#Boolean "Volatile", CC"(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean##Volatile)}, \ 2117+ {CC"get"#Boolean "Volatile", CC"(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean##Volatile)}, \
2318+ {CC"put"#Boolean "Volatile", CC"(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean##Volatile)} 2118+ {CC"put"#Boolean "Volatile", CC"(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean##Volatile)}
2319 2119
2320 2120
2321 #define DECLARE_GETSETNATIVE(Byte, B) \ 2121 #define DECLARE_GETSETNATIVE(Byte, B) \
2322- {CC"get"#Byte, CC"("ADR")"#B, FN_PTR(Unsafe_GetNative##Byte)}, \ 2122- {CC"get"#Byte, CC"("ADR")"#B, FN_PTR(Unsafe_GetNative##Byte)}, \
2323- {CC"put"#Byte, CC"("ADR#B")V", FN_PTR(Unsafe_SetNative##Byte)} 2123- {CC"put"#Byte, CC"("ADR#B")V", FN_PTR(Unsafe_SetNative##Byte)}
2324+ {CC"get"#Byte, CC"(" ADR ")" #B, FN_PTR(Unsafe_GetNative##Byte)}, \ 2124+ {CC"get"#Byte, CC"(" ADR ")" #B, FN_PTR(Unsafe_GetNative##Byte)}, \
2325+ {CC"put"#Byte, CC"(" ADR #B ")V", FN_PTR(Unsafe_SetNative##Byte)} 2125+ {CC"put"#Byte, CC"(" ADR #B ")V", FN_PTR(Unsafe_SetNative##Byte)}
2326 2126
2327 2127
2328 2128
2329 // These are the methods for 1.4.0 2129 // These are the methods for 1.4.0
2330 static JNINativeMethod methods_140[] = { 2130 static JNINativeMethod methods_140[] = {
2331- {CC"getObject", CC"("OBJ"I)"OBJ"", FN_PTR(Unsafe_GetObject140)}, 2131- {CC"getObject", CC"("OBJ"I)"OBJ"", FN_PTR(Unsafe_GetObject140)},
2332- {CC"putObject", CC"("OBJ"I"OBJ")V", FN_PTR(Unsafe_SetObject140)}, 2132- {CC"putObject", CC"("OBJ"I"OBJ")V", FN_PTR(Unsafe_SetObject140)},
2333+ {CC"getObject", CC"(" OBJ "I)" OBJ "", FN_PTR(Unsafe_GetObject140)}, 2133+ {CC"getObject", CC"(" OBJ "I)" OBJ "", FN_PTR(Unsafe_GetObject140)},
2334+ {CC"putObject", CC"(" OBJ "I" OBJ ")V", FN_PTR(Unsafe_SetObject140)}, 2134+ {CC"putObject", CC"(" OBJ "I" OBJ ")V", FN_PTR(Unsafe_SetObject140)},
2335 2135
2336 DECLARE_GETSETOOP_140(Boolean, Z), 2136 DECLARE_GETSETOOP_140(Boolean, Z),
2337 DECLARE_GETSETOOP_140(Byte, B), 2137 DECLARE_GETSETOOP_140(Byte, B),
2338@@ -1433,33 +1433,33 @@ static JNINativeMethod methods_140[] = { 2138@@ -1425,33 +1425,33 @@ static JNINativeMethod methods_140[] = {
2339 DECLARE_GETSETNATIVE(Float, F), 2139 DECLARE_GETSETNATIVE(Float, F),
2340 DECLARE_GETSETNATIVE(Double, D), 2140 DECLARE_GETSETNATIVE(Double, D),
2341 2141
2342- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, 2142- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
2343- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, 2143- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
2344+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, 2144+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
2345+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, 2145+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)},
2346 2146
2347- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, 2147- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
2348- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, 2148- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
2349- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, 2149- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
2350+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, 2150-
2351+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2352+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2353
2354- {CC"fieldOffset", CC"("FLD")I", FN_PTR(Unsafe_FieldOffset)}, 2151- {CC"fieldOffset", CC"("FLD")I", FN_PTR(Unsafe_FieldOffset)},
2355- {CC"staticFieldBase", CC"("CLS")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)}, 2152- {CC"staticFieldBase", CC"("CLS")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)},
2356- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 2153- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2357- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 2154- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
2358- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, 2155- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
2156+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
2157+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2158+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2159+
2359+ {CC"fieldOffset", CC"(" FLD ")I", FN_PTR(Unsafe_FieldOffset)}, 2160+ {CC"fieldOffset", CC"(" FLD ")I", FN_PTR(Unsafe_FieldOffset)},
2360+ {CC"staticFieldBase", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)}, 2161+ {CC"staticFieldBase", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)},
2361+ {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 2162+ {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)},
@@ -2363,7 +2164,7 @@ index 0846b20..5e61217 100644
2363+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, 2164+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)},
2364 {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, 2165 {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
2365 {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, 2166 {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
2366 2167
2367- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, 2168- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)},
2368- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, 2169- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
2369- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, 2170- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
@@ -2377,38 +2178,39 @@ index 0846b20..5e61217 100644
2377+ {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, 2178+ {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)},
2378+ {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)} 2179+ {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)}
2379 }; 2180 };
2380 2181
2381 // These are the methods prior to the JSR 166 changes in 1.5.0 2182 // These are the methods prior to the JSR 166 changes in 1.5.0
2382 static JNINativeMethod methods_141[] = { 2183 static JNINativeMethod methods_141[] = {
2383- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, 2184- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)},
2384- {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, 2185- {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)},
2385+ {CC"getObject", CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)}, 2186+ {CC"getObject", CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)},
2386+ {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)}, 2187+ {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)},
2387 2188
2388 DECLARE_GETSETOOP_141(Boolean, Z), 2189 DECLARE_GETSETOOP_141(Boolean, Z),
2389 DECLARE_GETSETOOP_141(Byte, B), 2190 DECLARE_GETSETOOP_141(Byte, B),
2390@@ -1478,37 +1478,37 @@ static JNINativeMethod methods_141[] = { 2191@@ -1470,37 +1470,37 @@ static JNINativeMethod methods_141[] = {
2391 DECLARE_GETSETNATIVE(Float, F), 2192 DECLARE_GETSETNATIVE(Float, F),
2392 DECLARE_GETSETNATIVE(Double, D), 2193 DECLARE_GETSETNATIVE(Double, D),
2393 2194
2394- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, 2195- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
2395- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, 2196- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
2396+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, 2197+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
2397+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, 2198+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)},
2398 2199
2399- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, 2200- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
2400- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, 2201- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
2401- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, 2202- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
2402+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, 2203-
2403+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2404+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2405
2406- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 2204- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2407- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, 2205- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
2408- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 2206- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
2409- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 2207- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2410- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 2208- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
2411- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, 2209- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
2210+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
2211+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2212+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2213+
2412+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 2214+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2413+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, 2215+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
2414+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 2216+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
@@ -2417,7 +2219,7 @@ index 0846b20..5e61217 100644
2417+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, 2219+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)},
2418 {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, 2220 {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
2419 {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, 2221 {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
2420 2222
2421- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, 2223- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)},
2422- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, 2224- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
2423- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, 2225- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
@@ -2430,9 +2232,9 @@ index 0846b20..5e61217 100644
2430+ {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)}, 2232+ {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)},
2431+ {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, 2233+ {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)},
2432+ {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)} 2234+ {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)}
2433 2235
2434 }; 2236 };
2435 2237
2436 // These are the methods prior to the JSR 166 changes in 1.6.0 2238 // These are the methods prior to the JSR 166 changes in 1.6.0
2437 static JNINativeMethod methods_15[] = { 2239 static JNINativeMethod methods_15[] = {
2438- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, 2240- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)},
@@ -2443,31 +2245,32 @@ index 0846b20..5e61217 100644
2443+ {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)}, 2245+ {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)},
2444+ {CC"getObjectVolatile",CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)}, 2246+ {CC"getObjectVolatile",CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)},
2445+ {CC"putObjectVolatile",CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)}, 2247+ {CC"putObjectVolatile",CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)},
2446 2248
2447 2249
2448 DECLARE_GETSETOOP(Boolean, Z), 2250 DECLARE_GETSETOOP(Boolean, Z),
2449@@ -1528,42 +1528,42 @@ static JNINativeMethod methods_15[] = { 2251@@ -1520,42 +1520,42 @@ static JNINativeMethod methods_15[] = {
2450 DECLARE_GETSETNATIVE(Float, F), 2252 DECLARE_GETSETNATIVE(Float, F),
2451 DECLARE_GETSETNATIVE(Double, D), 2253 DECLARE_GETSETNATIVE(Double, D),
2452 2254
2453- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, 2255- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
2454- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, 2256- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
2455+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, 2257+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
2456+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, 2258+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)},
2457 2259
2458- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, 2260- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
2459- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, 2261- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
2460- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, 2262- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
2461+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, 2263-
2462+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2463+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2464
2465- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 2264- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2466- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, 2265- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
2467- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 2266- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
2468- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 2267- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2469- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 2268- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
2470- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, 2269- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
2270+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
2271+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2272+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2273+
2471+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 2274+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2472+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, 2275+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
2473+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 2276+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
@@ -2476,7 +2279,7 @@ index 0846b20..5e61217 100644
2476+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, 2279+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)},
2477 {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, 2280 {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
2478 {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, 2281 {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
2479 2282
2480- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, 2283- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)},
2481- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, 2284- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
2482- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, 2285- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
@@ -2498,9 +2301,9 @@ index 0846b20..5e61217 100644
2498 {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)}, 2301 {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)},
2499- {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)} 2302- {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)}
2500+ {CC"unpark", CC"(" OBJ ")V", FN_PTR(Unsafe_Unpark)} 2303+ {CC"unpark", CC"(" OBJ ")V", FN_PTR(Unsafe_Unpark)}
2501 2304
2502 }; 2305 };
2503 2306
2504 // These are the methods for 1.6.0 and 1.7.0 2307 // These are the methods for 1.6.0 and 1.7.0
2505 static JNINativeMethod methods_16[] = { 2308 static JNINativeMethod methods_16[] = {
2506- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, 2309- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)},
@@ -2511,31 +2314,32 @@ index 0846b20..5e61217 100644
2511+ {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)}, 2314+ {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)},
2512+ {CC"getObjectVolatile",CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)}, 2315+ {CC"getObjectVolatile",CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)},
2513+ {CC"putObjectVolatile",CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)}, 2316+ {CC"putObjectVolatile",CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)},
2514 2317
2515 DECLARE_GETSETOOP(Boolean, Z), 2318 DECLARE_GETSETOOP(Boolean, Z),
2516 DECLARE_GETSETOOP(Byte, B), 2319 DECLARE_GETSETOOP(Byte, B),
2517@@ -1582,45 +1582,45 @@ static JNINativeMethod methods_16[] = { 2320@@ -1574,45 +1574,45 @@ static JNINativeMethod methods_16[] = {
2518 DECLARE_GETSETNATIVE(Float, F), 2321 DECLARE_GETSETNATIVE(Float, F),
2519 DECLARE_GETSETNATIVE(Double, D), 2322 DECLARE_GETSETNATIVE(Double, D),
2520 2323
2521- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, 2324- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
2522- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, 2325- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
2523+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, 2326+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
2524+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, 2327+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)},
2525 2328
2526- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, 2329- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
2527- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, 2330- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
2528- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, 2331- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
2529+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, 2332-
2530+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2531+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2532
2533- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 2333- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2534- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, 2334- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
2535- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 2335- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
2536- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 2336- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2537- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 2337- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
2538- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, 2338- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
2339+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
2340+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2341+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2342+
2539+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 2343+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2540+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, 2344+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
2541+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 2345+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
@@ -2544,7 +2348,7 @@ index 0846b20..5e61217 100644
2544+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, 2348+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)},
2545 {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, 2349 {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
2546 {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, 2350 {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
2547 2351
2548- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, 2352- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)},
2549- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, 2353- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
2550- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, 2354- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
@@ -2575,7 +2379,7 @@ index 0846b20..5e61217 100644
2575- {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)} 2379- {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)}
2576+ {CC"unpark", CC"(" OBJ ")V", FN_PTR(Unsafe_Unpark)} 2380+ {CC"unpark", CC"(" OBJ ")V", FN_PTR(Unsafe_Unpark)}
2577 }; 2381 };
2578 2382
2579 // These are the methods for 1.8.0 2383 // These are the methods for 1.8.0
2580 static JNINativeMethod methods_18[] = { 2384 static JNINativeMethod methods_18[] = {
2581- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, 2385- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)},
@@ -2586,31 +2390,32 @@ index 0846b20..5e61217 100644
2586+ {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)}, 2390+ {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)},
2587+ {CC"getObjectVolatile",CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)}, 2391+ {CC"getObjectVolatile",CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)},
2588+ {CC"putObjectVolatile",CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)}, 2392+ {CC"putObjectVolatile",CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)},
2589 2393
2590 DECLARE_GETSETOOP(Boolean, Z), 2394 DECLARE_GETSETOOP(Boolean, Z),
2591 DECLARE_GETSETOOP(Byte, B), 2395 DECLARE_GETSETOOP(Byte, B),
2592@@ -1639,36 +1639,36 @@ static JNINativeMethod methods_18[] = { 2396@@ -1631,36 +1631,36 @@ static JNINativeMethod methods_18[] = {
2593 DECLARE_GETSETNATIVE(Float, F), 2397 DECLARE_GETSETNATIVE(Float, F),
2594 DECLARE_GETSETNATIVE(Double, D), 2398 DECLARE_GETSETNATIVE(Double, D),
2595 2399
2596- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, 2400- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
2597- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, 2401- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
2598+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, 2402+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
2599+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, 2403+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)},
2600 2404
2601- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, 2405- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
2602- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, 2406- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
2603- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, 2407- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
2604+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, 2408-
2605+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2606+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2607
2608- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 2409- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2609- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, 2410- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
2610- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 2411- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
2611- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 2412- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2612- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 2413- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
2613- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, 2414- {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
2415+ {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
2416+ {CC"reallocateMemory", CC"(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
2417+ {CC"freeMemory", CC"(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
2418+
2614+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 2419+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2615+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, 2420+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
2616+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 2421+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
@@ -2619,7 +2424,7 @@ index 0846b20..5e61217 100644
2619+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, 2424+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)},
2620 {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, 2425 {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
2621 {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, 2426 {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
2622 2427
2623- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, 2428- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
2624- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, 2429- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
2625- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, 2430- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
@@ -2648,11 +2453,11 @@ index 0846b20..5e61217 100644
2648- {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)} 2453- {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)}
2649+ {CC"unpark", CC"(" OBJ ")V", FN_PTR(Unsafe_Unpark)} 2454+ {CC"unpark", CC"(" OBJ ")V", FN_PTR(Unsafe_Unpark)}
2650 }; 2455 };
2651 2456
2652 JNINativeMethod loadavg_method[] = { 2457 JNINativeMethod loadavg_method[] = {
2653@@ -1676,28 +1676,28 @@ JNINativeMethod loadavg_method[] = { 2458@@ -1668,28 +1668,28 @@ JNINativeMethod loadavg_method[] = {
2654 }; 2459 };
2655 2460
2656 JNINativeMethod prefetch_methods[] = { 2461 JNINativeMethod prefetch_methods[] = {
2657- {CC"prefetchRead", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)}, 2462- {CC"prefetchRead", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)},
2658- {CC"prefetchWrite", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)}, 2463- {CC"prefetchWrite", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)},
@@ -2663,38 +2468,36 @@ index 0846b20..5e61217 100644
2663+ {CC"prefetchReadStatic", CC"(" OBJ "J)V", FN_PTR(Unsafe_PrefetchRead)}, 2468+ {CC"prefetchReadStatic", CC"(" OBJ "J)V", FN_PTR(Unsafe_PrefetchRead)},
2664+ {CC"prefetchWriteStatic",CC"(" OBJ "J)V", FN_PTR(Unsafe_PrefetchWrite)} 2469+ {CC"prefetchWriteStatic",CC"(" OBJ "J)V", FN_PTR(Unsafe_PrefetchWrite)}
2665 }; 2470 };
2666 2471
2667 JNINativeMethod memcopy_methods_17[] = { 2472 JNINativeMethod memcopy_methods_17[] = {
2668- {CC"copyMemory", CC"("OBJ"J"OBJ"JJ)V", FN_PTR(Unsafe_CopyMemory2)}, 2473- {CC"copyMemory", CC"("OBJ"J"OBJ"JJ)V", FN_PTR(Unsafe_CopyMemory2)},
2669- {CC"setMemory", CC"("OBJ"JJB)V", FN_PTR(Unsafe_SetMemory2)} 2474- {CC"setMemory", CC"("OBJ"JJB)V", FN_PTR(Unsafe_SetMemory2)}
2670+ {CC"copyMemory", CC"(" OBJ "J" OBJ "JJ)V", FN_PTR(Unsafe_CopyMemory2)}, 2475+ {CC"copyMemory", CC"(" OBJ "J" OBJ "JJ)V", FN_PTR(Unsafe_CopyMemory2)},
2671+ {CC"setMemory", CC"(" OBJ "JJB)V", FN_PTR(Unsafe_SetMemory2)} 2476+ {CC"setMemory", CC"(" OBJ "JJB)V", FN_PTR(Unsafe_SetMemory2)}
2672 }; 2477 };
2673 2478
2674 JNINativeMethod memcopy_methods_15[] = { 2479 JNINativeMethod memcopy_methods_15[] = {
2675- {CC"setMemory", CC"("ADR"JB)V", FN_PTR(Unsafe_SetMemory)}, 2480- {CC"setMemory", CC"("ADR"JB)V", FN_PTR(Unsafe_SetMemory)},
2676- {CC"copyMemory", CC"("ADR ADR"J)V", FN_PTR(Unsafe_CopyMemory)} 2481- {CC"copyMemory", CC"("ADR ADR"J)V", FN_PTR(Unsafe_CopyMemory)}
2677+ {CC"setMemory", CC"(" ADR "JB)V", FN_PTR(Unsafe_SetMemory)}, 2482+ {CC"setMemory", CC"(" ADR "JB)V", FN_PTR(Unsafe_SetMemory)},
2678+ {CC"copyMemory", CC"(" ADR ADR "J)V", FN_PTR(Unsafe_CopyMemory)} 2483+ {CC"copyMemory", CC"(" ADR ADR "J)V", FN_PTR(Unsafe_CopyMemory)}
2679 }; 2484 };
2680 2485
2681 JNINativeMethod anonk_methods[] = { 2486 JNINativeMethod anonk_methods[] = {
2682- {CC"defineAnonymousClass", CC"("DAC_Args")"CLS, FN_PTR(Unsafe_DefineAnonymousClass)}, 2487- {CC"defineAnonymousClass", CC"("DAC_Args")"CLS, FN_PTR(Unsafe_DefineAnonymousClass)},
2683+ {CC"defineAnonymousClass", CC"(" DAC_Args ")" CLS, FN_PTR(Unsafe_DefineAnonymousClass)}, 2488+ {CC"defineAnonymousClass", CC"(" DAC_Args ")" CLS, FN_PTR(Unsafe_DefineAnonymousClass)},
2684 }; 2489 };
2685 2490
2686 JNINativeMethod lform_methods[] = { 2491 JNINativeMethod lform_methods[] = {
2687- {CC"shouldBeInitialized",CC"("CLS")Z", FN_PTR(Unsafe_ShouldBeInitialized)}, 2492- {CC"shouldBeInitialized",CC"("CLS")Z", FN_PTR(Unsafe_ShouldBeInitialized)},
2688+ {CC"shouldBeInitialized",CC"(" CLS ")Z", FN_PTR(Unsafe_ShouldBeInitialized)}, 2493+ {CC"shouldBeInitialized",CC"(" CLS ")Z", FN_PTR(Unsafe_ShouldBeInitialized)},
2689 }; 2494 };
2690 2495
2691 JNINativeMethod fence_methods[] = { 2496 JNINativeMethod fence_methods[] = {
2692diff --git hotspot/src/share/vm/prims/whitebox.cpp hotspot/src/share/vm/prims/whitebox.cpp 2497--- hotspot/src/share/vm/prims/whitebox.cpp.orig
2693index c3e0688..fdf8649 100644
2694--- hotspot/src/share/vm/prims/whitebox.cpp
2695+++ hotspot/src/share/vm/prims/whitebox.cpp 2498+++ hotspot/src/share/vm/prims/whitebox.cpp
2696@@ -166,8 +166,8 @@ WB_END 2499@@ -166,8 +166,8 @@ WB_END
2697 2500
2698 WB_ENTRY(void, WB_PrintHeapSizes(JNIEnv* env, jobject o)) { 2501 WB_ENTRY(void, WB_PrintHeapSizes(JNIEnv* env, jobject o)) {
2699 CollectorPolicy * p = Universe::heap()->collector_policy(); 2502 CollectorPolicy * p = Universe::heap()->collector_policy();
2700- gclog_or_tty->print_cr("Minimum heap "SIZE_FORMAT" Initial heap " 2503- gclog_or_tty->print_cr("Minimum heap "SIZE_FORMAT" Initial heap "
@@ -2704,7 +2507,7 @@ index c3e0688..fdf8649 100644
2704 p->min_heap_byte_size(), p->initial_heap_byte_size(), p->max_heap_byte_size(), 2507 p->min_heap_byte_size(), p->initial_heap_byte_size(), p->max_heap_byte_size(),
2705 p->space_alignment(), p->heap_alignment()); 2508 p->space_alignment(), p->heap_alignment());
2706 } 2509 }
2707@@ -202,8 +202,8 @@ WB_ENTRY(void, WB_ReadFromNoaccessArea(JNIEnv* env, jobject o)) 2510@@ -202,8 +202,8 @@ WB_ENTRY(void, WB_ReadFromNoaccessArea(J
2708 Universe::narrow_oop_use_implicit_null_checks() )) { 2511 Universe::narrow_oop_use_implicit_null_checks() )) {
2709 tty->print_cr("WB_ReadFromNoaccessArea method is useless:\n " 2512 tty->print_cr("WB_ReadFromNoaccessArea method is useless:\n "
2710 "\tUseCompressedOops is %d\n" 2513 "\tUseCompressedOops is %d\n"
@@ -2715,8 +2518,8 @@ index c3e0688..fdf8649 100644
2715 "\tUniverse::narrow_oop_use_implicit_null_checks() is %d", 2518 "\tUniverse::narrow_oop_use_implicit_null_checks() is %d",
2716 UseCompressedOops, 2519 UseCompressedOops,
2717 rhs.base(), 2520 rhs.base(),
2718@@ -256,8 +256,8 @@ static jint wb_stress_virtual_space_resize(size_t reserved_space_size, 2521@@ -256,8 +256,8 @@ static jint wb_stress_virtual_space_resi
2719 2522
2720 WB_ENTRY(jint, WB_StressVirtualSpaceResize(JNIEnv* env, jobject o, 2523 WB_ENTRY(jint, WB_StressVirtualSpaceResize(JNIEnv* env, jobject o,
2721 jlong reserved_space_size, jlong magnitude, jlong iterations)) 2524 jlong reserved_space_size, jlong magnitude, jlong iterations))
2722- tty->print_cr("reservedSpaceSize="JLONG_FORMAT", magnitude="JLONG_FORMAT", " 2525- tty->print_cr("reservedSpaceSize="JLONG_FORMAT", magnitude="JLONG_FORMAT", "
@@ -2726,12 +2529,10 @@ index c3e0688..fdf8649 100644
2726 iterations); 2529 iterations);
2727 if (reserved_space_size < 0 || magnitude < 0 || iterations < 0) { 2530 if (reserved_space_size < 0 || magnitude < 0 || iterations < 0) {
2728 tty->print_cr("One of variables printed above is negative. Can't proceed.\n"); 2531 tty->print_cr("One of variables printed above is negative. Can't proceed.\n");
2729diff --git hotspot/src/share/vm/runtime/safepoint.cpp hotspot/src/share/vm/runtime/safepoint.cpp 2532--- hotspot/src/share/vm/runtime/safepoint.cpp.orig
2730index 2f46a84..bbf0339 100644
2731--- hotspot/src/share/vm/runtime/safepoint.cpp
2732+++ hotspot/src/share/vm/runtime/safepoint.cpp 2533+++ hotspot/src/share/vm/runtime/safepoint.cpp
2733@@ -914,7 +914,7 @@ void ThreadSafepointState::restart() { 2534@@ -918,7 +918,7 @@ void ThreadSafepointState::restart() {
2734 2535
2735 case _running: 2536 case _running:
2736 default: 2537 default:
2737- tty->print_cr("restart thread "INTPTR_FORMAT" with state %d", 2538- tty->print_cr("restart thread "INTPTR_FORMAT" with state %d",
@@ -2739,8 +2540,8 @@ index 2f46a84..bbf0339 100644
2739 _thread, _type); 2540 _thread, _type);
2740 _thread->print(); 2541 _thread->print();
2741 ShouldNotReachHere(); 2542 ShouldNotReachHere();
2742@@ -1271,14 +1271,14 @@ void SafepointSynchronize::print_stat_on_exit() { 2543@@ -1275,14 +1275,14 @@ void SafepointSynchronize::print_stat_on
2743 2544
2744 for (int index = 0; index < VM_Operation::VMOp_Terminating; index++) { 2545 for (int index = 0; index < VM_Operation::VMOp_Terminating; index++) {
2745 if (_safepoint_reasons[index] != 0) { 2546 if (_safepoint_reasons[index] != 0) {
2746- tty->print_cr("%-26s"UINT64_FORMAT_W(10), VM_Operation::name(index), 2547- tty->print_cr("%-26s"UINT64_FORMAT_W(10), VM_Operation::name(index),
@@ -2748,7 +2549,7 @@ index 2f46a84..bbf0339 100644
2748 _safepoint_reasons[index]); 2549 _safepoint_reasons[index]);
2749 } 2550 }
2750 } 2551 }
2751 2552
2752 tty->print_cr(UINT64_FORMAT_W(5)" VM operations coalesced during safepoint", 2553 tty->print_cr(UINT64_FORMAT_W(5)" VM operations coalesced during safepoint",
2753 _coalesced_vmop_count); 2554 _coalesced_vmop_count);
2754- tty->print_cr("Maximum sync time "INT64_FORMAT_W(5)" ms", 2555- tty->print_cr("Maximum sync time "INT64_FORMAT_W(5)" ms",
@@ -2756,67 +2557,61 @@ index 2f46a84..bbf0339 100644
2756 _max_sync_time / MICROUNITS); 2557 _max_sync_time / MICROUNITS);
2757 tty->print_cr("Maximum vm operation time (except for Exit VM operation) " 2558 tty->print_cr("Maximum vm operation time (except for Exit VM operation) "
2758 INT64_FORMAT_W(5)" ms", 2559 INT64_FORMAT_W(5)" ms",
2759diff --git hotspot/src/share/vm/services/threadService.cpp hotspot/src/share/vm/services/threadService.cpp 2560--- hotspot/src/share/vm/services/threadService.cpp.orig
2760index 02156a2..be5acfd 100644
2761--- hotspot/src/share/vm/services/threadService.cpp
2762+++ hotspot/src/share/vm/services/threadService.cpp 2561+++ hotspot/src/share/vm/services/threadService.cpp
2763@@ -889,7 +889,7 @@ void DeadlockCycle::print_on(outputStream* st) const { 2562@@ -889,7 +889,7 @@ void DeadlockCycle::print_on(outputStrea
2764 st->print(" waiting to lock monitor " INTPTR_FORMAT, waitingToLockMonitor); 2563 st->print(" waiting to lock monitor " INTPTR_FORMAT, waitingToLockMonitor);
2765 oop obj = (oop)waitingToLockMonitor->object(); 2564 oop obj = (oop)waitingToLockMonitor->object();
2766 if (obj != NULL) { 2565 if (obj != NULL) {
2767- st->print(" (object "INTPTR_FORMAT ", a %s)", (address)obj, 2566- st->print(" (object "INTPTR_FORMAT ", a %s)", (address)obj,
2768+ st->print(" (object " INTPTR_FORMAT ", a %s)", (address)obj, 2567+ st->print(" (object " INTPTR_FORMAT ", a %s)", (address)obj,
2769 (InstanceKlass::cast(obj->klass()))->external_name()); 2568 (InstanceKlass::cast(obj->klass()))->external_name());
2770 2569
2771 if (!currentThread->current_pending_monitor_is_from_java()) { 2570 if (!currentThread->current_pending_monitor_is_from_java()) {
2772diff --git hotspot/src/share/vm/trace/traceStream.hpp hotspot/src/share/vm/trace/traceStream.hpp 2571--- hotspot/src/share/vm/trace/traceStream.hpp.orig
2773index 89911ea..e2c982a 100644
2774--- hotspot/src/share/vm/trace/traceStream.hpp
2775+++ hotspot/src/share/vm/trace/traceStream.hpp 2572+++ hotspot/src/share/vm/trace/traceStream.hpp
2776@@ -40,31 +40,31 @@ class TraceStream : public StackObj { 2573@@ -40,31 +40,31 @@ class TraceStream : public StackObj {
2777 TraceStream(outputStream& stream): _st(stream) {} 2574 TraceStream(outputStream& stream): _st(stream) {}
2778 2575
2779 void print_val(const char* label, u1 val) { 2576 void print_val(const char* label, u1 val) {
2780- _st.print("%s = "UINT32_FORMAT, label, val); 2577- _st.print("%s = "UINT32_FORMAT, label, val);
2781+ _st.print("%s = " UINT32_FORMAT, label, val); 2578+ _st.print("%s = " UINT32_FORMAT, label, val);
2782 } 2579 }
2783 2580
2784 void print_val(const char* label, u2 val) { 2581 void print_val(const char* label, u2 val) {
2785- _st.print("%s = "UINT32_FORMAT, label, val); 2582- _st.print("%s = "UINT32_FORMAT, label, val);
2786+ _st.print("%s = " UINT32_FORMAT, label, val); 2583+ _st.print("%s = " UINT32_FORMAT, label, val);
2787 } 2584 }
2788 2585
2789 void print_val(const char* label, s2 val) { 2586 void print_val(const char* label, s2 val) {
2790- _st.print("%s = "INT32_FORMAT, label, val); 2587- _st.print("%s = "INT32_FORMAT, label, val);
2791+ _st.print("%s = " INT32_FORMAT, label, val); 2588+ _st.print("%s = " INT32_FORMAT, label, val);
2792 } 2589 }
2793 2590
2794 void print_val(const char* label, u4 val) { 2591 void print_val(const char* label, u4 val) {
2795- _st.print("%s = "UINT32_FORMAT, label, val); 2592- _st.print("%s = "UINT32_FORMAT, label, val);
2796+ _st.print("%s = " UINT32_FORMAT, label, val); 2593+ _st.print("%s = " UINT32_FORMAT, label, val);
2797 } 2594 }
2798 2595
2799 void print_val(const char* label, s4 val) { 2596 void print_val(const char* label, s4 val) {
2800- _st.print("%s = "INT32_FORMAT, label, val); 2597- _st.print("%s = "INT32_FORMAT, label, val);
2801+ _st.print("%s = " INT32_FORMAT, label, val); 2598+ _st.print("%s = " INT32_FORMAT, label, val);
2802 } 2599 }
2803 2600
2804 void print_val(const char* label, u8 val) { 2601 void print_val(const char* label, u8 val) {
2805- _st.print("%s = "UINT64_FORMAT, label, val); 2602- _st.print("%s = "UINT64_FORMAT, label, val);
2806+ _st.print("%s = " UINT64_FORMAT, label, val); 2603+ _st.print("%s = " UINT64_FORMAT, label, val);
2807 } 2604 }
2808 2605
2809 void print_val(const char* label, s8 val) { 2606 void print_val(const char* label, s8 val) {
2810- _st.print("%s = "INT64_FORMAT, label, (int64_t) val); 2607- _st.print("%s = "INT64_FORMAT, label, (int64_t) val);
2811+ _st.print("%s = " INT64_FORMAT, label, (int64_t) val); 2608+ _st.print("%s = " INT64_FORMAT, label, (int64_t) val);
2812 } 2609 }
2813 2610
2814 void print_val(const char* label, bool val) { 2611 void print_val(const char* label, bool val) {
2815diff --git hotspot/src/share/vm/utilities/ostream.cpp hotspot/src/share/vm/utilities/ostream.cpp 2612--- hotspot/src/share/vm/utilities/ostream.cpp.orig
2816index 21bdd69..44ce683 100644
2817--- hotspot/src/share/vm/utilities/ostream.cpp
2818+++ hotspot/src/share/vm/utilities/ostream.cpp 2613+++ hotspot/src/share/vm/utilities/ostream.cpp
2819@@ -277,7 +277,7 @@ void outputStream::print_data(void* data, size_t len, bool with_ascii) { 2614@@ -277,7 +277,7 @@ void outputStream::print_data(void* data
2820 size_t limit = (len + 16) / 16 * 16; 2615 size_t limit = (len + 16) / 16 * 16;
2821 for (size_t i = 0; i < limit; ++i) { 2616 for (size_t i = 0; i < limit; ++i) {
2822 if (i % 16 == 0) { 2617 if (i % 16 == 0) {
@@ -2834,6 +2629,3 @@ index 21bdd69..44ce683 100644
2834 LOG_MAJOR_VERSION, LOG_MINOR_VERSION, 2629 LOG_MAJOR_VERSION, LOG_MINOR_VERSION,
2835 os::current_process_id(), (int64_t)time_ms); 2630 os::current_process_id(), (int64_t)time_ms);
2836 // Write VM version header immediately. 2631 // Write VM version header immediately.
2837--
28382.7.4
2839
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-zero-mode-crash.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-zero-mode-crash.patch
deleted file mode 100644
index 29702fa..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-zero-mode-crash.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1# HG changeset patch
2# User aph
3# Date 1461121375 -3600
4# Wed Apr 20 04:02:55 2016 +0100
5# Node ID 6811f311f905409fe71d2b1c2fb34c3268758724
6# Parent c66e4cc0fce57664ab44c55c47fa1a2f1bf02638
78154210: Zero: Better byte behaviour
8Summary: Complete support for 8132051 on Zero and fix failure on 64-bit big-endian systems
9Reviewed-by: andrew, chrisphi, coleenp
10
11Upstream-Status: Backport [Fixed in u112]
12
13diff --git hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
14--- hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
15+++ hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
16@@ -220,9 +220,16 @@
17 // Push our result
18 for (int i = 0; i < result_slots; i++) {
19 // Adjust result to smaller
20- intptr_t res = result[-i];
21+ union {
22+ intptr_t res;
23+ jint res_jint;
24+ };
25+ res = result[-i];
26 if (result_slots == 1) {
27- res = narrow(method->result_type(), res);
28+ BasicType t = method->result_type();
29+ if (is_subword_type(t)) {
30+ res_jint = (jint)narrow(t, res_jint);
31+ }
32 }
33 stack->push(res);
34 }
35diff --git hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
36--- hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
37+++ hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
38@@ -593,8 +593,9 @@
39 /* 0xDC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
40
41 /* 0xE0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
42-/* 0xE4 */ &&opc_default, &&opc_fast_aldc, &&opc_fast_aldc_w, &&opc_return_register_finalizer,
43-/* 0xE8 */ &&opc_invokehandle,&&opc_default, &&opc_default, &&opc_default,
44+/* 0xE4 */ &&opc_default, &&opc_default, &&opc_fast_aldc, &&opc_fast_aldc_w,
45+/* 0xE8 */ &&opc_return_register_finalizer,
46+ &&opc_invokehandle, &&opc_default, &&opc_default,
47 /* 0xEC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
48
49 /* 0xF0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-genx11-in-headless.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-genx11-in-headless.patch
index e34305c..38f5f9b 100644
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-genx11-in-headless.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-genx11-in-headless.patch
@@ -1,9 +1,9 @@
1--- jdk/make/GenerateSources.gmk.orig 2015-08-24 11:23:34.720648954 +0200 1--- jdk/make/GenerateSources.gmk.orig
2+++ jdk/make/GenerateSources.gmk 2015-08-24 11:24:41.376649205 +0200 2+++ jdk/make/GenerateSources.gmk
3@@ -73,9 +73,11 @@ 3@@ -73,9 +73,11 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
4 GENSRC += $(GENSRC_OSX_ICONS) 4 GENSRC += $(GENSRC_OSX_ICONS)
5 endif 5 endif
6 6
7- ifneq ($(OPENJDK_TARGET_OS), macosx) 7- ifneq ($(OPENJDK_TARGET_OS), macosx)
8- include gensrc/GensrcX11Wrappers.gmk 8- include gensrc/GensrcX11Wrappers.gmk
9- GENSRC += $(GENSRC_X11WRAPPERS) 9- GENSRC += $(GENSRC_X11WRAPPERS)
@@ -14,4 +14,4 @@
14+ endif 14+ endif
15 endif 15 endif
16 endif 16 endif
17 17
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch
index cd42544..7b5d998 100644
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch
@@ -1,9 +1,9 @@
1--- jdk/make/lib/Awt2dLibraries.gmk.orig 2015-09-03 15:05:21.429981848 +0200 1--- jdk/make/lib/Awt2dLibraries.gmk.orig
2+++ jdk/make/lib/Awt2dLibraries.gmk 2015-09-03 15:05:44.705981936 +0200 2+++ jdk/make/lib/Awt2dLibraries.gmk
3@@ -235,6 +235,10 @@ 3@@ -235,6 +235,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix)
4 LIBAWT_DIRS += $(JDK_TOPDIR)/src/aix/porting 4 LIBAWT_DIRS += $(JDK_TOPDIR)/src/aix/porting
5 endif 5 endif
6 6
7+ifdef BUILD_HEADLESS_ONLY 7+ifdef BUILD_HEADLESS_ONLY
8+LIBAWT_CFLAGS += -DHEADLESS=true 8+LIBAWT_CFLAGS += -DHEADLESS=true
9+endif 9+endif
@@ -11,10 +11,10 @@
11 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ 11 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
12 $(X_CFLAGS) \ 12 $(X_CFLAGS) \
13 $(foreach dir, $(LIBAWT_DIRS), -I$(dir)) 13 $(foreach dir, $(LIBAWT_DIRS), -I$(dir))
14@@ -1126,17 +1130,28 @@ 14@@ -792,17 +796,28 @@ ifeq ($(BUILD_HEADLESS), true)
15 -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks 15 -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
16 endif 16 $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir))
17 17
18- LIBAWT_HEADLESS_FILES := \ 18- LIBAWT_HEADLESS_FILES := \
19- awt_Font.c \ 19- awt_Font.c \
20- HeadlessToolkit.c \ 20- HeadlessToolkit.c \
@@ -45,7 +45,7 @@
45 OGLBlitLoops.c \ 45 OGLBlitLoops.c \
46 OGLBufImgOps.c \ 46 OGLBufImgOps.c \
47 OGLContext.c \ 47 OGLContext.c \
48@@ -1149,10 +1164,9 @@ 48@@ -815,10 +830,9 @@ ifeq ($(BUILD_HEADLESS), true)
49 OGLSurfaceData.c \ 49 OGLSurfaceData.c \
50 OGLTextRenderer.c \ 50 OGLTextRenderer.c \
51 OGLVertexCache.c \ 51 OGLVertexCache.c \
@@ -55,23 +55,23 @@
55- CUPSfuncs.c 55- CUPSfuncs.c
56+ $(LIBAWT_HEADLESS_X11_FILES) \ 56+ $(LIBAWT_HEADLESS_X11_FILES) \
57+ $(LIBAWT_HEADLESS_CUPS_FILES) 57+ $(LIBAWT_HEADLESS_CUPS_FILES)
58 58
59 LIBAWT_HEADLESS_REORDER := 59 LIBAWT_HEADLESS_REORDER :=
60 ifeq ($(OPENJDK_TARGET_OS), solaris) 60 ifeq ($(OPENJDK_TARGET_OS), solaris)
61--- jdk/make/CompileNativeLibraries.gmk.orig 2015-08-24 13:35:55.320678845 +0200 61--- jdk/make/CompileNativeLibraries.gmk.orig
62+++ jdk/make/CompileNativeLibraries.gmk 2015-08-24 13:36:22.776678949 +0200 62+++ jdk/make/CompileNativeLibraries.gmk
63@@ -85,7 +85,9 @@ 63@@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk
64 64
65 include lib/Awt2dLibraries.gmk 65 include lib/Awt2dLibraries.gmk
66 66
67+ifndef BUILD_SOUNDLESS_ONLY 67+ifndef BUILD_SOUNDLESS_ONLY
68 include lib/SoundLibraries.gmk 68 include lib/SoundLibraries.gmk
69+endif 69+endif
70 70
71 # Include the corresponding custom file, if present. 71 # Include the corresponding custom file, if present.
72 -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk 72 -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk
73--- jdk/src/solaris/native/sun/awt/jawt.c.orig 2015-08-24 14:12:29.376687104 +0200 73--- jdk/src/solaris/native/sun/awt/jawt.c.orig
74+++ jdk/src/solaris/native/sun/awt/jawt.c 2015-08-24 14:16:20.420687974 +0200 74+++ jdk/src/solaris/native/sun/awt/jawt.c
75@@ -33,7 +33,7 @@ 75@@ -33,7 +33,7 @@
76 */ 76 */
77 JNIEXPORT jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt) 77 JNIEXPORT jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt)
@@ -81,12 +81,12 @@
81 /* there are no AWT libs available at all */ 81 /* there are no AWT libs available at all */
82 return JNI_FALSE; 82 return JNI_FALSE;
83 #else 83 #else
84--- jdk/src/solaris/native/sun/awt/utility/rect.h.orig 2015-09-03 14:45:40.717977403 +0200 84--- jdk/src/solaris/native/sun/awt/utility/rect.h.orig
85+++ jdk/src/solaris/native/sun/awt/utility/rect.h 2015-09-03 14:46:46.337977650 +0200 85+++ jdk/src/solaris/native/sun/awt/utility/rect.h
86@@ -28,7 +28,7 @@ 86@@ -28,7 +28,7 @@
87 #ifndef _AWT_RECT_H 87 #ifndef _AWT_RECT_H
88 #define _AWT_RECT_H 88 #define _AWT_RECT_H
89 89
90-#ifndef MACOSX 90-#ifndef MACOSX
91+#if !(defined(MACOSX) || defined(HEADLESS)) 91+#if !(defined(MACOSX) || defined(HEADLESS))
92 #include <X11/Xlib.h> 92 #include <X11/Xlib.h>
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch
index 3a71403..7d340a8 100644
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch
@@ -1,6 +1,6 @@
1--- make/common/NativeCompilation.gmk.orig 2015-09-09 17:15:33.869765681 +0200 1--- make/common/NativeCompilation.gmk.orig
2+++ make/common/NativeCompilation.gmk 2015-09-09 17:55:26.485774688 +0200 2+++ make/common/NativeCompilation.gmk
3@@ -434,58 +434,6 @@ 3@@ -438,58 +438,6 @@ define SetupNativeCompilation
4 $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/% 4 $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
5 $(CP) $$< $$@ 5 $(CP) $$< $$@
6 endif 6 endif
@@ -58,8 +58,8 @@
58- endif 58- endif
59 endif 59 endif
60 endif 60 endif
61 61
62@@ -518,58 +466,6 @@ 62@@ -522,58 +470,6 @@ endif # no MacOS X support yet
63 $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/% 63 $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
64 $(CP) $$< $$@ 64 $(CP) $$< $$@
65 endif 65 endif
@@ -117,4 +117,4 @@
117- endif 117- endif
118 endif 118 endif
119 endif 119 endif
120 120
diff --git a/recipes-core/openjdk/patches-openjdk-8/remove-shell-variables-from-autoheader.patch b/recipes-core/openjdk/patches-openjdk-8/remove-shell-variables-from-autoheader.patch
index 92a9831..5e2f78b 100644
--- a/recipes-core/openjdk/patches-openjdk-8/remove-shell-variables-from-autoheader.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/remove-shell-variables-from-autoheader.patch
@@ -1,8 +1,8 @@
1--- common/autoconf/basics.m4.orig 2015-08-17 18:02:01.642657746 +0200 1--- common/autoconf/basics.m4.orig
2+++ common/autoconf/basics.m4 2015-08-17 18:14:44.046660616 +0200 2+++ common/autoconf/basics.m4
3@@ -466,21 +466,21 @@ 3@@ -472,21 +472,21 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
4 AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT) 4 AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT)
5 5
6 # Most of the probed defines are put into config.h 6 # Most of the probed defines are put into config.h
7- AC_CONFIG_HEADERS([$OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in]) 7- AC_CONFIG_HEADERS([$OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in])
8+ AC_CONFIG_HEADERS([config.h:config.h.in]) 8+ AC_CONFIG_HEADERS([config.h:config.h.in])
@@ -26,6 +26,6 @@
26 # which will look for generated configurations 26 # which will look for generated configurations
27- AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in]) 27- AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in])
28+ AC_CONFIG_FILES([Makefile:Makefile.in]) 28+ AC_CONFIG_FILES([Makefile:Makefile.in])
29 29
30 # Save the arguments given to us 30 # Save the arguments given to us
31 echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments 31 echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-26 11:38:40 +0000