summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-stdc++11.patch
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2019-12-30 15:35:59 +0100
committerRichard Leitner <richard.leitner@skidata.com>2020-01-28 15:09:31 +0100
commit7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14 (patch)
tree398a12e3addb7470622d4cb2f98e7ad2dda02c5c /recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-stdc++11.patch
parent19b569281cc30e3aa94e772d6885cd340b1d1724 (diff)
downloadmeta-java-7d30e6ff7b8a54d67256ce528e8c4fd7e63f6b14.tar.gz
openjdk-8: update to latest ga version 242
As OpenJDK-8 is now tagging "ga" versions in addition to the "build" version the recipes are adapted to use those "ga" versions. All existing patches got re-applied and renamed. For better handling Hotspot patches now start at patch number 1001 and jdk patches at 2001. Furthermore architecture dependent patches are prefixed with the architecture they apply on. Following patches/hunks were completely dropped: - 0002-hotspot-fix-compilation-with-security-flags-enabled.patch got backported to hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/c40a28e54185 - 0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch ostream.cpp:112 got fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f3108e56b502 - 0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch got backported to hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916 - 0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/32bc598624bd - 0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/5af8ec63c21c - openjdk8-add-missing-linker-flags.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f175513c2c3a - openjdk8-fix-shark-stdc++11.patch fixed in hotspot jdk8u - openjdk8-fix-libpng-neon-build.patch fixed in jdk https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/5d57817931e1 - aarch64-hotspot-fix-undefined-behaviour-gcc-v8-fix.patch got backported to hotspot jdk8u Following patches were newly added: - 0011-autoconf-fix-CC-with-arguments-detection.patch needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris" - 0012-autoconf-NativeCompilation-remove-sysroot.patch needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris" Additionally add UPDATING.md which describes the openjdk8 update process for this layer and update8checksums.sh, a script that updates the openjdk8 source archive checksums in the corresponding .inc files. Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-stdc++11.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-stdc++11.patch2631
1 files changed, 0 insertions, 2631 deletions
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
deleted file mode 100644
index 12fc17d..0000000
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-shark-stdc++11.patch
+++ /dev/null
@@ -1,2631 +0,0 @@
1--- hotspot/src/os/posix/vm/os_posix.cpp.orig
2+++ hotspot/src/os/posix/vm/os_posix.cpp
3@@ -594,7 +594,7 @@ const char* os::Posix::describe_sa_flags
4 strncpy(buffer, "none", size);
5
6 const struct {
7- int i;
8+ unsigned i;
9 const char* s;
10 } flaginfo [] = {
11 { SA_NOCLDSTOP, "SA_NOCLDSTOP" },
12--- hotspot/src/share/vm/classfile/dictionary.hpp.orig
13+++ hotspot/src/share/vm/classfile/dictionary.hpp
14@@ -373,7 +373,7 @@ class SymbolPropertyEntry : public Hasht
15
16 void print_on(outputStream* st) const {
17 symbol()->print_value_on(st);
18- st->print("/mode="INTX_FORMAT, symbol_mode());
19+ st->print("/mode=" INTX_FORMAT, symbol_mode());
20 st->print(" -> ");
21 bool printed = false;
22 if (method() != NULL) {
23--- hotspot/src/share/vm/code/exceptionHandlerTable.cpp.orig
24+++ hotspot/src/share/vm/code/exceptionHandlerTable.cpp
25@@ -186,7 +186,7 @@ uint ImplicitExceptionTable::at( uint ex
26 void ImplicitExceptionTable::print(address base) const {
27 tty->print("{");
28 for( uint i=0; i<len(); i++ )
29- 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));
31 tty->print_cr("}");
32 }
33
34--- hotspot/src/share/vm/code/nmethod.cpp.orig
35+++ hotspot/src/share/vm/code/nmethod.cpp
36@@ -2344,7 +2344,7 @@ public:
37 void maybe_print(oop* p) {
38 if (_print_nm == NULL) return;
39 if (!_detected_scavenge_root) _print_nm->print_on(tty, "new scavenge root");
40- tty->print_cr(""PTR_FORMAT"[offset=%d] detected scavengable oop "PTR_FORMAT" (found at "PTR_FORMAT")",
41+ tty->print_cr("" PTR_FORMAT "[offset=%d] detected scavengable oop " PTR_FORMAT " (found at " PTR_FORMAT ")",
42 _print_nm, (int)((intptr_t)p - (intptr_t)_print_nm),
43 (void *)(*p), (intptr_t)p);
44 (*p)->print();
45@@ -2725,7 +2725,7 @@ public:
46 _nm->print_nmethod(true);
47 _ok = false;
48 }
49- tty->print_cr("*** non-oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)",
50+ tty->print_cr("*** non-oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)",
51 (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
52 }
53 virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
54@@ -2849,7 +2849,7 @@ public:
55 _nm->print_nmethod(true);
56 _ok = false;
57 }
58- tty->print_cr("*** scavengable oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)",
59+ tty->print_cr("*** scavengable oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)",
60 (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm));
61 (*p)->print();
62 }
63@@ -2894,7 +2894,7 @@ void nmethod::print() const {
64 print_on(tty, NULL);
65
66 if (WizardMode) {
67- tty->print("((nmethod*) "INTPTR_FORMAT ") ", this);
68+ tty->print("((nmethod*) " INTPTR_FORMAT ") ", this);
69 tty->print(" for method " INTPTR_FORMAT , (address)method());
70 tty->print(" { ");
71 if (is_in_use()) tty->print("in_use ");
72--- hotspot/src/share/vm/compiler/compileBroker.cpp.orig
73+++ hotspot/src/share/vm/compiler/compileBroker.cpp
74@@ -203,7 +203,7 @@ class CompilationLog : public StringEven
75 }
76
77 void log_nmethod(JavaThread* thread, nmethod* nm) {
78- 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 "]",
80 nm->compile_id(), nm->is_osr_method() ? "%" : "",
81 p2i(nm), p2i(nm->code_begin()), p2i(nm->code_end()));
82 }
83--- hotspot/src/share/vm/compiler/disassembler.cpp.orig
84+++ hotspot/src/share/vm/compiler/disassembler.cpp
85@@ -63,7 +63,7 @@ bool Disassembler::_tried_to_load
86 Disassembler::decode_func_virtual Disassembler::_decode_instructions_virtual = NULL;
87 Disassembler::decode_func Disassembler::_decode_instructions = NULL;
88
89-static const char hsdis_library_name[] = "hsdis-"HOTSPOT_LIB_ARCH;
90+static const char hsdis_library_name[] = "hsdis-" HOTSPOT_LIB_ARCH;
91 static const char decode_instructions_virtual_name[] = "decode_instructions_virtual";
92 static const char decode_instructions_name[] = "decode_instructions";
93 static bool use_new_version = true;
94--- hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.orig
95+++ hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
96@@ -838,18 +838,18 @@ void ConcurrentMarkSweepGeneration::prin
97 GenCollectedHeap* gch = GenCollectedHeap::heap();
98 if (PrintGCDetails) {
99 if (Verbose) {
100- gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"("SIZE_FORMAT")]",
101+ gclog_or_tty->print("[%d %s-%s: " SIZE_FORMAT "(" SIZE_FORMAT ")]",
102 level(), short_name(), s, used(), capacity());
103 } else {
104- gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"K("SIZE_FORMAT"K)]",
105+ gclog_or_tty->print("[%d %s-%s: " SIZE_FORMAT "K(" SIZE_FORMAT "K)]",
106 level(), short_name(), s, used() / K, capacity() / K);
107 }
108 }
109 if (Verbose) {
110- gclog_or_tty->print(" "SIZE_FORMAT"("SIZE_FORMAT")",
111+ gclog_or_tty->print(" " SIZE_FORMAT "(" SIZE_FORMAT ")",
112 gch->used(), gch->capacity());
113 } else {
114- gclog_or_tty->print(" "SIZE_FORMAT"K("SIZE_FORMAT"K)",
115+ gclog_or_tty->print(" " SIZE_FORMAT "K(" SIZE_FORMAT "K)",
116 gch->used() / K, gch->capacity() / K);
117 }
118 }
119@@ -879,8 +879,8 @@ bool ConcurrentMarkSweepGeneration::prom
120 bool res = (available >= av_promo) || (available >= max_promotion_in_bytes);
121 if (Verbose && PrintGCDetails) {
122 gclog_or_tty->print_cr(
123- "CMS: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT"),"
124- "max_promo("SIZE_FORMAT")",
125+ "CMS: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT "),"
126+ "max_promo(" SIZE_FORMAT ")",
127 res? "":" not", available, res? ">=":"<",
128 av_promo, max_promotion_in_bytes);
129 }
130@@ -966,8 +966,8 @@ void ConcurrentMarkSweepGeneration::comp
131 desired_free_percentage);
132 gclog_or_tty->print_cr(" Maximum free fraction %f",
133 maximum_free_percentage);
134- gclog_or_tty->print_cr(" Capactiy "SIZE_FORMAT, capacity()/1000);
135- gclog_or_tty->print_cr(" Desired capacity "SIZE_FORMAT,
136+ gclog_or_tty->print_cr(" Capactiy " SIZE_FORMAT, capacity()/1000);
137+ gclog_or_tty->print_cr(" Desired capacity " SIZE_FORMAT,
138 desired_capacity/1000);
139 int prev_level = level() - 1;
140 if (prev_level >= 0) {
141@@ -975,14 +975,14 @@ void ConcurrentMarkSweepGeneration::comp
142 GenCollectedHeap* gch = GenCollectedHeap::heap();
143 Generation* prev_gen = gch->_gens[prev_level];
144 prev_size = prev_gen->capacity();
145- gclog_or_tty->print_cr(" Younger gen size "SIZE_FORMAT,
146+ gclog_or_tty->print_cr(" Younger gen size " SIZE_FORMAT,
147 prev_size/1000);
148 }
149- gclog_or_tty->print_cr(" unsafe_max_alloc_nogc "SIZE_FORMAT,
150+ gclog_or_tty->print_cr(" unsafe_max_alloc_nogc " SIZE_FORMAT,
151 unsafe_max_alloc_nogc()/1000);
152- gclog_or_tty->print_cr(" contiguous available "SIZE_FORMAT,
153+ gclog_or_tty->print_cr(" contiguous available " SIZE_FORMAT,
154 contiguous_available()/1000);
155- gclog_or_tty->print_cr(" Expand by "SIZE_FORMAT" (bytes)",
156+ gclog_or_tty->print_cr(" Expand by " SIZE_FORMAT " (bytes)",
157 expand_bytes);
158 }
159 // safe if expansion fails
160@@ -1513,8 +1513,8 @@ bool CMSCollector::shouldConcurrentColle
161 stats().print_on(gclog_or_tty);
162 gclog_or_tty->print_cr("time_until_cms_gen_full %3.7f",
163 stats().time_until_cms_gen_full());
164- gclog_or_tty->print_cr("free="SIZE_FORMAT, _cmsGen->free());
165- gclog_or_tty->print_cr("contiguous_available="SIZE_FORMAT,
166+ gclog_or_tty->print_cr("free=" SIZE_FORMAT, _cmsGen->free());
167+ gclog_or_tty->print_cr("contiguous_available=" SIZE_FORMAT,
168 _cmsGen->contiguous_available());
169 gclog_or_tty->print_cr("promotion_rate=%g", stats().promotion_rate());
170 gclog_or_tty->print_cr("cms_allocation_rate=%g", stats().cms_allocation_rate());
171@@ -2792,7 +2792,7 @@ void ConcurrentMarkSweepGeneration::gc_p
172 assert(_numObjectsPromoted == 0, "check");
173 assert(_numWordsPromoted == 0, "check");
174 if (Verbose && PrintGC) {
175- gclog_or_tty->print("Allocated "SIZE_FORMAT" objects, "
176+ gclog_or_tty->print("Allocated " SIZE_FORMAT " objects, "
177 SIZE_FORMAT" bytes concurrently",
178 _numObjectsAllocated, _numWordsAllocated*sizeof(HeapWord));
179 }
180@@ -2879,7 +2879,7 @@ void ConcurrentMarkSweepGeneration::gc_e
181 assert(_numObjectsAllocated == 0, "check");
182 assert(_numWordsAllocated == 0, "check");
183 if (Verbose && PrintGC) {
184- gclog_or_tty->print("Promoted "SIZE_FORMAT" objects, "
185+ gclog_or_tty->print("Promoted " SIZE_FORMAT " objects, "
186 SIZE_FORMAT" bytes",
187 _numObjectsPromoted, _numWordsPromoted*sizeof(HeapWord));
188 }
189@@ -2890,7 +2890,7 @@ void ConcurrentMarkSweepGeneration::gc_e
190 if (PrintGC && Verbose) {
191 // Call down the chain in contiguous_available needs the freelistLock
192 // so print this out before releasing the freeListLock.
193- gclog_or_tty->print(" Contiguous available "SIZE_FORMAT" bytes ",
194+ gclog_or_tty->print(" Contiguous available " SIZE_FORMAT " bytes ",
195 contiguous_available());
196 }
197 }
198@@ -2978,7 +2978,7 @@ class VerifyMarkedClosure: public BitMap
199 HeapWord* addr = _marks->offsetToHeapWord(offset);
200 if (!_marks->isMarked(addr)) {
201 oop(addr)->print_on(gclog_or_tty);
202- gclog_or_tty->print_cr(" ("INTPTR_FORMAT" should have been marked)", addr);
203+ gclog_or_tty->print_cr(" (" INTPTR_FORMAT " should have been marked)", addr);
204 _failed = true;
205 }
206 return true;
207@@ -5039,7 +5039,7 @@ void CMSCollector::checkpointRootsFinal(
208
209 SpecializationStats::clear();
210 if (PrintGCDetails) {
211- gclog_or_tty->print("[YG occupancy: "SIZE_FORMAT" K ("SIZE_FORMAT" K)]",
212+ gclog_or_tty->print("[YG occupancy: " SIZE_FORMAT " K (" SIZE_FORMAT " K)]",
213 _young_gen->used() / K,
214 _young_gen->capacity() / K);
215 }
216@@ -5172,8 +5172,8 @@ void CMSCollector::checkpointRootsFinalW
217 if (ser_ovflw > 0) {
218 if (PrintCMSStatistics != 0) {
219 gclog_or_tty->print_cr("Marking stack overflow (benign) "
220- "(pmc_pc="SIZE_FORMAT", pmc_rm="SIZE_FORMAT", kac="SIZE_FORMAT
221- ", kac_preclean="SIZE_FORMAT")",
222+ "(pmc_pc=" SIZE_FORMAT ", pmc_rm=" SIZE_FORMAT ", kac=" SIZE_FORMAT
223+ ", kac_preclean=" SIZE_FORMAT ")",
224 _ser_pmc_preclean_ovflw, _ser_pmc_remark_ovflw,
225 _ser_kac_ovflw, _ser_kac_preclean_ovflw);
226 }
227@@ -5186,7 +5186,7 @@ void CMSCollector::checkpointRootsFinalW
228 if (_par_pmc_remark_ovflw > 0 || _par_kac_ovflw > 0) {
229 if (PrintCMSStatistics != 0) {
230 gclog_or_tty->print_cr("Work queue overflow (benign) "
231- "(pmc_rm="SIZE_FORMAT", kac="SIZE_FORMAT")",
232+ "(pmc_rm=" SIZE_FORMAT ", kac=" SIZE_FORMAT ")",
233 _par_pmc_remark_ovflw, _par_kac_ovflw);
234 }
235 _par_pmc_remark_ovflw = 0;
236@@ -5194,12 +5194,12 @@ void CMSCollector::checkpointRootsFinalW
237 }
238 if (PrintCMSStatistics != 0) {
239 if (_markStack._hit_limit > 0) {
240- gclog_or_tty->print_cr(" (benign) Hit max stack size limit ("SIZE_FORMAT")",
241+ gclog_or_tty->print_cr(" (benign) Hit max stack size limit (" SIZE_FORMAT ")",
242 _markStack._hit_limit);
243 }
244 if (_markStack._failed_double > 0) {
245- gclog_or_tty->print_cr(" (benign) Failed stack doubling ("SIZE_FORMAT"),"
246- " current capacity "SIZE_FORMAT,
247+ gclog_or_tty->print_cr(" (benign) Failed stack doubling (" SIZE_FORMAT "),"
248+ " current capacity " SIZE_FORMAT,
249 _markStack._failed_double,
250 _markStack.capacity());
251 }
252@@ -5963,7 +5963,7 @@ void CMSCollector::do_remark_non_paralle
253 &markFromDirtyCardsClosure);
254 verify_work_stacks_empty();
255 if (PrintCMSStatistics != 0) {
256- gclog_or_tty->print(" (re-scanned "SIZE_FORMAT" dirty cards in cms gen) ",
257+ gclog_or_tty->print(" (re-scanned " SIZE_FORMAT " dirty cards in cms gen) ",
258 markFromDirtyCardsClosure.num_dirty_cards());
259 }
260 }
261@@ -6893,7 +6893,7 @@ void CMSMarkStack::expand() {
262 } else if (_failed_double++ == 0 && !CMSConcurrentMTEnabled && PrintGCDetails) {
263 // Failed to double capacity, continue;
264 // we print a detail message only once per CMS cycle.
265- gclog_or_tty->print(" (benign) Failed to expand marking stack from "SIZE_FORMAT"K to "
266+ gclog_or_tty->print(" (benign) Failed to expand marking stack from " SIZE_FORMAT "K to "
267 SIZE_FORMAT"K",
268 _capacity / K, new_capacity / K);
269 }
270@@ -8216,25 +8216,25 @@ SweepClosure::~SweepClosure() {
271 ShouldNotReachHere();
272 }
273 if (Verbose && PrintGC) {
274- gclog_or_tty->print("Collected "SIZE_FORMAT" objects, " SIZE_FORMAT " bytes",
275+ gclog_or_tty->print("Collected " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes",
276 _numObjectsFreed, _numWordsFreed*sizeof(HeapWord));
277- gclog_or_tty->print_cr("\nLive "SIZE_FORMAT" objects, "
278+ gclog_or_tty->print_cr("\nLive " SIZE_FORMAT " objects, "
279 SIZE_FORMAT" bytes "
280- "Already free "SIZE_FORMAT" objects, "SIZE_FORMAT" bytes",
281+ "Already free " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes",
282 _numObjectsLive, _numWordsLive*sizeof(HeapWord),
283 _numObjectsAlreadyFree, _numWordsAlreadyFree*sizeof(HeapWord));
284 size_t totalBytes = (_numWordsFreed + _numWordsLive + _numWordsAlreadyFree)
285 * sizeof(HeapWord);
286- gclog_or_tty->print_cr("Total sweep: "SIZE_FORMAT" bytes", totalBytes);
287+ gclog_or_tty->print_cr("Total sweep: " SIZE_FORMAT " bytes", totalBytes);
288
289 if (PrintCMSStatistics && CMSVerifyReturnedBytes) {
290 size_t indexListReturnedBytes = _sp->sumIndexedFreeListArrayReturnedBytes();
291 size_t dict_returned_bytes = _sp->dictionary()->sum_dict_returned_bytes();
292 size_t returned_bytes = indexListReturnedBytes + dict_returned_bytes;
293- gclog_or_tty->print("Returned "SIZE_FORMAT" bytes", returned_bytes);
294- gclog_or_tty->print(" Indexed List Returned "SIZE_FORMAT" bytes",
295+ gclog_or_tty->print("Returned " SIZE_FORMAT " bytes", returned_bytes);
296+ gclog_or_tty->print(" Indexed List Returned " SIZE_FORMAT " bytes",
297 indexListReturnedBytes);
298- gclog_or_tty->print_cr(" Dictionary Returned "SIZE_FORMAT" bytes",
299+ gclog_or_tty->print_cr(" Dictionary Returned " SIZE_FORMAT " bytes",
300 dict_returned_bytes);
301 }
302 }
303@@ -8313,13 +8313,13 @@ size_t SweepClosure::do_blk_careful(Heap
304 // coalesced chunk to the appropriate free list.
305 if (inFreeRange()) {
306 assert(freeFinger() >= _sp->bottom() && freeFinger() < _limit,
307- err_msg("freeFinger() " PTR_FORMAT" is out-of-bounds", freeFinger()));
308+ err_msg("freeFinger() " PTR_FORMAT " is out-of-bounds", freeFinger()));
309 flush_cur_free_chunk(freeFinger(),
310 pointer_delta(addr, freeFinger()));
311 if (CMSTraceSweeper) {
312 gclog_or_tty->print("Sweep: last chunk: ");
313- gclog_or_tty->print("put_free_blk 0x%x ("SIZE_FORMAT") "
314- "[coalesced:"SIZE_FORMAT"]\n",
315+ gclog_or_tty->print("put_free_blk 0x%x (" SIZE_FORMAT ") "
316+ "[coalesced:" SIZE_FORMAT "]\n",
317 freeFinger(), pointer_delta(addr, freeFinger()),
318 lastFreeRangeCoalesced());
319 }
320--- hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp.orig
321+++ hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
322@@ -92,7 +92,7 @@ public:
323 regions_at_put(_curr_index, NULL);
324 assert(hr->reclaimable_bytes() <= _remaining_reclaimable_bytes,
325 err_msg("remaining reclaimable bytes inconsistent "
326- "from region: "SIZE_FORMAT" remaining: "SIZE_FORMAT,
327+ "from region: " SIZE_FORMAT " remaining: " SIZE_FORMAT,
328 hr->reclaimable_bytes(), _remaining_reclaimable_bytes));
329 _remaining_reclaimable_bytes -= hr->reclaimable_bytes();
330 _curr_index += 1;
331--- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.orig
332+++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
333@@ -284,7 +284,7 @@ void CMMarkStack::expand() {
334 if (PrintGCDetails && Verbose) {
335 // Failed to double capacity, continue;
336 gclog_or_tty->print(" (benign) Failed to expand marking stack capacity from "
337- SIZE_FORMAT"K to " SIZE_FORMAT"K",
338+ SIZE_FORMAT "K to " SIZE_FORMAT "K",
339 _capacity / K, new_capacity / K);
340 }
341 }
342@@ -581,7 +581,7 @@ ConcurrentMark::ConcurrentMark(G1Collect
343 _verbose_level = verbose_level;
344
345 if (verbose_low()) {
346- gclog_or_tty->print_cr("[global] init, heap start = "PTR_FORMAT", "
347+ gclog_or_tty->print_cr("[global] init, heap start = " PTR_FORMAT ", "
348 "heap end = " INTPTR_FORMAT, p2i(_heap_start), p2i(_heap_end));
349 }
350
351@@ -837,7 +837,7 @@ void ConcurrentMark::set_concurrency_and
352 // in a STW phase.
353 assert(!concurrent_marking_in_progress(), "invariant");
354 assert(out_of_regions(),
355- err_msg("only way to get here: _finger: "PTR_FORMAT", _heap_end: "PTR_FORMAT,
356+ err_msg("only way to get here: _finger: " PTR_FORMAT ", _heap_end: " PTR_FORMAT,
357 p2i(_finger), p2i(_heap_end)));
358 }
359 }
360@@ -1452,7 +1452,7 @@ public:
361
362 assert(start <= hr->end() && start <= ntams && ntams <= hr->end(),
363 err_msg("Preconditions not met - "
364- "start: "PTR_FORMAT", ntams: "PTR_FORMAT", end: "PTR_FORMAT,
365+ "start: " PTR_FORMAT ", ntams: " PTR_FORMAT ", end: " PTR_FORMAT,
366 p2i(start), p2i(ntams), p2i(hr->end())));
367
368 // Find the first marked object at or after "start".
369@@ -1769,10 +1769,10 @@ class FinalCountDataUpdateClosure: publi
370 }
371
372 assert(end_idx <= _card_bm->size(),
373- err_msg("oob: end_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT,
374+ err_msg("oob: end_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT,
375 end_idx, _card_bm->size()));
376 assert(start_idx < _card_bm->size(),
377- err_msg("oob: start_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT,
378+ err_msg("oob: start_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT,
379 start_idx, _card_bm->size()));
380
381 _cm->set_card_bitmap_range(_card_bm, start_idx, end_idx, true /* is_par */);
382@@ -2277,7 +2277,7 @@ class G1CMKeepAliveAndDrainClosure: publ
383 oop obj = oopDesc::load_decode_heap_oop(p);
384 if (_cm->verbose_high()) {
385 gclog_or_tty->print_cr("\t[%u] we're looking at location "
386- "*"PTR_FORMAT" = "PTR_FORMAT,
387+ "*" PTR_FORMAT " = " PTR_FORMAT,
388 _task->worker_id(), p2i(p), p2i((void*) obj));
389 }
390
391@@ -2846,7 +2846,7 @@ public:
392 }
393 }
394
395- _out->print_cr(" "PTR_FORMAT": "PTR_FORMAT"%s%s",
396+ _out->print_cr(" " PTR_FORMAT ": " PTR_FORMAT "%s%s",
397 p2i(p), p2i((void*) obj), str, str2);
398 }
399 };
400@@ -2873,7 +2873,7 @@ public:
401 bool print_it = _all || over_tams || marked;
402
403 if (print_it) {
404- _out->print_cr(" "PTR_FORMAT"%s",
405+ _out->print_cr(" " PTR_FORMAT "%s",
406 p2i((void *)o), (over_tams) ? " >" : (marked) ? " M" : "");
407 PrintReachableOopClosure oopCl(_out, _vo, _all);
408 o->oop_iterate_no_header(&oopCl);
409@@ -2894,7 +2894,7 @@ public:
410 HeapWord* e = hr->end();
411 HeapWord* t = hr->top();
412 HeapWord* p = _g1h->top_at_mark_start(hr, _vo);
413- _out->print_cr("** ["PTR_FORMAT", "PTR_FORMAT"] top: "PTR_FORMAT" "
414+ _out->print_cr("** [" PTR_FORMAT ", " PTR_FORMAT "] top: " PTR_FORMAT " "
415 "TAMS: " PTR_FORMAT, p2i(b), p2i(e), p2i(t), p2i(p));
416 _out->cr();
417
418@@ -3018,9 +3018,9 @@ ConcurrentMark::claim_region(uint worker
419 HeapWord* limit = curr_region->next_top_at_mark_start();
420
421 if (verbose_low()) {
422- gclog_or_tty->print_cr("[%u] curr_region = "PTR_FORMAT" "
423- "["PTR_FORMAT", "PTR_FORMAT"), "
424- "limit = "PTR_FORMAT,
425+ gclog_or_tty->print_cr("[%u] curr_region = " PTR_FORMAT " "
426+ "[" PTR_FORMAT ", " PTR_FORMAT "), "
427+ "limit = " PTR_FORMAT,
428 worker_id, p2i(curr_region), p2i(bottom), p2i(end), p2i(limit));
429 }
430
431@@ -3035,7 +3035,7 @@ ConcurrentMark::claim_region(uint worker
432
433 if (limit > bottom) {
434 if (verbose_low()) {
435- gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is not empty, "
436+ gclog_or_tty->print_cr("[%u] region " PTR_FORMAT " is not empty, "
437 "returning it ", worker_id, p2i(curr_region));
438 }
439 return curr_region;
440@@ -3043,7 +3043,7 @@ ConcurrentMark::claim_region(uint worker
441 assert(limit == bottom,
442 "the region limit should be at bottom");
443 if (verbose_low()) {
444- gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is empty, "
445+ gclog_or_tty->print_cr("[%u] region " PTR_FORMAT " is empty, "
446 "returning NULL", worker_id, p2i(curr_region));
447 }
448 // we return NULL and the caller should try calling
449@@ -3055,13 +3055,13 @@ ConcurrentMark::claim_region(uint worker
450 if (verbose_low()) {
451 if (curr_region == NULL) {
452 gclog_or_tty->print_cr("[%u] found uncommitted region, moving finger, "
453- "global finger = "PTR_FORMAT", "
454- "our finger = "PTR_FORMAT,
455+ "global finger = " PTR_FORMAT ", "
456+ "our finger = " PTR_FORMAT,
457 worker_id, p2i(_finger), p2i(finger));
458 } else {
459 gclog_or_tty->print_cr("[%u] somebody else moved the finger, "
460- "global finger = "PTR_FORMAT", "
461- "our finger = "PTR_FORMAT,
462+ "global finger = " PTR_FORMAT ", "
463+ "our finger = " PTR_FORMAT,
464 worker_id, p2i(_finger), p2i(finger));
465 }
466 }
467@@ -3097,7 +3097,7 @@ private:
468
469 void do_object_work(oop obj) {
470 guarantee(!_g1h->obj_in_cs(obj),
471- err_msg("obj: "PTR_FORMAT" in CSet, phase: %s, info: %d",
472+ err_msg("obj: " PTR_FORMAT " in CSet, phase: %s, info: %d",
473 p2i((void*) obj), phase_str(), _info));
474 }
475
476@@ -3158,7 +3158,7 @@ void ConcurrentMark::verify_no_cset_oops
477 // here.
478 HeapRegion* global_hr = _g1h->heap_region_containing_raw(global_finger);
479 guarantee(global_hr == NULL || global_finger == global_hr->bottom(),
480- err_msg("global finger: "PTR_FORMAT" region: "HR_FORMAT,
481+ err_msg("global finger: " PTR_FORMAT " region: " HR_FORMAT,
482 p2i(global_finger), HR_FORMAT_PARAMS(global_hr)));
483 }
484
485@@ -3172,7 +3172,7 @@ void ConcurrentMark::verify_no_cset_oops
486 HeapRegion* task_hr = _g1h->heap_region_containing_raw(task_finger);
487 guarantee(task_hr == NULL || task_finger == task_hr->bottom() ||
488 !task_hr->in_collection_set(),
489- err_msg("task finger: "PTR_FORMAT" region: "HR_FORMAT,
490+ err_msg("task finger: " PTR_FORMAT " region: " HR_FORMAT,
491 p2i(task_finger), HR_FORMAT_PARAMS(task_hr)));
492 }
493 }
494@@ -3214,8 +3214,8 @@ class AggregateCountDataHRClosure: publi
495
496 assert(start <= limit && limit <= hr->top() && hr->top() <= hr->end(),
497 err_msg("Preconditions not met - "
498- "start: "PTR_FORMAT", limit: "PTR_FORMAT", "
499- "top: "PTR_FORMAT", end: "PTR_FORMAT,
500+ "start: " PTR_FORMAT ", limit: " PTR_FORMAT ", "
501+ "top: " PTR_FORMAT ", end: " PTR_FORMAT,
502 p2i(start), p2i(limit), p2i(hr->top()), p2i(hr->end())));
503
504 assert(hr->next_marked_bytes() == 0, "Precondition");
505@@ -3494,7 +3494,7 @@ bool ConcurrentMark::do_yield_check(uint
506 #ifndef PRODUCT
507 // for debugging purposes
508 void ConcurrentMark::print_finger() {
509- gclog_or_tty->print_cr("heap ["PTR_FORMAT", "PTR_FORMAT"), global finger = "PTR_FORMAT,
510+ gclog_or_tty->print_cr("heap [" PTR_FORMAT ", " PTR_FORMAT "), global finger = " PTR_FORMAT,
511 p2i(_heap_start), p2i(_heap_end), p2i(_finger));
512 for (uint i = 0; i < _max_worker_id; ++i) {
513 gclog_or_tty->print(" %u: " PTR_FORMAT, i, p2i(_tasks[i]->finger()));
514@@ -3579,7 +3579,7 @@ void CMTask::setup_for_region(HeapRegion
515 "claim_region() should have filtered out continues humongous regions");
516
517 if (_cm->verbose_low()) {
518- 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,
520 _worker_id, p2i(hr));
521 }
522
523@@ -3596,7 +3596,7 @@ void CMTask::update_region_limit() {
524 if (limit == bottom) {
525 if (_cm->verbose_low()) {
526 gclog_or_tty->print_cr("[%u] found an empty region "
527- "["PTR_FORMAT", "PTR_FORMAT")",
528+ "[" PTR_FORMAT ", " PTR_FORMAT ")",
529 _worker_id, p2i(bottom), p2i(limit));
530 }
531 // The region was collected underneath our feet.
532@@ -3628,7 +3628,7 @@ void CMTask::update_region_limit() {
533 void CMTask::giveup_current_region() {
534 assert(_curr_region != NULL, "invariant");
535 if (_cm->verbose_low()) {
536- gclog_or_tty->print_cr("[%u] giving up region "PTR_FORMAT,
537+ gclog_or_tty->print_cr("[%u] giving up region " PTR_FORMAT,
538 _worker_id, p2i(_curr_region));
539 }
540 clear_region_fields();
541@@ -3750,7 +3750,7 @@ void CMTask::regular_clock_call() {
542
543 if (_cm->verbose_medium()) {
544 gclog_or_tty->print_cr("[%u] regular clock, interval = %1.2lfms, "
545- "scanned = "SIZE_FORMAT"%s, refs reached = "SIZE_FORMAT"%s",
546+ "scanned = " SIZE_FORMAT "%s, refs reached = " SIZE_FORMAT "%s",
547 _worker_id, last_interval_ms,
548 _words_scanned,
549 (_words_scanned >= _words_scanned_limit) ? " (*)" : "",
550@@ -3919,7 +3919,7 @@ void CMTask::drain_local_queue(bool part
551 statsOnly( ++_local_pops );
552
553 if (_cm->verbose_high()) {
554- gclog_or_tty->print_cr("[%u] popped "PTR_FORMAT, _worker_id,
555+ gclog_or_tty->print_cr("[%u] popped " PTR_FORMAT, _worker_id,
556 p2i((void*) obj));
557 }
558
559@@ -4272,8 +4272,8 @@ void CMTask::do_marking_step(double time
560
561 if (_cm->verbose_low()) {
562 gclog_or_tty->print_cr("[%u] we're scanning part "
563- "["PTR_FORMAT", "PTR_FORMAT") "
564- "of region "HR_FORMAT,
565+ "[" PTR_FORMAT ", " PTR_FORMAT ") "
566+ "of region " HR_FORMAT,
567 _worker_id, p2i(_finger), p2i(_region_limit),
568 HR_FORMAT_PARAMS(_curr_region));
569 }
570@@ -4360,7 +4360,7 @@ void CMTask::do_marking_step(double time
571
572 if (_cm->verbose_low()) {
573 gclog_or_tty->print_cr("[%u] we successfully claimed "
574- "region "PTR_FORMAT,
575+ "region " PTR_FORMAT,
576 _worker_id, p2i(claimed_region));
577 }
578
579@@ -4421,7 +4421,7 @@ void CMTask::do_marking_step(double time
580
581 if (_cm->try_stealing(_worker_id, &_hash_seed, obj)) {
582 if (_cm->verbose_medium()) {
583- gclog_or_tty->print_cr("[%u] stolen "PTR_FORMAT" successfully",
584+ gclog_or_tty->print_cr("[%u] stolen " PTR_FORMAT " successfully",
585 _worker_id, p2i((void*) obj));
586 }
587
588@@ -4629,7 +4629,7 @@ CMTask::CMTask(uint worker_id,
589 // identify them easily in a large log file.
590 #define G1PPRL_LINE_PREFIX "###"
591
592-#define G1PPRL_ADDR_BASE_FORMAT " "PTR_FORMAT"-"PTR_FORMAT
593+#define G1PPRL_ADDR_BASE_FORMAT " " PTR_FORMAT "-" PTR_FORMAT
594 #ifdef _LP64
595 #define G1PPRL_ADDR_BASE_H_FORMAT " %37s"
596 #else // _LP64
597@@ -4639,16 +4639,16 @@ CMTask::CMTask(uint worker_id,
598 // For per-region info
599 #define G1PPRL_TYPE_FORMAT " %-4s"
600 #define G1PPRL_TYPE_H_FORMAT " %4s"
601-#define G1PPRL_BYTE_FORMAT " "SIZE_FORMAT_W(9)
602+#define G1PPRL_BYTE_FORMAT " " SIZE_FORMAT_W(9)
603 #define G1PPRL_BYTE_H_FORMAT " %9s"
604 #define G1PPRL_DOUBLE_FORMAT " %14.1f"
605 #define G1PPRL_DOUBLE_H_FORMAT " %14s"
606
607 // For summary info
608-#define G1PPRL_SUM_ADDR_FORMAT(tag) " "tag":"G1PPRL_ADDR_BASE_FORMAT
609-#define G1PPRL_SUM_BYTE_FORMAT(tag) " "tag": "SIZE_FORMAT
610-#define G1PPRL_SUM_MB_FORMAT(tag) " "tag": %1.2f MB"
611-#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag)" / %1.2f %%"
612+#define G1PPRL_SUM_ADDR_FORMAT(tag) " " tag ":" G1PPRL_ADDR_BASE_FORMAT
613+#define G1PPRL_SUM_BYTE_FORMAT(tag) " " tag ": " SIZE_FORMAT
614+#define G1PPRL_SUM_MB_FORMAT(tag) " " tag ": %1.2f MB"
615+#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag) " / %1.2f %%"
616
617 G1PrintRegionLivenessInfoClosure::
618 G1PrintRegionLivenessInfoClosure(outputStream* out, const char* phase_name)
619--- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp.orig
620+++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
621@@ -196,8 +196,8 @@ inline bool CMBitMapRO::iterate(BitMapCl
622 assert(_bmStartWord <= (addr) && (addr) < (_bmStartWord + _bmWordSize), \
623 "outside underlying space?"); \
624 assert(G1CollectedHeap::heap()->is_in_exact(addr), \
625- err_msg("Trying to access not available bitmap "PTR_FORMAT \
626- " corresponding to "PTR_FORMAT" (%u)", \
627+ err_msg("Trying to access not available bitmap " PTR_FORMAT \
628+ " corresponding to " PTR_FORMAT " (%u)", \
629 p2i(this), p2i(addr), G1CollectedHeap::heap()->addr_to_region(addr)));
630
631 inline void CMBitMap::mark(HeapWord* addr) {
632@@ -343,7 +343,7 @@ inline void CMTask::make_reference_grey(
633
634 inline void CMTask::deal_with_reference(oop obj) {
635 if (_cm->verbose_high()) {
636- 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,
638 _worker_id, p2i((void*) obj));
639 }
640
641@@ -392,7 +392,7 @@ inline void ConcurrentMark::grayRoot(oop
642 // assert that word_size is under an upper bound which is its
643 // containing region's capacity.
644 assert(word_size * HeapWordSize <= hr->capacity(),
645- err_msg("size: "SIZE_FORMAT" capacity: "SIZE_FORMAT" "HR_FORMAT,
646+ err_msg("size: " SIZE_FORMAT " capacity: " SIZE_FORMAT " " HR_FORMAT,
647 word_size * HeapWordSize, hr->capacity(),
648 HR_FORMAT_PARAMS(hr)));
649
650--- hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp.orig
651+++ hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp
652@@ -140,7 +140,7 @@ HeapWord* G1AllocRegion::new_alloc_regio
653 }
654
655 void G1AllocRegion::fill_in_ext_msg(ar_ext_msg* msg, const char* message) {
656- 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,
658 _name, message, _count, BOOL_TO_STR(_bot_updates),
659 p2i(_alloc_region), _used_bytes_before);
660 }
661@@ -217,7 +217,7 @@ void G1AllocRegion::trace(const char* st
662
663 if (G1_ALLOC_REGION_TRACING > 1) {
664 if (result != NULL) {
665- jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT" "PTR_FORMAT,
666+ jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT " " PTR_FORMAT,
667 word_size, result);
668 } else if (word_size != 0) {
669 jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT, word_size);
670--- hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp.orig
671+++ hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp
672@@ -73,7 +73,7 @@ public:
673
674 void decrease_used(size_t bytes) {
675 assert(_summary_bytes_used >= bytes,
676- err_msg("invariant: _summary_bytes_used: "SIZE_FORMAT" should be >= bytes: "SIZE_FORMAT,
677+ err_msg("invariant: _summary_bytes_used: " SIZE_FORMAT " should be >= bytes: " SIZE_FORMAT,
678 _summary_bytes_used, bytes));
679 _summary_bytes_used -= bytes;
680 }
681--- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp.orig
682+++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp
683@@ -385,11 +385,11 @@ G1BlockOffsetArray::verify_for_object(He
684 HeapWord* card_addr = _array->address_for_index(card);
685 HeapWord* block_start = block_start_const(card_addr);
686 if (block_start != obj_start) {
687- gclog_or_tty->print_cr("block start: "PTR_FORMAT" is incorrect - "
688- "card index: "SIZE_FORMAT" "
689- "card addr: "PTR_FORMAT" BOT entry: %u "
690- "obj: "PTR_FORMAT" word size: "SIZE_FORMAT" "
691- "cards: ["SIZE_FORMAT","SIZE_FORMAT"]",
692+ gclog_or_tty->print_cr("block start: " PTR_FORMAT " is incorrect - "
693+ "card index: " SIZE_FORMAT " "
694+ "card addr: " PTR_FORMAT " BOT entry: %u "
695+ "obj: " PTR_FORMAT " word size: " SIZE_FORMAT " "
696+ "cards: [" SIZE_FORMAT "," SIZE_FORMAT "]",
697 block_start, card, card_addr,
698 _array->offset_array(card),
699 obj_start, word_size, first_card, last_card);
700@@ -404,11 +404,11 @@ void
701 G1BlockOffsetArray::print_on(outputStream* out) {
702 size_t from_index = _array->index_for(_bottom);
703 size_t to_index = _array->index_for(_end);
704- out->print_cr(">> BOT for area ["PTR_FORMAT","PTR_FORMAT") "
705- "cards ["SIZE_FORMAT","SIZE_FORMAT")",
706+ out->print_cr(">> BOT for area [" PTR_FORMAT "," PTR_FORMAT ") "
707+ "cards [" SIZE_FORMAT "," SIZE_FORMAT ")",
708 _bottom, _end, from_index, to_index);
709 for (size_t i = from_index; i < to_index; ++i) {
710- out->print_cr(" entry "SIZE_FORMAT_W(8)" | "PTR_FORMAT" : %3u",
711+ out->print_cr(" entry " SIZE_FORMAT_W(8) " | " PTR_FORMAT " : %3u",
712 i, _array->address_for_index(i),
713 (uint) _array->offset_array(i));
714 }
715@@ -488,7 +488,7 @@ G1BlockOffsetArrayContigSpace::set_for_s
716 void
717 G1BlockOffsetArrayContigSpace::print_on(outputStream* out) {
718 G1BlockOffsetArray::print_on(out);
719- out->print_cr(" next offset threshold: "PTR_FORMAT, _next_offset_threshold);
720- out->print_cr(" next offset index: "SIZE_FORMAT, _next_offset_index);
721+ out->print_cr(" next offset threshold: " PTR_FORMAT, _next_offset_threshold);
722+ out->print_cr(" next offset index: " SIZE_FORMAT, _next_offset_index);
723 }
724 #endif // !PRODUCT
725--- hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp.orig
726+++ hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp
727@@ -47,15 +47,15 @@ G1BlockOffsetTable::block_start_const(co
728 }
729 }
730
731-#define check_index(index, msg) \
732- assert((index) < (_reserved.word_size() >> LogN_words), \
733- err_msg("%s - index: "SIZE_FORMAT", _vs.committed_size: "SIZE_FORMAT, \
734- msg, (index), (_reserved.word_size() >> LogN_words))); \
735- assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \
736- err_msg("Index "SIZE_FORMAT" corresponding to "PTR_FORMAT \
737- " (%u) is not in committed area.", \
738- (index), \
739- p2i(address_for_index_raw(index)), \
740+#define check_index(index, msg) \
741+ assert((index) < (_reserved.word_size() >> LogN_words), \
742+ err_msg("%s - index: " SIZE_FORMAT ", _vs.committed_size: " SIZE_FORMAT, \
743+ msg, (index), (_reserved.word_size() >> LogN_words))); \
744+ assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \
745+ err_msg("Index " SIZE_FORMAT " corresponding to " PTR_FORMAT \
746+ " (%u) is not in committed area.", \
747+ (index), \
748+ p2i(address_for_index_raw(index)), \
749 G1CollectedHeap::heap()->addr_to_region(address_for_index_raw(index))));
750
751 u_char G1BlockOffsetSharedArray::offset_array(size_t index) const {
752--- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp.orig
753+++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp
754@@ -44,7 +44,7 @@ void G1CardCountsMappingChangedListener:
755 void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) {
756 if (has_count_table()) {
757 assert(from_card_num < to_card_num,
758- err_msg("Wrong order? from: " SIZE_FORMAT ", to: "SIZE_FORMAT,
759+ err_msg("Wrong order? from: " SIZE_FORMAT ", to: " SIZE_FORMAT,
760 from_card_num, to_card_num));
761 Copy::fill_to_bytes(&_card_counts[from_card_num], (to_card_num - from_card_num));
762 }
763@@ -87,7 +87,7 @@ uint G1CardCounts::add_card_count(jbyte*
764 if (has_count_table()) {
765 size_t card_num = ptr_2_card_num(card_ptr);
766 assert(card_num < _reserved_max_card_num,
767- err_msg("Card "SIZE_FORMAT" outside of card counts table (max size "SIZE_FORMAT")",
768+ err_msg("Card " SIZE_FORMAT " outside of card counts table (max size " SIZE_FORMAT ")",
769 card_num, _reserved_max_card_num));
770 count = (uint) _card_counts[card_num];
771 if (count < G1ConcRSHotCardLimit) {
772--- hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp.orig
773+++ hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp
774@@ -91,7 +91,7 @@ class G1CardCounts: public CHeapObj<mtGC
775
776 jbyte* card_num_2_ptr(size_t card_num) {
777 assert(card_num >= 0 && card_num < _reserved_max_card_num,
778- err_msg("card num out of range: "SIZE_FORMAT, card_num));
779+ err_msg("card num out of range: " SIZE_FORMAT, card_num));
780 return (jbyte*) (_ct_bot + card_num);
781 }
782
783--- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.orig
784+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
785@@ -230,7 +230,7 @@ bool YoungList::check_list_well_formed()
786 HeapRegion* last = NULL;
787 while (curr != NULL) {
788 if (!curr->is_young()) {
789- gclog_or_tty->print_cr("### YOUNG REGION "PTR_FORMAT"-"PTR_FORMAT" "
790+ gclog_or_tty->print_cr("### YOUNG REGION " PTR_FORMAT "-" PTR_FORMAT " "
791 "incorrectly tagged (y: %d, surv: %d)",
792 curr->bottom(), curr->end(),
793 curr->is_young(), curr->is_survivor());
794@@ -359,7 +359,7 @@ void YoungList::print() {
795 if (curr == NULL)
796 gclog_or_tty->print_cr(" empty");
797 while (curr != NULL) {
798- gclog_or_tty->print_cr(" "HR_FORMAT", P: "PTR_FORMAT ", N: "PTR_FORMAT", age: %4d",
799+ gclog_or_tty->print_cr(" " HR_FORMAT ", P: " PTR_FORMAT ", N: " PTR_FORMAT ", age: %4d",
800 HR_FORMAT_PARAMS(curr),
801 curr->prev_top_at_mark_start(),
802 curr->next_top_at_mark_start(),
803@@ -490,7 +490,7 @@ void G1CollectedHeap::check_ct_logs_at_s
804 gclog_or_tty->print_cr("Log entries = %d, dirty cards = %d.",
805 clear.num_processed(), orig_count);
806 guarantee(redirty.num_processed() == clear.num_processed(),
807- err_msg("Redirtied "SIZE_FORMAT" cards, bug cleared "SIZE_FORMAT,
808+ err_msg("Redirtied " SIZE_FORMAT " cards, bug cleared " SIZE_FORMAT,
809 redirty.num_processed(), clear.num_processed()));
810
811 CountNonCleanMemRegionClosure count3(this);
812@@ -528,7 +528,7 @@ G1CollectedHeap::new_region_try_secondar
813 HeapRegion* res = _hrm.allocate_free_region(is_old);
814 if (G1ConcRegionFreeingVerbose) {
815 gclog_or_tty->print_cr("G1ConcRegionFreeing [region alloc] : "
816- "allocated "HR_FORMAT" from secondary_free_list",
817+ "allocated " HR_FORMAT " from secondary_free_list",
818 HR_FORMAT_PARAMS(res));
819 }
820 return res;
821@@ -1597,8 +1597,8 @@ resize_if_necessary_after_full_collectio
822 // This assert only makes sense here, before we adjust them
823 // with respect to the min and max heap size.
824 assert(minimum_desired_capacity <= maximum_desired_capacity,
825- err_msg("minimum_desired_capacity = "SIZE_FORMAT", "
826- "maximum_desired_capacity = "SIZE_FORMAT,
827+ err_msg("minimum_desired_capacity = " SIZE_FORMAT ", "
828+ "maximum_desired_capacity = " SIZE_FORMAT,
829 minimum_desired_capacity, maximum_desired_capacity));
830
831 // Should not be greater than the heap max size. No need to adjust
832@@ -2256,7 +2256,7 @@ public:
833 virtual bool doHeapRegion(HeapRegion* hr) {
834 unsigned region_gc_time_stamp = hr->get_gc_time_stamp();
835 if (_gc_time_stamp != region_gc_time_stamp) {
836- gclog_or_tty->print_cr("Region "HR_FORMAT" has GC time stamp = %d, "
837+ gclog_or_tty->print_cr("Region " HR_FORMAT " has GC time stamp = %d, "
838 "expected %d", HR_FORMAT_PARAMS(hr),
839 region_gc_time_stamp, _gc_time_stamp);
840 _failures = true;
841@@ -2679,7 +2679,7 @@ public:
842 } else if (r->continuesHumongous()) {
843 if (r->humongous_start_region() != _sh_region) {
844 gclog_or_tty->print_cr("Region " HR_FORMAT ", "
845- "HS = "PTR_FORMAT", should be "PTR_FORMAT,
846+ "HS = " PTR_FORMAT ", should be " PTR_FORMAT,
847 HR_FORMAT_PARAMS(r),
848 r->humongous_start_region(),
849 _sh_region);
850@@ -2991,10 +2991,10 @@ public:
851 if (!oopDesc::is_null(heap_oop)) {
852 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
853 if (_g1h->is_obj_dead_cond(obj, _vo)) {
854- gclog_or_tty->print_cr("Root location "PTR_FORMAT" "
855- "points to dead obj "PTR_FORMAT, p, (void*) obj);
856+ gclog_or_tty->print_cr("Root location " PTR_FORMAT " "
857+ "points to dead obj " PTR_FORMAT, p, (void*) obj);
858 if (_vo == VerifyOption_G1UseMarkWord) {
859- gclog_or_tty->print_cr(" Mark word: "PTR_FORMAT, (void*)(obj->mark()));
860+ gclog_or_tty->print_cr(" Mark word: " PTR_FORMAT, (void*)(obj->mark()));
861 }
862 obj->print_on(gclog_or_tty);
863 _failures = true;
864@@ -3041,9 +3041,9 @@ class G1VerifyCodeRootOopClosure: public
865 // Verify that the strong code root list for this region
866 // contains the nmethod
867 if (!hrrs->strong_code_roots_list_contains(_nm)) {
868- gclog_or_tty->print_cr("Code root location "PTR_FORMAT" "
869- "from nmethod "PTR_FORMAT" not in strong "
870- "code roots for region ["PTR_FORMAT","PTR_FORMAT")",
871+ gclog_or_tty->print_cr("Code root location " PTR_FORMAT " "
872+ "from nmethod " PTR_FORMAT " not in strong "
873+ "code roots for region [" PTR_FORMAT "," PTR_FORMAT ")",
874 p, _nm, hr->bottom(), hr->end());
875 _failures = true;
876 }
877@@ -3173,7 +3173,7 @@ public:
878 if (o != NULL) {
879 HeapWord *start = (HeapWord *) o;
880 size_t word_sz = o->size();
881- gclog_or_tty->print("\nPrinting obj "PTR_FORMAT" of size " SIZE_FORMAT
882+ gclog_or_tty->print("\nPrinting obj " PTR_FORMAT " of size " SIZE_FORMAT
883 " isMarkedPrev %d isMarkedNext %d isAllocSince %d\n",
884 (void*) o, word_sz,
885 _g1->isMarkedPrev(o),
886@@ -3184,7 +3184,7 @@ public:
887 int *val;
888 for (cur = start; cur < end; cur++) {
889 val = (int *) cur;
890- gclog_or_tty->print("\t "PTR_FORMAT":"PTR_FORMAT"\n", val, *val);
891+ gclog_or_tty->print("\t " PTR_FORMAT ":" PTR_FORMAT "\n", val, *val);
892 }
893 }
894 }
895@@ -3219,9 +3219,9 @@ public:
896 r->object_iterate(&not_dead_yet_cl);
897 if (_vo != VerifyOption_G1UseNextMarking) {
898 if (r->max_live_bytes() < not_dead_yet_cl.live_bytes()) {
899- gclog_or_tty->print_cr("["PTR_FORMAT","PTR_FORMAT"] "
900- "max_live_bytes "SIZE_FORMAT" "
901- "< calculated "SIZE_FORMAT,
902+ gclog_or_tty->print_cr("[" PTR_FORMAT "," PTR_FORMAT "] "
903+ "max_live_bytes " SIZE_FORMAT " "
904+ "< calculated " SIZE_FORMAT,
905 r->bottom(), r->end(),
906 r->max_live_bytes(),
907 not_dead_yet_cl.live_bytes());
908@@ -3533,7 +3533,7 @@ public:
909 size_t occupied = hrrs->occupied();
910 _occupied_sum += occupied;
911
912- gclog_or_tty->print_cr("Printing RSet for region "HR_FORMAT,
913+ gclog_or_tty->print_cr("Printing RSet for region " HR_FORMAT,
914 HR_FORMAT_PARAMS(r));
915 if (occupied == 0) {
916 gclog_or_tty->print_cr(" RSet is empty");
917@@ -3552,7 +3552,7 @@ public:
918 }
919
920 ~PrintRSetsClosure() {
921- gclog_or_tty->print_cr("Occupied Sum: "SIZE_FORMAT, _occupied_sum);
922+ gclog_or_tty->print_cr("Occupied Sum: " SIZE_FORMAT, _occupied_sum);
923 gclog_or_tty->print_cr("========================================");
924 gclog_or_tty->cr();
925 }
926@@ -4416,7 +4416,7 @@ oop
927 G1CollectedHeap::handle_evacuation_failure_par(G1ParScanThreadState* _par_scan_state,
928 oop old) {
929 assert(obj_in_cs(old),
930- err_msg("obj: "PTR_FORMAT" should still be in the CSet",
931+ err_msg("obj: " PTR_FORMAT " should still be in the CSet",
932 (HeapWord*) old));
933 markOop m = old->mark();
934 oop forward_ptr = old->forward_to_atomic(old);
935@@ -4450,7 +4450,7 @@ G1CollectedHeap::handle_evacuation_failu
936 // space for this object (old != forward_ptr) or they beat us in
937 // self-forwarding it (old == forward_ptr).
938 assert(old == forward_ptr || !obj_in_cs(forward_ptr),
939- err_msg("obj: "PTR_FORMAT" forwarded to: "PTR_FORMAT" "
940+ err_msg("obj: " PTR_FORMAT " forwarded to: " PTR_FORMAT " "
941 "should not be in the CSet",
942 (HeapWord*) old, (HeapWord*) forward_ptr));
943 return forward_ptr;
944@@ -4837,16 +4837,16 @@ public:
945
946 ~G1StringSymbolTableUnlinkTask() {
947 guarantee(!_process_strings || !_do_in_parallel || StringTable::parallel_claimed_index() >= _initial_string_table_size,
948- err_msg("claim value "INT32_FORMAT" after unlink less than initial string table size "INT32_FORMAT,
949+ err_msg("claim value " INT32_FORMAT " after unlink less than initial string table size " INT32_FORMAT,
950 StringTable::parallel_claimed_index(), _initial_string_table_size));
951 guarantee(!_process_symbols || !_do_in_parallel || SymbolTable::parallel_claimed_index() >= _initial_symbol_table_size,
952- 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,
954 SymbolTable::parallel_claimed_index(), _initial_symbol_table_size));
955
956 if (G1TraceStringSymbolTableScrubbing) {
957 gclog_or_tty->print_cr("Cleaned string and symbol table, "
958- "strings: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed, "
959- "symbols: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed",
960+ "strings: " SIZE_FORMAT " processed, " SIZE_FORMAT " removed, "
961+ "symbols: " SIZE_FORMAT " processed, " SIZE_FORMAT " removed",
962 strings_processed(), strings_removed(),
963 symbols_processed(), symbols_removed());
964 }
965@@ -6029,13 +6029,13 @@ void G1CollectedHeap::verify_dirty_young
966 bool G1CollectedHeap::verify_no_bits_over_tams(const char* bitmap_name, CMBitMapRO* bitmap,
967 HeapWord* tams, HeapWord* end) {
968 guarantee(tams <= end,
969- err_msg("tams: "PTR_FORMAT" end: "PTR_FORMAT, tams, end));
970+ err_msg("tams: " PTR_FORMAT " end: " PTR_FORMAT, tams, end));
971 HeapWord* result = bitmap->getNextMarkedWordAddress(tams, end);
972 if (result < end) {
973 gclog_or_tty->cr();
974- gclog_or_tty->print_cr("## wrong marked address on %s bitmap: "PTR_FORMAT,
975+ gclog_or_tty->print_cr("## wrong marked address on %s bitmap: " PTR_FORMAT,
976 bitmap_name, result);
977- gclog_or_tty->print_cr("## %s tams: "PTR_FORMAT" end: "PTR_FORMAT,
978+ gclog_or_tty->print_cr("## %s tams: " PTR_FORMAT " end: " PTR_FORMAT,
979 bitmap_name, tams, end);
980 return false;
981 }
982@@ -6061,7 +6061,7 @@ bool G1CollectedHeap::verify_bitmaps(con
983 res_n = verify_no_bits_over_tams("next", next_bitmap, ntams, end);
984 }
985 if (!res_p || !res_n) {
986- gclog_or_tty->print_cr("#### Bitmap verification failed for "HR_FORMAT,
987+ gclog_or_tty->print_cr("#### Bitmap verification failed for " HR_FORMAT,
988 HR_FORMAT_PARAMS(hr));
989 gclog_or_tty->print_cr("#### Caller: %s", caller);
990 return false;
991@@ -6373,7 +6373,7 @@ class G1FreeHumongousRegionClosure : pub
992 !r->rem_set()->is_empty()) {
993
994 if (G1TraceEagerReclaimHumongousObjects) {
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",
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",
997 region_idx,
998 obj->size()*HeapWordSize,
999 r->bottom(),
1000@@ -6395,7 +6395,7 @@ class G1FreeHumongousRegionClosure : pub
1001 r->bottom()));
1002
1003 if (G1TraceEagerReclaimHumongousObjects) {
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",
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",
1006 region_idx,
1007 obj->size()*HeapWordSize,
1008 r->bottom(),
1009@@ -6551,7 +6551,7 @@ public:
1010 NoYoungRegionsClosure() : _success(true) { }
1011 bool doHeapRegion(HeapRegion* r) {
1012 if (r->is_young()) {
1013- gclog_or_tty->print_cr("Region ["PTR_FORMAT", "PTR_FORMAT") tagged as young",
1014+ gclog_or_tty->print_cr("Region [" PTR_FORMAT ", " PTR_FORMAT ") tagged as young",
1015 r->bottom(), r->end());
1016 _success = false;
1017 }
1018@@ -6680,7 +6680,7 @@ void G1CollectedHeap::rebuild_region_set
1019 }
1020 assert(_allocator->used_unlocked() == recalculate_used(),
1021 err_msg("inconsistent _allocator->used_unlocked(), "
1022- "value: "SIZE_FORMAT" recalculated: "SIZE_FORMAT,
1023+ "value: " SIZE_FORMAT " recalculated: " SIZE_FORMAT,
1024 _allocator->used_unlocked(), recalculate_used()));
1025 }
1026
1027@@ -6901,8 +6901,8 @@ class RegisterNMethodOopClosure: public
1028 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
1029 HeapRegion* hr = _g1h->heap_region_containing(obj);
1030 assert(!hr->continuesHumongous(),
1031- err_msg("trying to add code root "PTR_FORMAT" in continuation of humongous region "HR_FORMAT
1032- " starting at "HR_FORMAT,
1033+ err_msg("trying to add code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT
1034+ " starting at " HR_FORMAT,
1035 _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
1036
1037 // HeapRegion::add_strong_code_root_locked() avoids adding duplicate entries.
1038@@ -6928,8 +6928,8 @@ class UnregisterNMethodOopClosure: publi
1039 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
1040 HeapRegion* hr = _g1h->heap_region_containing(obj);
1041 assert(!hr->continuesHumongous(),
1042- err_msg("trying to remove code root "PTR_FORMAT" in continuation of humongous region "HR_FORMAT
1043- " starting at "HR_FORMAT,
1044+ err_msg("trying to remove code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT
1045+ " starting at " HR_FORMAT,
1046 _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region())));
1047
1048 hr->remove_strong_code_root(_nm);
1049--- hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp.orig
1050+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
1051@@ -81,7 +81,7 @@ inline HeapRegion* G1CollectedHeap::regi
1052
1053 inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const {
1054 assert(is_in_reserved(addr),
1055- err_msg("Cannot calculate region index for address "PTR_FORMAT" that is outside of the heap ["PTR_FORMAT", "PTR_FORMAT")",
1056+ err_msg("Cannot calculate region index for address " PTR_FORMAT " that is outside of the heap [" PTR_FORMAT ", " PTR_FORMAT ")",
1057 p2i(addr), p2i(_reserved.start()), p2i(_reserved.end())));
1058 return (uint)(pointer_delta(addr, _reserved.start(), sizeof(uint8_t)) >> HeapRegion::LogOfHRGrainBytes);
1059 }
1060@@ -94,7 +94,7 @@ template <class T>
1061 inline HeapRegion* G1CollectedHeap::heap_region_containing_raw(const T addr) const {
1062 assert(addr != NULL, "invariant");
1063 assert(is_in_g1_reserved((const void*) addr),
1064- err_msg("Address "PTR_FORMAT" is outside of the heap ranging from ["PTR_FORMAT" to "PTR_FORMAT")",
1065+ err_msg("Address " PTR_FORMAT " is outside of the heap ranging from [" PTR_FORMAT " to " PTR_FORMAT ")",
1066 p2i((void*)addr), p2i(g1_reserved().start()), p2i(g1_reserved().end())));
1067 return _hrm.addr_to_region((HeapWord*) addr);
1068 }
1069--- hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp.orig
1070+++ hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
1071@@ -199,7 +199,7 @@ G1CollectorPolicy::G1CollectorPolicy() :
1072 const size_t region_size = HeapRegion::GrainWords;
1073 if (YoungPLABSize > region_size || OldPLABSize > region_size) {
1074 char buffer[128];
1075- jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most "SIZE_FORMAT,
1076+ jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most " SIZE_FORMAT,
1077 OldPLABSize > region_size ? "Old" : "Young", region_size);
1078 vm_exit_during_initialization(buffer);
1079 }
1080@@ -846,7 +846,7 @@ void G1CollectorPolicy::record_collectio
1081 update_survivors_policy();
1082
1083 assert(_g1->used() == _g1->recalculate_used(),
1084- err_msg("sanity, used: "SIZE_FORMAT" recalculate_used: "SIZE_FORMAT,
1085+ err_msg("sanity, used: " SIZE_FORMAT " recalculate_used: " SIZE_FORMAT,
1086 _g1->used(), _g1->recalculate_used()));
1087
1088 double s_w_t_ms = (start_time_sec - _stop_world_start) * 1000.0;
1089@@ -1231,10 +1231,10 @@ void G1CollectorPolicy::print_detailed_h
1090 (_young_list_target_length * HeapRegion::GrainBytes) - survivor_used_bytes_after_gc;
1091
1092 gclog_or_tty->print(
1093- " [Eden: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT") "
1094- "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" "
1095- "Heap: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"
1096- EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")]",
1097+ " [Eden: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->" EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ") "
1098+ "Survivors: " EXT_SIZE_FORMAT "->" EXT_SIZE_FORMAT " "
1099+ "Heap: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->"
1100+ EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")]",
1101 EXT_SIZE_PARAMS(_eden_used_bytes_before_gc),
1102 EXT_SIZE_PARAMS(_eden_capacity_bytes_before_gc),
1103 EXT_SIZE_PARAMS(eden_used_bytes_after_gc),
1104@@ -1851,7 +1851,7 @@ void G1CollectorPolicy::print_collection
1105 while (csr != NULL) {
1106 HeapRegion* next = csr->next_in_collection_set();
1107 assert(csr->in_collection_set(), "bad CS");
1108- st->print_cr(" "HR_FORMAT", P: "PTR_FORMAT "N: "PTR_FORMAT", age: %4d",
1109+ st->print_cr(" " HR_FORMAT ", P: " PTR_FORMAT "N: " PTR_FORMAT ", age: %4d",
1110 HR_FORMAT_PARAMS(csr),
1111 csr->prev_top_at_mark_start(), csr->next_top_at_mark_start(),
1112 csr->age_in_surv_rate_group_cond());
1113--- hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp.orig
1114+++ hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
1115@@ -121,15 +121,15 @@ public:
1116 // Single parameter format strings
1117 #define ergo_format_str(_name_) ", " _name_ ": %s"
1118 #define ergo_format_region(_name_) ", " _name_ ": %u regions"
1119-#define ergo_format_byte(_name_) ", " _name_ ": "SIZE_FORMAT" bytes"
1120+#define ergo_format_byte(_name_) ", " _name_ ": " SIZE_FORMAT " bytes"
1121 #define ergo_format_double(_name_) ", " _name_ ": %1.2f"
1122 #define ergo_format_perc(_name_) ", " _name_ ": %1.2f %%"
1123 #define ergo_format_ms(_name_) ", " _name_ ": %1.2f ms"
1124-#define ergo_format_size(_name_) ", " _name_ ": "SIZE_FORMAT
1125+#define ergo_format_size(_name_) ", " _name_ ": " SIZE_FORMAT
1126
1127 // Double parameter format strings
1128 #define ergo_format_byte_perc(_name_) \
1129- ", " _name_ ": "SIZE_FORMAT" bytes (%1.2f %%)"
1130+ ", " _name_ ": " SIZE_FORMAT " bytes (%1.2f %%)"
1131
1132 // Generates the format string
1133 #define ergo_format(_extra_format_) \
1134--- hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp.orig
1135+++ hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp
1136@@ -332,7 +332,7 @@ void G1GCPhaseTimes::print_stats(int lev
1137 }
1138
1139 void G1GCPhaseTimes::print_stats(int level, const char* str, size_t value) {
1140- LineBuffer(level).append_and_print_cr("[%s: "SIZE_FORMAT"]", str, value);
1141+ LineBuffer(level).append_and_print_cr("[%s: " SIZE_FORMAT "]", str, value);
1142 }
1143
1144 void G1GCPhaseTimes::print_stats(int level, const char* str, double value, uint workers) {
1145@@ -452,7 +452,7 @@ class G1GCParPhasePrinter : public Stack
1146
1147 if (phase->_thread_work_items != NULL) {
1148 LineBuffer buf2(phase->_thread_work_items->_indent_level);
1149- 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));
1151 }
1152 }
1153
1154--- hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp.orig
1155+++ hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp
1156@@ -84,18 +84,18 @@ void G1HRPrinter::print(ActionType actio
1157
1158 if (type_str != NULL) {
1159 if (top != NULL) {
1160- gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT" "PTR_FORMAT,
1161+ gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT " " PTR_FORMAT,
1162 action_str, type_str, bottom, top);
1163 } else {
1164- gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT,
1165+ gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT,
1166 action_str, type_str, bottom);
1167 }
1168 } else {
1169 if (top != NULL) {
1170- gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT" "PTR_FORMAT,
1171+ gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT " " PTR_FORMAT,
1172 action_str, bottom, top);
1173 } else {
1174- gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT,
1175+ gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT,
1176 action_str, bottom);
1177 }
1178 }
1179@@ -104,11 +104,11 @@ void G1HRPrinter::print(ActionType actio
1180 void G1HRPrinter::print(ActionType action, HeapWord* bottom, HeapWord* end) {
1181 const char* action_str = action_name(action);
1182
1183- 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 "]",
1185 action_str, bottom, end);
1186 }
1187
1188 void G1HRPrinter::print(PhaseType phase, size_t phase_num) {
1189 const char* phase_str = phase_name(phase);
1190- 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);
1192 }
1193--- hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp.orig
1194+++ hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
1195@@ -118,7 +118,7 @@ inline void G1CMOopClosure::do_oop_nv(T*
1196 oop obj = oopDesc::load_decode_heap_oop(p);
1197 if (_cm->verbose_high()) {
1198 gclog_or_tty->print_cr("[%u] we're looking at location "
1199- "*"PTR_FORMAT" = "PTR_FORMAT,
1200+ "*" PTR_FORMAT " = " PTR_FORMAT,
1201 _task->worker_id(), p2i(p), p2i((void*) obj));
1202 }
1203 _task->deal_with_reference(obj);
1204--- hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp.orig
1205+++ hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
1206@@ -442,7 +442,7 @@ G1UpdateRSOrPushRefOopClosure(G1Collecte
1207 bool G1RemSet::refine_card(jbyte* card_ptr, uint worker_i,
1208 bool check_for_refs_into_cset) {
1209 assert(_g1->is_in_exact(_ct_bs->addr_for(card_ptr)),
1210- err_msg("Card at "PTR_FORMAT" index "SIZE_FORMAT" representing heap at "PTR_FORMAT" (%u) must be in committed heap",
1211+ err_msg("Card at " PTR_FORMAT " index " SIZE_FORMAT " representing heap at " PTR_FORMAT " (%u) must be in committed heap",
1212 p2i(card_ptr),
1213 _ct_bs->index_for(_ct_bs->addr_for(card_ptr)),
1214 _ct_bs->addr_for(card_ptr),
1215--- hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp.orig
1216+++ hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp
1217@@ -344,16 +344,16 @@ public:
1218
1219 void G1RemSetSummary::print_on(outputStream* out) {
1220 out->print_cr("\n Recent concurrent refinement statistics");
1221- out->print_cr(" Processed "SIZE_FORMAT" cards",
1222+ out->print_cr(" Processed " SIZE_FORMAT " cards",
1223 num_concurrent_refined_cards());
1224- out->print_cr(" Of "SIZE_FORMAT" completed buffers:", num_processed_buf_total());
1225- out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) by concurrent RS threads.",
1226+ out->print_cr(" Of " SIZE_FORMAT " completed buffers:", num_processed_buf_total());
1227+ out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) by concurrent RS threads.",
1228 num_processed_buf_total(),
1229 percent_of(num_processed_buf_rs_threads(), num_processed_buf_total()));
1230- out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) by mutator threads.",
1231+ out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) by mutator threads.",
1232 num_processed_buf_mutator(),
1233 percent_of(num_processed_buf_mutator(), num_processed_buf_total()));
1234- out->print_cr(" Did "SIZE_FORMAT" coarsenings.", num_coarsenings());
1235+ out->print_cr(" Did " SIZE_FORMAT " coarsenings.", num_coarsenings());
1236 out->print_cr(" Concurrent RS threads times (s)");
1237 out->print(" ");
1238 for (uint i = 0; i < _num_vtimes; i++) {
1239--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp.orig
1240+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
1241@@ -151,7 +151,7 @@ void G1StringDedupQueue::unlink_or_oops_
1242 void G1StringDedupQueue::print_statistics(outputStream* st) {
1243 st->print_cr(
1244 " [Queue]\n"
1245- " [Dropped: "UINTX_FORMAT"]", _queue->_dropped);
1246+ " [Dropped: " UINTX_FORMAT "]", _queue->_dropped);
1247 }
1248
1249 void G1StringDedupQueue::verify() {
1250--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp.orig
1251+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp
1252@@ -80,8 +80,8 @@ void G1StringDedupStat::print_summary(ou
1253 st->stamp(PrintGCTimeStamps);
1254 st->print_cr(
1255 "[GC concurrent-string-deduplication, "
1256- G1_STRDEDUP_BYTES_FORMAT_NS"->"G1_STRDEDUP_BYTES_FORMAT_NS"("G1_STRDEDUP_BYTES_FORMAT_NS"), avg "
1257- G1_STRDEDUP_PERCENT_FORMAT_NS", "G1_STRDEDUP_TIME_FORMAT"]",
1258+ G1_STRDEDUP_BYTES_FORMAT_NS "->" G1_STRDEDUP_BYTES_FORMAT_NS "(" G1_STRDEDUP_BYTES_FORMAT_NS "), avg "
1259+ G1_STRDEDUP_PERCENT_FORMAT_NS ", " G1_STRDEDUP_TIME_FORMAT "]",
1260 G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes),
1261 G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes - last_stat._deduped_bytes),
1262 G1_STRDEDUP_BYTES_PARAM(last_stat._deduped_bytes),
1263@@ -135,22 +135,22 @@ void G1StringDedupStat::print_statistics
1264
1265 if (total) {
1266 st->print_cr(
1267- " [Total Exec: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT", Idle: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT", Blocked: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT"]",
1268+ " [Total Exec: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT ", Idle: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT ", Blocked: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT "]",
1269 stat._exec, stat._exec_elapsed, stat._idle, stat._idle_elapsed, stat._block, stat._block_elapsed);
1270 } else {
1271 st->print_cr(
1272- " [Last Exec: "G1_STRDEDUP_TIME_FORMAT", Idle: "G1_STRDEDUP_TIME_FORMAT", Blocked: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT"]",
1273+ " [Last Exec: " G1_STRDEDUP_TIME_FORMAT ", Idle: " G1_STRDEDUP_TIME_FORMAT ", Blocked: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT "]",
1274 stat._exec_elapsed, stat._idle_elapsed, stat._block, stat._block_elapsed);
1275 }
1276 st->print_cr(
1277- " [Inspected: "G1_STRDEDUP_OBJECTS_FORMAT"]\n"
1278- " [Skipped: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n"
1279- " [Hashed: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n"
1280- " [Known: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n"
1281- " [New: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"]\n"
1282- " [Deduplicated: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n"
1283- " [Young: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n"
1284- " [Old: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]",
1285+ " [Inspected: " G1_STRDEDUP_OBJECTS_FORMAT "]\n"
1286+ " [Skipped: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n"
1287+ " [Hashed: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n"
1288+ " [Known: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n"
1289+ " [New: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "]\n"
1290+ " [Deduplicated: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n"
1291+ " [Young: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n"
1292+ " [Old: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]",
1293 stat._inspected,
1294 stat._skipped, skipped_percent,
1295 stat._hashed, hashed_percent,
1296--- hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp.orig
1297+++ hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
1298@@ -596,12 +596,12 @@ void G1StringDedupTable::clean_entry_cac
1299 void G1StringDedupTable::print_statistics(outputStream* st) {
1300 st->print_cr(
1301 " [Table]\n"
1302- " [Memory Usage: "G1_STRDEDUP_BYTES_FORMAT_NS"]\n"
1303- " [Size: "SIZE_FORMAT", Min: "SIZE_FORMAT", Max: "SIZE_FORMAT"]\n"
1304- " [Entries: "UINTX_FORMAT", Load: "G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " UINTX_FORMAT ", Added: "UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n"
1305- " [Resize Count: "UINTX_FORMAT", Shrink Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS"), Grow Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS")]\n"
1306- " [Rehash Count: "UINTX_FORMAT", Rehash Threshold: "UINTX_FORMAT", Hash Seed: 0x%x]\n"
1307- " [Age Threshold: "UINTX_FORMAT"]",
1308+ " [Memory Usage: " G1_STRDEDUP_BYTES_FORMAT_NS "]\n"
1309+ " [Size: " SIZE_FORMAT ", Min: " SIZE_FORMAT ", Max: " SIZE_FORMAT "]\n"
1310+ " [Entries: " UINTX_FORMAT ", Load: " G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " UINTX_FORMAT ", Added: " UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n"
1311+ " [Resize Count: " UINTX_FORMAT ", Shrink Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS "), Grow Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS ")]\n"
1312+ " [Rehash Count: " UINTX_FORMAT ", Rehash Threshold: " UINTX_FORMAT ", Hash Seed: 0x%x]\n"
1313+ " [Age Threshold: " UINTX_FORMAT "]",
1314 G1_STRDEDUP_BYTES_PARAM(_table->_size * sizeof(G1StringDedupEntry*) + (_table->_entries + _entry_cache->size()) * sizeof(G1StringDedupEntry)),
1315 _table->_size, _min_size, _max_size,
1316 _table->_entries, (double)_table->_entries / (double)_table->_size * 100.0, _entry_cache->size(), _entries_added, _entries_removed,
1317--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp.orig
1318+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
1319@@ -333,7 +333,7 @@ void HeapRegion::note_self_forwarding_re
1320 bool during_conc_mark,
1321 size_t marked_bytes) {
1322 assert(0 <= marked_bytes && marked_bytes <= used(),
1323- err_msg("marked: "SIZE_FORMAT" used: "SIZE_FORMAT,
1324+ err_msg("marked: " SIZE_FORMAT " used: " SIZE_FORMAT,
1325 marked_bytes, used()));
1326 _prev_top_at_mark_start = top();
1327 _prev_marked_bytes = marked_bytes;
1328@@ -514,9 +514,9 @@ class VerifyStrongCodeRootOopClosure: pu
1329 // Object is in the region. Check that its less than top
1330 if (_hr->top() <= (HeapWord*)obj) {
1331 // Object is above top
1332- gclog_or_tty->print_cr("Object "PTR_FORMAT" in region "
1333- "["PTR_FORMAT", "PTR_FORMAT") is above "
1334- "top "PTR_FORMAT,
1335+ gclog_or_tty->print_cr("Object " PTR_FORMAT " in region "
1336+ "[" PTR_FORMAT ", " PTR_FORMAT ") is above "
1337+ "top " PTR_FORMAT,
1338 (void *)obj, _hr->bottom(), _hr->end(), _hr->top());
1339 _failures = true;
1340 return;
1341@@ -550,22 +550,22 @@ public:
1342 if (nm != NULL) {
1343 // Verify that the nemthod is live
1344 if (!nm->is_alive()) {
1345- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has dead nmethod "
1346- PTR_FORMAT" in its strong code roots",
1347+ gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has dead nmethod "
1348+ PTR_FORMAT " in its strong code roots",
1349 _hr->bottom(), _hr->end(), nm);
1350 _failures = true;
1351 } else {
1352 VerifyStrongCodeRootOopClosure oop_cl(_hr, nm);
1353 nm->oops_do(&oop_cl);
1354 if (!oop_cl.has_oops_in_region()) {
1355- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has nmethod "
1356- PTR_FORMAT" in its strong code roots "
1357+ gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has nmethod "
1358+ PTR_FORMAT " in its strong code roots "
1359 "with no pointers into region",
1360 _hr->bottom(), _hr->end(), nm);
1361 _failures = true;
1362 } else if (oop_cl.failures()) {
1363- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has other "
1364- "failures for nmethod "PTR_FORMAT,
1365+ gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has other "
1366+ "failures for nmethod " PTR_FORMAT,
1367 _hr->bottom(), _hr->end(), nm);
1368 _failures = true;
1369 }
1370@@ -599,8 +599,8 @@ void HeapRegion::verify_strong_code_root
1371 // on its strong code root list
1372 if (is_empty()) {
1373 if (strong_code_roots_length > 0) {
1374- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is empty "
1375- "but has "SIZE_FORMAT" code root entries",
1376+ gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] is empty "
1377+ "but has " SIZE_FORMAT " code root entries",
1378 bottom(), end(), strong_code_roots_length);
1379 *failures = true;
1380 }
1381@@ -609,8 +609,8 @@ void HeapRegion::verify_strong_code_root
1382
1383 if (continuesHumongous()) {
1384 if (strong_code_roots_length > 0) {
1385- gclog_or_tty->print_cr("region "HR_FORMAT" is a continuation of a humongous "
1386- "region but has "SIZE_FORMAT" code root entries",
1387+ gclog_or_tty->print_cr("region " HR_FORMAT " is a continuation of a humongous "
1388+ "region but has " SIZE_FORMAT " code root entries",
1389 HR_FORMAT_PARAMS(this), strong_code_roots_length);
1390 *failures = true;
1391 }
1392@@ -634,7 +634,7 @@ void HeapRegion::print_on(outputStream*
1393 else
1394 st->print(" ");
1395 st->print(" TS %5d", _gc_time_stamp);
1396- st->print(" PTAMS "PTR_FORMAT" NTAMS "PTR_FORMAT,
1397+ st->print(" PTAMS " PTR_FORMAT " NTAMS " PTR_FORMAT,
1398 prev_top_at_mark_start(), next_top_at_mark_start());
1399 G1OffsetTableContigSpace::print_on(st);
1400 }
1401@@ -708,25 +708,25 @@ public:
1402 }
1403 if (!_g1h->is_in_closed_subset(obj)) {
1404 HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
1405- gclog_or_tty->print_cr("Field "PTR_FORMAT
1406- " of live obj "PTR_FORMAT" in region "
1407- "["PTR_FORMAT", "PTR_FORMAT")",
1408+ gclog_or_tty->print_cr("Field " PTR_FORMAT
1409+ " of live obj " PTR_FORMAT " in region "
1410+ "[" PTR_FORMAT ", " PTR_FORMAT ")",
1411 p, (void*) _containing_obj,
1412 from->bottom(), from->end());
1413 print_object(gclog_or_tty, _containing_obj);
1414- gclog_or_tty->print_cr("points to obj "PTR_FORMAT" not in the heap",
1415+ gclog_or_tty->print_cr("points to obj " PTR_FORMAT " not in the heap",
1416 (void*) obj);
1417 } else {
1418 HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p);
1419 HeapRegion* to = _g1h->heap_region_containing((HeapWord*)obj);
1420- gclog_or_tty->print_cr("Field "PTR_FORMAT
1421- " of live obj "PTR_FORMAT" in region "
1422- "["PTR_FORMAT", "PTR_FORMAT")",
1423+ gclog_or_tty->print_cr("Field " PTR_FORMAT
1424+ " of live obj " PTR_FORMAT " in region "
1425+ "[" PTR_FORMAT ", " PTR_FORMAT ")",
1426 p, (void*) _containing_obj,
1427 from->bottom(), from->end());
1428 print_object(gclog_or_tty, _containing_obj);
1429- gclog_or_tty->print_cr("points to dead obj "PTR_FORMAT" in region "
1430- "["PTR_FORMAT", "PTR_FORMAT")",
1431+ gclog_or_tty->print_cr("points to dead obj " PTR_FORMAT " in region "
1432+ "[" PTR_FORMAT ", " PTR_FORMAT ")",
1433 (void*) obj, to->bottom(), to->end());
1434 print_object(gclog_or_tty, obj);
1435 }
1436@@ -784,14 +784,14 @@ public:
1437 gclog_or_tty->print_cr("----------");
1438 }
1439 gclog_or_tty->print_cr("Missing rem set entry:");
1440- gclog_or_tty->print_cr("Field "PTR_FORMAT" "
1441- "of obj "PTR_FORMAT", "
1442- "in region "HR_FORMAT,
1443+ gclog_or_tty->print_cr("Field " PTR_FORMAT " "
1444+ "of obj " PTR_FORMAT ", "
1445+ "in region " HR_FORMAT,
1446 p, (void*) _containing_obj,
1447 HR_FORMAT_PARAMS(from));
1448 _containing_obj->print_on(gclog_or_tty);
1449- gclog_or_tty->print_cr("points to obj "PTR_FORMAT" "
1450- "in region "HR_FORMAT,
1451+ gclog_or_tty->print_cr("points to obj " PTR_FORMAT " "
1452+ "in region " HR_FORMAT,
1453 (void*) obj,
1454 HR_FORMAT_PARAMS(to));
1455 if (obj->is_oop()) {
1456@@ -830,8 +830,8 @@ void HeapRegion::verify(VerifyOption vo,
1457
1458 if (is_humongous != g1->isHumongous(obj_size) &&
1459 !g1->is_obj_dead(obj, this)) { // Dead objects may have bigger block_size since they span several objects.
1460- gclog_or_tty->print_cr("obj "PTR_FORMAT" is of %shumongous size ("
1461- SIZE_FORMAT" words) in a %shumongous region",
1462+ gclog_or_tty->print_cr("obj " PTR_FORMAT " is of %shumongous size ("
1463+ SIZE_FORMAT " words) in a %shumongous region",
1464 p, g1->isHumongous(obj_size) ? "" : "non-",
1465 obj_size, is_humongous ? "" : "non-");
1466 *failures = true;
1467@@ -854,12 +854,12 @@ void HeapRegion::verify(VerifyOption vo,
1468 (vo == VerifyOption_G1UsePrevMarking &&
1469 ClassLoaderDataGraph::unload_list_contains(klass));
1470 if (!is_metaspace_object) {
1471- gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" "
1472+ gclog_or_tty->print_cr("klass " PTR_FORMAT " of object " PTR_FORMAT " "
1473 "not metadata", klass, (void *)obj);
1474 *failures = true;
1475 return;
1476 } else if (!klass->is_klass()) {
1477- gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" "
1478+ gclog_or_tty->print_cr("klass " PTR_FORMAT " of object " PTR_FORMAT " "
1479 "not a klass", klass, (void *)obj);
1480 *failures = true;
1481 return;
1482@@ -891,7 +891,7 @@ void HeapRegion::verify(VerifyOption vo,
1483 }
1484 }
1485 } else {
1486- gclog_or_tty->print_cr(PTR_FORMAT" not an oop", (void *)obj);
1487+ gclog_or_tty->print_cr(PTR_FORMAT " not an oop", (void *)obj);
1488 *failures = true;
1489 return;
1490 }
1491@@ -901,8 +901,8 @@ void HeapRegion::verify(VerifyOption vo,
1492 }
1493
1494 if (p != top()) {
1495- gclog_or_tty->print_cr("end of last object "PTR_FORMAT" "
1496- "does not match top "PTR_FORMAT, p, top());
1497+ gclog_or_tty->print_cr("end of last object " PTR_FORMAT " "
1498+ "does not match top " PTR_FORMAT, p, top());
1499 *failures = true;
1500 return;
1501 }
1502@@ -917,8 +917,8 @@ void HeapRegion::verify(VerifyOption vo,
1503 HeapWord* addr_1 = p;
1504 HeapWord* b_start_1 = _offsets.block_start_const(addr_1);
1505 if (b_start_1 != p) {
1506- gclog_or_tty->print_cr("BOT look up for top: "PTR_FORMAT" "
1507- " yielded "PTR_FORMAT", expecting "PTR_FORMAT,
1508+ gclog_or_tty->print_cr("BOT look up for top: " PTR_FORMAT " "
1509+ " yielded " PTR_FORMAT ", expecting " PTR_FORMAT,
1510 addr_1, b_start_1, p);
1511 *failures = true;
1512 return;
1513@@ -929,8 +929,8 @@ void HeapRegion::verify(VerifyOption vo,
1514 if (addr_2 < the_end) {
1515 HeapWord* b_start_2 = _offsets.block_start_const(addr_2);
1516 if (b_start_2 != p) {
1517- gclog_or_tty->print_cr("BOT look up for top + 1: "PTR_FORMAT" "
1518- " yielded "PTR_FORMAT", expecting "PTR_FORMAT,
1519+ gclog_or_tty->print_cr("BOT look up for top + 1: " PTR_FORMAT " "
1520+ " yielded " PTR_FORMAT ", expecting " PTR_FORMAT,
1521 addr_2, b_start_2, p);
1522 *failures = true;
1523 return;
1524@@ -943,8 +943,8 @@ void HeapRegion::verify(VerifyOption vo,
1525 if (addr_3 < the_end) {
1526 HeapWord* b_start_3 = _offsets.block_start_const(addr_3);
1527 if (b_start_3 != p) {
1528- gclog_or_tty->print_cr("BOT look up for top + diff: "PTR_FORMAT" "
1529- " yielded "PTR_FORMAT", expecting "PTR_FORMAT,
1530+ gclog_or_tty->print_cr("BOT look up for top + diff: " PTR_FORMAT " "
1531+ " yielded " PTR_FORMAT ", expecting " PTR_FORMAT,
1532 addr_3, b_start_3, p);
1533 *failures = true;
1534 return;
1535@@ -955,8 +955,8 @@ void HeapRegion::verify(VerifyOption vo,
1536 HeapWord* addr_4 = the_end - 1;
1537 HeapWord* b_start_4 = _offsets.block_start_const(addr_4);
1538 if (b_start_4 != p) {
1539- gclog_or_tty->print_cr("BOT look up for end - 1: "PTR_FORMAT" "
1540- " yielded "PTR_FORMAT", expecting "PTR_FORMAT,
1541+ gclog_or_tty->print_cr("BOT look up for end - 1: " PTR_FORMAT " "
1542+ " yielded " PTR_FORMAT ", expecting " PTR_FORMAT,
1543 addr_4, b_start_4, p);
1544 *failures = true;
1545 return;
1546@@ -964,8 +964,8 @@ void HeapRegion::verify(VerifyOption vo,
1547 }
1548
1549 if (is_humongous && object_num > 1) {
1550- gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is humongous "
1551- "but has "SIZE_FORMAT", objects",
1552+ gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] is humongous "
1553+ "but has " SIZE_FORMAT ", objects",
1554 bottom(), end(), object_num);
1555 *failures = true;
1556 return;
1557--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp.orig
1558+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
1559@@ -52,7 +52,7 @@ class HeapRegion;
1560 class HeapRegionSetBase;
1561 class nmethod;
1562
1563-#define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]"
1564+#define HR_FORMAT "%u:(%s)[" PTR_FORMAT "," PTR_FORMAT "," PTR_FORMAT "]"
1565 #define HR_FORMAT_PARAMS(_hr_) \
1566 (_hr_)->hrm_index(), \
1567 (_hr_)->get_short_type_str(), \
1568@@ -534,8 +534,8 @@ class HeapRegion: public G1OffsetTableCo
1569 void set_containing_set(HeapRegionSetBase* containing_set) {
1570 assert((containing_set == NULL && _containing_set != NULL) ||
1571 (containing_set != NULL && _containing_set == NULL),
1572- err_msg("containing_set: "PTR_FORMAT" "
1573- "_containing_set: "PTR_FORMAT,
1574+ err_msg("containing_set: " PTR_FORMAT " "
1575+ "_containing_set: " PTR_FORMAT,
1576 p2i(containing_set), p2i(_containing_set)));
1577
1578 _containing_set = containing_set;
1579--- hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp.orig
1580+++ hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
1581@@ -112,7 +112,7 @@ HeapRegion::block_size(const HeapWord *a
1582
1583 assert(ClassUnloadingWithConcurrentMark,
1584 err_msg("All blocks should be objects if G1 Class Unloading isn't used. "
1585- "HR: ["PTR_FORMAT", "PTR_FORMAT", "PTR_FORMAT") "
1586+ "HR: [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ") "
1587 "addr: " PTR_FORMAT,
1588 p2i(bottom()), p2i(top()), p2i(end()), p2i(addr)));
1589
1590--- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp.orig
1591+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp
1592@@ -432,7 +432,7 @@ void HeapRegionManager::verify() {
1593 HeapRegion* hr = _regions.get_by_index(i);
1594 guarantee(hr != NULL, err_msg("invariant: i: %u", i));
1595 guarantee(!prev_committed || hr->bottom() == prev_end,
1596- err_msg("invariant i: %u "HR_FORMAT" prev_end: "PTR_FORMAT,
1597+ err_msg("invariant i: %u " HR_FORMAT " prev_end: " PTR_FORMAT,
1598 i, HR_FORMAT_PARAMS(hr), p2i(prev_end)));
1599 guarantee(hr->hrm_index() == i,
1600 err_msg("invariant: i: %u hrm_index(): %u", i, hr->hrm_index()));
1601--- hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp.orig
1602+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp
1603@@ -31,9 +31,9 @@
1604
1605 inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const {
1606 assert(addr < heap_end(),
1607- err_msg("addr: "PTR_FORMAT" end: "PTR_FORMAT, p2i(addr), p2i(heap_end())));
1608+ err_msg("addr: " PTR_FORMAT " end: " PTR_FORMAT, p2i(addr), p2i(heap_end())));
1609 assert(addr >= heap_bottom(),
1610- 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())));
1612
1613 HeapRegion* hr = _regions.get_by_address(addr);
1614 return hr;
1615--- hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.orig
1616+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
1617@@ -91,7 +91,7 @@ protected:
1618 // concurrency.
1619
1620 if (G1TraceHeapRegionRememberedSet) {
1621- 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 ").",
1623 from,
1624 UseCompressedOops
1625 ? (void *)oopDesc::load_decode_heap_oop((narrowOop*)from)
1626@@ -381,7 +381,7 @@ void FromCardCache::initialize(uint n_pa
1627
1628 void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) {
1629 guarantee((size_t)start_idx + new_num_regions <= max_uintx,
1630- err_msg("Trying to invalidate beyond maximum region, from %u size "SIZE_FORMAT,
1631+ err_msg("Trying to invalidate beyond maximum region, from %u size " SIZE_FORMAT,
1632 start_idx, new_num_regions));
1633 for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) {
1634 uint end_idx = (start_idx + (uint)new_num_regions);
1635@@ -396,7 +396,7 @@ void FromCardCache::invalidate(uint star
1636 void FromCardCache::print(outputStream* out) {
1637 for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) {
1638 for (uint j = 0; j < _max_regions; j++) {
1639- out->print_cr("_from_card_cache["UINT32_FORMAT"]["UINT32_FORMAT"] = "INT32_FORMAT".",
1640+ out->print_cr("_from_card_cache[" UINT32_FORMAT "][" UINT32_FORMAT "] = " INT32_FORMAT ".",
1641 i, j, at(i, j));
1642 }
1643 }
1644@@ -436,7 +436,7 @@ void OtherRegionsTable::add_reference(Oo
1645 int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift);
1646
1647 if (G1TraceHeapRegionRememberedSet) {
1648- 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 ")",
1650 hr()->bottom(), from_card,
1651 FromCardCache::at((uint)tid, cur_hrm_ind));
1652 }
1653@@ -642,13 +642,13 @@ void OtherRegionsTable::scrub(CardTableM
1654
1655 assert(_coarse_map.size() == region_bm->size(), "Precondition");
1656 if (G1RSScrubVerbose) {
1657- gclog_or_tty->print(" Coarse map: before = "SIZE_FORMAT"...",
1658+ gclog_or_tty->print(" Coarse map: before = " SIZE_FORMAT "...",
1659 _n_coarse_entries);
1660 }
1661 _coarse_map.set_intersection(*region_bm);
1662 _n_coarse_entries = _coarse_map.count_one_bits();
1663 if (G1RSScrubVerbose) {
1664- gclog_or_tty->print_cr(" after = "SIZE_FORMAT".", _n_coarse_entries);
1665+ gclog_or_tty->print_cr(" after = " SIZE_FORMAT ".", _n_coarse_entries);
1666 }
1667
1668 // Now do the fine-grained maps.
1669@@ -1044,7 +1044,7 @@ bool HeapRegionRemSetIterator::fine_has_
1670
1671 card_index = _cur_region_card_offset + _cur_card_in_prt;
1672 guarantee(_cur_card_in_prt < HeapRegion::CardsPerRegion,
1673- 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));
1675 return true;
1676 }
1677
1678@@ -1213,8 +1213,8 @@ void PerRegionTable::test_fl_mem_size()
1679
1680 size_t min_prt_size = sizeof(void*) + dummy->bm()->size_in_words() * HeapWordSize;
1681 assert(dummy->mem_size() > min_prt_size,
1682- err_msg("PerRegionTable memory usage is suspiciously small, only has "SIZE_FORMAT" bytes. "
1683- "Should be at least "SIZE_FORMAT" bytes.", dummy->mem_size(), min_prt_size));
1684+ err_msg("PerRegionTable memory usage is suspiciously small, only has " SIZE_FORMAT " bytes. "
1685+ "Should be at least " SIZE_FORMAT " bytes.", dummy->mem_size(), min_prt_size));
1686 free(dummy);
1687 guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size");
1688 // try to reset the state
1689--- hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp.orig
1690+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp
1691@@ -32,7 +32,7 @@ PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
1692 uint FreeRegionList::_unrealistically_long_length = 0;
1693
1694 void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) {
1695- msg->append("[%s] %s ln: %u cy: "SIZE_FORMAT,
1696+ msg->append("[%s] %s ln: %u cy: " SIZE_FORMAT,
1697 name(), message, length(), total_capacity_bytes());
1698 fill_in_ext_msg_extra(msg);
1699 }
1700@@ -84,13 +84,13 @@ void HeapRegionSetBase::verify_end() {
1701
1702 void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) {
1703 out->cr();
1704- out->print_cr("Set: %s ("PTR_FORMAT")", name(), this);
1705+ out->print_cr("Set: %s (" PTR_FORMAT ")", name(), this);
1706 out->print_cr(" Region Assumptions");
1707 out->print_cr(" humongous : %s", BOOL_TO_STR(regions_humongous()));
1708 out->print_cr(" free : %s", BOOL_TO_STR(regions_free()));
1709 out->print_cr(" Attributes");
1710 out->print_cr(" length : %14u", length());
1711- out->print_cr(" total capacity : "SIZE_FORMAT_W(14)" bytes",
1712+ out->print_cr(" total capacity : " SIZE_FORMAT_W(14) " bytes",
1713 total_capacity_bytes());
1714 }
1715
1716@@ -106,7 +106,7 @@ void FreeRegionList::set_unrealistically
1717 }
1718
1719 void FreeRegionList::fill_in_ext_msg_extra(hrs_ext_msg* msg) {
1720- msg->append(" hd: "PTR_FORMAT" tl: "PTR_FORMAT, _head, _tail);
1721+ msg->append(" hd: " PTR_FORMAT " tl: " PTR_FORMAT, _head, _tail);
1722 }
1723
1724 void FreeRegionList::remove_all() {
1725@@ -277,8 +277,8 @@ void FreeRegionList::clear() {
1726 void FreeRegionList::print_on(outputStream* out, bool print_contents) {
1727 HeapRegionSetBase::print_on(out, print_contents);
1728 out->print_cr(" Linking");
1729- out->print_cr(" head : "PTR_FORMAT, _head);
1730- out->print_cr(" tail : "PTR_FORMAT, _tail);
1731+ out->print_cr(" head : " PTR_FORMAT, _head);
1732+ out->print_cr(" tail : " PTR_FORMAT, _tail);
1733
1734 if (print_contents) {
1735 out->print_cr(" Contents");
1736@@ -306,7 +306,7 @@ void FreeRegionList::verify_list() {
1737
1738 count++;
1739 guarantee(count < _unrealistically_long_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()));
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()));
1742
1743 if (curr->next() != NULL) {
1744 guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up");
1745--- hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp.orig
1746+++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
1747@@ -668,7 +668,7 @@ jlong PSMarkSweep::millis_since_last_gc(
1748 jlong ret_val = now - _time_of_last_gc;
1749 // XXX See note in genCollectedHeap::millis_since_last_gc().
1750 if (ret_val < 0) {
1751- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
1752+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);)
1753 return 0;
1754 }
1755 return ret_val;
1756--- hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.orig
1757+++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
1758@@ -3291,7 +3291,7 @@ jlong PSParallelCompact::millis_since_la
1759 jlong ret_val = now - _time_of_last_gc;
1760 // XXX See note in genCollectedHeap::millis_since_last_gc().
1761 if (ret_val < 0) {
1762- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);)
1763+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);)
1764 return 0;
1765 }
1766 return ret_val;
1767--- hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp.orig
1768+++ hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
1769@@ -86,7 +86,7 @@ void MutableNUMASpace::ensure_parsabilit
1770 while (words_left_to_fill > 0) {
1771 size_t words_to_fill = MIN2(words_left_to_fill, CollectedHeap::filler_array_max_size());
1772 assert(words_to_fill >= CollectedHeap::min_fill_size(),
1773- err_msg("Remaining size ("SIZE_FORMAT ") is too small to fill (based on " SIZE_FORMAT " and " SIZE_FORMAT ")",
1774+ err_msg("Remaining size (" SIZE_FORMAT ") is too small to fill (based on " SIZE_FORMAT " and " SIZE_FORMAT ")",
1775 words_to_fill, words_left_to_fill, CollectedHeap::filler_array_max_size()));
1776 CollectedHeap::fill_with_object((HeapWord*)cur_top, words_to_fill);
1777 if (!os::numa_has_static_binding()) {
1778--- hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp.orig
1779+++ hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp
1780@@ -98,10 +98,10 @@ void PLABStats::adjust_desired_plab_sz(u
1781 if (_allocated == 0) {
1782 assert(_unused == 0,
1783 err_msg("Inconsistency in PLAB stats: "
1784- "_allocated: "SIZE_FORMAT", "
1785- "_wasted: "SIZE_FORMAT", "
1786- "_unused: "SIZE_FORMAT", "
1787- "_used : "SIZE_FORMAT,
1788+ "_allocated: " SIZE_FORMAT ", "
1789+ "_wasted: " SIZE_FORMAT ", "
1790+ "_unused: " SIZE_FORMAT ", "
1791+ "_used : " SIZE_FORMAT,
1792 _allocated, _wasted, _unused, _used));
1793
1794 _allocated = 1;
1795--- hotspot/src/share/vm/memory/cardTableModRefBS.hpp.orig
1796+++ hotspot/src/share/vm/memory/cardTableModRefBS.hpp
1797@@ -158,8 +158,8 @@ class CardTableModRefBS: public ModRefBa
1798 // Mapping from address to card marking array entry
1799 jbyte* byte_for(const void* p) const {
1800 assert(_whole_heap.contains(p),
1801- err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of "
1802- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
1803+ err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of "
1804+ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
1805 p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
1806 jbyte* result = &byte_map_base[uintptr_t(p) >> card_shift];
1807 assert(result >= _byte_map && result < _byte_map + _byte_map_size,
1808@@ -436,8 +436,8 @@ public:
1809 size_t delta = pointer_delta(p, byte_map_base, sizeof(jbyte));
1810 HeapWord* result = (HeapWord*) (delta << card_shift);
1811 assert(_whole_heap.contains(result),
1812- err_msg("Returning result = "PTR_FORMAT" out of bounds of "
1813- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
1814+ err_msg("Returning result = " PTR_FORMAT " out of bounds of "
1815+ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
1816 p2i(result), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
1817 return result;
1818 }
1819@@ -445,8 +445,8 @@ public:
1820 // Mapping from address to card marking array index.
1821 size_t index_for(void* p) {
1822 assert(_whole_heap.contains(p),
1823- err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of "
1824- " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
1825+ err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of "
1826+ " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
1827 p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
1828 return byte_for(p) - _byte_map;
1829 }
1830--- hotspot/src/share/vm/memory/genCollectedHeap.cpp.orig
1831+++ hotspot/src/share/vm/memory/genCollectedHeap.cpp
1832@@ -1403,7 +1403,7 @@ jlong GenCollectedHeap::millis_since_las
1833 // back a time later than 'now'.
1834 jlong retVal = now - tolgc_cl.time();
1835 if (retVal < 0) {
1836- NOT_PRODUCT(warning("time warp: "INT64_FORMAT, (int64_t) retVal);)
1837+ NOT_PRODUCT(warning("time warp: " INT64_FORMAT, (int64_t) retVal);)
1838 return 0;
1839 }
1840 return retVal;
1841--- hotspot/src/share/vm/memory/generation.cpp.orig
1842+++ hotspot/src/share/vm/memory/generation.cpp
1843@@ -187,7 +187,7 @@ bool Generation::promotion_attempt_is_sa
1844 bool res = (available >= max_promotion_in_bytes);
1845 if (PrintGC && Verbose) {
1846 gclog_or_tty->print_cr(
1847- "Generation: promo attempt is%s safe: available("SIZE_FORMAT") %s max_promo("SIZE_FORMAT")",
1848+ "Generation: promo attempt is%s safe: available(" SIZE_FORMAT ") %s max_promo(" SIZE_FORMAT ")",
1849 res? "":" not", available, res? ">=":"<",
1850 max_promotion_in_bytes);
1851 }
1852--- hotspot/src/share/vm/memory/generation.hpp.orig
1853+++ hotspot/src/share/vm/memory/generation.hpp
1854@@ -422,7 +422,7 @@ class Generation: public CHeapObj<mtGC>
1855 // have to guard against non-monotonicity.
1856 NOT_PRODUCT(
1857 if (now < _time_of_last_gc) {
1858- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now);
1859+ warning("time warp: " INT64_FORMAT " to " INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now);
1860 }
1861 )
1862 return _time_of_last_gc;
1863--- hotspot/src/share/vm/memory/referenceProcessor.cpp.orig
1864+++ hotspot/src/share/vm/memory/referenceProcessor.cpp
1865@@ -161,7 +161,7 @@ void ReferenceProcessor::update_soft_ref
1866
1867 NOT_PRODUCT(
1868 if (now < _soft_ref_timestamp_clock) {
1869- warning("time warp: "INT64_FORMAT" to "INT64_FORMAT,
1870+ warning("time warp: " INT64_FORMAT " to " INT64_FORMAT,
1871 _soft_ref_timestamp_clock, now);
1872 }
1873 )
1874--- hotspot/src/share/vm/memory/tenuredGeneration.cpp.orig
1875+++ hotspot/src/share/vm/memory/tenuredGeneration.cpp
1876@@ -294,8 +294,8 @@ bool TenuredGeneration::promotion_attemp
1877 bool res = (available >= av_promo) || (available >= max_promotion_in_bytes);
1878 if (PrintGC && Verbose) {
1879 gclog_or_tty->print_cr(
1880- "Tenured: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT"),"
1881- "max_promo("SIZE_FORMAT")",
1882+ "Tenured: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT "),"
1883+ "max_promo(" SIZE_FORMAT ")",
1884 res? "":" not", available, res? ">=":"<",
1885 av_promo, max_promotion_in_bytes);
1886 }
1887--- hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp.orig
1888+++ hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp
1889@@ -94,10 +94,10 @@ void ThreadLocalAllocBuffer::record_slow
1890
1891 if (PrintTLAB && Verbose) {
1892 Thread* thrd = myThread();
1893- gclog_or_tty->print("TLAB: %s thread: "INTPTR_FORMAT" [id: %2d]"
1894- " obj: "SIZE_FORMAT
1895- " free: "SIZE_FORMAT
1896- " waste: "SIZE_FORMAT"\n",
1897+ gclog_or_tty->print("TLAB: %s thread: " INTPTR_FORMAT " [id: %2d]"
1898+ " obj: " SIZE_FORMAT
1899+ " free: " SIZE_FORMAT
1900+ " waste: " SIZE_FORMAT "\n",
1901 "slow", p2i(thrd), thrd->osthread()->thread_id(),
1902 obj_size, free(), refill_waste_limit());
1903 }
1904--- hotspot/src/share/vm/memory/universe.cpp.orig
1905+++ hotspot/src/share/vm/memory/universe.cpp
1906@@ -926,7 +926,7 @@ void Universe::print_compressed_oops_mod
1907 // Reserve the Java heap, which is now the same for all GCs.
1908 ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
1909 assert(alignment <= Arguments::conservative_max_heap_alignment(),
1910- err_msg("actual alignment "SIZE_FORMAT" must be within maximum heap alignment "SIZE_FORMAT,
1911+ err_msg("actual alignment " SIZE_FORMAT " must be within maximum heap alignment " SIZE_FORMAT,
1912 alignment, Arguments::conservative_max_heap_alignment()));
1913 size_t total_reserved = align_size_up(heap_size, alignment);
1914 assert(!UseCompressedOops || (total_reserved <= (OopEncodingHeapMax - os::vm_page_size())),
1915--- hotspot/src/share/vm/oops/constantPool.cpp.orig
1916+++ hotspot/src/share/vm/oops/constantPool.cpp
1917@@ -1494,7 +1494,7 @@ static void print_cpool_bytes(jint cnt,
1918 }
1919 case JVM_CONSTANT_Long: {
1920 u8 val = Bytes::get_Java_u8(bytes);
1921- printf("long "INT64_FORMAT, (int64_t) *(jlong *) &val);
1922+ printf("long " INT64_FORMAT, (int64_t) *(jlong *) &val);
1923 ent_size = 8;
1924 idx++; // Long takes two cpool slots
1925 break;
1926--- hotspot/src/share/vm/oops/cpCache.cpp.orig
1927+++ hotspot/src/share/vm/oops/cpCache.cpp
1928@@ -315,7 +315,7 @@ void ConstantPoolCacheEntry::set_method_
1929 adapter->size_of_parameters());
1930
1931 if (TraceInvokeDynamic) {
1932- 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 " ",
1934 invoke_code,
1935 (void *)appendix(), (has_appendix ? "" : " (unused)"),
1936 (void *)method_type(), (has_method_type ? "" : " (unused)"),
1937@@ -529,12 +529,12 @@ void ConstantPoolCacheEntry::print(outpu
1938 // print separator
1939 if (index == 0) st->print_cr(" -------------");
1940 // print entry
1941- st->print("%3d ("PTR_FORMAT") ", index, (intptr_t)this);
1942+ st->print("%3d (" PTR_FORMAT ") ", index, (intptr_t)this);
1943 st->print_cr("[%02x|%02x|%5d]", bytecode_2(), bytecode_1(),
1944 constant_pool_index());
1945- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f1);
1946- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f2);
1947- st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_flags);
1948+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f1);
1949+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f2);
1950+ st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_flags);
1951 st->print_cr(" -------------");
1952 }
1953
1954--- hotspot/src/share/vm/oops/markOop.cpp.orig
1955+++ hotspot/src/share/vm/oops/markOop.cpp
1956@@ -49,7 +49,7 @@ void markOopDesc::print_on(outputStream*
1957 st->print("monitor=NULL");
1958 else {
1959 BasicLock * bl = (BasicLock *) mon->owner();
1960- st->print("monitor={count="INTPTR_FORMAT",waiters="INTPTR_FORMAT",recursions="INTPTR_FORMAT",owner="INTPTR_FORMAT"}",
1961+ st->print("monitor={count=" INTPTR_FORMAT ",waiters=" INTPTR_FORMAT ",recursions=" INTPTR_FORMAT ",owner=" INTPTR_FORMAT "}",
1962 mon->count(), mon->waiters(), mon->recursions(), p2i(bl));
1963 }
1964 } else {
1965--- hotspot/src/share/vm/oops/objArrayKlass.cpp.orig
1966+++ hotspot/src/share/vm/oops/objArrayKlass.cpp
1967@@ -657,7 +657,7 @@ void ObjArrayKlass::oop_print_value_on(o
1968 if (i > max_objArray_print_length) {
1969 st->print("..."); break;
1970 }
1971- st->print(" "INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i));
1972+ st->print(" " INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i));
1973 }
1974 st->print(" }");
1975 }
1976--- hotspot/src/share/vm/oops/oop.cpp.orig
1977+++ hotspot/src/share/vm/oops/oop.cpp
1978@@ -46,7 +46,7 @@ void oopDesc::print_on(outputStream* st)
1979
1980 void oopDesc::print_address_on(outputStream* st) const {
1981 if (PrintOopAddress) {
1982- st->print("{"INTPTR_FORMAT"}", this);
1983+ st->print("{" INTPTR_FORMAT "}", this);
1984 }
1985 }
1986
1987--- hotspot/src/share/vm/prims/methodHandles.cpp.orig
1988+++ hotspot/src/share/vm/prims/methodHandles.cpp
1989@@ -1342,27 +1342,27 @@ JVM_END
1990
1991 // These are the native methods on java.lang.invoke.MethodHandleNatives.
1992 static JNINativeMethod MHN_methods[] = {
1993- {CC"init", CC"("MEM""OBJ")V", FN_PTR(MHN_init_Mem)},
1994- {CC"expand", CC"("MEM")V", FN_PTR(MHN_expand_Mem)},
1995- {CC"resolve", CC"("MEM""CLS")"MEM, FN_PTR(MHN_resolve_Mem)},
1996- {CC"getConstant", CC"(I)I", FN_PTR(MHN_getConstant)},
1997+ {CC "init", CC "(" MEM "" OBJ ")V", FN_PTR(MHN_init_Mem)},
1998+ {CC "expand", CC "(" MEM ")V", FN_PTR(MHN_expand_Mem)},
1999+ {CC "resolve", CC "(" MEM "" CLS ")" MEM, FN_PTR(MHN_resolve_Mem)},
2000+ {CC "getConstant", CC "(I)I", FN_PTR(MHN_getConstant)},
2001 // static native int getNamedCon(int which, Object[] name)
2002- {CC"getNamedCon", CC"(I["OBJ")I", FN_PTR(MHN_getNamedCon)},
2003+ {CC "getNamedCon", CC "(I[" OBJ ")I", FN_PTR(MHN_getNamedCon)},
2004 // static native int getMembers(Class<?> defc, String matchName, String matchSig,
2005 // int matchFlags, Class<?> caller, int skip, MemberName[] results);
2006- {CC"getMembers", CC"("CLS""STRG""STRG"I"CLS"I["MEM")I", FN_PTR(MHN_getMembers)},
2007- {CC"objectFieldOffset", CC"("MEM")J", FN_PTR(MHN_objectFieldOffset)},
2008- {CC"setCallSiteTargetNormal", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetNormal)},
2009- {CC"setCallSiteTargetVolatile", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetVolatile)},
2010- {CC"staticFieldOffset", CC"("MEM")J", FN_PTR(MHN_staticFieldOffset)},
2011- {CC"staticFieldBase", CC"("MEM")"OBJ, FN_PTR(MHN_staticFieldBase)},
2012- {CC"getMemberVMInfo", CC"("MEM")"OBJ, FN_PTR(MHN_getMemberVMInfo)}
2013+ {CC "getMembers", CC "(" CLS "" STRG "" STRG "I" CLS "I[" MEM ")I", FN_PTR(MHN_getMembers)},
2014+ {CC "objectFieldOffset", CC "(" MEM ")J", FN_PTR(MHN_objectFieldOffset)},
2015+ {CC "setCallSiteTargetNormal", CC "(" CS "" MH ")V", FN_PTR(MHN_setCallSiteTargetNormal)},
2016+ {CC "setCallSiteTargetVolatile", CC "(" CS "" MH ")V", FN_PTR(MHN_setCallSiteTargetVolatile)},
2017+ {CC "staticFieldOffset", CC "(" MEM ")J", FN_PTR(MHN_staticFieldOffset)},
2018+ {CC "staticFieldBase", CC "(" MEM ")" OBJ, FN_PTR(MHN_staticFieldBase)},
2019+ {CC "getMemberVMInfo", CC "(" MEM ")" OBJ, FN_PTR(MHN_getMemberVMInfo)}
2020 };
2021
2022 static JNINativeMethod MH_methods[] = {
2023 // UnsupportedOperationException throwers
2024- {CC"invoke", CC"(["OBJ")"OBJ, FN_PTR(MH_invoke_UOE)},
2025- {CC"invokeExact", CC"(["OBJ")"OBJ, FN_PTR(MH_invokeExact_UOE)}
2026+ {CC"invoke", CC "([" OBJ ")" OBJ, FN_PTR(MH_invoke_UOE)},
2027+ {CC"invokeExact", CC "([" OBJ ")" OBJ, FN_PTR(MH_invokeExact_UOE)}
2028 };
2029
2030 /**
2031--- hotspot/src/share/vm/prims/perf.cpp.orig
2032+++ hotspot/src/share/vm/prims/perf.cpp
2033@@ -290,17 +290,17 @@ PERF_END
2034 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
2035 #define BB "Ljava/nio/ByteBuffer;"
2036 #define JLS "Ljava/lang/String;"
2037-#define CL_ARGS CC"("JLS"IIJ)"BB
2038-#define CBA_ARGS CC"("JLS"II[BI)"BB
2039+#define CL_ARGS CC "(" JLS "IIJ)" BB
2040+#define CBA_ARGS CC "(" JLS "II[BI)" BB
2041
2042 static JNINativeMethod perfmethods[] = {
2043
2044- {CC"attach", CC"("JLS"II)"BB, FN_PTR(Perf_Attach)},
2045- {CC"detach", CC"("BB")V", FN_PTR(Perf_Detach)},
2046- {CC"createLong", CL_ARGS, FN_PTR(Perf_CreateLong)},
2047- {CC"createByteArray", CBA_ARGS, FN_PTR(Perf_CreateByteArray)},
2048- {CC"highResCounter", CC"()J", FN_PTR(Perf_HighResCounter)},
2049- {CC"highResFrequency", CC"()J", FN_PTR(Perf_HighResFrequency)}
2050+ {CC"attach", CC "(" JLS "II)" BB, FN_PTR(Perf_Attach)},
2051+ {CC"detach", CC "(" BB ")V", FN_PTR(Perf_Detach)},
2052+ {CC"createLong", CL_ARGS, FN_PTR(Perf_CreateLong)},
2053+ {CC"createByteArray", CBA_ARGS, FN_PTR(Perf_CreateByteArray)},
2054+ {CC"highResCounter", CC "()J", FN_PTR(Perf_HighResCounter)},
2055+ {CC"highResFrequency", CC "()J", FN_PTR(Perf_HighResFrequency)}
2056 };
2057
2058 #undef CBA_ARGS
2059--- hotspot/src/share/vm/prims/unsafe.cpp.orig
2060+++ hotspot/src/share/vm/prims/unsafe.cpp
2061@@ -1001,7 +1001,7 @@ UNSAFE_ENTRY(jclass, Unsafe_DefineClass0
2062 UNSAFE_END
2063
2064
2065-#define DAC_Args CLS"[B["OBJ
2066+#define DAC_Args CLS "[B[" OBJ
2067 // define a class but do not make it known to the class loader or system dictionary
2068 // - host_class: supplies context for linkage, access control, protection domain, and class loader
2069 // - data: bytes of a class file, a raw memory address (length gives the number of bytes)
2070@@ -1366,47 +1366,47 @@ UNSAFE_END
2071
2072 #define LANG "Ljava/lang/"
2073
2074-#define OBJ LANG"Object;"
2075-#define CLS LANG"Class;"
2076-#define CTR LANG"reflect/Constructor;"
2077-#define FLD LANG"reflect/Field;"
2078-#define MTH LANG"reflect/Method;"
2079-#define THR LANG"Throwable;"
2080+#define OBJ LANG "Object;"
2081+#define CLS LANG "Class;"
2082+#define CTR LANG "reflect/Constructor;"
2083+#define FLD LANG "reflect/Field;"
2084+#define MTH LANG "reflect/Method;"
2085+#define THR LANG "Throwable;"
2086
2087-#define DC0_Args LANG"String;[BII"
2088-#define DC_Args DC0_Args LANG"ClassLoader;" "Ljava/security/ProtectionDomain;"
2089+#define DC0_Args LANG "String;[BII"
2090+#define DC_Args DC0_Args LANG "ClassLoader;" "Ljava/security/ProtectionDomain;"
2091
2092 #define CC (char*) /*cast a literal from (const char*)*/
2093 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
2094
2095 // define deprecated accessors for compabitility with 1.4.0
2096 #define DECLARE_GETSETOOP_140(Boolean, Z) \
2097- {CC"get"#Boolean, CC"("OBJ"I)"#Z, FN_PTR(Unsafe_Get##Boolean##140)}, \
2098- {CC"put"#Boolean, CC"("OBJ"I"#Z")V", FN_PTR(Unsafe_Set##Boolean##140)}
2099+ {CC"get"#Boolean, CC"(" OBJ "I)" #Z, FN_PTR(Unsafe_Get##Boolean##140)}, \
2100+ {CC"put"#Boolean, CC"(" OBJ "I" #Z ")V", FN_PTR(Unsafe_Set##Boolean##140)}
2101
2102 // Note: In 1.4.1, getObject and kin take both int and long offsets.
2103 #define DECLARE_GETSETOOP_141(Boolean, Z) \
2104- {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \
2105- {CC"put"#Boolean, CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)}
2106+ {CC"get"#Boolean, CC"(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean)}, \
2107+ {CC"put"#Boolean, CC"(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean)}
2108
2109 // Note: In 1.5.0, there are volatile versions too
2110 #define DECLARE_GETSETOOP(Boolean, Z) \
2111- {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \
2112- {CC"put"#Boolean, CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)}, \
2113- {CC"get"#Boolean"Volatile", CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean##Volatile)}, \
2114- {CC"put"#Boolean"Volatile", CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean##Volatile)}
2115+ {CC"get"#Boolean, CC"(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean)}, \
2116+ {CC"put"#Boolean, CC"(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean)}, \
2117+ {CC"get"#Boolean "Volatile", CC"(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean##Volatile)}, \
2118+ {CC"put"#Boolean "Volatile", CC"(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean##Volatile)}
2119
2120
2121 #define DECLARE_GETSETNATIVE(Byte, B) \
2122- {CC"get"#Byte, CC"("ADR")"#B, FN_PTR(Unsafe_GetNative##Byte)}, \
2123- {CC"put"#Byte, CC"("ADR#B")V", FN_PTR(Unsafe_SetNative##Byte)}
2124+ {CC"get"#Byte, CC"(" ADR ")" #B, FN_PTR(Unsafe_GetNative##Byte)}, \
2125+ {CC"put"#Byte, CC"(" ADR #B ")V", FN_PTR(Unsafe_SetNative##Byte)}
2126
2127
2128
2129 // These are the methods for 1.4.0
2130 static JNINativeMethod methods_140[] = {
2131- {CC"getObject", CC"("OBJ"I)"OBJ"", FN_PTR(Unsafe_GetObject140)},
2132- {CC"putObject", CC"("OBJ"I"OBJ")V", FN_PTR(Unsafe_SetObject140)},
2133+ {CC"getObject", CC"(" OBJ "I)" OBJ "", FN_PTR(Unsafe_GetObject140)},
2134+ {CC"putObject", CC"(" OBJ "I" OBJ ")V", FN_PTR(Unsafe_SetObject140)},
2135
2136 DECLARE_GETSETOOP_140(Boolean, Z),
2137 DECLARE_GETSETOOP_140(Byte, B),
2138@@ -1425,33 +1425,33 @@ static JNINativeMethod methods_140[] = {
2139 DECLARE_GETSETNATIVE(Float, F),
2140 DECLARE_GETSETNATIVE(Double, D),
2141
2142- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
2143- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
2144+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
2145+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)},
2146
2147- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
2148- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
2149- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
2150-
2151- {CC"fieldOffset", CC"("FLD")I", FN_PTR(Unsafe_FieldOffset)},
2152- {CC"staticFieldBase", CC"("CLS")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)},
2153- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2154- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
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+
2160+ {CC"fieldOffset", CC"(" FLD ")I", FN_PTR(Unsafe_FieldOffset)},
2161+ {CC"staticFieldBase", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)},
2162+ {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2163+ {CC"arrayBaseOffset", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)},
2164+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)},
2165 {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
2166 {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
2167
2168- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)},
2169- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
2170- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
2171- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
2172- {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)},
2173- {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}
2174+ {CC"defineClass", CC"(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)},
2175+ {CC"defineClass", CC"(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)},
2176+ {CC"allocateInstance", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)},
2177+ {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)},
2178+ {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)},
2179+ {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)}
2180 };
2181
2182 // These are the methods prior to the JSR 166 changes in 1.5.0
2183 static JNINativeMethod methods_141[] = {
2184- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)},
2185- {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)},
2186+ {CC"getObject", CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)},
2187+ {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)},
2188
2189 DECLARE_GETSETOOP_141(Boolean, Z),
2190 DECLARE_GETSETOOP_141(Byte, B),
2191@@ -1470,37 +1470,37 @@ static JNINativeMethod methods_141[] = {
2192 DECLARE_GETSETNATIVE(Float, F),
2193 DECLARE_GETSETNATIVE(Double, D),
2194
2195- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
2196- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
2197+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
2198+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)},
2199
2200- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
2201- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
2202- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
2203-
2204- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2205- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
2206- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
2207- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2208- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
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+
2214+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2215+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
2216+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
2217+ {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2218+ {CC"arrayBaseOffset", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)},
2219+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)},
2220 {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
2221 {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
2222
2223- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)},
2224- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
2225- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
2226- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
2227- {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)},
2228- {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}
2229+ {CC"defineClass", CC"(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)},
2230+ {CC"defineClass", CC"(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)},
2231+ {CC"allocateInstance", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)},
2232+ {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)},
2233+ {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)},
2234+ {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)}
2235
2236 };
2237
2238 // These are the methods prior to the JSR 166 changes in 1.6.0
2239 static JNINativeMethod methods_15[] = {
2240- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)},
2241- {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)},
2242- {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)},
2243- {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)},
2244+ {CC"getObject", CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)},
2245+ {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)},
2246+ {CC"getObjectVolatile",CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)},
2247+ {CC"putObjectVolatile",CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)},
2248
2249
2250 DECLARE_GETSETOOP(Boolean, Z),
2251@@ -1520,42 +1520,42 @@ static JNINativeMethod methods_15[] = {
2252 DECLARE_GETSETNATIVE(Float, F),
2253 DECLARE_GETSETNATIVE(Double, D),
2254
2255- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
2256- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
2257+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
2258+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)},
2259
2260- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
2261- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
2262- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
2263-
2264- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2265- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
2266- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
2267- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2268- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
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+
2274+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2275+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
2276+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
2277+ {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2278+ {CC"arrayBaseOffset", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)},
2279+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)},
2280 {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
2281 {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
2282
2283- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)},
2284- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
2285- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
2286- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
2287- {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)},
2288- {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)},
2289- {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
2290- {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
2291- {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
2292+ {CC"defineClass", CC"(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)},
2293+ {CC"defineClass", CC"(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)},
2294+ {CC"allocateInstance", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)},
2295+ {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)},
2296+ {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)},
2297+ {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)},
2298+ {CC"compareAndSwapObject", CC"(" OBJ "J" OBJ "" OBJ ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
2299+ {CC"compareAndSwapInt", CC"(" OBJ "J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
2300+ {CC"compareAndSwapLong", CC"(" OBJ "J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
2301 {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)},
2302- {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)}
2303+ {CC"unpark", CC"(" OBJ ")V", FN_PTR(Unsafe_Unpark)}
2304
2305 };
2306
2307 // These are the methods for 1.6.0 and 1.7.0
2308 static JNINativeMethod methods_16[] = {
2309- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)},
2310- {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)},
2311- {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)},
2312- {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)},
2313+ {CC"getObject", CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)},
2314+ {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)},
2315+ {CC"getObjectVolatile",CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)},
2316+ {CC"putObjectVolatile",CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)},
2317
2318 DECLARE_GETSETOOP(Boolean, Z),
2319 DECLARE_GETSETOOP(Byte, B),
2320@@ -1574,45 +1574,45 @@ static JNINativeMethod methods_16[] = {
2321 DECLARE_GETSETNATIVE(Float, F),
2322 DECLARE_GETSETNATIVE(Double, D),
2323
2324- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
2325- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
2326+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
2327+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)},
2328
2329- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
2330- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
2331- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
2332-
2333- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2334- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
2335- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
2336- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2337- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
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+
2343+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2344+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
2345+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
2346+ {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2347+ {CC"arrayBaseOffset", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)},
2348+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)},
2349 {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
2350 {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
2351
2352- {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)},
2353- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
2354- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
2355- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
2356- {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)},
2357- {CC"tryMonitorEnter", CC"("OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)},
2358- {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)},
2359- {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
2360- {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
2361- {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
2362- {CC"putOrderedObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetOrderedObject)},
2363- {CC"putOrderedInt", CC"("OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)},
2364- {CC"putOrderedLong", CC"("OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)},
2365+ {CC"defineClass", CC"(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)},
2366+ {CC"defineClass", CC"(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)},
2367+ {CC"allocateInstance", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)},
2368+ {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)},
2369+ {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)},
2370+ {CC"tryMonitorEnter", CC"(" OBJ ")Z", FN_PTR(Unsafe_TryMonitorEnter)},
2371+ {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)},
2372+ {CC"compareAndSwapObject", CC"(" OBJ "J" OBJ "" OBJ ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
2373+ {CC"compareAndSwapInt", CC"(" OBJ "J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
2374+ {CC"compareAndSwapLong", CC"(" OBJ "J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
2375+ {CC"putOrderedObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetOrderedObject)},
2376+ {CC"putOrderedInt", CC"(" OBJ "JI)V", FN_PTR(Unsafe_SetOrderedInt)},
2377+ {CC"putOrderedLong", CC"(" OBJ "JJ)V", FN_PTR(Unsafe_SetOrderedLong)},
2378 {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)},
2379- {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)}
2380+ {CC"unpark", CC"(" OBJ ")V", FN_PTR(Unsafe_Unpark)}
2381 };
2382
2383 // These are the methods for 1.8.0
2384 static JNINativeMethod methods_18[] = {
2385- {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)},
2386- {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)},
2387- {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)},
2388- {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)},
2389+ {CC"getObject", CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)},
2390+ {CC"putObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)},
2391+ {CC"getObjectVolatile",CC"(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)},
2392+ {CC"putObjectVolatile",CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)},
2393
2394 DECLARE_GETSETOOP(Boolean, Z),
2395 DECLARE_GETSETOOP(Byte, B),
2396@@ -1631,36 +1631,36 @@ static JNINativeMethod methods_18[] = {
2397 DECLARE_GETSETNATIVE(Float, F),
2398 DECLARE_GETSETNATIVE(Double, D),
2399
2400- {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
2401- {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
2402+ {CC"getAddress", CC"(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
2403+ {CC"putAddress", CC"(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)},
2404
2405- {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
2406- {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
2407- {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
2408-
2409- {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2410- {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
2411- {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
2412- {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2413- {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
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+
2419+ {CC"objectFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
2420+ {CC"staticFieldOffset", CC"(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
2421+ {CC"staticFieldBase", CC"(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
2422+ {CC"ensureClassInitialized",CC"(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)},
2423+ {CC"arrayBaseOffset", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)},
2424+ {CC"arrayIndexScale", CC"(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)},
2425 {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
2426 {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
2427
2428- {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
2429- {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
2430- {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
2431- {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)},
2432- {CC"tryMonitorEnter", CC"("OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)},
2433- {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)},
2434- {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
2435- {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
2436- {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
2437- {CC"putOrderedObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetOrderedObject)},
2438- {CC"putOrderedInt", CC"("OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)},
2439- {CC"putOrderedLong", CC"("OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)},
2440+ {CC"defineClass", CC"(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)},
2441+ {CC"allocateInstance", CC"(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)},
2442+ {CC"monitorEnter", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)},
2443+ {CC"monitorExit", CC"(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)},
2444+ {CC"tryMonitorEnter", CC"(" OBJ ")Z", FN_PTR(Unsafe_TryMonitorEnter)},
2445+ {CC"throwException", CC"(" THR ")V", FN_PTR(Unsafe_ThrowException)},
2446+ {CC"compareAndSwapObject", CC"(" OBJ "J" OBJ "" OBJ ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
2447+ {CC"compareAndSwapInt", CC"(" OBJ "J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
2448+ {CC"compareAndSwapLong", CC"(" OBJ "J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
2449+ {CC"putOrderedObject", CC"(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetOrderedObject)},
2450+ {CC"putOrderedInt", CC"(" OBJ "JI)V", FN_PTR(Unsafe_SetOrderedInt)},
2451+ {CC"putOrderedLong", CC"(" OBJ "JJ)V", FN_PTR(Unsafe_SetOrderedLong)},
2452 {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)},
2453- {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)}
2454+ {CC"unpark", CC"(" OBJ ")V", FN_PTR(Unsafe_Unpark)}
2455 };
2456
2457 JNINativeMethod loadavg_method[] = {
2458@@ -1668,28 +1668,28 @@ JNINativeMethod loadavg_method[] = {
2459 };
2460
2461 JNINativeMethod prefetch_methods[] = {
2462- {CC"prefetchRead", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)},
2463- {CC"prefetchWrite", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)},
2464- {CC"prefetchReadStatic", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)},
2465- {CC"prefetchWriteStatic",CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)}
2466+ {CC"prefetchRead", CC"(" OBJ "J)V", FN_PTR(Unsafe_PrefetchRead)},
2467+ {CC"prefetchWrite", CC"(" OBJ "J)V", FN_PTR(Unsafe_PrefetchWrite)},
2468+ {CC"prefetchReadStatic", CC"(" OBJ "J)V", FN_PTR(Unsafe_PrefetchRead)},
2469+ {CC"prefetchWriteStatic",CC"(" OBJ "J)V", FN_PTR(Unsafe_PrefetchWrite)}
2470 };
2471
2472 JNINativeMethod memcopy_methods_17[] = {
2473- {CC"copyMemory", CC"("OBJ"J"OBJ"JJ)V", FN_PTR(Unsafe_CopyMemory2)},
2474- {CC"setMemory", CC"("OBJ"JJB)V", FN_PTR(Unsafe_SetMemory2)}
2475+ {CC"copyMemory", CC"(" OBJ "J" OBJ "JJ)V", FN_PTR(Unsafe_CopyMemory2)},
2476+ {CC"setMemory", CC"(" OBJ "JJB)V", FN_PTR(Unsafe_SetMemory2)}
2477 };
2478
2479 JNINativeMethod memcopy_methods_15[] = {
2480- {CC"setMemory", CC"("ADR"JB)V", FN_PTR(Unsafe_SetMemory)},
2481- {CC"copyMemory", CC"("ADR ADR"J)V", FN_PTR(Unsafe_CopyMemory)}
2482+ {CC"setMemory", CC"(" ADR "JB)V", FN_PTR(Unsafe_SetMemory)},
2483+ {CC"copyMemory", CC"(" ADR ADR "J)V", FN_PTR(Unsafe_CopyMemory)}
2484 };
2485
2486 JNINativeMethod anonk_methods[] = {
2487- {CC"defineAnonymousClass", CC"("DAC_Args")"CLS, FN_PTR(Unsafe_DefineAnonymousClass)},
2488+ {CC"defineAnonymousClass", CC"(" DAC_Args ")" CLS, FN_PTR(Unsafe_DefineAnonymousClass)},
2489 };
2490
2491 JNINativeMethod lform_methods[] = {
2492- {CC"shouldBeInitialized",CC"("CLS")Z", FN_PTR(Unsafe_ShouldBeInitialized)},
2493+ {CC"shouldBeInitialized",CC"(" CLS ")Z", FN_PTR(Unsafe_ShouldBeInitialized)},
2494 };
2495
2496 JNINativeMethod fence_methods[] = {
2497--- hotspot/src/share/vm/prims/whitebox.cpp.orig
2498+++ hotspot/src/share/vm/prims/whitebox.cpp
2499@@ -166,8 +166,8 @@ WB_END
2500
2501 WB_ENTRY(void, WB_PrintHeapSizes(JNIEnv* env, jobject o)) {
2502 CollectorPolicy * p = Universe::heap()->collector_policy();
2503- gclog_or_tty->print_cr("Minimum heap "SIZE_FORMAT" Initial heap "
2504- SIZE_FORMAT" Maximum heap "SIZE_FORMAT" Min alignment "SIZE_FORMAT" Max alignment "SIZE_FORMAT,
2505+ gclog_or_tty->print_cr("Minimum heap " SIZE_FORMAT " Initial heap "
2506+ SIZE_FORMAT " Maximum heap " SIZE_FORMAT " Min alignment " SIZE_FORMAT " Max alignment " SIZE_FORMAT,
2507 p->min_heap_byte_size(), p->initial_heap_byte_size(), p->max_heap_byte_size(),
2508 p->space_alignment(), p->heap_alignment());
2509 }
2510@@ -202,8 +202,8 @@ WB_ENTRY(void, WB_ReadFromNoaccessArea(J
2511 Universe::narrow_oop_use_implicit_null_checks() )) {
2512 tty->print_cr("WB_ReadFromNoaccessArea method is useless:\n "
2513 "\tUseCompressedOops is %d\n"
2514- "\trhs.base() is "PTR_FORMAT"\n"
2515- "\tUniverse::narrow_oop_base() is "PTR_FORMAT"\n"
2516+ "\trhs.base() is " PTR_FORMAT "\n"
2517+ "\tUniverse::narrow_oop_base() is " PTR_FORMAT "\n"
2518 "\tUniverse::narrow_oop_use_implicit_null_checks() is %d",
2519 UseCompressedOops,
2520 rhs.base(),
2521@@ -256,8 +256,8 @@ static jint wb_stress_virtual_space_resi
2522
2523 WB_ENTRY(jint, WB_StressVirtualSpaceResize(JNIEnv* env, jobject o,
2524 jlong reserved_space_size, jlong magnitude, jlong iterations))
2525- tty->print_cr("reservedSpaceSize="JLONG_FORMAT", magnitude="JLONG_FORMAT", "
2526- "iterations="JLONG_FORMAT"\n", reserved_space_size, magnitude,
2527+ tty->print_cr("reservedSpaceSize=" JLONG_FORMAT ", magnitude=" JLONG_FORMAT ", "
2528+ "iterations=" JLONG_FORMAT "\n", reserved_space_size, magnitude,
2529 iterations);
2530 if (reserved_space_size < 0 || magnitude < 0 || iterations < 0) {
2531 tty->print_cr("One of variables printed above is negative. Can't proceed.\n");
2532--- hotspot/src/share/vm/runtime/safepoint.cpp.orig
2533+++ hotspot/src/share/vm/runtime/safepoint.cpp
2534@@ -918,7 +918,7 @@ void ThreadSafepointState::restart() {
2535
2536 case _running:
2537 default:
2538- tty->print_cr("restart thread "INTPTR_FORMAT" with state %d",
2539+ tty->print_cr("restart thread " INTPTR_FORMAT " with state %d",
2540 _thread, _type);
2541 _thread->print();
2542 ShouldNotReachHere();
2543@@ -1275,14 +1275,14 @@ void SafepointSynchronize::print_stat_on
2544
2545 for (int index = 0; index < VM_Operation::VMOp_Terminating; index++) {
2546 if (_safepoint_reasons[index] != 0) {
2547- tty->print_cr("%-26s"UINT64_FORMAT_W(10), VM_Operation::name(index),
2548+ tty->print_cr("%-26s" UINT64_FORMAT_W(10), VM_Operation::name(index),
2549 _safepoint_reasons[index]);
2550 }
2551 }
2552
2553 tty->print_cr(UINT64_FORMAT_W(5)" VM operations coalesced during safepoint",
2554 _coalesced_vmop_count);
2555- tty->print_cr("Maximum sync time "INT64_FORMAT_W(5)" ms",
2556+ tty->print_cr("Maximum sync time " INT64_FORMAT_W(5) " ms",
2557 _max_sync_time / MICROUNITS);
2558 tty->print_cr("Maximum vm operation time (except for Exit VM operation) "
2559 INT64_FORMAT_W(5)" ms",
2560--- hotspot/src/share/vm/services/threadService.cpp.orig
2561+++ hotspot/src/share/vm/services/threadService.cpp
2562@@ -889,7 +889,7 @@ void DeadlockCycle::print_on(outputStrea
2563 st->print(" waiting to lock monitor " INTPTR_FORMAT, waitingToLockMonitor);
2564 oop obj = (oop)waitingToLockMonitor->object();
2565 if (obj != NULL) {
2566- st->print(" (object "INTPTR_FORMAT ", a %s)", (address)obj,
2567+ st->print(" (object " INTPTR_FORMAT ", a %s)", (address)obj,
2568 (InstanceKlass::cast(obj->klass()))->external_name());
2569
2570 if (!currentThread->current_pending_monitor_is_from_java()) {
2571--- hotspot/src/share/vm/trace/traceStream.hpp.orig
2572+++ hotspot/src/share/vm/trace/traceStream.hpp
2573@@ -40,31 +40,31 @@ class TraceStream : public StackObj {
2574 TraceStream(outputStream& stream): _st(stream) {}
2575
2576 void print_val(const char* label, u1 val) {
2577- _st.print("%s = "UINT32_FORMAT, label, val);
2578+ _st.print("%s = " UINT32_FORMAT, label, val);
2579 }
2580
2581 void print_val(const char* label, u2 val) {
2582- _st.print("%s = "UINT32_FORMAT, label, val);
2583+ _st.print("%s = " UINT32_FORMAT, label, val);
2584 }
2585
2586 void print_val(const char* label, s2 val) {
2587- _st.print("%s = "INT32_FORMAT, label, val);
2588+ _st.print("%s = " INT32_FORMAT, label, val);
2589 }
2590
2591 void print_val(const char* label, u4 val) {
2592- _st.print("%s = "UINT32_FORMAT, label, val);
2593+ _st.print("%s = " UINT32_FORMAT, label, val);
2594 }
2595
2596 void print_val(const char* label, s4 val) {
2597- _st.print("%s = "INT32_FORMAT, label, val);
2598+ _st.print("%s = " INT32_FORMAT, label, val);
2599 }
2600
2601 void print_val(const char* label, u8 val) {
2602- _st.print("%s = "UINT64_FORMAT, label, val);
2603+ _st.print("%s = " UINT64_FORMAT, label, val);
2604 }
2605
2606 void print_val(const char* label, s8 val) {
2607- _st.print("%s = "INT64_FORMAT, label, (int64_t) val);
2608+ _st.print("%s = " INT64_FORMAT, label, (int64_t) val);
2609 }
2610
2611 void print_val(const char* label, bool val) {
2612--- hotspot/src/share/vm/utilities/ostream.cpp.orig
2613+++ hotspot/src/share/vm/utilities/ostream.cpp
2614@@ -277,7 +277,7 @@ void outputStream::print_data(void* data
2615 size_t limit = (len + 16) / 16 * 16;
2616 for (size_t i = 0; i < limit; ++i) {
2617 if (i % 16 == 0) {
2618- indent().print(SIZE_FORMAT_HEX_W(07)":", i);
2619+ indent().print(SIZE_FORMAT_HEX_W(07) ":", i);
2620 }
2621 if (i % 2 == 0) {
2622 print(" ");
2623@@ -945,7 +945,7 @@ void defaultStream::start_log() {
2624 // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if
2625 // we ever get round to introduce that method on the os class
2626 xs->head("hotspot_log version='%d %d'"
2627- " process='%d' time_ms='"INT64_FORMAT"'",
2628+ " process='%d' time_ms='" INT64_FORMAT "'",
2629 LOG_MAJOR_VERSION, LOG_MINOR_VERSION,
2630 os::current_process_id(), (int64_t)time_ms);
2631 // Write VM version header immediately.
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-03 19:51:11 +0000