Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
Thu, 14 Jun 2018 09:15:08 -0700
- author
- kevinw
- date
- Thu, 14 Jun 2018 09:15:08 -0700
- changeset 9327
- f96fcd9e1e1b
- parent 9324
- efdbe9b904ad
- child 9328
- da9104a01336
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
Summary: Need to add a space between macro identifier and string literal
Reviewed-by: bpittore, stefank, dholmes, kbarrett
1.1 --- a/src/cpu/ppc/vm/methodHandles_ppc.cpp Tue Feb 23 18:58:36 2016 -0500 1.2 +++ b/src/cpu/ppc/vm/methodHandles_ppc.cpp Thu Jun 14 09:15:08 2018 -0700 1.3 @@ -463,7 +463,7 @@ 1.4 bool has_mh = (strstr(adaptername, "/static") == NULL && 1.5 strstr(adaptername, "linkTo") == NULL); // static linkers don't have MH 1.6 const char* mh_reg_name = has_mh ? "R23_method_handle" : "G23"; 1.7 - tty->print_cr("MH %s %s="INTPTR_FORMAT " sp=" INTPTR_FORMAT, 1.8 + tty->print_cr("MH %s %s=" INTPTR_FORMAT " sp=" INTPTR_FORMAT, 1.9 adaptername, mh_reg_name, (intptr_t) mh, (intptr_t) entry_sp); 1.10 1.11 if (Verbose) {
2.1 --- a/src/cpu/sparc/vm/methodHandles_sparc.cpp Tue Feb 23 18:58:36 2016 -0500 2.2 +++ b/src/cpu/sparc/vm/methodHandles_sparc.cpp Thu Jun 14 09:15:08 2018 -0700 2.3 @@ -481,7 +481,7 @@ 2.4 bool has_mh = (strstr(adaptername, "/static") == NULL && 2.5 strstr(adaptername, "linkTo") == NULL); // static linkers don't have MH 2.6 const char* mh_reg_name = has_mh ? "G3_mh" : "G3"; 2.7 - tty->print_cr("MH %s %s="INTPTR_FORMAT " saved_sp=" INTPTR_FORMAT " args=" INTPTR_FORMAT, 2.8 + tty->print_cr("MH %s %s=" INTPTR_FORMAT " saved_sp=" INTPTR_FORMAT " args=" INTPTR_FORMAT, 2.9 adaptername, mh_reg_name, 2.10 (intptr_t) mh, saved_sp, args); 2.11
3.1 --- a/src/cpu/sparc/vm/vtableStubs_sparc.cpp Tue Feb 23 18:58:36 2016 -0500 3.2 +++ b/src/cpu/sparc/vm/vtableStubs_sparc.cpp Thu Jun 14 09:15:08 2018 -0700 3.3 @@ -111,7 +111,7 @@ 3.4 masm->flush(); 3.5 3.6 if (PrintMiscellaneous && (WizardMode || Verbose)) { 3.7 - tty->print_cr("vtable #%d at "PTR_FORMAT"[%d] left over: %d", 3.8 + tty->print_cr("vtable #%d at " PTR_FORMAT "[%d] left over: %d", 3.9 vtable_index, s->entry_point(), 3.10 (int)(s->code_end() - s->entry_point()), 3.11 (int)(s->code_end() - __ pc())); 3.12 @@ -219,7 +219,7 @@ 3.13 masm->flush(); 3.14 3.15 if (PrintMiscellaneous && (WizardMode || Verbose)) { 3.16 - tty->print_cr("itable #%d at "PTR_FORMAT"[%d] left over: %d", 3.17 + tty->print_cr("itable #%d at " PTR_FORMAT "[%d] left over: %d", 3.18 itable_index, s->entry_point(), 3.19 (int)(s->code_end() - s->entry_point()), 3.20 (int)(s->code_end() - __ pc()));
4.1 --- a/src/cpu/x86/vm/macroAssembler_x86.cpp Tue Feb 23 18:58:36 2016 -0500 4.2 +++ b/src/cpu/x86/vm/macroAssembler_x86.cpp Thu Jun 14 09:15:08 2018 -0700 4.3 @@ -5217,7 +5217,7 @@ 4.4 { 4.5 ResourceMark rm; 4.6 stringStream ss; 4.7 - ss.print("DelayedValue="INTPTR_FORMAT, delayed_value_addr[1]); 4.8 + ss.print("DelayedValue=" INTPTR_FORMAT, delayed_value_addr[1]); 4.9 buf = code_string(ss.as_string()); 4.10 } 4.11 jcc(Assembler::notZero, L);
5.1 --- a/src/cpu/x86/vm/methodHandles_x86.cpp Tue Feb 23 18:58:36 2016 -0500 5.2 +++ b/src/cpu/x86/vm/methodHandles_x86.cpp Thu Jun 14 09:15:08 2018 -0700 5.3 @@ -483,7 +483,7 @@ 5.4 bool has_mh = (strstr(adaptername, "/static") == NULL && 5.5 strstr(adaptername, "linkTo") == NULL); // static linkers don't have MH 5.6 const char* mh_reg_name = has_mh ? "rcx_mh" : "rcx"; 5.7 - tty->print_cr("MH %s %s="PTR_FORMAT" sp="PTR_FORMAT, 5.8 + tty->print_cr("MH %s %s=" PTR_FORMAT " sp=" PTR_FORMAT, 5.9 adaptername, mh_reg_name, 5.10 (void *)mh, entry_sp); 5.11
6.1 --- a/src/cpu/x86/vm/vtableStubs_x86_32.cpp Tue Feb 23 18:58:36 2016 -0500 6.2 +++ b/src/cpu/x86/vm/vtableStubs_x86_32.cpp Thu Jun 14 09:15:08 2018 -0700 6.3 @@ -118,7 +118,7 @@ 6.4 masm->flush(); 6.5 6.6 if (PrintMiscellaneous && (WizardMode || Verbose)) { 6.7 - tty->print_cr("vtable #%d at "PTR_FORMAT"[%d] left over: %d", 6.8 + tty->print_cr("vtable #%d at " PTR_FORMAT "[%d] left over: %d", 6.9 vtable_index, p2i(s->entry_point()), 6.10 (int)(s->code_end() - s->entry_point()), 6.11 (int)(s->code_end() - __ pc())); 6.12 @@ -217,7 +217,7 @@ 6.13 __ flush(); 6.14 6.15 if (PrintMiscellaneous && (WizardMode || Verbose)) { 6.16 - tty->print_cr("itable #%d at "PTR_FORMAT"[%d] left over: %d", 6.17 + tty->print_cr("itable #%d at " PTR_FORMAT "[%d] left over: %d", 6.18 itable_index, p2i(s->entry_point()), 6.19 (int)(s->code_end() - s->entry_point()), 6.20 (int)(s->code_end() - __ pc()));
7.1 --- a/src/cpu/x86/vm/vtableStubs_x86_64.cpp Tue Feb 23 18:58:36 2016 -0500 7.2 +++ b/src/cpu/x86/vm/vtableStubs_x86_64.cpp Thu Jun 14 09:15:08 2018 -0700 7.3 @@ -113,7 +113,7 @@ 7.4 __ flush(); 7.5 7.6 if (PrintMiscellaneous && (WizardMode || Verbose)) { 7.7 - tty->print_cr("vtable #%d at "PTR_FORMAT"[%d] left over: %d", 7.8 + tty->print_cr("vtable #%d at " PTR_FORMAT "[%d] left over: %d", 7.9 vtable_index, s->entry_point(), 7.10 (int)(s->code_end() - s->entry_point()), 7.11 (int)(s->code_end() - __ pc())); 7.12 @@ -220,7 +220,7 @@ 7.13 __ flush(); 7.14 7.15 if (PrintMiscellaneous && (WizardMode || Verbose)) { 7.16 - tty->print_cr("itable #%d at "PTR_FORMAT"[%d] left over: %d", 7.17 + tty->print_cr("itable #%d at " PTR_FORMAT "[%d] left over: %d", 7.18 itable_index, s->entry_point(), 7.19 (int)(s->code_end() - s->entry_point()), 7.20 (int)(s->code_end() - __ pc()));
8.1 --- a/src/os/windows/vm/os_windows.cpp Tue Feb 23 18:58:36 2016 -0500 8.2 +++ b/src/os/windows/vm/os_windows.cpp Thu Jun 14 09:15:08 2018 -0700 8.3 @@ -5782,7 +5782,7 @@ 8.4 char* result = os::reserve_memory_special(large_allocation_size, os::large_page_size(), NULL, false); 8.5 if (result == NULL) { 8.6 if (VerboseInternalVMTests) { 8.7 - gclog_or_tty->print("Failed to allocate control block with size "SIZE_FORMAT". Skipping remainder of test.", 8.8 + gclog_or_tty->print("Failed to allocate control block with size " SIZE_FORMAT ". Skipping remainder of test.", 8.9 large_allocation_size); 8.10 } 8.11 } else { 8.12 @@ -5795,7 +5795,7 @@ 8.13 char* actual_location = os::reserve_memory_special(expected_allocation_size, os::large_page_size(), expected_location, false); 8.14 if (actual_location == NULL) { 8.15 if (VerboseInternalVMTests) { 8.16 - gclog_or_tty->print("Failed to allocate any memory at "PTR_FORMAT" size "SIZE_FORMAT". Skipping remainder of test.", 8.17 + gclog_or_tty->print("Failed to allocate any memory at " PTR_FORMAT " size " SIZE_FORMAT ". Skipping remainder of test.", 8.18 expected_location, large_allocation_size); 8.19 } 8.20 } else { 8.21 @@ -5803,7 +5803,7 @@ 8.22 os::release_memory_special(actual_location, expected_allocation_size); 8.23 // only now check, after releasing any memory to avoid any leaks. 8.24 assert(actual_location == expected_location, 8.25 - err_msg("Failed to allocate memory at requested location "PTR_FORMAT" of size "SIZE_FORMAT", is "PTR_FORMAT" instead", 8.26 + err_msg("Failed to allocate memory at requested location " PTR_FORMAT " of size " SIZE_FORMAT ", is " PTR_FORMAT " instead", 8.27 expected_location, expected_allocation_size, actual_location)); 8.28 } 8.29 }
9.1 --- a/src/share/vm/c1/c1_CFGPrinter.cpp Tue Feb 23 18:58:36 2016 -0500 9.2 +++ b/src/share/vm/c1/c1_CFGPrinter.cpp Thu Jun 14 09:15:08 2018 -0700 9.3 @@ -161,7 +161,7 @@ 9.4 9.5 print("name \"%s\"", method_name(_compilation->method(), true)); 9.6 print("method \"%s\"", method_name(_compilation->method())); 9.7 - print("date "INT64_FORMAT, (int64_t) os::javaTimeMillis()); 9.8 + print("date " INT64_FORMAT, (int64_t) os::javaTimeMillis()); 9.9 9.10 print_end("compilation"); 9.11 }
10.1 --- a/src/share/vm/classfile/classLoaderData.cpp Tue Feb 23 18:58:36 2016 -0500 10.2 +++ b/src/share/vm/classfile/classLoaderData.cpp Thu Jun 14 09:15:08 2018 -0700 10.3 @@ -502,7 +502,7 @@ 10.4 10.5 void ClassLoaderData::dump(outputStream * const out) { 10.6 ResourceMark rm; 10.7 - out->print("ClassLoaderData CLD: "PTR_FORMAT", loader: "PTR_FORMAT", loader_klass: "PTR_FORMAT" %s {", 10.8 + out->print("ClassLoaderData CLD: " PTR_FORMAT ", loader: " PTR_FORMAT ", loader_klass: " PTR_FORMAT " %s {", 10.9 p2i(this), p2i((void *)class_loader()), 10.10 p2i(class_loader() != NULL ? class_loader()->klass() : NULL), loader_name()); 10.11 if (claimed()) out->print(" claimed "); 10.12 @@ -520,7 +520,7 @@ 10.13 ResourceMark rm; 10.14 Klass* k = _klasses; 10.15 while (k != NULL) { 10.16 - out->print_cr("klass "PTR_FORMAT", %s, CT: %d, MUT: %d", k, k->name()->as_C_string(), 10.17 + out->print_cr("klass " PTR_FORMAT ", %s, CT: %d, MUT: %d", k, k->name()->as_C_string(), 10.18 k->has_modified_oops(), k->has_accumulated_modified_oops()); 10.19 assert(k != k->next_link(), "no loops!"); 10.20 k = k->next_link();
11.1 --- a/src/share/vm/classfile/dictionary.cpp Tue Feb 23 18:58:36 2016 -0500 11.2 +++ b/src/share/vm/classfile/dictionary.cpp Thu Jun 14 09:15:08 2018 -0700 11.3 @@ -568,7 +568,7 @@ 11.4 } 11.5 11.6 void ProtectionDomainCacheEntry::print() { 11.7 - tty->print_cr("entry "PTR_FORMAT" value "PTR_FORMAT" strongly_reachable %d next "PTR_FORMAT, 11.8 + tty->print_cr("entry " PTR_FORMAT " value " PTR_FORMAT " strongly_reachable %d next " PTR_FORMAT, 11.9 this, (void*)literal(), _strongly_reachable, next()); 11.10 } 11.11 #endif
12.1 --- a/src/share/vm/classfile/dictionary.hpp Tue Feb 23 18:58:36 2016 -0500 12.2 +++ b/src/share/vm/classfile/dictionary.hpp Thu Jun 14 09:15:08 2018 -0700 12.3 @@ -373,7 +373,7 @@ 12.4 12.5 void print_on(outputStream* st) const { 12.6 symbol()->print_value_on(st); 12.7 - st->print("/mode="INTX_FORMAT, symbol_mode()); 12.8 + st->print("/mode=" INTX_FORMAT, symbol_mode()); 12.9 st->print(" -> "); 12.10 bool printed = false; 12.11 if (method() != NULL) {
13.1 --- a/src/share/vm/code/exceptionHandlerTable.cpp Tue Feb 23 18:58:36 2016 -0500 13.2 +++ b/src/share/vm/code/exceptionHandlerTable.cpp Thu Jun 14 09:15:08 2018 -0700 13.3 @@ -186,7 +186,7 @@ 13.4 void ImplicitExceptionTable::print(address base) const { 13.5 tty->print("{"); 13.6 for( uint i=0; i<len(); i++ ) 13.7 - tty->print("< "INTPTR_FORMAT", "INTPTR_FORMAT" > ",base + *adr(i), base + *(adr(i)+1)); 13.8 + tty->print("< " INTPTR_FORMAT ", " INTPTR_FORMAT " > ",base + *adr(i), base + *(adr(i)+1)); 13.9 tty->print_cr("}"); 13.10 } 13.11
14.1 --- a/src/share/vm/code/nmethod.cpp Tue Feb 23 18:58:36 2016 -0500 14.2 +++ b/src/share/vm/code/nmethod.cpp Thu Jun 14 09:15:08 2018 -0700 14.3 @@ -2323,7 +2323,7 @@ 14.4 void maybe_print(oop* p) { 14.5 if (_print_nm == NULL) return; 14.6 if (!_detected_scavenge_root) _print_nm->print_on(tty, "new scavenge root"); 14.7 - tty->print_cr(""PTR_FORMAT"[offset=%d] detected scavengable oop "PTR_FORMAT" (found at "PTR_FORMAT")", 14.8 + tty->print_cr("" PTR_FORMAT "[offset=%d] detected scavengable oop " PTR_FORMAT " (found at " PTR_FORMAT ")", 14.9 _print_nm, (int)((intptr_t)p - (intptr_t)_print_nm), 14.10 (void *)(*p), (intptr_t)p); 14.11 (*p)->print(); 14.12 @@ -2704,7 +2704,7 @@ 14.13 _nm->print_nmethod(true); 14.14 _ok = false; 14.15 } 14.16 - tty->print_cr("*** non-oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)", 14.17 + tty->print_cr("*** non-oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)", 14.18 (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm)); 14.19 } 14.20 virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); } 14.21 @@ -2828,7 +2828,7 @@ 14.22 _nm->print_nmethod(true); 14.23 _ok = false; 14.24 } 14.25 - tty->print_cr("*** scavengable oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)", 14.26 + tty->print_cr("*** scavengable oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)", 14.27 (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm)); 14.28 (*p)->print(); 14.29 } 14.30 @@ -2873,7 +2873,7 @@ 14.31 print_on(tty, NULL); 14.32 14.33 if (WizardMode) { 14.34 - tty->print("((nmethod*) "INTPTR_FORMAT ") ", this); 14.35 + tty->print("((nmethod*) " INTPTR_FORMAT ") ", this); 14.36 tty->print(" for method " INTPTR_FORMAT , (address)method()); 14.37 tty->print(" { "); 14.38 if (is_in_use()) tty->print("in_use ");
15.1 --- a/src/share/vm/compiler/compileBroker.cpp Tue Feb 23 18:58:36 2016 -0500 15.2 +++ b/src/share/vm/compiler/compileBroker.cpp Thu Jun 14 09:15:08 2018 -0700 15.3 @@ -203,7 +203,7 @@ 15.4 } 15.5 15.6 void log_nmethod(JavaThread* thread, nmethod* nm) { 15.7 - log(thread, "nmethod %d%s " INTPTR_FORMAT " code ["INTPTR_FORMAT ", " INTPTR_FORMAT "]", 15.8 + log(thread, "nmethod %d%s " INTPTR_FORMAT " code [" INTPTR_FORMAT ", " INTPTR_FORMAT "]", 15.9 nm->compile_id(), nm->is_osr_method() ? "%" : "", 15.10 p2i(nm), p2i(nm->code_begin()), p2i(nm->code_end())); 15.11 }
16.1 --- a/src/share/vm/compiler/disassembler.cpp Tue Feb 23 18:58:36 2016 -0500 16.2 +++ b/src/share/vm/compiler/disassembler.cpp Thu Jun 14 09:15:08 2018 -0700 16.3 @@ -60,7 +60,7 @@ 16.4 Disassembler::decode_func_virtual Disassembler::_decode_instructions_virtual = NULL; 16.5 Disassembler::decode_func Disassembler::_decode_instructions = NULL; 16.6 16.7 -static const char hsdis_library_name[] = "hsdis-"HOTSPOT_LIB_ARCH; 16.8 +static const char hsdis_library_name[] = "hsdis-" HOTSPOT_LIB_ARCH; 16.9 static const char decode_instructions_virtual_name[] = "decode_instructions_virtual"; 16.10 static const char decode_instructions_name[] = "decode_instructions"; 16.11 static bool use_new_version = true;
17.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Tue Feb 23 18:58:36 2016 -0500 17.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Thu Jun 14 09:15:08 2018 -0700 17.3 @@ -838,18 +838,18 @@ 17.4 GenCollectedHeap* gch = GenCollectedHeap::heap(); 17.5 if (PrintGCDetails) { 17.6 if (Verbose) { 17.7 - gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"("SIZE_FORMAT")]", 17.8 + gclog_or_tty->print("[%d %s-%s: " SIZE_FORMAT "(" SIZE_FORMAT ")]", 17.9 level(), short_name(), s, used(), capacity()); 17.10 } else { 17.11 - gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"K("SIZE_FORMAT"K)]", 17.12 + gclog_or_tty->print("[%d %s-%s: " SIZE_FORMAT "K(" SIZE_FORMAT "K)]", 17.13 level(), short_name(), s, used() / K, capacity() / K); 17.14 } 17.15 } 17.16 if (Verbose) { 17.17 - gclog_or_tty->print(" "SIZE_FORMAT"("SIZE_FORMAT")", 17.18 + gclog_or_tty->print(" " SIZE_FORMAT "(" SIZE_FORMAT ")", 17.19 gch->used(), gch->capacity()); 17.20 } else { 17.21 - gclog_or_tty->print(" "SIZE_FORMAT"K("SIZE_FORMAT"K)", 17.22 + gclog_or_tty->print(" " SIZE_FORMAT "K(" SIZE_FORMAT "K)", 17.23 gch->used() / K, gch->capacity() / K); 17.24 } 17.25 } 17.26 @@ -879,8 +879,8 @@ 17.27 bool res = (available >= av_promo) || (available >= max_promotion_in_bytes); 17.28 if (Verbose && PrintGCDetails) { 17.29 gclog_or_tty->print_cr( 17.30 - "CMS: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT")," 17.31 - "max_promo("SIZE_FORMAT")", 17.32 + "CMS: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT ")," 17.33 + "max_promo(" SIZE_FORMAT ")", 17.34 res? "":" not", available, res? ">=":"<", 17.35 av_promo, max_promotion_in_bytes); 17.36 } 17.37 @@ -966,8 +966,8 @@ 17.38 desired_free_percentage); 17.39 gclog_or_tty->print_cr(" Maximum free fraction %f", 17.40 maximum_free_percentage); 17.41 - gclog_or_tty->print_cr(" Capactiy "SIZE_FORMAT, capacity()/1000); 17.42 - gclog_or_tty->print_cr(" Desired capacity "SIZE_FORMAT, 17.43 + gclog_or_tty->print_cr(" Capactiy " SIZE_FORMAT, capacity()/1000); 17.44 + gclog_or_tty->print_cr(" Desired capacity " SIZE_FORMAT, 17.45 desired_capacity/1000); 17.46 int prev_level = level() - 1; 17.47 if (prev_level >= 0) { 17.48 @@ -975,14 +975,14 @@ 17.49 GenCollectedHeap* gch = GenCollectedHeap::heap(); 17.50 Generation* prev_gen = gch->_gens[prev_level]; 17.51 prev_size = prev_gen->capacity(); 17.52 - gclog_or_tty->print_cr(" Younger gen size "SIZE_FORMAT, 17.53 + gclog_or_tty->print_cr(" Younger gen size " SIZE_FORMAT, 17.54 prev_size/1000); 17.55 } 17.56 - gclog_or_tty->print_cr(" unsafe_max_alloc_nogc "SIZE_FORMAT, 17.57 + gclog_or_tty->print_cr(" unsafe_max_alloc_nogc " SIZE_FORMAT, 17.58 unsafe_max_alloc_nogc()/1000); 17.59 - gclog_or_tty->print_cr(" contiguous available "SIZE_FORMAT, 17.60 + gclog_or_tty->print_cr(" contiguous available " SIZE_FORMAT, 17.61 contiguous_available()/1000); 17.62 - gclog_or_tty->print_cr(" Expand by "SIZE_FORMAT" (bytes)", 17.63 + gclog_or_tty->print_cr(" Expand by " SIZE_FORMAT " (bytes)", 17.64 expand_bytes); 17.65 } 17.66 // safe if expansion fails 17.67 @@ -1513,8 +1513,8 @@ 17.68 stats().print_on(gclog_or_tty); 17.69 gclog_or_tty->print_cr("time_until_cms_gen_full %3.7f", 17.70 stats().time_until_cms_gen_full()); 17.71 - gclog_or_tty->print_cr("free="SIZE_FORMAT, _cmsGen->free()); 17.72 - gclog_or_tty->print_cr("contiguous_available="SIZE_FORMAT, 17.73 + gclog_or_tty->print_cr("free=" SIZE_FORMAT, _cmsGen->free()); 17.74 + gclog_or_tty->print_cr("contiguous_available=" SIZE_FORMAT, 17.75 _cmsGen->contiguous_available()); 17.76 gclog_or_tty->print_cr("promotion_rate=%g", stats().promotion_rate()); 17.77 gclog_or_tty->print_cr("cms_allocation_rate=%g", stats().cms_allocation_rate()); 17.78 @@ -2792,8 +2792,8 @@ 17.79 assert(_numObjectsPromoted == 0, "check"); 17.80 assert(_numWordsPromoted == 0, "check"); 17.81 if (Verbose && PrintGC) { 17.82 - gclog_or_tty->print("Allocated "SIZE_FORMAT" objects, " 17.83 - SIZE_FORMAT" bytes concurrently", 17.84 + gclog_or_tty->print("Allocated " SIZE_FORMAT " objects, " 17.85 + SIZE_FORMAT " bytes concurrently", 17.86 _numObjectsAllocated, _numWordsAllocated*sizeof(HeapWord)); 17.87 } 17.88 _numObjectsAllocated = 0; 17.89 @@ -2879,8 +2879,8 @@ 17.90 assert(_numObjectsAllocated == 0, "check"); 17.91 assert(_numWordsAllocated == 0, "check"); 17.92 if (Verbose && PrintGC) { 17.93 - gclog_or_tty->print("Promoted "SIZE_FORMAT" objects, " 17.94 - SIZE_FORMAT" bytes", 17.95 + gclog_or_tty->print("Promoted " SIZE_FORMAT " objects, " 17.96 + SIZE_FORMAT " bytes", 17.97 _numObjectsPromoted, _numWordsPromoted*sizeof(HeapWord)); 17.98 } 17.99 _numObjectsPromoted = 0; 17.100 @@ -2890,7 +2890,7 @@ 17.101 if (PrintGC && Verbose) { 17.102 // Call down the chain in contiguous_available needs the freelistLock 17.103 // so print this out before releasing the freeListLock. 17.104 - gclog_or_tty->print(" Contiguous available "SIZE_FORMAT" bytes ", 17.105 + gclog_or_tty->print(" Contiguous available " SIZE_FORMAT " bytes ", 17.106 contiguous_available()); 17.107 } 17.108 } 17.109 @@ -2978,7 +2978,7 @@ 17.110 HeapWord* addr = _marks->offsetToHeapWord(offset); 17.111 if (!_marks->isMarked(addr)) { 17.112 oop(addr)->print_on(gclog_or_tty); 17.113 - gclog_or_tty->print_cr(" ("INTPTR_FORMAT" should have been marked)", addr); 17.114 + gclog_or_tty->print_cr(" (" INTPTR_FORMAT " should have been marked)", addr); 17.115 _failed = true; 17.116 } 17.117 return true; 17.118 @@ -5039,7 +5039,7 @@ 17.119 17.120 SpecializationStats::clear(); 17.121 if (PrintGCDetails) { 17.122 - gclog_or_tty->print("[YG occupancy: "SIZE_FORMAT" K ("SIZE_FORMAT" K)]", 17.123 + gclog_or_tty->print("[YG occupancy: " SIZE_FORMAT " K (" SIZE_FORMAT " K)]", 17.124 _young_gen->used() / K, 17.125 _young_gen->capacity() / K); 17.126 } 17.127 @@ -5172,8 +5172,8 @@ 17.128 if (ser_ovflw > 0) { 17.129 if (PrintCMSStatistics != 0) { 17.130 gclog_or_tty->print_cr("Marking stack overflow (benign) " 17.131 - "(pmc_pc="SIZE_FORMAT", pmc_rm="SIZE_FORMAT", kac="SIZE_FORMAT 17.132 - ", kac_preclean="SIZE_FORMAT")", 17.133 + "(pmc_pc=" SIZE_FORMAT ", pmc_rm=" SIZE_FORMAT ", kac=" SIZE_FORMAT 17.134 + ", kac_preclean=" SIZE_FORMAT ")", 17.135 _ser_pmc_preclean_ovflw, _ser_pmc_remark_ovflw, 17.136 _ser_kac_ovflw, _ser_kac_preclean_ovflw); 17.137 } 17.138 @@ -5186,7 +5186,7 @@ 17.139 if (_par_pmc_remark_ovflw > 0 || _par_kac_ovflw > 0) { 17.140 if (PrintCMSStatistics != 0) { 17.141 gclog_or_tty->print_cr("Work queue overflow (benign) " 17.142 - "(pmc_rm="SIZE_FORMAT", kac="SIZE_FORMAT")", 17.143 + "(pmc_rm=" SIZE_FORMAT ", kac=" SIZE_FORMAT ")", 17.144 _par_pmc_remark_ovflw, _par_kac_ovflw); 17.145 } 17.146 _par_pmc_remark_ovflw = 0; 17.147 @@ -5194,12 +5194,12 @@ 17.148 } 17.149 if (PrintCMSStatistics != 0) { 17.150 if (_markStack._hit_limit > 0) { 17.151 - gclog_or_tty->print_cr(" (benign) Hit max stack size limit ("SIZE_FORMAT")", 17.152 + gclog_or_tty->print_cr(" (benign) Hit max stack size limit (" SIZE_FORMAT ")", 17.153 _markStack._hit_limit); 17.154 } 17.155 if (_markStack._failed_double > 0) { 17.156 - gclog_or_tty->print_cr(" (benign) Failed stack doubling ("SIZE_FORMAT")," 17.157 - " current capacity "SIZE_FORMAT, 17.158 + gclog_or_tty->print_cr(" (benign) Failed stack doubling (" SIZE_FORMAT ")," 17.159 + " current capacity " SIZE_FORMAT, 17.160 _markStack._failed_double, 17.161 _markStack.capacity()); 17.162 } 17.163 @@ -5963,7 +5963,7 @@ 17.164 &markFromDirtyCardsClosure); 17.165 verify_work_stacks_empty(); 17.166 if (PrintCMSStatistics != 0) { 17.167 - gclog_or_tty->print(" (re-scanned "SIZE_FORMAT" dirty cards in cms gen) ", 17.168 + gclog_or_tty->print(" (re-scanned " SIZE_FORMAT " dirty cards in cms gen) ", 17.169 markFromDirtyCardsClosure.num_dirty_cards()); 17.170 } 17.171 } 17.172 @@ -6893,8 +6893,8 @@ 17.173 } else if (_failed_double++ == 0 && !CMSConcurrentMTEnabled && PrintGCDetails) { 17.174 // Failed to double capacity, continue; 17.175 // we print a detail message only once per CMS cycle. 17.176 - gclog_or_tty->print(" (benign) Failed to expand marking stack from "SIZE_FORMAT"K to " 17.177 - SIZE_FORMAT"K", 17.178 + gclog_or_tty->print(" (benign) Failed to expand marking stack from " SIZE_FORMAT "K to " 17.179 + SIZE_FORMAT "K", 17.180 _capacity / K, new_capacity / K); 17.181 } 17.182 } 17.183 @@ -8216,25 +8216,25 @@ 17.184 ShouldNotReachHere(); 17.185 } 17.186 if (Verbose && PrintGC) { 17.187 - gclog_or_tty->print("Collected "SIZE_FORMAT" objects, " SIZE_FORMAT " bytes", 17.188 + gclog_or_tty->print("Collected " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes", 17.189 _numObjectsFreed, _numWordsFreed*sizeof(HeapWord)); 17.190 - gclog_or_tty->print_cr("\nLive "SIZE_FORMAT" objects, " 17.191 - SIZE_FORMAT" bytes " 17.192 - "Already free "SIZE_FORMAT" objects, "SIZE_FORMAT" bytes", 17.193 + gclog_or_tty->print_cr("\nLive " SIZE_FORMAT " objects, " 17.194 + SIZE_FORMAT " bytes " 17.195 + "Already free " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes", 17.196 _numObjectsLive, _numWordsLive*sizeof(HeapWord), 17.197 _numObjectsAlreadyFree, _numWordsAlreadyFree*sizeof(HeapWord)); 17.198 size_t totalBytes = (_numWordsFreed + _numWordsLive + _numWordsAlreadyFree) 17.199 * sizeof(HeapWord); 17.200 - gclog_or_tty->print_cr("Total sweep: "SIZE_FORMAT" bytes", totalBytes); 17.201 + gclog_or_tty->print_cr("Total sweep: " SIZE_FORMAT " bytes", totalBytes); 17.202 17.203 if (PrintCMSStatistics && CMSVerifyReturnedBytes) { 17.204 size_t indexListReturnedBytes = _sp->sumIndexedFreeListArrayReturnedBytes(); 17.205 size_t dict_returned_bytes = _sp->dictionary()->sum_dict_returned_bytes(); 17.206 size_t returned_bytes = indexListReturnedBytes + dict_returned_bytes; 17.207 - gclog_or_tty->print("Returned "SIZE_FORMAT" bytes", returned_bytes); 17.208 - gclog_or_tty->print(" Indexed List Returned "SIZE_FORMAT" bytes", 17.209 + gclog_or_tty->print("Returned " SIZE_FORMAT " bytes", returned_bytes); 17.210 + gclog_or_tty->print(" Indexed List Returned " SIZE_FORMAT " bytes", 17.211 indexListReturnedBytes); 17.212 - gclog_or_tty->print_cr(" Dictionary Returned "SIZE_FORMAT" bytes", 17.213 + gclog_or_tty->print_cr(" Dictionary Returned " SIZE_FORMAT " bytes", 17.214 dict_returned_bytes); 17.215 } 17.216 } 17.217 @@ -8313,13 +8313,13 @@ 17.218 // coalesced chunk to the appropriate free list. 17.219 if (inFreeRange()) { 17.220 assert(freeFinger() >= _sp->bottom() && freeFinger() < _limit, 17.221 - err_msg("freeFinger() " PTR_FORMAT" is out-of-bounds", freeFinger())); 17.222 + err_msg("freeFinger() " PTR_FORMAT " is out-of-bounds", freeFinger())); 17.223 flush_cur_free_chunk(freeFinger(), 17.224 pointer_delta(addr, freeFinger())); 17.225 if (CMSTraceSweeper) { 17.226 gclog_or_tty->print("Sweep: last chunk: "); 17.227 - gclog_or_tty->print("put_free_blk 0x%x ("SIZE_FORMAT") " 17.228 - "[coalesced:"SIZE_FORMAT"]\n", 17.229 + gclog_or_tty->print("put_free_blk 0x%x (" SIZE_FORMAT ") " 17.230 + "[coalesced:" SIZE_FORMAT "]\n", 17.231 freeFinger(), pointer_delta(addr, freeFinger()), 17.232 lastFreeRangeCoalesced()); 17.233 }
18.1 --- a/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp Tue Feb 23 18:58:36 2016 -0500 18.2 +++ b/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp Thu Jun 14 09:15:08 2018 -0700 18.3 @@ -117,7 +117,7 @@ 18.4 } 18.5 guarantee(sum_of_reclaimable_bytes == _remaining_reclaimable_bytes, 18.6 err_msg("reclaimable bytes inconsistent, " 18.7 - "remaining: "SIZE_FORMAT" sum: "SIZE_FORMAT, 18.8 + "remaining: " SIZE_FORMAT " sum: " SIZE_FORMAT, 18.9 _remaining_reclaimable_bytes, sum_of_reclaimable_bytes)); 18.10 } 18.11 #endif // !PRODUCT
19.1 --- a/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp Tue Feb 23 18:58:36 2016 -0500 19.2 +++ b/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp Thu Jun 14 09:15:08 2018 -0700 19.3 @@ -92,7 +92,7 @@ 19.4 regions_at_put(_curr_index, NULL); 19.5 assert(hr->reclaimable_bytes() <= _remaining_reclaimable_bytes, 19.6 err_msg("remaining reclaimable bytes inconsistent " 19.7 - "from region: "SIZE_FORMAT" remaining: "SIZE_FORMAT, 19.8 + "from region: " SIZE_FORMAT " remaining: " SIZE_FORMAT, 19.9 hr->reclaimable_bytes(), _remaining_reclaimable_bytes)); 19.10 _remaining_reclaimable_bytes -= hr->reclaimable_bytes(); 19.11 _curr_index += 1;
20.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp Tue Feb 23 18:58:36 2016 -0500 20.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp Thu Jun 14 09:15:08 2018 -0700 20.3 @@ -284,7 +284,7 @@ 20.4 if (PrintGCDetails && Verbose) { 20.5 // Failed to double capacity, continue; 20.6 gclog_or_tty->print(" (benign) Failed to expand marking stack capacity from " 20.7 - SIZE_FORMAT"K to " SIZE_FORMAT"K", 20.8 + SIZE_FORMAT "K to " SIZE_FORMAT "K", 20.9 _capacity / K, new_capacity / K); 20.10 } 20.11 } 20.12 @@ -581,7 +581,7 @@ 20.13 _verbose_level = verbose_level; 20.14 20.15 if (verbose_low()) { 20.16 - gclog_or_tty->print_cr("[global] init, heap start = "PTR_FORMAT", " 20.17 + gclog_or_tty->print_cr("[global] init, heap start = " PTR_FORMAT", " 20.18 "heap end = " INTPTR_FORMAT, p2i(_heap_start), p2i(_heap_end)); 20.19 } 20.20 20.21 @@ -837,7 +837,7 @@ 20.22 // in a STW phase. 20.23 assert(!concurrent_marking_in_progress(), "invariant"); 20.24 assert(out_of_regions(), 20.25 - err_msg("only way to get here: _finger: "PTR_FORMAT", _heap_end: "PTR_FORMAT, 20.26 + err_msg("only way to get here: _finger: " PTR_FORMAT ", _heap_end: " PTR_FORMAT, 20.27 p2i(_finger), p2i(_heap_end))); 20.28 } 20.29 } 20.30 @@ -1452,7 +1452,7 @@ 20.31 20.32 assert(start <= hr->end() && start <= ntams && ntams <= hr->end(), 20.33 err_msg("Preconditions not met - " 20.34 - "start: "PTR_FORMAT", ntams: "PTR_FORMAT", end: "PTR_FORMAT, 20.35 + "start: " PTR_FORMAT ", ntams: " PTR_FORMAT ", end: " PTR_FORMAT, 20.36 p2i(start), p2i(ntams), p2i(hr->end()))); 20.37 20.38 // Find the first marked object at or after "start". 20.39 @@ -1769,10 +1769,10 @@ 20.40 } 20.41 20.42 assert(end_idx <= _card_bm->size(), 20.43 - err_msg("oob: end_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT, 20.44 + err_msg("oob: end_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT, 20.45 end_idx, _card_bm->size())); 20.46 assert(start_idx < _card_bm->size(), 20.47 - err_msg("oob: start_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT, 20.48 + err_msg("oob: start_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT, 20.49 start_idx, _card_bm->size())); 20.50 20.51 _cm->set_card_bitmap_range(_card_bm, start_idx, end_idx, true /* is_par */); 20.52 @@ -2277,7 +2277,7 @@ 20.53 oop obj = oopDesc::load_decode_heap_oop(p); 20.54 if (_cm->verbose_high()) { 20.55 gclog_or_tty->print_cr("\t[%u] we're looking at location " 20.56 - "*"PTR_FORMAT" = "PTR_FORMAT, 20.57 + "*" PTR_FORMAT " = " PTR_FORMAT, 20.58 _task->worker_id(), p2i(p), p2i((void*) obj)); 20.59 } 20.60 20.61 @@ -3018,9 +3018,9 @@ 20.62 HeapWord* limit = curr_region->next_top_at_mark_start(); 20.63 20.64 if (verbose_low()) { 20.65 - gclog_or_tty->print_cr("[%u] curr_region = "PTR_FORMAT" " 20.66 - "["PTR_FORMAT", "PTR_FORMAT"), " 20.67 - "limit = "PTR_FORMAT, 20.68 + gclog_or_tty->print_cr("[%u] curr_region = " PTR_FORMAT " " 20.69 + "[" PTR_FORMAT ", " PTR_FORMAT "), " 20.70 + "limit = " PTR_FORMAT, 20.71 worker_id, p2i(curr_region), p2i(bottom), p2i(end), p2i(limit)); 20.72 } 20.73 20.74 @@ -3035,7 +3035,7 @@ 20.75 20.76 if (limit > bottom) { 20.77 if (verbose_low()) { 20.78 - gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is not empty, " 20.79 + gclog_or_tty->print_cr("[%u] region " PTR_FORMAT " is not empty, " 20.80 "returning it ", worker_id, p2i(curr_region)); 20.81 } 20.82 return curr_region; 20.83 @@ -3043,7 +3043,7 @@ 20.84 assert(limit == bottom, 20.85 "the region limit should be at bottom"); 20.86 if (verbose_low()) { 20.87 - gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is empty, " 20.88 + gclog_or_tty->print_cr("[%u] region " PTR_FORMAT " is empty, " 20.89 "returning NULL", worker_id, p2i(curr_region)); 20.90 } 20.91 // we return NULL and the caller should try calling 20.92 @@ -3055,13 +3055,13 @@ 20.93 if (verbose_low()) { 20.94 if (curr_region == NULL) { 20.95 gclog_or_tty->print_cr("[%u] found uncommitted region, moving finger, " 20.96 - "global finger = "PTR_FORMAT", " 20.97 - "our finger = "PTR_FORMAT, 20.98 + "global finger = " PTR_FORMAT ", " 20.99 + "our finger = " PTR_FORMAT, 20.100 worker_id, p2i(_finger), p2i(finger)); 20.101 } else { 20.102 gclog_or_tty->print_cr("[%u] somebody else moved the finger, " 20.103 - "global finger = "PTR_FORMAT", " 20.104 - "our finger = "PTR_FORMAT, 20.105 + "global finger = " PTR_FORMAT ", " 20.106 + "our finger = " PTR_FORMAT, 20.107 worker_id, p2i(_finger), p2i(finger)); 20.108 } 20.109 } 20.110 @@ -3097,7 +3097,7 @@ 20.111 20.112 void do_object_work(oop obj) { 20.113 guarantee(!_g1h->obj_in_cs(obj), 20.114 - err_msg("obj: "PTR_FORMAT" in CSet, phase: %s, info: %d", 20.115 + err_msg("obj: " PTR_FORMAT " in CSet, phase: %s, info: %d", 20.116 p2i((void*) obj), phase_str(), _info)); 20.117 } 20.118 20.119 @@ -3158,7 +3158,7 @@ 20.120 // here. 20.121 HeapRegion* global_hr = _g1h->heap_region_containing_raw(global_finger); 20.122 guarantee(global_hr == NULL || global_finger == global_hr->bottom(), 20.123 - err_msg("global finger: "PTR_FORMAT" region: "HR_FORMAT, 20.124 + err_msg("global finger: " PTR_FORMAT " region: " HR_FORMAT, 20.125 p2i(global_finger), HR_FORMAT_PARAMS(global_hr))); 20.126 } 20.127 20.128 @@ -3172,7 +3172,7 @@ 20.129 HeapRegion* task_hr = _g1h->heap_region_containing_raw(task_finger); 20.130 guarantee(task_hr == NULL || task_finger == task_hr->bottom() || 20.131 !task_hr->in_collection_set(), 20.132 - err_msg("task finger: "PTR_FORMAT" region: "HR_FORMAT, 20.133 + err_msg("task finger: " PTR_FORMAT " region: " HR_FORMAT, 20.134 p2i(task_finger), HR_FORMAT_PARAMS(task_hr))); 20.135 } 20.136 } 20.137 @@ -3214,8 +3214,8 @@ 20.138 20.139 assert(start <= limit && limit <= hr->top() && hr->top() <= hr->end(), 20.140 err_msg("Preconditions not met - " 20.141 - "start: "PTR_FORMAT", limit: "PTR_FORMAT", " 20.142 - "top: "PTR_FORMAT", end: "PTR_FORMAT, 20.143 + "start: " PTR_FORMAT ", limit: " PTR_FORMAT ", " 20.144 + "top: " PTR_FORMAT ", end: " PTR_FORMAT, 20.145 p2i(start), p2i(limit), p2i(hr->top()), p2i(hr->end()))); 20.146 20.147 assert(hr->next_marked_bytes() == 0, "Precondition"); 20.148 @@ -3494,7 +3494,7 @@ 20.149 #ifndef PRODUCT 20.150 // for debugging purposes 20.151 void ConcurrentMark::print_finger() { 20.152 - gclog_or_tty->print_cr("heap ["PTR_FORMAT", "PTR_FORMAT"), global finger = "PTR_FORMAT, 20.153 + gclog_or_tty->print_cr("heap [" PTR_FORMAT ", " PTR_FORMAT "), global finger = " PTR_FORMAT, 20.154 p2i(_heap_start), p2i(_heap_end), p2i(_finger)); 20.155 for (uint i = 0; i < _max_worker_id; ++i) { 20.156 gclog_or_tty->print(" %u: " PTR_FORMAT, i, p2i(_tasks[i]->finger())); 20.157 @@ -3579,7 +3579,7 @@ 20.158 "claim_region() should have filtered out continues humongous regions"); 20.159 20.160 if (_cm->verbose_low()) { 20.161 - gclog_or_tty->print_cr("[%u] setting up for region "PTR_FORMAT, 20.162 + gclog_or_tty->print_cr("[%u] setting up for region " PTR_FORMAT, 20.163 _worker_id, p2i(hr)); 20.164 } 20.165 20.166 @@ -3596,7 +3596,7 @@ 20.167 if (limit == bottom) { 20.168 if (_cm->verbose_low()) { 20.169 gclog_or_tty->print_cr("[%u] found an empty region " 20.170 - "["PTR_FORMAT", "PTR_FORMAT")", 20.171 + "[" PTR_FORMAT ", " PTR_FORMAT ")", 20.172 _worker_id, p2i(bottom), p2i(limit)); 20.173 } 20.174 // The region was collected underneath our feet. 20.175 @@ -3628,7 +3628,7 @@ 20.176 void CMTask::giveup_current_region() { 20.177 assert(_curr_region != NULL, "invariant"); 20.178 if (_cm->verbose_low()) { 20.179 - gclog_or_tty->print_cr("[%u] giving up region "PTR_FORMAT, 20.180 + gclog_or_tty->print_cr("[%u] giving up region " PTR_FORMAT, 20.181 _worker_id, p2i(_curr_region)); 20.182 } 20.183 clear_region_fields(); 20.184 @@ -3750,7 +3750,7 @@ 20.185 20.186 if (_cm->verbose_medium()) { 20.187 gclog_or_tty->print_cr("[%u] regular clock, interval = %1.2lfms, " 20.188 - "scanned = "SIZE_FORMAT"%s, refs reached = "SIZE_FORMAT"%s", 20.189 + "scanned = " SIZE_FORMAT "%s, refs reached = " SIZE_FORMAT "%s", 20.190 _worker_id, last_interval_ms, 20.191 _words_scanned, 20.192 (_words_scanned >= _words_scanned_limit) ? " (*)" : "", 20.193 @@ -3919,7 +3919,7 @@ 20.194 statsOnly( ++_local_pops ); 20.195 20.196 if (_cm->verbose_high()) { 20.197 - gclog_or_tty->print_cr("[%u] popped "PTR_FORMAT, _worker_id, 20.198 + gclog_or_tty->print_cr("[%u] popped " PTR_FORMAT, _worker_id, 20.199 p2i((void*) obj)); 20.200 } 20.201 20.202 @@ -4272,8 +4272,8 @@ 20.203 20.204 if (_cm->verbose_low()) { 20.205 gclog_or_tty->print_cr("[%u] we're scanning part " 20.206 - "["PTR_FORMAT", "PTR_FORMAT") " 20.207 - "of region "HR_FORMAT, 20.208 + "[" PTR_FORMAT ", " PTR_FORMAT ") " 20.209 + "of region " HR_FORMAT, 20.210 _worker_id, p2i(_finger), p2i(_region_limit), 20.211 HR_FORMAT_PARAMS(_curr_region)); 20.212 } 20.213 @@ -4360,7 +4360,7 @@ 20.214 20.215 if (_cm->verbose_low()) { 20.216 gclog_or_tty->print_cr("[%u] we successfully claimed " 20.217 - "region "PTR_FORMAT, 20.218 + "region " PTR_FORMAT, 20.219 _worker_id, p2i(claimed_region)); 20.220 } 20.221 20.222 @@ -4421,7 +4421,7 @@ 20.223 20.224 if (_cm->try_stealing(_worker_id, &_hash_seed, obj)) { 20.225 if (_cm->verbose_medium()) { 20.226 - gclog_or_tty->print_cr("[%u] stolen "PTR_FORMAT" successfully", 20.227 + gclog_or_tty->print_cr("[%u] stolen " PTR_FORMAT " successfully", 20.228 _worker_id, p2i((void*) obj)); 20.229 } 20.230 20.231 @@ -4629,7 +4629,7 @@ 20.232 // identify them easily in a large log file. 20.233 #define G1PPRL_LINE_PREFIX "###" 20.234 20.235 -#define G1PPRL_ADDR_BASE_FORMAT " "PTR_FORMAT"-"PTR_FORMAT 20.236 +#define G1PPRL_ADDR_BASE_FORMAT " " PTR_FORMAT "-" PTR_FORMAT 20.237 #ifdef _LP64 20.238 #define G1PPRL_ADDR_BASE_H_FORMAT " %37s" 20.239 #else // _LP64 20.240 @@ -4639,16 +4639,16 @@ 20.241 // For per-region info 20.242 #define G1PPRL_TYPE_FORMAT " %-4s" 20.243 #define G1PPRL_TYPE_H_FORMAT " %4s" 20.244 -#define G1PPRL_BYTE_FORMAT " "SIZE_FORMAT_W(9) 20.245 +#define G1PPRL_BYTE_FORMAT " " SIZE_FORMAT_W(9) 20.246 #define G1PPRL_BYTE_H_FORMAT " %9s" 20.247 #define G1PPRL_DOUBLE_FORMAT " %14.1f" 20.248 #define G1PPRL_DOUBLE_H_FORMAT " %14s" 20.249 20.250 // For summary info 20.251 -#define G1PPRL_SUM_ADDR_FORMAT(tag) " "tag":"G1PPRL_ADDR_BASE_FORMAT 20.252 -#define G1PPRL_SUM_BYTE_FORMAT(tag) " "tag": "SIZE_FORMAT 20.253 -#define G1PPRL_SUM_MB_FORMAT(tag) " "tag": %1.2f MB" 20.254 -#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag)" / %1.2f %%" 20.255 +#define G1PPRL_SUM_ADDR_FORMAT(tag) " " tag ":" G1PPRL_ADDR_BASE_FORMAT 20.256 +#define G1PPRL_SUM_BYTE_FORMAT(tag) " " tag ": " SIZE_FORMAT 20.257 +#define G1PPRL_SUM_MB_FORMAT(tag) " " tag ": %1.2f MB" 20.258 +#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag) " / %1.2f %%" 20.259 20.260 G1PrintRegionLivenessInfoClosure:: 20.261 G1PrintRegionLivenessInfoClosure(outputStream* out, const char* phase_name)
21.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp Tue Feb 23 18:58:36 2016 -0500 21.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp Thu Jun 14 09:15:08 2018 -0700 21.3 @@ -196,8 +196,8 @@ 21.4 assert(_bmStartWord <= (addr) && (addr) < (_bmStartWord + _bmWordSize), \ 21.5 "outside underlying space?"); \ 21.6 assert(G1CollectedHeap::heap()->is_in_exact(addr), \ 21.7 - err_msg("Trying to access not available bitmap "PTR_FORMAT \ 21.8 - " corresponding to "PTR_FORMAT" (%u)", \ 21.9 + err_msg("Trying to access not available bitmap " PTR_FORMAT \ 21.10 + " corresponding to " PTR_FORMAT " (%u)", \ 21.11 p2i(this), p2i(addr), G1CollectedHeap::heap()->addr_to_region(addr))); 21.12 21.13 inline void CMBitMap::mark(HeapWord* addr) { 21.14 @@ -343,7 +343,7 @@ 21.15 21.16 inline void CMTask::deal_with_reference(oop obj) { 21.17 if (_cm->verbose_high()) { 21.18 - gclog_or_tty->print_cr("[%u] we're dealing with reference = "PTR_FORMAT, 21.19 + gclog_or_tty->print_cr("[%u] we're dealing with reference = " PTR_FORMAT, 21.20 _worker_id, p2i((void*) obj)); 21.21 } 21.22 21.23 @@ -392,7 +392,7 @@ 21.24 // assert that word_size is under an upper bound which is its 21.25 // containing region's capacity. 21.26 assert(word_size * HeapWordSize <= hr->capacity(), 21.27 - err_msg("size: "SIZE_FORMAT" capacity: "SIZE_FORMAT" "HR_FORMAT, 21.28 + err_msg("size: " SIZE_FORMAT " capacity: " SIZE_FORMAT " " HR_FORMAT, 21.29 word_size * HeapWordSize, hr->capacity(), 21.30 HR_FORMAT_PARAMS(hr))); 21.31
22.1 --- a/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp Tue Feb 23 18:58:36 2016 -0500 22.2 +++ b/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp Thu Jun 14 09:15:08 2018 -0700 22.3 @@ -140,7 +140,7 @@ 22.4 } 22.5 22.6 void G1AllocRegion::fill_in_ext_msg(ar_ext_msg* msg, const char* message) { 22.7 - msg->append("[%s] %s c: %u b: %s r: "PTR_FORMAT" u: "SIZE_FORMAT, 22.8 + msg->append("[%s] %s c: %u b: %s r: " PTR_FORMAT " u: " SIZE_FORMAT, 22.9 _name, message, _count, BOOL_TO_STR(_bot_updates), 22.10 p2i(_alloc_region), _used_bytes_before); 22.11 } 22.12 @@ -217,7 +217,7 @@ 22.13 22.14 if (G1_ALLOC_REGION_TRACING > 1) { 22.15 if (result != NULL) { 22.16 - jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT" "PTR_FORMAT, 22.17 + jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT " " PTR_FORMAT, 22.18 word_size, result); 22.19 } else if (word_size != 0) { 22.20 jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT, word_size);
23.1 --- a/src/share/vm/gc_implementation/g1/g1Allocator.hpp Tue Feb 23 18:58:36 2016 -0500 23.2 +++ b/src/share/vm/gc_implementation/g1/g1Allocator.hpp Thu Jun 14 09:15:08 2018 -0700 23.3 @@ -73,7 +73,7 @@ 23.4 23.5 void decrease_used(size_t bytes) { 23.6 assert(_summary_bytes_used >= bytes, 23.7 - err_msg("invariant: _summary_bytes_used: "SIZE_FORMAT" should be >= bytes: "SIZE_FORMAT, 23.8 + err_msg("invariant: _summary_bytes_used: " SIZE_FORMAT " should be >= bytes: " SIZE_FORMAT, 23.9 _summary_bytes_used, bytes)); 23.10 _summary_bytes_used -= bytes; 23.11 }
24.1 --- a/src/share/vm/gc_implementation/g1/g1BiasedArray.cpp Tue Feb 23 18:58:36 2016 -0500 24.2 +++ b/src/share/vm/gc_implementation/g1/g1BiasedArray.cpp Thu Jun 14 09:15:08 2018 -0700 24.3 @@ -36,19 +36,19 @@ 24.4 #ifndef PRODUCT 24.5 void G1BiasedMappedArrayBase::verify_index(idx_t index) const { 24.6 guarantee(_base != NULL, "Array not initialized"); 24.7 - guarantee(index < length(), err_msg("Index out of bounds index: "SIZE_FORMAT" length: "SIZE_FORMAT, index, length())); 24.8 + guarantee(index < length(), err_msg("Index out of bounds index: " SIZE_FORMAT " length: " SIZE_FORMAT, index, length())); 24.9 } 24.10 24.11 void G1BiasedMappedArrayBase::verify_biased_index(idx_t biased_index) const { 24.12 guarantee(_biased_base != NULL, "Array not initialized"); 24.13 guarantee(biased_index >= bias() && biased_index < (bias() + length()), 24.14 - err_msg("Biased index out of bounds, index: "SIZE_FORMAT" bias: "SIZE_FORMAT" length: "SIZE_FORMAT, biased_index, bias(), length())); 24.15 + err_msg("Biased index out of bounds, index: " SIZE_FORMAT " bias: " SIZE_FORMAT " length: " SIZE_FORMAT, biased_index, bias(), length())); 24.16 } 24.17 24.18 void G1BiasedMappedArrayBase::verify_biased_index_inclusive_end(idx_t biased_index) const { 24.19 guarantee(_biased_base != NULL, "Array not initialized"); 24.20 guarantee(biased_index >= bias() && biased_index <= (bias() + length()), 24.21 - err_msg("Biased index out of inclusive bounds, index: "SIZE_FORMAT" bias: "SIZE_FORMAT" length: "SIZE_FORMAT, biased_index, bias(), length())); 24.22 + err_msg("Biased index out of inclusive bounds, index: " SIZE_FORMAT " bias: " SIZE_FORMAT " length: " SIZE_FORMAT, biased_index, bias(), length())); 24.23 } 24.24 24.25 class TestMappedArray : public G1BiasedMappedArray<int> {
25.1 --- a/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp Tue Feb 23 18:58:36 2016 -0500 25.2 +++ b/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp Thu Jun 14 09:15:08 2018 -0700 25.3 @@ -385,11 +385,11 @@ 25.4 HeapWord* card_addr = _array->address_for_index(card); 25.5 HeapWord* block_start = block_start_const(card_addr); 25.6 if (block_start != obj_start) { 25.7 - gclog_or_tty->print_cr("block start: "PTR_FORMAT" is incorrect - " 25.8 - "card index: "SIZE_FORMAT" " 25.9 - "card addr: "PTR_FORMAT" BOT entry: %u " 25.10 - "obj: "PTR_FORMAT" word size: "SIZE_FORMAT" " 25.11 - "cards: ["SIZE_FORMAT","SIZE_FORMAT"]", 25.12 + gclog_or_tty->print_cr("block start: " PTR_FORMAT " is incorrect - " 25.13 + "card index: " SIZE_FORMAT " " 25.14 + "card addr: " PTR_FORMAT " BOT entry: %u " 25.15 + "obj: " PTR_FORMAT " word size: " SIZE_FORMAT " " 25.16 + "cards: [" SIZE_FORMAT "," SIZE_FORMAT "]", 25.17 block_start, card, card_addr, 25.18 _array->offset_array(card), 25.19 obj_start, word_size, first_card, last_card); 25.20 @@ -404,11 +404,11 @@ 25.21 G1BlockOffsetArray::print_on(outputStream* out) { 25.22 size_t from_index = _array->index_for(_bottom); 25.23 size_t to_index = _array->index_for(_end); 25.24 - out->print_cr(">> BOT for area ["PTR_FORMAT","PTR_FORMAT") " 25.25 - "cards ["SIZE_FORMAT","SIZE_FORMAT")", 25.26 + out->print_cr(">> BOT for area [" PTR_FORMAT "," PTR_FORMAT ") " 25.27 + "cards [" SIZE_FORMAT "," SIZE_FORMAT ")", 25.28 _bottom, _end, from_index, to_index); 25.29 for (size_t i = from_index; i < to_index; ++i) { 25.30 - out->print_cr(" entry "SIZE_FORMAT_W(8)" | "PTR_FORMAT" : %3u", 25.31 + out->print_cr(" entry " SIZE_FORMAT_W(8) " | " PTR_FORMAT " : %3u", 25.32 i, _array->address_for_index(i), 25.33 (uint) _array->offset_array(i)); 25.34 } 25.35 @@ -488,7 +488,7 @@ 25.36 void 25.37 G1BlockOffsetArrayContigSpace::print_on(outputStream* out) { 25.38 G1BlockOffsetArray::print_on(out); 25.39 - out->print_cr(" next offset threshold: "PTR_FORMAT, _next_offset_threshold); 25.40 - out->print_cr(" next offset index: "SIZE_FORMAT, _next_offset_index); 25.41 + out->print_cr(" next offset threshold: " PTR_FORMAT, _next_offset_threshold); 25.42 + out->print_cr(" next offset index: " SIZE_FORMAT, _next_offset_index); 25.43 } 25.44 #endif // !PRODUCT
26.1 --- a/src/share/vm/gc_implementation/g1/g1CardCounts.cpp Tue Feb 23 18:58:36 2016 -0500 26.2 +++ b/src/share/vm/gc_implementation/g1/g1CardCounts.cpp Thu Jun 14 09:15:08 2018 -0700 26.3 @@ -44,7 +44,7 @@ 26.4 void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) { 26.5 if (has_count_table()) { 26.6 assert(from_card_num < to_card_num, 26.7 - err_msg("Wrong order? from: " SIZE_FORMAT ", to: "SIZE_FORMAT, 26.8 + err_msg("Wrong order? from: " SIZE_FORMAT ", to: " SIZE_FORMAT, 26.9 from_card_num, to_card_num)); 26.10 Copy::fill_to_bytes(&_card_counts[from_card_num], (to_card_num - from_card_num)); 26.11 } 26.12 @@ -87,7 +87,7 @@ 26.13 if (has_count_table()) { 26.14 size_t card_num = ptr_2_card_num(card_ptr); 26.15 assert(card_num < _reserved_max_card_num, 26.16 - err_msg("Card "SIZE_FORMAT" outside of card counts table (max size "SIZE_FORMAT")", 26.17 + err_msg("Card " SIZE_FORMAT " outside of card counts table (max size " SIZE_FORMAT ")", 26.18 card_num, _reserved_max_card_num)); 26.19 count = (uint) _card_counts[card_num]; 26.20 if (count < G1ConcRSHotCardLimit) {
27.1 --- a/src/share/vm/gc_implementation/g1/g1CardCounts.hpp Tue Feb 23 18:58:36 2016 -0500 27.2 +++ b/src/share/vm/gc_implementation/g1/g1CardCounts.hpp Thu Jun 14 09:15:08 2018 -0700 27.3 @@ -91,7 +91,7 @@ 27.4 27.5 jbyte* card_num_2_ptr(size_t card_num) { 27.6 assert(card_num >= 0 && card_num < _reserved_max_card_num, 27.7 - err_msg("card num out of range: "SIZE_FORMAT, card_num)); 27.8 + err_msg("card num out of range: " SIZE_FORMAT, card_num)); 27.9 return (jbyte*) (_ct_bot + card_num); 27.10 } 27.11
28.1 --- a/src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.cpp Tue Feb 23 18:58:36 2016 -0500 28.2 +++ b/src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.cpp Thu Jun 14 09:15:08 2018 -0700 28.3 @@ -352,11 +352,11 @@ 28.4 assert(set1.is_empty(), "Code root set must be initially empty but is not."); 28.5 28.6 assert(G1CodeRootSet::static_mem_size() == sizeof(void*), 28.7 - err_msg("The code root set's static memory usage is incorrect, "SIZE_FORMAT" bytes", G1CodeRootSet::static_mem_size())); 28.8 + err_msg("The code root set's static memory usage is incorrect, " SIZE_FORMAT " bytes", G1CodeRootSet::static_mem_size())); 28.9 28.10 set1.add((nmethod*)1); 28.11 assert(set1.length() == 1, err_msg("Added exactly one element, but set contains " 28.12 - SIZE_FORMAT" elements", set1.length())); 28.13 + SIZE_FORMAT " elements", set1.length())); 28.14 28.15 const size_t num_to_add = (size_t)G1CodeRootSet::Threshold + 1; 28.16 28.17 @@ -365,14 +365,14 @@ 28.18 } 28.19 assert(set1.length() == 1, 28.20 err_msg("Duplicate detection should not have increased the set size but " 28.21 - "is "SIZE_FORMAT, set1.length())); 28.22 + "is " SIZE_FORMAT, set1.length())); 28.23 28.24 for (size_t i = 2; i <= num_to_add; i++) { 28.25 set1.add((nmethod*)(uintptr_t)(i)); 28.26 } 28.27 assert(set1.length() == num_to_add, 28.28 - err_msg("After adding in total "SIZE_FORMAT" distinct code roots, they " 28.29 - "need to be in the set, but there are only "SIZE_FORMAT, 28.30 + err_msg("After adding in total " SIZE_FORMAT " distinct code roots, they " 28.31 + "need to be in the set, but there are only " SIZE_FORMAT, 28.32 num_to_add, set1.length())); 28.33 28.34 assert(CodeRootSetTable::_purge_list != NULL, "should have grown to large hashtable"); 28.35 @@ -387,7 +387,7 @@ 28.36 } 28.37 } 28.38 assert(num_popped == num_to_add, 28.39 - err_msg("Managed to pop "SIZE_FORMAT" code roots, but only "SIZE_FORMAT" " 28.40 + err_msg("Managed to pop " SIZE_FORMAT " code roots, but only " SIZE_FORMAT " " 28.41 "were added", num_popped, num_to_add)); 28.42 assert(CodeRootSetTable::_purge_list != NULL, "should have grown to large hashtable"); 28.43
29.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Tue Feb 23 18:58:36 2016 -0500 29.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Thu Jun 14 09:15:08 2018 -0700 29.3 @@ -230,7 +230,7 @@ 29.4 HeapRegion* last = NULL; 29.5 while (curr != NULL) { 29.6 if (!curr->is_young()) { 29.7 - gclog_or_tty->print_cr("### YOUNG REGION "PTR_FORMAT"-"PTR_FORMAT" " 29.8 + gclog_or_tty->print_cr("### YOUNG REGION " PTR_FORMAT "-" PTR_FORMAT " " 29.9 "incorrectly tagged (y: %d, surv: %d)", 29.10 curr->bottom(), curr->end(), 29.11 curr->is_young(), curr->is_survivor()); 29.12 @@ -359,7 +359,7 @@ 29.13 if (curr == NULL) 29.14 gclog_or_tty->print_cr(" empty"); 29.15 while (curr != NULL) { 29.16 - gclog_or_tty->print_cr(" "HR_FORMAT", P: "PTR_FORMAT ", N: "PTR_FORMAT", age: %4d", 29.17 + gclog_or_tty->print_cr(" " HR_FORMAT ", P: " PTR_FORMAT ", N: " PTR_FORMAT ", age: %4d", 29.18 HR_FORMAT_PARAMS(curr), 29.19 curr->prev_top_at_mark_start(), 29.20 curr->next_top_at_mark_start(), 29.21 @@ -490,7 +490,7 @@ 29.22 gclog_or_tty->print_cr("Log entries = %d, dirty cards = %d.", 29.23 clear.num_processed(), orig_count); 29.24 guarantee(redirty.num_processed() == clear.num_processed(), 29.25 - err_msg("Redirtied "SIZE_FORMAT" cards, bug cleared "SIZE_FORMAT, 29.26 + err_msg("Redirtied " SIZE_FORMAT " cards, bug cleared " SIZE_FORMAT, 29.27 redirty.num_processed(), clear.num_processed())); 29.28 29.29 CountNonCleanMemRegionClosure count3(this); 29.30 @@ -528,7 +528,7 @@ 29.31 HeapRegion* res = _hrm.allocate_free_region(is_old); 29.32 if (G1ConcRegionFreeingVerbose) { 29.33 gclog_or_tty->print_cr("G1ConcRegionFreeing [region alloc] : " 29.34 - "allocated "HR_FORMAT" from secondary_free_list", 29.35 + "allocated " HR_FORMAT " from secondary_free_list", 29.36 HR_FORMAT_PARAMS(res)); 29.37 } 29.38 return res; 29.39 @@ -1597,8 +1597,8 @@ 29.40 // This assert only makes sense here, before we adjust them 29.41 // with respect to the min and max heap size. 29.42 assert(minimum_desired_capacity <= maximum_desired_capacity, 29.43 - err_msg("minimum_desired_capacity = "SIZE_FORMAT", " 29.44 - "maximum_desired_capacity = "SIZE_FORMAT, 29.45 + err_msg("minimum_desired_capacity = " SIZE_FORMAT ", " 29.46 + "maximum_desired_capacity = " SIZE_FORMAT, 29.47 minimum_desired_capacity, maximum_desired_capacity)); 29.48 29.49 // Should not be greater than the heap max size. No need to adjust 29.50 @@ -2256,7 +2256,7 @@ 29.51 virtual bool doHeapRegion(HeapRegion* hr) { 29.52 unsigned region_gc_time_stamp = hr->get_gc_time_stamp(); 29.53 if (_gc_time_stamp != region_gc_time_stamp) { 29.54 - gclog_or_tty->print_cr("Region "HR_FORMAT" has GC time stamp = %d, " 29.55 + gclog_or_tty->print_cr("Region " HR_FORMAT " has GC time stamp = %d, " 29.56 "expected %d", HR_FORMAT_PARAMS(hr), 29.57 region_gc_time_stamp, _gc_time_stamp); 29.58 _failures = true; 29.59 @@ -2679,7 +2679,7 @@ 29.60 } else if (r->continuesHumongous()) { 29.61 if (r->humongous_start_region() != _sh_region) { 29.62 gclog_or_tty->print_cr("Region " HR_FORMAT ", " 29.63 - "HS = "PTR_FORMAT", should be "PTR_FORMAT, 29.64 + "HS = " PTR_FORMAT ", should be " PTR_FORMAT, 29.65 HR_FORMAT_PARAMS(r), 29.66 r->humongous_start_region(), 29.67 _sh_region); 29.68 @@ -2991,10 +2991,10 @@ 29.69 if (!oopDesc::is_null(heap_oop)) { 29.70 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); 29.71 if (_g1h->is_obj_dead_cond(obj, _vo)) { 29.72 - gclog_or_tty->print_cr("Root location "PTR_FORMAT" " 29.73 - "points to dead obj "PTR_FORMAT, p, (void*) obj); 29.74 + gclog_or_tty->print_cr("Root location " PTR_FORMAT " " 29.75 + "points to dead obj " PTR_FORMAT, p, (void*) obj); 29.76 if (_vo == VerifyOption_G1UseMarkWord) { 29.77 - gclog_or_tty->print_cr(" Mark word: "PTR_FORMAT, (void*)(obj->mark())); 29.78 + gclog_or_tty->print_cr(" Mark word: " PTR_FORMAT, (void*)(obj->mark())); 29.79 } 29.80 obj->print_on(gclog_or_tty); 29.81 _failures = true; 29.82 @@ -3041,9 +3041,9 @@ 29.83 // Verify that the strong code root list for this region 29.84 // contains the nmethod 29.85 if (!hrrs->strong_code_roots_list_contains(_nm)) { 29.86 - gclog_or_tty->print_cr("Code root location "PTR_FORMAT" " 29.87 - "from nmethod "PTR_FORMAT" not in strong " 29.88 - "code roots for region ["PTR_FORMAT","PTR_FORMAT")", 29.89 + gclog_or_tty->print_cr("Code root location " PTR_FORMAT " " 29.90 + "from nmethod " PTR_FORMAT " not in strong " 29.91 + "code roots for region [" PTR_FORMAT "," PTR_FORMAT ")", 29.92 p, _nm, hr->bottom(), hr->end()); 29.93 _failures = true; 29.94 } 29.95 @@ -3173,7 +3173,7 @@ 29.96 if (o != NULL) { 29.97 HeapWord *start = (HeapWord *) o; 29.98 size_t word_sz = o->size(); 29.99 - gclog_or_tty->print("\nPrinting obj "PTR_FORMAT" of size " SIZE_FORMAT 29.100 + gclog_or_tty->print("\nPrinting obj " PTR_FORMAT " of size " SIZE_FORMAT 29.101 " isMarkedPrev %d isMarkedNext %d isAllocSince %d\n", 29.102 (void*) o, word_sz, 29.103 _g1->isMarkedPrev(o), 29.104 @@ -3184,7 +3184,7 @@ 29.105 int *val; 29.106 for (cur = start; cur < end; cur++) { 29.107 val = (int *) cur; 29.108 - gclog_or_tty->print("\t "PTR_FORMAT":"PTR_FORMAT"\n", val, *val); 29.109 + gclog_or_tty->print("\t " PTR_FORMAT ":" PTR_FORMAT "\n", val, *val); 29.110 } 29.111 } 29.112 } 29.113 @@ -3219,9 +3219,9 @@ 29.114 r->object_iterate(¬_dead_yet_cl); 29.115 if (_vo != VerifyOption_G1UseNextMarking) { 29.116 if (r->max_live_bytes() < not_dead_yet_cl.live_bytes()) { 29.117 - gclog_or_tty->print_cr("["PTR_FORMAT","PTR_FORMAT"] " 29.118 - "max_live_bytes "SIZE_FORMAT" " 29.119 - "< calculated "SIZE_FORMAT, 29.120 + gclog_or_tty->print_cr("[" PTR_FORMAT "," PTR_FORMAT "] " 29.121 + "max_live_bytes " SIZE_FORMAT " " 29.122 + "< calculated " SIZE_FORMAT, 29.123 r->bottom(), r->end(), 29.124 r->max_live_bytes(), 29.125 not_dead_yet_cl.live_bytes()); 29.126 @@ -3533,7 +3533,7 @@ 29.127 size_t occupied = hrrs->occupied(); 29.128 _occupied_sum += occupied; 29.129 29.130 - gclog_or_tty->print_cr("Printing RSet for region "HR_FORMAT, 29.131 + gclog_or_tty->print_cr("Printing RSet for region " HR_FORMAT, 29.132 HR_FORMAT_PARAMS(r)); 29.133 if (occupied == 0) { 29.134 gclog_or_tty->print_cr(" RSet is empty"); 29.135 @@ -3552,7 +3552,7 @@ 29.136 } 29.137 29.138 ~PrintRSetsClosure() { 29.139 - gclog_or_tty->print_cr("Occupied Sum: "SIZE_FORMAT, _occupied_sum); 29.140 + gclog_or_tty->print_cr("Occupied Sum: " SIZE_FORMAT, _occupied_sum); 29.141 gclog_or_tty->print_cr("========================================"); 29.142 gclog_or_tty->cr(); 29.143 } 29.144 @@ -4416,7 +4416,7 @@ 29.145 G1CollectedHeap::handle_evacuation_failure_par(G1ParScanThreadState* _par_scan_state, 29.146 oop old) { 29.147 assert(obj_in_cs(old), 29.148 - err_msg("obj: "PTR_FORMAT" should still be in the CSet", 29.149 + err_msg("obj: " PTR_FORMAT " should still be in the CSet", 29.150 (HeapWord*) old)); 29.151 markOop m = old->mark(); 29.152 oop forward_ptr = old->forward_to_atomic(old); 29.153 @@ -4450,7 +4450,7 @@ 29.154 // space for this object (old != forward_ptr) or they beat us in 29.155 // self-forwarding it (old == forward_ptr). 29.156 assert(old == forward_ptr || !obj_in_cs(forward_ptr), 29.157 - err_msg("obj: "PTR_FORMAT" forwarded to: "PTR_FORMAT" " 29.158 + err_msg("obj: " PTR_FORMAT " forwarded to: " PTR_FORMAT " " 29.159 "should not be in the CSet", 29.160 (HeapWord*) old, (HeapWord*) forward_ptr)); 29.161 return forward_ptr; 29.162 @@ -4837,16 +4837,16 @@ 29.163 29.164 ~G1StringSymbolTableUnlinkTask() { 29.165 guarantee(!_process_strings || !_do_in_parallel || StringTable::parallel_claimed_index() >= _initial_string_table_size, 29.166 - err_msg("claim value "INT32_FORMAT" after unlink less than initial string table size "INT32_FORMAT, 29.167 + err_msg("claim value " INT32_FORMAT " after unlink less than initial string table size " INT32_FORMAT, 29.168 StringTable::parallel_claimed_index(), _initial_string_table_size)); 29.169 guarantee(!_process_symbols || !_do_in_parallel || SymbolTable::parallel_claimed_index() >= _initial_symbol_table_size, 29.170 - err_msg("claim value "INT32_FORMAT" after unlink less than initial symbol table size "INT32_FORMAT, 29.171 + err_msg("claim value " INT32_FORMAT " after unlink less than initial symbol table size " INT32_FORMAT, 29.172 SymbolTable::parallel_claimed_index(), _initial_symbol_table_size)); 29.173 29.174 if (G1TraceStringSymbolTableScrubbing) { 29.175 gclog_or_tty->print_cr("Cleaned string and symbol table, " 29.176 - "strings: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed, " 29.177 - "symbols: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed", 29.178 + "strings: " SIZE_FORMAT " processed, " SIZE_FORMAT " removed, " 29.179 + "symbols: " SIZE_FORMAT " processed, " SIZE_FORMAT " removed", 29.180 strings_processed(), strings_removed(), 29.181 symbols_processed(), symbols_removed()); 29.182 } 29.183 @@ -6029,13 +6029,13 @@ 29.184 bool G1CollectedHeap::verify_no_bits_over_tams(const char* bitmap_name, CMBitMapRO* bitmap, 29.185 HeapWord* tams, HeapWord* end) { 29.186 guarantee(tams <= end, 29.187 - err_msg("tams: "PTR_FORMAT" end: "PTR_FORMAT, tams, end)); 29.188 + err_msg("tams: " PTR_FORMAT " end: " PTR_FORMAT, tams, end)); 29.189 HeapWord* result = bitmap->getNextMarkedWordAddress(tams, end); 29.190 if (result < end) { 29.191 gclog_or_tty->cr(); 29.192 - gclog_or_tty->print_cr("## wrong marked address on %s bitmap: "PTR_FORMAT, 29.193 + gclog_or_tty->print_cr("## wrong marked address on %s bitmap: " PTR_FORMAT, 29.194 bitmap_name, result); 29.195 - gclog_or_tty->print_cr("## %s tams: "PTR_FORMAT" end: "PTR_FORMAT, 29.196 + gclog_or_tty->print_cr("## %s tams: " PTR_FORMAT " end: " PTR_FORMAT, 29.197 bitmap_name, tams, end); 29.198 return false; 29.199 } 29.200 @@ -6061,7 +6061,7 @@ 29.201 res_n = verify_no_bits_over_tams("next", next_bitmap, ntams, end); 29.202 } 29.203 if (!res_p || !res_n) { 29.204 - gclog_or_tty->print_cr("#### Bitmap verification failed for "HR_FORMAT, 29.205 + gclog_or_tty->print_cr("#### Bitmap verification failed for " HR_FORMAT, 29.206 HR_FORMAT_PARAMS(hr)); 29.207 gclog_or_tty->print_cr("#### Caller: %s", caller); 29.208 return false; 29.209 @@ -6373,7 +6373,7 @@ 29.210 !r->rem_set()->is_empty()) { 29.211 29.212 if (G1TraceEagerReclaimHumongousObjects) { 29.213 - 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", 29.214 + 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", 29.215 region_idx, 29.216 obj->size()*HeapWordSize, 29.217 r->bottom(), 29.218 @@ -6395,7 +6395,7 @@ 29.219 r->bottom())); 29.220 29.221 if (G1TraceEagerReclaimHumongousObjects) { 29.222 - 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", 29.223 + 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", 29.224 region_idx, 29.225 obj->size()*HeapWordSize, 29.226 r->bottom(), 29.227 @@ -6551,7 +6551,7 @@ 29.228 NoYoungRegionsClosure() : _success(true) { } 29.229 bool doHeapRegion(HeapRegion* r) { 29.230 if (r->is_young()) { 29.231 - gclog_or_tty->print_cr("Region ["PTR_FORMAT", "PTR_FORMAT") tagged as young", 29.232 + gclog_or_tty->print_cr("Region [" PTR_FORMAT ", " PTR_FORMAT ") tagged as young", 29.233 r->bottom(), r->end()); 29.234 _success = false; 29.235 } 29.236 @@ -6680,7 +6680,7 @@ 29.237 } 29.238 assert(_allocator->used_unlocked() == recalculate_used(), 29.239 err_msg("inconsistent _allocator->used_unlocked(), " 29.240 - "value: "SIZE_FORMAT" recalculated: "SIZE_FORMAT, 29.241 + "value: " SIZE_FORMAT " recalculated: " SIZE_FORMAT, 29.242 _allocator->used_unlocked(), recalculate_used())); 29.243 } 29.244 29.245 @@ -6901,8 +6901,8 @@ 29.246 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); 29.247 HeapRegion* hr = _g1h->heap_region_containing(obj); 29.248 assert(!hr->continuesHumongous(), 29.249 - err_msg("trying to add code root "PTR_FORMAT" in continuation of humongous region "HR_FORMAT 29.250 - " starting at "HR_FORMAT, 29.251 + err_msg("trying to add code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT 29.252 + " starting at " HR_FORMAT, 29.253 _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()))); 29.254 29.255 // HeapRegion::add_strong_code_root_locked() avoids adding duplicate entries. 29.256 @@ -6928,8 +6928,8 @@ 29.257 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); 29.258 HeapRegion* hr = _g1h->heap_region_containing(obj); 29.259 assert(!hr->continuesHumongous(), 29.260 - err_msg("trying to remove code root "PTR_FORMAT" in continuation of humongous region "HR_FORMAT 29.261 - " starting at "HR_FORMAT, 29.262 + err_msg("trying to remove code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT 29.263 + " starting at " HR_FORMAT, 29.264 _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()))); 29.265 29.266 hr->remove_strong_code_root(_nm);
30.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp Tue Feb 23 18:58:36 2016 -0500 30.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp Thu Jun 14 09:15:08 2018 -0700 30.3 @@ -81,7 +81,7 @@ 30.4 30.5 inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const { 30.6 assert(is_in_reserved(addr), 30.7 - err_msg("Cannot calculate region index for address "PTR_FORMAT" that is outside of the heap ["PTR_FORMAT", "PTR_FORMAT")", 30.8 + err_msg("Cannot calculate region index for address " PTR_FORMAT " that is outside of the heap [" PTR_FORMAT ", " PTR_FORMAT ")", 30.9 p2i(addr), p2i(_reserved.start()), p2i(_reserved.end()))); 30.10 return (uint)(pointer_delta(addr, _reserved.start(), sizeof(uint8_t)) >> HeapRegion::LogOfHRGrainBytes); 30.11 } 30.12 @@ -94,7 +94,7 @@ 30.13 inline HeapRegion* G1CollectedHeap::heap_region_containing_raw(const T addr) const { 30.14 assert(addr != NULL, "invariant"); 30.15 assert(is_in_g1_reserved((const void*) addr), 30.16 - err_msg("Address "PTR_FORMAT" is outside of the heap ranging from ["PTR_FORMAT" to "PTR_FORMAT")", 30.17 + err_msg("Address " PTR_FORMAT " is outside of the heap ranging from [" PTR_FORMAT " to " PTR_FORMAT ")", 30.18 p2i((void*)addr), p2i(g1_reserved().start()), p2i(g1_reserved().end()))); 30.19 return _hrm.addr_to_region((HeapWord*) addr); 30.20 }
31.1 --- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Tue Feb 23 18:58:36 2016 -0500 31.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Thu Jun 14 09:15:08 2018 -0700 31.3 @@ -199,7 +199,7 @@ 31.4 const size_t region_size = HeapRegion::GrainWords; 31.5 if (YoungPLABSize > region_size || OldPLABSize > region_size) { 31.6 char buffer[128]; 31.7 - jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most "SIZE_FORMAT, 31.8 + jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most " SIZE_FORMAT, 31.9 OldPLABSize > region_size ? "Old" : "Young", region_size); 31.10 vm_exit_during_initialization(buffer); 31.11 } 31.12 @@ -846,7 +846,7 @@ 31.13 update_survivors_policy(); 31.14 31.15 assert(_g1->used() == _g1->recalculate_used(), 31.16 - err_msg("sanity, used: "SIZE_FORMAT" recalculate_used: "SIZE_FORMAT, 31.17 + err_msg("sanity, used: " SIZE_FORMAT " recalculate_used: " SIZE_FORMAT, 31.18 _g1->used(), _g1->recalculate_used())); 31.19 31.20 double s_w_t_ms = (start_time_sec - _stop_world_start) * 1000.0; 31.21 @@ -1231,10 +1231,10 @@ 31.22 (_young_list_target_length * HeapRegion::GrainBytes) - survivor_used_bytes_after_gc; 31.23 31.24 gclog_or_tty->print( 31.25 - " [Eden: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT") " 31.26 - "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" " 31.27 - "Heap: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->" 31.28 - EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")]", 31.29 + " [Eden: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->" EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ") " 31.30 + "Survivors: " EXT_SIZE_FORMAT "->" EXT_SIZE_FORMAT " " 31.31 + "Heap: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->" 31.32 + EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")]", 31.33 EXT_SIZE_PARAMS(_eden_used_bytes_before_gc), 31.34 EXT_SIZE_PARAMS(_eden_capacity_bytes_before_gc), 31.35 EXT_SIZE_PARAMS(eden_used_bytes_after_gc), 31.36 @@ -1851,7 +1851,7 @@ 31.37 while (csr != NULL) { 31.38 HeapRegion* next = csr->next_in_collection_set(); 31.39 assert(csr->in_collection_set(), "bad CS"); 31.40 - st->print_cr(" "HR_FORMAT", P: "PTR_FORMAT "N: "PTR_FORMAT", age: %4d", 31.41 + st->print_cr(" " HR_FORMAT ", P: " PTR_FORMAT "N: " PTR_FORMAT ", age: %4d", 31.42 HR_FORMAT_PARAMS(csr), 31.43 csr->prev_top_at_mark_start(), csr->next_top_at_mark_start(), 31.44 csr->age_in_surv_rate_group_cond());
32.1 --- a/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp Tue Feb 23 18:58:36 2016 -0500 32.2 +++ b/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp Thu Jun 14 09:15:08 2018 -0700 32.3 @@ -121,15 +121,15 @@ 32.4 // Single parameter format strings 32.5 #define ergo_format_str(_name_) ", " _name_ ": %s" 32.6 #define ergo_format_region(_name_) ", " _name_ ": %u regions" 32.7 -#define ergo_format_byte(_name_) ", " _name_ ": "SIZE_FORMAT" bytes" 32.8 +#define ergo_format_byte(_name_) ", " _name_ ": " SIZE_FORMAT " bytes" 32.9 #define ergo_format_double(_name_) ", " _name_ ": %1.2f" 32.10 #define ergo_format_perc(_name_) ", " _name_ ": %1.2f %%" 32.11 #define ergo_format_ms(_name_) ", " _name_ ": %1.2f ms" 32.12 -#define ergo_format_size(_name_) ", " _name_ ": "SIZE_FORMAT 32.13 +#define ergo_format_size(_name_) ", " _name_ ": " SIZE_FORMAT 32.14 32.15 // Double parameter format strings 32.16 #define ergo_format_byte_perc(_name_) \ 32.17 - ", " _name_ ": "SIZE_FORMAT" bytes (%1.2f %%)" 32.18 + ", " _name_ ": " SIZE_FORMAT " bytes (%1.2f %%)" 32.19 32.20 // Generates the format string 32.21 #define ergo_format(_extra_format_) \
33.1 --- a/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp Tue Feb 23 18:58:36 2016 -0500 33.2 +++ b/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp Thu Jun 14 09:15:08 2018 -0700 33.3 @@ -332,7 +332,7 @@ 33.4 } 33.5 33.6 void G1GCPhaseTimes::print_stats(int level, const char* str, size_t value) { 33.7 - LineBuffer(level).append_and_print_cr("[%s: "SIZE_FORMAT"]", str, value); 33.8 + LineBuffer(level).append_and_print_cr("[%s: " SIZE_FORMAT "]", str, value); 33.9 } 33.10 33.11 void G1GCPhaseTimes::print_stats(int level, const char* str, double value, uint workers) { 33.12 @@ -452,7 +452,7 @@ 33.13 33.14 if (phase->_thread_work_items != NULL) { 33.15 LineBuffer buf2(phase->_thread_work_items->_indent_level); 33.16 - buf2.append_and_print_cr("[%s: "SIZE_FORMAT"]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id)); 33.17 + buf2.append_and_print_cr("[%s: " SIZE_FORMAT "]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id)); 33.18 } 33.19 } 33.20
34.1 --- a/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp Tue Feb 23 18:58:36 2016 -0500 34.2 +++ b/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp Thu Jun 14 09:15:08 2018 -0700 34.3 @@ -84,18 +84,18 @@ 34.4 34.5 if (type_str != NULL) { 34.6 if (top != NULL) { 34.7 - gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT" "PTR_FORMAT, 34.8 + gclog_or_tty->print_cr(G1HR_PREFIX " %s(%s) " PTR_FORMAT " " PTR_FORMAT, 34.9 action_str, type_str, bottom, top); 34.10 } else { 34.11 - gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT, 34.12 + gclog_or_tty->print_cr(G1HR_PREFIX " %s(%s) " PTR_FORMAT, 34.13 action_str, type_str, bottom); 34.14 } 34.15 } else { 34.16 if (top != NULL) { 34.17 - gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT" "PTR_FORMAT, 34.18 + gclog_or_tty->print_cr(G1HR_PREFIX " %s " PTR_FORMAT " " PTR_FORMAT, 34.19 action_str, bottom, top); 34.20 } else { 34.21 - gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT, 34.22 + gclog_or_tty->print_cr(G1HR_PREFIX " %s " PTR_FORMAT, 34.23 action_str, bottom); 34.24 } 34.25 } 34.26 @@ -104,11 +104,11 @@ 34.27 void G1HRPrinter::print(ActionType action, HeapWord* bottom, HeapWord* end) { 34.28 const char* action_str = action_name(action); 34.29 34.30 - gclog_or_tty->print_cr(G1HR_PREFIX" %s ["PTR_FORMAT","PTR_FORMAT"]", 34.31 + gclog_or_tty->print_cr(G1HR_PREFIX " %s [" PTR_FORMAT "," PTR_FORMAT "]", 34.32 action_str, bottom, end); 34.33 } 34.34 34.35 void G1HRPrinter::print(PhaseType phase, size_t phase_num) { 34.36 const char* phase_str = phase_name(phase); 34.37 - gclog_or_tty->print_cr(G1HR_PREFIX" #%s "SIZE_FORMAT, phase_str, phase_num); 34.38 + gclog_or_tty->print_cr(G1HR_PREFIX " #%s " SIZE_FORMAT, phase_str, phase_num); 34.39 }
35.1 --- a/src/share/vm/gc_implementation/g1/g1InCSetState.hpp Tue Feb 23 18:58:36 2016 -0500 35.2 +++ b/src/share/vm/gc_implementation/g1/g1InCSetState.hpp Thu Jun 14 09:15:08 2018 -0700 35.3 @@ -103,7 +103,7 @@ 35.4 public: 35.5 void set_humongous(uintptr_t index) { 35.6 assert(get_by_index(index).is_default(), 35.7 - err_msg("State at index " INTPTR_FORMAT" should be default but is " CSETSTATE_FORMAT, index, get_by_index(index).value())); 35.8 + err_msg("State at index " INTPTR_FORMAT " should be default but is " CSETSTATE_FORMAT, index, get_by_index(index).value())); 35.9 set_by_index(index, InCSetState::Humongous); 35.10 } 35.11 35.12 @@ -113,13 +113,13 @@ 35.13 35.14 void set_in_young(uintptr_t index) { 35.15 assert(get_by_index(index).is_default(), 35.16 - err_msg("State at index " INTPTR_FORMAT" should be default but is " CSETSTATE_FORMAT, index, get_by_index(index).value())); 35.17 + err_msg("State at index " INTPTR_FORMAT " should be default but is " CSETSTATE_FORMAT, index, get_by_index(index).value())); 35.18 set_by_index(index, InCSetState::Young); 35.19 } 35.20 35.21 void set_in_old(uintptr_t index) { 35.22 assert(get_by_index(index).is_default(), 35.23 - err_msg("State at index " INTPTR_FORMAT" should be default but is " CSETSTATE_FORMAT, index, get_by_index(index).value())); 35.24 + err_msg("State at index " INTPTR_FORMAT " should be default but is " CSETSTATE_FORMAT, index, get_by_index(index).value())); 35.25 set_by_index(index, InCSetState::Old); 35.26 } 35.27
36.1 --- a/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp Tue Feb 23 18:58:36 2016 -0500 36.2 +++ b/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp Thu Jun 14 09:15:08 2018 -0700 36.3 @@ -118,7 +118,7 @@ 36.4 oop obj = oopDesc::load_decode_heap_oop(p); 36.5 if (_cm->verbose_high()) { 36.6 gclog_or_tty->print_cr("[%u] we're looking at location " 36.7 - "*"PTR_FORMAT" = "PTR_FORMAT, 36.8 + "*" PTR_FORMAT " = " PTR_FORMAT, 36.9 _task->worker_id(), p2i(p), p2i((void*) obj)); 36.10 } 36.11 _task->deal_with_reference(obj);
37.1 --- a/src/share/vm/gc_implementation/g1/g1RemSet.cpp Tue Feb 23 18:58:36 2016 -0500 37.2 +++ b/src/share/vm/gc_implementation/g1/g1RemSet.cpp Thu Jun 14 09:15:08 2018 -0700 37.3 @@ -442,7 +442,7 @@ 37.4 bool G1RemSet::refine_card(jbyte* card_ptr, uint worker_i, 37.5 bool check_for_refs_into_cset) { 37.6 assert(_g1->is_in_exact(_ct_bs->addr_for(card_ptr)), 37.7 - err_msg("Card at "PTR_FORMAT" index "SIZE_FORMAT" representing heap at "PTR_FORMAT" (%u) must be in committed heap", 37.8 + err_msg("Card at " PTR_FORMAT " index " SIZE_FORMAT " representing heap at " PTR_FORMAT " (%u) must be in committed heap", 37.9 p2i(card_ptr), 37.10 _ct_bs->index_for(_ct_bs->addr_for(card_ptr)), 37.11 _ct_bs->addr_for(card_ptr),
38.1 --- a/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp Tue Feb 23 18:58:36 2016 -0500 38.2 +++ b/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp Thu Jun 14 09:15:08 2018 -0700 38.3 @@ -183,26 +183,26 @@ 38.4 size_t code_root_elems() const { return _code_root_elems; } 38.5 38.6 void print_rs_mem_info_on(outputStream * out, size_t total) { 38.7 - out->print_cr(" "SIZE_FORMAT_W(8) "%s (%5.1f%%) by "SIZE_FORMAT" %s regions", 38.8 + out->print_cr(" " SIZE_FORMAT_W(8) "%s (%5.1f%%) by " SIZE_FORMAT " %s regions", 38.9 byte_size_in_proper_unit(rs_mem_size()), 38.10 proper_unit_for_byte_size(rs_mem_size()), 38.11 rs_mem_size_percent_of(total), amount(), _name); 38.12 } 38.13 38.14 void print_cards_occupied_info_on(outputStream * out, size_t total) { 38.15 - out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) entries by "SIZE_FORMAT" %s regions", 38.16 + out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) entries by " SIZE_FORMAT " %s regions", 38.17 cards_occupied(), cards_occupied_percent_of(total), amount(), _name); 38.18 } 38.19 38.20 void print_code_root_mem_info_on(outputStream * out, size_t total) { 38.21 - out->print_cr(" "SIZE_FORMAT_W(8) "%s (%5.1f%%) by "SIZE_FORMAT" %s regions", 38.22 + out->print_cr(" " SIZE_FORMAT_W(8) "%s (%5.1f%%) by " SIZE_FORMAT " %s regions", 38.23 byte_size_in_proper_unit(code_root_mem_size()), 38.24 proper_unit_for_byte_size(code_root_mem_size()), 38.25 code_root_mem_size_percent_of(total), amount(), _name); 38.26 } 38.27 38.28 void print_code_root_elems_info_on(outputStream * out, size_t total) { 38.29 - out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) elements by "SIZE_FORMAT" %s regions", 38.30 + out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) elements by " SIZE_FORMAT " %s regions", 38.31 code_root_elems(), code_root_elems_percent_of(total), amount(), _name); 38.32 } 38.33 }; 38.34 @@ -298,7 +298,7 @@ 38.35 byte_size_in_proper_unit(HeapRegionRemSet::fl_mem_size()), 38.36 proper_unit_for_byte_size(HeapRegionRemSet::fl_mem_size())); 38.37 38.38 - out->print_cr(" "SIZE_FORMAT" occupied cards represented.", 38.39 + out->print_cr(" " SIZE_FORMAT " occupied cards represented.", 38.40 total_cards_occupied()); 38.41 for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) { 38.42 (*current)->print_cards_occupied_info_on(out, total_cards_occupied()); 38.43 @@ -306,8 +306,8 @@ 38.44 38.45 // Largest sized rem set region statistics 38.46 HeapRegionRemSet* rem_set = max_rs_mem_sz_region()->rem_set(); 38.47 - out->print_cr(" Region with largest rem set = "HR_FORMAT", " 38.48 - "size = "SIZE_FORMAT "%s, occupied = "SIZE_FORMAT "%s.", 38.49 + out->print_cr(" Region with largest rem set = " HR_FORMAT ", " 38.50 + "size = " SIZE_FORMAT "%s, occupied = " SIZE_FORMAT "%s.", 38.51 HR_FORMAT_PARAMS(max_rs_mem_sz_region()), 38.52 byte_size_in_proper_unit(rem_set->mem_size()), 38.53 proper_unit_for_byte_size(rem_set->mem_size()), 38.54 @@ -326,14 +326,14 @@ 38.55 (*current)->print_code_root_mem_info_on(out, total_code_root_mem_sz()); 38.56 } 38.57 38.58 - out->print_cr(" "SIZE_FORMAT" code roots represented.", 38.59 + out->print_cr(" " SIZE_FORMAT " code roots represented.", 38.60 total_code_root_elems()); 38.61 for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) { 38.62 (*current)->print_code_root_elems_info_on(out, total_code_root_elems()); 38.63 } 38.64 38.65 - out->print_cr(" Region with largest amount of code roots = "HR_FORMAT", " 38.66 - "size = "SIZE_FORMAT "%s, num_elems = "SIZE_FORMAT".", 38.67 + out->print_cr(" Region with largest amount of code roots = " HR_FORMAT ", " 38.68 + "size = " SIZE_FORMAT "%s, num_elems = " SIZE_FORMAT ".", 38.69 HR_FORMAT_PARAMS(max_code_root_mem_sz_region()), 38.70 byte_size_in_proper_unit(max_code_root_rem_set->strong_code_roots_mem_size()), 38.71 proper_unit_for_byte_size(max_code_root_rem_set->strong_code_roots_mem_size()), 38.72 @@ -344,16 +344,16 @@ 38.73 38.74 void G1RemSetSummary::print_on(outputStream* out) { 38.75 out->print_cr("\n Recent concurrent refinement statistics"); 38.76 - out->print_cr(" Processed "SIZE_FORMAT" cards", 38.77 + out->print_cr(" Processed " SIZE_FORMAT " cards", 38.78 num_concurrent_refined_cards()); 38.79 - out->print_cr(" Of "SIZE_FORMAT" completed buffers:", num_processed_buf_total()); 38.80 - out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) by concurrent RS threads.", 38.81 + out->print_cr(" Of " SIZE_FORMAT " completed buffers:", num_processed_buf_total()); 38.82 + out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) by concurrent RS threads.", 38.83 num_processed_buf_total(), 38.84 percent_of(num_processed_buf_rs_threads(), num_processed_buf_total())); 38.85 - out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) by mutator threads.", 38.86 + out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) by mutator threads.", 38.87 num_processed_buf_mutator(), 38.88 percent_of(num_processed_buf_mutator(), num_processed_buf_total())); 38.89 - out->print_cr(" Did "SIZE_FORMAT" coarsenings.", num_coarsenings()); 38.90 + out->print_cr(" Did " SIZE_FORMAT " coarsenings.", num_coarsenings()); 38.91 out->print_cr(" Concurrent RS threads times (s)"); 38.92 out->print(" "); 38.93 for (uint i = 0; i < _num_vtimes; i++) {
39.1 --- a/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp Tue Feb 23 18:58:36 2016 -0500 39.2 +++ b/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp Thu Jun 14 09:15:08 2018 -0700 39.3 @@ -151,7 +151,7 @@ 39.4 void G1StringDedupQueue::print_statistics(outputStream* st) { 39.5 st->print_cr( 39.6 " [Queue]\n" 39.7 - " [Dropped: "UINTX_FORMAT"]", _queue->_dropped); 39.8 + " [Dropped: " UINTX_FORMAT "]", _queue->_dropped); 39.9 } 39.10 39.11 void G1StringDedupQueue::verify() {
40.1 --- a/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp Tue Feb 23 18:58:36 2016 -0500 40.2 +++ b/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp Thu Jun 14 09:15:08 2018 -0700 40.3 @@ -80,8 +80,8 @@ 40.4 st->stamp(PrintGCTimeStamps); 40.5 st->print_cr( 40.6 "[GC concurrent-string-deduplication, " 40.7 - G1_STRDEDUP_BYTES_FORMAT_NS"->"G1_STRDEDUP_BYTES_FORMAT_NS"("G1_STRDEDUP_BYTES_FORMAT_NS"), avg " 40.8 - G1_STRDEDUP_PERCENT_FORMAT_NS", "G1_STRDEDUP_TIME_FORMAT"]", 40.9 + G1_STRDEDUP_BYTES_FORMAT_NS "->" G1_STRDEDUP_BYTES_FORMAT_NS "(" G1_STRDEDUP_BYTES_FORMAT_NS "), avg " 40.10 + G1_STRDEDUP_PERCENT_FORMAT_NS ", " G1_STRDEDUP_TIME_FORMAT "]", 40.11 G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes), 40.12 G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes - last_stat._deduped_bytes), 40.13 G1_STRDEDUP_BYTES_PARAM(last_stat._deduped_bytes), 40.14 @@ -135,22 +135,22 @@ 40.15 40.16 if (total) { 40.17 st->print_cr( 40.18 - " [Total Exec: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT", Idle: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT", Blocked: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT"]", 40.19 + " [Total Exec: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT ", Idle: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT ", Blocked: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT "]", 40.20 stat._exec, stat._exec_elapsed, stat._idle, stat._idle_elapsed, stat._block, stat._block_elapsed); 40.21 } else { 40.22 st->print_cr( 40.23 - " [Last Exec: "G1_STRDEDUP_TIME_FORMAT", Idle: "G1_STRDEDUP_TIME_FORMAT", Blocked: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT"]", 40.24 + " [Last Exec: " G1_STRDEDUP_TIME_FORMAT ", Idle: " G1_STRDEDUP_TIME_FORMAT ", Blocked: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT "]", 40.25 stat._exec_elapsed, stat._idle_elapsed, stat._block, stat._block_elapsed); 40.26 } 40.27 st->print_cr( 40.28 - " [Inspected: "G1_STRDEDUP_OBJECTS_FORMAT"]\n" 40.29 - " [Skipped: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" 40.30 - " [Hashed: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" 40.31 - " [Known: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" 40.32 - " [New: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"]\n" 40.33 - " [Deduplicated: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" 40.34 - " [Young: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" 40.35 - " [Old: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]", 40.36 + " [Inspected: " G1_STRDEDUP_OBJECTS_FORMAT "]\n" 40.37 + " [Skipped: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" 40.38 + " [Hashed: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" 40.39 + " [Known: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" 40.40 + " [New: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "]\n" 40.41 + " [Deduplicated: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" 40.42 + " [Young: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" 40.43 + " [Old: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]", 40.44 stat._inspected, 40.45 stat._skipped, skipped_percent, 40.46 stat._hashed, hashed_percent,
41.1 --- a/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp Tue Feb 23 18:58:36 2016 -0500 41.2 +++ b/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp Thu Jun 14 09:15:08 2018 -0700 41.3 @@ -596,12 +596,12 @@ 41.4 void G1StringDedupTable::print_statistics(outputStream* st) { 41.5 st->print_cr( 41.6 " [Table]\n" 41.7 - " [Memory Usage: "G1_STRDEDUP_BYTES_FORMAT_NS"]\n" 41.8 - " [Size: "SIZE_FORMAT", Min: "SIZE_FORMAT", Max: "SIZE_FORMAT"]\n" 41.9 - " [Entries: "UINTX_FORMAT", Load: "G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " UINTX_FORMAT ", Added: "UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n" 41.10 - " [Resize Count: "UINTX_FORMAT", Shrink Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS"), Grow Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS")]\n" 41.11 - " [Rehash Count: "UINTX_FORMAT", Rehash Threshold: "UINTX_FORMAT", Hash Seed: 0x%x]\n" 41.12 - " [Age Threshold: "UINTX_FORMAT"]", 41.13 + " [Memory Usage: " G1_STRDEDUP_BYTES_FORMAT_NS "]\n" 41.14 + " [Size: " SIZE_FORMAT ", Min: " SIZE_FORMAT ", Max: " SIZE_FORMAT "]\n" 41.15 + " [Entries: " UINTX_FORMAT ", Load: " G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " UINTX_FORMAT ", Added: " UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n" 41.16 + " [Resize Count: " UINTX_FORMAT ", Shrink Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS "), Grow Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS ")]\n" 41.17 + " [Rehash Count: " UINTX_FORMAT ", Rehash Threshold: " UINTX_FORMAT ", Hash Seed: 0x%x]\n" 41.18 + " [Age Threshold: " UINTX_FORMAT "]", 41.19 G1_STRDEDUP_BYTES_PARAM(_table->_size * sizeof(G1StringDedupEntry*) + (_table->_entries + _entry_cache->size()) * sizeof(G1StringDedupEntry)), 41.20 _table->_size, _min_size, _max_size, 41.21 _table->_entries, (double)_table->_entries / (double)_table->_size * 100.0, _entry_cache->size(), _entries_added, _entries_removed,
42.1 --- a/src/share/vm/gc_implementation/g1/heapRegion.cpp Tue Feb 23 18:58:36 2016 -0500 42.2 +++ b/src/share/vm/gc_implementation/g1/heapRegion.cpp Thu Jun 14 09:15:08 2018 -0700 42.3 @@ -333,7 +333,7 @@ 42.4 bool during_conc_mark, 42.5 size_t marked_bytes) { 42.6 assert(0 <= marked_bytes && marked_bytes <= used(), 42.7 - err_msg("marked: "SIZE_FORMAT" used: "SIZE_FORMAT, 42.8 + err_msg("marked: " SIZE_FORMAT " used: " SIZE_FORMAT, 42.9 marked_bytes, used())); 42.10 _prev_top_at_mark_start = top(); 42.11 _prev_marked_bytes = marked_bytes; 42.12 @@ -514,9 +514,9 @@ 42.13 // Object is in the region. Check that its less than top 42.14 if (_hr->top() <= (HeapWord*)obj) { 42.15 // Object is above top 42.16 - gclog_or_tty->print_cr("Object "PTR_FORMAT" in region " 42.17 - "["PTR_FORMAT", "PTR_FORMAT") is above " 42.18 - "top "PTR_FORMAT, 42.19 + gclog_or_tty->print_cr("Object " PTR_FORMAT " in region " 42.20 + "[" PTR_FORMAT ", " PTR_FORMAT ") is above " 42.21 + "top " PTR_FORMAT, 42.22 (void *)obj, _hr->bottom(), _hr->end(), _hr->top()); 42.23 _failures = true; 42.24 return; 42.25 @@ -550,22 +550,22 @@ 42.26 if (nm != NULL) { 42.27 // Verify that the nemthod is live 42.28 if (!nm->is_alive()) { 42.29 - gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has dead nmethod " 42.30 - PTR_FORMAT" in its strong code roots", 42.31 + gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has dead nmethod " 42.32 + PTR_FORMAT " in its strong code roots", 42.33 _hr->bottom(), _hr->end(), nm); 42.34 _failures = true; 42.35 } else { 42.36 VerifyStrongCodeRootOopClosure oop_cl(_hr, nm); 42.37 nm->oops_do(&oop_cl); 42.38 if (!oop_cl.has_oops_in_region()) { 42.39 - gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has nmethod " 42.40 - PTR_FORMAT" in its strong code roots " 42.41 + gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has nmethod " 42.42 + PTR_FORMAT " in its strong code roots " 42.43 "with no pointers into region", 42.44 _hr->bottom(), _hr->end(), nm); 42.45 _failures = true; 42.46 } else if (oop_cl.failures()) { 42.47 - gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has other " 42.48 - "failures for nmethod "PTR_FORMAT, 42.49 + gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has other " 42.50 + "failures for nmethod " PTR_FORMAT, 42.51 _hr->bottom(), _hr->end(), nm); 42.52 _failures = true; 42.53 } 42.54 @@ -599,8 +599,8 @@ 42.55 // on its strong code root list 42.56 if (is_empty()) { 42.57 if (strong_code_roots_length > 0) { 42.58 - gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is empty " 42.59 - "but has "SIZE_FORMAT" code root entries", 42.60 + gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] is empty " 42.61 + "but has " SIZE_FORMAT " code root entries", 42.62 bottom(), end(), strong_code_roots_length); 42.63 *failures = true; 42.64 } 42.65 @@ -609,8 +609,8 @@ 42.66 42.67 if (continuesHumongous()) { 42.68 if (strong_code_roots_length > 0) { 42.69 - gclog_or_tty->print_cr("region "HR_FORMAT" is a continuation of a humongous " 42.70 - "region but has "SIZE_FORMAT" code root entries", 42.71 + gclog_or_tty->print_cr("region " HR_FORMAT " is a continuation of a humongous " 42.72 + "region but has " SIZE_FORMAT " code root entries", 42.73 HR_FORMAT_PARAMS(this), strong_code_roots_length); 42.74 *failures = true; 42.75 } 42.76 @@ -634,7 +634,7 @@ 42.77 else 42.78 st->print(" "); 42.79 st->print(" TS %5d", _gc_time_stamp); 42.80 - st->print(" PTAMS "PTR_FORMAT" NTAMS "PTR_FORMAT, 42.81 + st->print(" PTAMS " PTR_FORMAT " NTAMS " PTR_FORMAT, 42.82 prev_top_at_mark_start(), next_top_at_mark_start()); 42.83 G1OffsetTableContigSpace::print_on(st); 42.84 } 42.85 @@ -708,25 +708,25 @@ 42.86 } 42.87 if (!_g1h->is_in_closed_subset(obj)) { 42.88 HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p); 42.89 - gclog_or_tty->print_cr("Field "PTR_FORMAT 42.90 - " of live obj "PTR_FORMAT" in region " 42.91 - "["PTR_FORMAT", "PTR_FORMAT")", 42.92 + gclog_or_tty->print_cr("Field " PTR_FORMAT 42.93 + " of live obj " PTR_FORMAT " in region " 42.94 + "[" PTR_FORMAT ", " PTR_FORMAT ")", 42.95 p, (void*) _containing_obj, 42.96 from->bottom(), from->end()); 42.97 print_object(gclog_or_tty, _containing_obj); 42.98 - gclog_or_tty->print_cr("points to obj "PTR_FORMAT" not in the heap", 42.99 + gclog_or_tty->print_cr("points to obj " PTR_FORMAT " not in the heap", 42.100 (void*) obj); 42.101 } else { 42.102 HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p); 42.103 HeapRegion* to = _g1h->heap_region_containing((HeapWord*)obj); 42.104 - gclog_or_tty->print_cr("Field "PTR_FORMAT 42.105 - " of live obj "PTR_FORMAT" in region " 42.106 - "["PTR_FORMAT", "PTR_FORMAT")", 42.107 + gclog_or_tty->print_cr("Field " PTR_FORMAT 42.108 + " of live obj " PTR_FORMAT " in region " 42.109 + "[" PTR_FORMAT ", " PTR_FORMAT ")", 42.110 p, (void*) _containing_obj, 42.111 from->bottom(), from->end()); 42.112 print_object(gclog_or_tty, _containing_obj); 42.113 - gclog_or_tty->print_cr("points to dead obj "PTR_FORMAT" in region " 42.114 - "["PTR_FORMAT", "PTR_FORMAT")", 42.115 + gclog_or_tty->print_cr("points to dead obj " PTR_FORMAT " in region " 42.116 + "[" PTR_FORMAT ", " PTR_FORMAT ")", 42.117 (void*) obj, to->bottom(), to->end()); 42.118 print_object(gclog_or_tty, obj); 42.119 } 42.120 @@ -784,14 +784,14 @@ 42.121 gclog_or_tty->print_cr("----------"); 42.122 } 42.123 gclog_or_tty->print_cr("Missing rem set entry:"); 42.124 - gclog_or_tty->print_cr("Field "PTR_FORMAT" " 42.125 - "of obj "PTR_FORMAT", " 42.126 - "in region "HR_FORMAT, 42.127 + gclog_or_tty->print_cr("Field " PTR_FORMAT " " 42.128 + "of obj " PTR_FORMAT ", " 42.129 + "in region " HR_FORMAT, 42.130 p, (void*) _containing_obj, 42.131 HR_FORMAT_PARAMS(from)); 42.132 _containing_obj->print_on(gclog_or_tty); 42.133 - gclog_or_tty->print_cr("points to obj "PTR_FORMAT" " 42.134 - "in region "HR_FORMAT, 42.135 + gclog_or_tty->print_cr("points to obj " PTR_FORMAT " " 42.136 + "in region " HR_FORMAT, 42.137 (void*) obj, 42.138 HR_FORMAT_PARAMS(to)); 42.139 if (obj->is_oop()) { 42.140 @@ -830,8 +830,8 @@ 42.141 42.142 if (is_humongous != g1->isHumongous(obj_size) && 42.143 !g1->is_obj_dead(obj, this)) { // Dead objects may have bigger block_size since they span several objects. 42.144 - gclog_or_tty->print_cr("obj "PTR_FORMAT" is of %shumongous size (" 42.145 - SIZE_FORMAT" words) in a %shumongous region", 42.146 + gclog_or_tty->print_cr("obj " PTR_FORMAT " is of %shumongous size (" 42.147 + SIZE_FORMAT " words) in a %shumongous region", 42.148 p, g1->isHumongous(obj_size) ? "" : "non-", 42.149 obj_size, is_humongous ? "" : "non-"); 42.150 *failures = true; 42.151 @@ -854,12 +854,12 @@ 42.152 (vo == VerifyOption_G1UsePrevMarking && 42.153 ClassLoaderDataGraph::unload_list_contains(klass)); 42.154 if (!is_metaspace_object) { 42.155 - gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" " 42.156 + gclog_or_tty->print_cr("klass " PTR_FORMAT " of object " PTR_FORMAT " " 42.157 "not metadata", klass, (void *)obj); 42.158 *failures = true; 42.159 return; 42.160 } else if (!klass->is_klass()) { 42.161 - gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" " 42.162 + gclog_or_tty->print_cr("klass " PTR_FORMAT " of object " PTR_FORMAT " " 42.163 "not a klass", klass, (void *)obj); 42.164 *failures = true; 42.165 return; 42.166 @@ -891,7 +891,7 @@ 42.167 } 42.168 } 42.169 } else { 42.170 - gclog_or_tty->print_cr(PTR_FORMAT" not an oop", (void *)obj); 42.171 + gclog_or_tty->print_cr(PTR_FORMAT " not an oop", (void *)obj); 42.172 *failures = true; 42.173 return; 42.174 } 42.175 @@ -901,8 +901,8 @@ 42.176 } 42.177 42.178 if (p != top()) { 42.179 - gclog_or_tty->print_cr("end of last object "PTR_FORMAT" " 42.180 - "does not match top "PTR_FORMAT, p, top()); 42.181 + gclog_or_tty->print_cr("end of last object " PTR_FORMAT " " 42.182 + "does not match top " PTR_FORMAT, p, top()); 42.183 *failures = true; 42.184 return; 42.185 } 42.186 @@ -917,8 +917,8 @@ 42.187 HeapWord* addr_1 = p; 42.188 HeapWord* b_start_1 = _offsets.block_start_const(addr_1); 42.189 if (b_start_1 != p) { 42.190 - gclog_or_tty->print_cr("BOT look up for top: "PTR_FORMAT" " 42.191 - " yielded "PTR_FORMAT", expecting "PTR_FORMAT, 42.192 + gclog_or_tty->print_cr("BOT look up for top: " PTR_FORMAT " " 42.193 + " yielded " PTR_FORMAT ", expecting " PTR_FORMAT, 42.194 addr_1, b_start_1, p); 42.195 *failures = true; 42.196 return; 42.197 @@ -929,8 +929,8 @@ 42.198 if (addr_2 < the_end) { 42.199 HeapWord* b_start_2 = _offsets.block_start_const(addr_2); 42.200 if (b_start_2 != p) { 42.201 - gclog_or_tty->print_cr("BOT look up for top + 1: "PTR_FORMAT" " 42.202 - " yielded "PTR_FORMAT", expecting "PTR_FORMAT, 42.203 + gclog_or_tty->print_cr("BOT look up for top + 1: " PTR_FORMAT " " 42.204 + " yielded " PTR_FORMAT ", expecting " PTR_FORMAT, 42.205 addr_2, b_start_2, p); 42.206 *failures = true; 42.207 return; 42.208 @@ -943,8 +943,8 @@ 42.209 if (addr_3 < the_end) { 42.210 HeapWord* b_start_3 = _offsets.block_start_const(addr_3); 42.211 if (b_start_3 != p) { 42.212 - gclog_or_tty->print_cr("BOT look up for top + diff: "PTR_FORMAT" " 42.213 - " yielded "PTR_FORMAT", expecting "PTR_FORMAT, 42.214 + gclog_or_tty->print_cr("BOT look up for top + diff: " PTR_FORMAT " " 42.215 + " yielded " PTR_FORMAT ", expecting " PTR_FORMAT, 42.216 addr_3, b_start_3, p); 42.217 *failures = true; 42.218 return; 42.219 @@ -955,8 +955,8 @@ 42.220 HeapWord* addr_4 = the_end - 1; 42.221 HeapWord* b_start_4 = _offsets.block_start_const(addr_4); 42.222 if (b_start_4 != p) { 42.223 - gclog_or_tty->print_cr("BOT look up for end - 1: "PTR_FORMAT" " 42.224 - " yielded "PTR_FORMAT", expecting "PTR_FORMAT, 42.225 + gclog_or_tty->print_cr("BOT look up for end - 1: " PTR_FORMAT " " 42.226 + " yielded " PTR_FORMAT ", expecting " PTR_FORMAT, 42.227 addr_4, b_start_4, p); 42.228 *failures = true; 42.229 return; 42.230 @@ -964,8 +964,8 @@ 42.231 } 42.232 42.233 if (is_humongous && object_num > 1) { 42.234 - gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is humongous " 42.235 - "but has "SIZE_FORMAT", objects", 42.236 + gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] is humongous " 42.237 + "but has " SIZE_FORMAT ", objects", 42.238 bottom(), end(), object_num); 42.239 *failures = true; 42.240 return;
43.1 --- a/src/share/vm/gc_implementation/g1/heapRegion.hpp Tue Feb 23 18:58:36 2016 -0500 43.2 +++ b/src/share/vm/gc_implementation/g1/heapRegion.hpp Thu Jun 14 09:15:08 2018 -0700 43.3 @@ -52,7 +52,7 @@ 43.4 class HeapRegionSetBase; 43.5 class nmethod; 43.6 43.7 -#define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]" 43.8 +#define HR_FORMAT "%u:(%s)[" PTR_FORMAT "," PTR_FORMAT "," PTR_FORMAT "]" 43.9 #define HR_FORMAT_PARAMS(_hr_) \ 43.10 (_hr_)->hrm_index(), \ 43.11 (_hr_)->get_short_type_str(), \ 43.12 @@ -534,8 +534,8 @@ 43.13 void set_containing_set(HeapRegionSetBase* containing_set) { 43.14 assert((containing_set == NULL && _containing_set != NULL) || 43.15 (containing_set != NULL && _containing_set == NULL), 43.16 - err_msg("containing_set: "PTR_FORMAT" " 43.17 - "_containing_set: "PTR_FORMAT, 43.18 + err_msg("containing_set: " PTR_FORMAT " " 43.19 + "_containing_set: " PTR_FORMAT, 43.20 p2i(containing_set), p2i(_containing_set))); 43.21 43.22 _containing_set = containing_set;
44.1 --- a/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp Tue Feb 23 18:58:36 2016 -0500 44.2 +++ b/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp Thu Jun 14 09:15:08 2018 -0700 44.3 @@ -112,7 +112,7 @@ 44.4 44.5 assert(ClassUnloadingWithConcurrentMark, 44.6 err_msg("All blocks should be objects if G1 Class Unloading isn't used. " 44.7 - "HR: ["PTR_FORMAT", "PTR_FORMAT", "PTR_FORMAT") " 44.8 + "HR: [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ") " 44.9 "addr: " PTR_FORMAT, 44.10 p2i(bottom()), p2i(top()), p2i(end()), p2i(addr))); 44.11
45.1 --- a/src/share/vm/gc_implementation/g1/heapRegionManager.cpp Tue Feb 23 18:58:36 2016 -0500 45.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionManager.cpp Thu Jun 14 09:15:08 2018 -0700 45.3 @@ -432,7 +432,7 @@ 45.4 HeapRegion* hr = _regions.get_by_index(i); 45.5 guarantee(hr != NULL, err_msg("invariant: i: %u", i)); 45.6 guarantee(!prev_committed || hr->bottom() == prev_end, 45.7 - err_msg("invariant i: %u "HR_FORMAT" prev_end: "PTR_FORMAT, 45.8 + err_msg("invariant i: %u " HR_FORMAT " prev_end: " PTR_FORMAT, 45.9 i, HR_FORMAT_PARAMS(hr), p2i(prev_end))); 45.10 guarantee(hr->hrm_index() == i, 45.11 err_msg("invariant: i: %u hrm_index(): %u", i, hr->hrm_index()));
46.1 --- a/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp Tue Feb 23 18:58:36 2016 -0500 46.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp Thu Jun 14 09:15:08 2018 -0700 46.3 @@ -31,9 +31,9 @@ 46.4 46.5 inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const { 46.6 assert(addr < heap_end(), 46.7 - err_msg("addr: "PTR_FORMAT" end: "PTR_FORMAT, p2i(addr), p2i(heap_end()))); 46.8 + err_msg("addr: " PTR_FORMAT " end: " PTR_FORMAT, p2i(addr), p2i(heap_end()))); 46.9 assert(addr >= heap_bottom(), 46.10 - err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT, p2i(addr), p2i(heap_bottom()))); 46.11 + err_msg("addr: " PTR_FORMAT " bottom: " PTR_FORMAT, p2i(addr), p2i(heap_bottom()))); 46.12 46.13 HeapRegion* hr = _regions.get_by_address(addr); 46.14 return hr;
47.1 --- a/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp Tue Feb 23 18:58:36 2016 -0500 47.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp Thu Jun 14 09:15:08 2018 -0700 47.3 @@ -381,7 +381,7 @@ 47.4 47.5 void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) { 47.6 guarantee((size_t)start_idx + new_num_regions <= max_uintx, 47.7 - err_msg("Trying to invalidate beyond maximum region, from %u size "SIZE_FORMAT, 47.8 + err_msg("Trying to invalidate beyond maximum region, from %u size " SIZE_FORMAT, 47.9 start_idx, new_num_regions)); 47.10 for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) { 47.11 uint end_idx = (start_idx + (uint)new_num_regions); 47.12 @@ -650,13 +650,13 @@ 47.13 47.14 assert(_coarse_map.size() == region_bm->size(), "Precondition"); 47.15 if (G1RSScrubVerbose) { 47.16 - gclog_or_tty->print(" Coarse map: before = "SIZE_FORMAT"...", 47.17 + gclog_or_tty->print(" Coarse map: before = " SIZE_FORMAT "...", 47.18 _n_coarse_entries); 47.19 } 47.20 _coarse_map.set_intersection(*region_bm); 47.21 _n_coarse_entries = _coarse_map.count_one_bits(); 47.22 if (G1RSScrubVerbose) { 47.23 - gclog_or_tty->print_cr(" after = "SIZE_FORMAT".", _n_coarse_entries); 47.24 + gclog_or_tty->print_cr(" after = " SIZE_FORMAT ".", _n_coarse_entries); 47.25 } 47.26 47.27 // Now do the fine-grained maps. 47.28 @@ -1052,7 +1052,7 @@ 47.29 47.30 card_index = _cur_region_card_offset + _cur_card_in_prt; 47.31 guarantee(_cur_card_in_prt < HeapRegion::CardsPerRegion, 47.32 - err_msg("Card index "SIZE_FORMAT" must be within the region", _cur_card_in_prt)); 47.33 + err_msg("Card index " SIZE_FORMAT " must be within the region", _cur_card_in_prt)); 47.34 return true; 47.35 } 47.36 47.37 @@ -1221,8 +1221,8 @@ 47.38 47.39 size_t min_prt_size = sizeof(void*) + dummy->bm()->size_in_words() * HeapWordSize; 47.40 assert(dummy->mem_size() > min_prt_size, 47.41 - err_msg("PerRegionTable memory usage is suspiciously small, only has "SIZE_FORMAT" bytes. " 47.42 - "Should be at least "SIZE_FORMAT" bytes.", dummy->mem_size(), min_prt_size)); 47.43 + err_msg("PerRegionTable memory usage is suspiciously small, only has " SIZE_FORMAT " bytes. " 47.44 + "Should be at least " SIZE_FORMAT " bytes.", dummy->mem_size(), min_prt_size)); 47.45 free(dummy); 47.46 guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size"); 47.47 // try to reset the state
48.1 --- a/src/share/vm/gc_implementation/g1/heapRegionSet.cpp Tue Feb 23 18:58:36 2016 -0500 48.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionSet.cpp Thu Jun 14 09:15:08 2018 -0700 48.3 @@ -32,7 +32,7 @@ 48.4 uint FreeRegionList::_unrealistically_long_length = 0; 48.5 48.6 void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) { 48.7 - msg->append("[%s] %s ln: %u cy: "SIZE_FORMAT, 48.8 + msg->append("[%s] %s ln: %u cy: " SIZE_FORMAT, 48.9 name(), message, length(), total_capacity_bytes()); 48.10 fill_in_ext_msg_extra(msg); 48.11 } 48.12 @@ -84,13 +84,13 @@ 48.13 48.14 void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) { 48.15 out->cr(); 48.16 - out->print_cr("Set: %s ("PTR_FORMAT")", name(), this); 48.17 + out->print_cr("Set: %s (" PTR_FORMAT ")", name(), this); 48.18 out->print_cr(" Region Assumptions"); 48.19 out->print_cr(" humongous : %s", BOOL_TO_STR(regions_humongous())); 48.20 out->print_cr(" free : %s", BOOL_TO_STR(regions_free())); 48.21 out->print_cr(" Attributes"); 48.22 out->print_cr(" length : %14u", length()); 48.23 - out->print_cr(" total capacity : "SIZE_FORMAT_W(14)" bytes", 48.24 + out->print_cr(" total capacity : " SIZE_FORMAT_W(14) " bytes", 48.25 total_capacity_bytes()); 48.26 } 48.27 48.28 @@ -106,7 +106,7 @@ 48.29 } 48.30 48.31 void FreeRegionList::fill_in_ext_msg_extra(hrs_ext_msg* msg) { 48.32 - msg->append(" hd: "PTR_FORMAT" tl: "PTR_FORMAT, _head, _tail); 48.33 + msg->append(" hd: " PTR_FORMAT " tl: " PTR_FORMAT, _head, _tail); 48.34 } 48.35 48.36 void FreeRegionList::remove_all() { 48.37 @@ -277,8 +277,8 @@ 48.38 void FreeRegionList::print_on(outputStream* out, bool print_contents) { 48.39 HeapRegionSetBase::print_on(out, print_contents); 48.40 out->print_cr(" Linking"); 48.41 - out->print_cr(" head : "PTR_FORMAT, _head); 48.42 - out->print_cr(" tail : "PTR_FORMAT, _tail); 48.43 + out->print_cr(" head : " PTR_FORMAT, _head); 48.44 + out->print_cr(" tail : " PTR_FORMAT, _tail); 48.45 48.46 if (print_contents) { 48.47 out->print_cr(" Contents"); 48.48 @@ -306,7 +306,7 @@ 48.49 48.50 count++; 48.51 guarantee(count < _unrealistically_long_length, 48.52 - 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())); 48.53 + 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())); 48.54 48.55 if (curr->next() != NULL) { 48.56 guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up");
49.1 --- a/src/share/vm/gc_implementation/g1/satbQueue.cpp Tue Feb 23 18:58:36 2016 -0500 49.2 +++ b/src/share/vm/gc_implementation/g1/satbQueue.cpp Thu Jun 14 09:15:08 2018 -0700 49.3 @@ -202,8 +202,8 @@ 49.4 49.5 void ObjPtrQueue::print(const char* name, 49.6 void** buf, size_t index, size_t sz) { 49.7 - gclog_or_tty->print_cr(" SATB BUFFER [%s] buf: "PTR_FORMAT" " 49.8 - "index: "SIZE_FORMAT" sz: "SIZE_FORMAT, 49.9 + gclog_or_tty->print_cr(" SATB BUFFER [%s] buf: " PTR_FORMAT " " 49.10 + "index: " SIZE_FORMAT " sz: " SIZE_FORMAT, 49.11 name, buf, index, sz); 49.12 } 49.13 #endif // PRODUCT
50.1 --- a/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp Tue Feb 23 18:58:36 2016 -0500 50.2 +++ b/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp Thu Jun 14 09:15:08 2018 -0700 50.3 @@ -86,7 +86,7 @@ 50.4 while (words_left_to_fill > 0) { 50.5 size_t words_to_fill = MIN2(words_left_to_fill, CollectedHeap::filler_array_max_size()); 50.6 assert(words_to_fill >= CollectedHeap::min_fill_size(), 50.7 - err_msg("Remaining size ("SIZE_FORMAT ") is too small to fill (based on " SIZE_FORMAT " and " SIZE_FORMAT ")", 50.8 + err_msg("Remaining size (" SIZE_FORMAT ") is too small to fill (based on " SIZE_FORMAT " and " SIZE_FORMAT ")", 50.9 words_to_fill, words_left_to_fill, CollectedHeap::filler_array_max_size())); 50.10 CollectedHeap::fill_with_object((HeapWord*)cur_top, words_to_fill); 50.11 if (!os::numa_has_static_binding()) {
51.1 --- a/src/share/vm/memory/allocation.cpp Tue Feb 23 18:58:36 2016 -0500 51.2 +++ b/src/share/vm/memory/allocation.cpp Thu Jun 14 09:15:08 2018 -0700 51.3 @@ -749,7 +749,7 @@ 51.4 julong AllocStats::resource_bytes() { return Arena::_bytes_allocated - start_res_bytes; } 51.5 void AllocStats::print() { 51.6 tty->print_cr(UINT64_FORMAT " mallocs (" UINT64_FORMAT "MB), " 51.7 - UINT64_FORMAT" frees (" UINT64_FORMAT "MB), " UINT64_FORMAT "MB resrc", 51.8 + UINT64_FORMAT " frees (" UINT64_FORMAT "MB), " UINT64_FORMAT "MB resrc", 51.9 num_mallocs(), alloc_bytes()/M, num_frees(), free_bytes()/M, resource_bytes()/M); 51.10 } 51.11
52.1 --- a/src/share/vm/memory/barrierSet.inline.hpp Tue Feb 23 18:58:36 2016 -0500 52.2 +++ b/src/share/vm/memory/barrierSet.inline.hpp Thu Jun 14 09:15:08 2018 -0700 52.3 @@ -69,7 +69,7 @@ 52.4 assert(UseCompressedOops || (aligned_start == start && aligned_end == end), 52.5 "Expected heap word alignment of start and end"); 52.6 #if 0 52.7 - warning("Post:\t" INTPTR_FORMAT "[" SIZE_FORMAT "] : [" INTPTR_FORMAT","INTPTR_FORMAT")\t", 52.8 + warning("Post:\t" INTPTR_FORMAT "[" SIZE_FORMAT "] : [" INTPTR_FORMAT "," INTPTR_FORMAT ")\t", 52.9 start, count, aligned_start, aligned_end); 52.10 #endif 52.11 write_ref_array_work(MemRegion(aligned_start, aligned_end));
53.1 --- a/src/share/vm/memory/blockOffsetTable.cpp Tue Feb 23 18:58:36 2016 -0500 53.2 +++ b/src/share/vm/memory/blockOffsetTable.cpp Thu Jun 14 09:15:08 2018 -0700 53.3 @@ -560,7 +560,7 @@ 53.4 q = n; 53.5 n += _sp->block_size(n); 53.6 assert(n > q, 53.7 - err_msg("Looping at n = " PTR_FORMAT " with last = " PTR_FORMAT"," 53.8 + err_msg("Looping at n = " PTR_FORMAT " with last = " PTR_FORMAT "," 53.9 " while querying blk_start(" PTR_FORMAT ")" 53.10 " on _sp = [" PTR_FORMAT "," PTR_FORMAT ")", 53.11 p2i(n), p2i(last), p2i(addr), p2i(_sp->bottom()), p2i(_sp->end())));
54.1 --- a/src/share/vm/memory/cardTableModRefBS.cpp Tue Feb 23 18:58:36 2016 -0500 54.2 +++ b/src/share/vm/memory/cardTableModRefBS.cpp Thu Jun 14 09:15:08 2018 -0700 54.3 @@ -678,7 +678,7 @@ 54.4 (val_equals) ? "" : "not ", val); 54.5 failures = true; 54.6 } 54.7 - tty->print_cr("== card "PTR_FORMAT" ["PTR_FORMAT","PTR_FORMAT"], " 54.8 + tty->print_cr("== card " PTR_FORMAT " [" PTR_FORMAT "," PTR_FORMAT "], " 54.9 "val: %d", p2i(curr), p2i(addr_for(curr)), 54.10 p2i((HeapWord*) (((size_t) addr_for(curr)) + card_size)), 54.11 (int) curr_val);
55.1 --- a/src/share/vm/memory/cardTableModRefBS.hpp Tue Feb 23 18:58:36 2016 -0500 55.2 +++ b/src/share/vm/memory/cardTableModRefBS.hpp Thu Jun 14 09:15:08 2018 -0700 55.3 @@ -158,8 +158,8 @@ 55.4 // Mapping from address to card marking array entry 55.5 jbyte* byte_for(const void* p) const { 55.6 assert(_whole_heap.contains(p), 55.7 - err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of " 55.8 - " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")", 55.9 + err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of " 55.10 + " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")", 55.11 p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end()))); 55.12 jbyte* result = &byte_map_base[uintptr_t(p) >> card_shift]; 55.13 assert(result >= _byte_map && result < _byte_map + _byte_map_size, 55.14 @@ -436,8 +436,8 @@ 55.15 size_t delta = pointer_delta(p, byte_map_base, sizeof(jbyte)); 55.16 HeapWord* result = (HeapWord*) (delta << card_shift); 55.17 assert(_whole_heap.contains(result), 55.18 - err_msg("Returning result = "PTR_FORMAT" out of bounds of " 55.19 - " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")", 55.20 + err_msg("Returning result = " PTR_FORMAT " out of bounds of " 55.21 + " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")", 55.22 p2i(result), p2i(_whole_heap.start()), p2i(_whole_heap.end()))); 55.23 return result; 55.24 } 55.25 @@ -445,8 +445,8 @@ 55.26 // Mapping from address to card marking array index. 55.27 size_t index_for(void* p) { 55.28 assert(_whole_heap.contains(p), 55.29 - err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of " 55.30 - " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")", 55.31 + err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of " 55.32 + " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")", 55.33 p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end()))); 55.34 return byte_for(p) - _byte_map; 55.35 }
56.1 --- a/src/share/vm/memory/generation.cpp Tue Feb 23 18:58:36 2016 -0500 56.2 +++ b/src/share/vm/memory/generation.cpp Thu Jun 14 09:15:08 2018 -0700 56.3 @@ -187,7 +187,7 @@ 56.4 bool res = (available >= max_promotion_in_bytes); 56.5 if (PrintGC && Verbose) { 56.6 gclog_or_tty->print_cr( 56.7 - "Generation: promo attempt is%s safe: available("SIZE_FORMAT") %s max_promo("SIZE_FORMAT")", 56.8 + "Generation: promo attempt is%s safe: available(" SIZE_FORMAT ") %s max_promo(" SIZE_FORMAT ")", 56.9 res? "":" not", available, res? ">=":"<", 56.10 max_promotion_in_bytes); 56.11 }
57.1 --- a/src/share/vm/memory/tenuredGeneration.cpp Tue Feb 23 18:58:36 2016 -0500 57.2 +++ b/src/share/vm/memory/tenuredGeneration.cpp Thu Jun 14 09:15:08 2018 -0700 57.3 @@ -294,8 +294,8 @@ 57.4 bool res = (available >= av_promo) || (available >= max_promotion_in_bytes); 57.5 if (PrintGC && Verbose) { 57.6 gclog_or_tty->print_cr( 57.7 - "Tenured: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT")," 57.8 - "max_promo("SIZE_FORMAT")", 57.9 + "Tenured: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT ")," 57.10 + "max_promo(" SIZE_FORMAT ")", 57.11 res? "":" not", available, res? ">=":"<", 57.12 av_promo, max_promotion_in_bytes); 57.13 }
58.1 --- a/src/share/vm/memory/universe.cpp Tue Feb 23 18:58:36 2016 -0500 58.2 +++ b/src/share/vm/memory/universe.cpp Thu Jun 14 09:15:08 2018 -0700 58.3 @@ -924,7 +924,7 @@ 58.4 // Reserve the Java heap, which is now the same for all GCs. 58.5 ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) { 58.6 assert(alignment <= Arguments::conservative_max_heap_alignment(), 58.7 - err_msg("actual alignment "SIZE_FORMAT" must be within maximum heap alignment "SIZE_FORMAT, 58.8 + err_msg("actual alignment " SIZE_FORMAT " must be within maximum heap alignment " SIZE_FORMAT, 58.9 alignment, Arguments::conservative_max_heap_alignment())); 58.10 size_t total_reserved = align_size_up(heap_size, alignment); 58.11 assert(!UseCompressedOops || (total_reserved <= (OopEncodingHeapMax - os::vm_page_size())),
59.1 --- a/src/share/vm/oops/constantPool.cpp Tue Feb 23 18:58:36 2016 -0500 59.2 +++ b/src/share/vm/oops/constantPool.cpp Thu Jun 14 09:15:08 2018 -0700 59.3 @@ -1494,7 +1494,7 @@ 59.4 } 59.5 case JVM_CONSTANT_Long: { 59.6 u8 val = Bytes::get_Java_u8(bytes); 59.7 - printf("long "INT64_FORMAT, (int64_t) *(jlong *) &val); 59.8 + printf("long " INT64_FORMAT, (int64_t) *(jlong *) &val); 59.9 ent_size = 8; 59.10 idx++; // Long takes two cpool slots 59.11 break;
60.1 --- a/src/share/vm/oops/cpCache.cpp Tue Feb 23 18:58:36 2016 -0500 60.2 +++ b/src/share/vm/oops/cpCache.cpp Thu Jun 14 09:15:08 2018 -0700 60.3 @@ -314,7 +314,7 @@ 60.4 adapter->size_of_parameters()); 60.5 60.6 if (TraceInvokeDynamic) { 60.7 - tty->print_cr("set_method_handle bc=%d appendix="PTR_FORMAT"%s method_type="PTR_FORMAT"%s method="PTR_FORMAT" ", 60.8 + tty->print_cr("set_method_handle bc=%d appendix=" PTR_FORMAT "%s method_type=" PTR_FORMAT "%s method=" PTR_FORMAT " ", 60.9 invoke_code, 60.10 (void *)appendix(), (has_appendix ? "" : " (unused)"), 60.11 (void *)method_type(), (has_method_type ? "" : " (unused)"), 60.12 @@ -528,12 +528,12 @@ 60.13 // print separator 60.14 if (index == 0) st->print_cr(" -------------"); 60.15 // print entry 60.16 - st->print("%3d ("PTR_FORMAT") ", index, (intptr_t)this); 60.17 + st->print("%3d (" PTR_FORMAT ") ", index, (intptr_t)this); 60.18 st->print_cr("[%02x|%02x|%5d]", bytecode_2(), bytecode_1(), 60.19 constant_pool_index()); 60.20 - st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f1); 60.21 - st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f2); 60.22 - st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_flags); 60.23 + st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f1); 60.24 + st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f2); 60.25 + st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_flags); 60.26 st->print_cr(" -------------"); 60.27 } 60.28
61.1 --- a/src/share/vm/oops/markOop.cpp Tue Feb 23 18:58:36 2016 -0500 61.2 +++ b/src/share/vm/oops/markOop.cpp Thu Jun 14 09:15:08 2018 -0700 61.3 @@ -49,7 +49,7 @@ 61.4 st->print("monitor=NULL"); 61.5 else { 61.6 BasicLock * bl = (BasicLock *) mon->owner(); 61.7 - st->print("monitor={count="INTPTR_FORMAT",waiters="INTPTR_FORMAT",recursions="INTPTR_FORMAT",owner="INTPTR_FORMAT"}", 61.8 + st->print("monitor={count=" INTPTR_FORMAT ",waiters=" INTPTR_FORMAT ",recursions=" INTPTR_FORMAT ",owner=" INTPTR_FORMAT "}", 61.9 mon->count(), mon->waiters(), mon->recursions(), p2i(bl)); 61.10 } 61.11 } else {
62.1 --- a/src/share/vm/oops/method.cpp Tue Feb 23 18:58:36 2016 -0500 62.2 +++ b/src/share/vm/oops/method.cpp Thu Jun 14 09:15:08 2018 -0700 62.3 @@ -1969,9 +1969,9 @@ 62.4 assert(is_method(), "must be method"); 62.5 st->print_cr("%s", internal_name()); 62.6 // get the effect of PrintOopAddress, always, for methods: 62.7 - st->print_cr(" - this oop: "INTPTR_FORMAT, (intptr_t)this); 62.8 + st->print_cr(" - this oop: " INTPTR_FORMAT, (intptr_t)this); 62.9 st->print (" - method holder: "); method_holder()->print_value_on(st); st->cr(); 62.10 - st->print (" - constants: "INTPTR_FORMAT" ", (address)constants()); 62.11 + st->print (" - constants: " INTPTR_FORMAT " ", (address)constants()); 62.12 constants()->print_value_on(st); st->cr(); 62.13 st->print (" - access: 0x%x ", access_flags().as_int()); access_flags().print_on(st); st->cr(); 62.14 st->print (" - name: "); name()->print_value_on(st); st->cr();
63.1 --- a/src/share/vm/oops/objArrayKlass.cpp Tue Feb 23 18:58:36 2016 -0500 63.2 +++ b/src/share/vm/oops/objArrayKlass.cpp Thu Jun 14 09:15:08 2018 -0700 63.3 @@ -657,7 +657,7 @@ 63.4 if (i > max_objArray_print_length) { 63.5 st->print("..."); break; 63.6 } 63.7 - st->print(" "INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i)); 63.8 + st->print(" " INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i)); 63.9 } 63.10 st->print(" }"); 63.11 }
64.1 --- a/src/share/vm/oops/oop.cpp Tue Feb 23 18:58:36 2016 -0500 64.2 +++ b/src/share/vm/oops/oop.cpp Thu Jun 14 09:15:08 2018 -0700 64.3 @@ -46,7 +46,7 @@ 64.4 64.5 void oopDesc::print_address_on(outputStream* st) const { 64.6 if (PrintOopAddress) { 64.7 - st->print("{"INTPTR_FORMAT"}", this); 64.8 + st->print("{" INTPTR_FORMAT "}", this); 64.9 } 64.10 } 64.11
65.1 --- a/src/share/vm/opto/callnode.cpp Tue Feb 23 18:58:36 2016 -0500 65.2 +++ b/src/share/vm/opto/callnode.cpp Thu Jun 14 09:15:08 2018 -0700 65.3 @@ -340,7 +340,7 @@ 65.4 const Type *t = n->bottom_type(); 65.5 switch (t->base()) { 65.6 case Type::Int: 65.7 - st->print(" %s%d]=#"INT32_FORMAT,msg,i,t->is_int()->get_con()); 65.8 + st->print(" %s%d]=#" INT32_FORMAT,msg,i,t->is_int()->get_con()); 65.9 break; 65.10 case Type::AnyPtr: 65.11 assert( t == TypePtr::NULL_PTR || n->in_dump(), "" ); 65.12 @@ -369,7 +369,7 @@ 65.13 st->print(" %s%d]=#%fF",msg,i,t->is_float_constant()->_f); 65.14 break; 65.15 case Type::Long: 65.16 - st->print(" %s%d]=#"INT64_FORMAT,msg,i,(int64_t)(t->is_long()->get_con())); 65.17 + st->print(" %s%d]=#" INT64_FORMAT,msg,i,(int64_t)(t->is_long()->get_con())); 65.18 break; 65.19 case Type::Half: 65.20 case Type::Top:
66.1 --- a/src/share/vm/prims/methodHandles.cpp Tue Feb 23 18:58:36 2016 -0500 66.2 +++ b/src/share/vm/prims/methodHandles.cpp Thu Jun 14 09:15:08 2018 -0700 66.3 @@ -1329,40 +1329,40 @@ 66.4 #define LANG "Ljava/lang/" 66.5 #define JLINV "Ljava/lang/invoke/" 66.6 66.7 -#define OBJ LANG"Object;" 66.8 -#define CLS LANG"Class;" 66.9 -#define STRG LANG"String;" 66.10 -#define CS JLINV"CallSite;" 66.11 -#define MT JLINV"MethodType;" 66.12 -#define MH JLINV"MethodHandle;" 66.13 -#define MEM JLINV"MemberName;" 66.14 +#define OBJ LANG "Object;" 66.15 +#define CLS LANG "Class;" 66.16 +#define STRG LANG "String;" 66.17 +#define CS JLINV "CallSite;" 66.18 +#define MT JLINV "MethodType;" 66.19 +#define MH JLINV "MethodHandle;" 66.20 +#define MEM JLINV "MemberName;" 66.21 66.22 #define CC (char*) /*cast a literal from (const char*)*/ 66.23 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f) 66.24 66.25 // These are the native methods on java.lang.invoke.MethodHandleNatives. 66.26 static JNINativeMethod MHN_methods[] = { 66.27 - {CC"init", CC"("MEM""OBJ")V", FN_PTR(MHN_init_Mem)}, 66.28 - {CC"expand", CC"("MEM")V", FN_PTR(MHN_expand_Mem)}, 66.29 - {CC"resolve", CC"("MEM""CLS")"MEM, FN_PTR(MHN_resolve_Mem)}, 66.30 - {CC"getConstant", CC"(I)I", FN_PTR(MHN_getConstant)}, 66.31 + {CC "init", CC "(" MEM "" OBJ ")V", FN_PTR(MHN_init_Mem)}, 66.32 + {CC"expand", CC "(" MEM ")V", FN_PTR(MHN_expand_Mem)}, 66.33 + {CC "resolve", CC "(" MEM "" CLS ")" MEM, FN_PTR(MHN_resolve_Mem)}, 66.34 + {CC "getConstant", CC "(I)I", FN_PTR(MHN_getConstant)}, 66.35 // static native int getNamedCon(int which, Object[] name) 66.36 - {CC"getNamedCon", CC"(I["OBJ")I", FN_PTR(MHN_getNamedCon)}, 66.37 + {CC "getNamedCon", CC "(I[" OBJ ")I", FN_PTR(MHN_getNamedCon)}, 66.38 // static native int getMembers(Class<?> defc, String matchName, String matchSig, 66.39 // int matchFlags, Class<?> caller, int skip, MemberName[] results); 66.40 - {CC"getMembers", CC"("CLS""STRG""STRG"I"CLS"I["MEM")I", FN_PTR(MHN_getMembers)}, 66.41 - {CC"objectFieldOffset", CC"("MEM")J", FN_PTR(MHN_objectFieldOffset)}, 66.42 - {CC"setCallSiteTargetNormal", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetNormal)}, 66.43 - {CC"setCallSiteTargetVolatile", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetVolatile)}, 66.44 - {CC"staticFieldOffset", CC"("MEM")J", FN_PTR(MHN_staticFieldOffset)}, 66.45 - {CC"staticFieldBase", CC"("MEM")"OBJ, FN_PTR(MHN_staticFieldBase)}, 66.46 - {CC"getMemberVMInfo", CC"("MEM")"OBJ, FN_PTR(MHN_getMemberVMInfo)} 66.47 + {CC "getMembers", CC "(" CLS "" STRG "" STRG "I" CLS "I[" MEM ")I", FN_PTR(MHN_getMembers)}, 66.48 + {CC "objectFieldOffset", CC "(" MEM ")J", FN_PTR(MHN_objectFieldOffset)}, 66.49 + {CC "setCallSiteTargetNormal", CC "(" CS "" MH ")V", FN_PTR(MHN_setCallSiteTargetNormal)}, 66.50 + {CC "setCallSiteTargetVolatile", CC "(" CS "" MH ")V", FN_PTR(MHN_setCallSiteTargetVolatile)}, 66.51 + {CC "staticFieldOffset", CC "(" MEM ")J", FN_PTR(MHN_staticFieldOffset)}, 66.52 + {CC "staticFieldBase", CC "(" MEM ")" OBJ, FN_PTR(MHN_staticFieldBase)}, 66.53 + {CC "getMemberVMInfo", CC "(" MEM ")" OBJ, FN_PTR(MHN_getMemberVMInfo)} 66.54 }; 66.55 66.56 static JNINativeMethod MH_methods[] = { 66.57 // UnsupportedOperationException throwers 66.58 - {CC"invoke", CC"(["OBJ")"OBJ, FN_PTR(MH_invoke_UOE)}, 66.59 - {CC"invokeExact", CC"(["OBJ")"OBJ, FN_PTR(MH_invokeExact_UOE)} 66.60 + {CC "invoke", CC "([" OBJ ")" OBJ, FN_PTR(MH_invoke_UOE)}, 66.61 + {CC "invokeExact", CC "([" OBJ ")" OBJ, FN_PTR(MH_invokeExact_UOE)} 66.62 }; 66.63 66.64 /**
67.1 --- a/src/share/vm/prims/perf.cpp Tue Feb 23 18:58:36 2016 -0500 67.2 +++ b/src/share/vm/prims/perf.cpp Thu Jun 14 09:15:08 2018 -0700 67.3 @@ -290,17 +290,17 @@ 67.4 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f) 67.5 #define BB "Ljava/nio/ByteBuffer;" 67.6 #define JLS "Ljava/lang/String;" 67.7 -#define CL_ARGS CC"("JLS"IIJ)"BB 67.8 -#define CBA_ARGS CC"("JLS"II[BI)"BB 67.9 +#define CL_ARGS CC "(" JLS "IIJ)" BB 67.10 +#define CBA_ARGS CC "(" JLS "II[BI)" BB 67.11 67.12 static JNINativeMethod perfmethods[] = { 67.13 67.14 - {CC"attach", CC"("JLS"II)"BB, FN_PTR(Perf_Attach)}, 67.15 - {CC"detach", CC"("BB")V", FN_PTR(Perf_Detach)}, 67.16 - {CC"createLong", CL_ARGS, FN_PTR(Perf_CreateLong)}, 67.17 - {CC"createByteArray", CBA_ARGS, FN_PTR(Perf_CreateByteArray)}, 67.18 - {CC"highResCounter", CC"()J", FN_PTR(Perf_HighResCounter)}, 67.19 - {CC"highResFrequency", CC"()J", FN_PTR(Perf_HighResFrequency)} 67.20 + {CC "attach", CC "(" JLS "II)" BB, FN_PTR(Perf_Attach)}, 67.21 + {CC "detach", CC "(" BB ")V", FN_PTR(Perf_Detach)}, 67.22 + {CC "createLong", CL_ARGS, FN_PTR(Perf_CreateLong)}, 67.23 + {CC "createByteArray", CBA_ARGS, FN_PTR(Perf_CreateByteArray)}, 67.24 + {CC "highResCounter", CC "()J", FN_PTR(Perf_HighResCounter)}, 67.25 + {CC "highResFrequency", CC "()J", FN_PTR(Perf_HighResFrequency)} 67.26 }; 67.27 67.28 #undef CBA_ARGS
68.1 --- a/src/share/vm/prims/unsafe.cpp Tue Feb 23 18:58:36 2016 -0500 68.2 +++ b/src/share/vm/prims/unsafe.cpp Thu Jun 14 09:15:08 2018 -0700 68.3 @@ -1350,47 +1350,47 @@ 68.4 68.5 #define LANG "Ljava/lang/" 68.6 68.7 -#define OBJ LANG"Object;" 68.8 -#define CLS LANG"Class;" 68.9 -#define CTR LANG"reflect/Constructor;" 68.10 -#define FLD LANG"reflect/Field;" 68.11 -#define MTH LANG"reflect/Method;" 68.12 -#define THR LANG"Throwable;" 68.13 +#define OBJ LANG "Object;" 68.14 +#define CLS LANG "Class;" 68.15 +#define CTR LANG "reflect/Constructor;" 68.16 +#define FLD LANG "reflect/Field;" 68.17 +#define MTH LANG "reflect/Method;" 68.18 +#define THR LANG "Throwable;" 68.19 68.20 -#define DC0_Args LANG"String;[BII" 68.21 -#define DC_Args DC0_Args LANG"ClassLoader;" "Ljava/security/ProtectionDomain;" 68.22 +#define DC0_Args LANG "String;[BII" 68.23 +#define DC_Args DC0_Args LANG "ClassLoader;" "Ljava/security/ProtectionDomain;" 68.24 68.25 #define CC (char*) /*cast a literal from (const char*)*/ 68.26 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f) 68.27 68.28 // define deprecated accessors for compabitility with 1.4.0 68.29 #define DECLARE_GETSETOOP_140(Boolean, Z) \ 68.30 - {CC"get"#Boolean, CC"("OBJ"I)"#Z, FN_PTR(Unsafe_Get##Boolean##140)}, \ 68.31 - {CC"put"#Boolean, CC"("OBJ"I"#Z")V", FN_PTR(Unsafe_Set##Boolean##140)} 68.32 + {CC "get" #Boolean, CC "(" OBJ "I)" #Z, FN_PTR(Unsafe_Get##Boolean##140)}, \ 68.33 + {CC "put" #Boolean, CC "(" OBJ "I" #Z ")V", FN_PTR(Unsafe_Set##Boolean##140)} 68.34 68.35 // Note: In 1.4.1, getObject and kin take both int and long offsets. 68.36 #define DECLARE_GETSETOOP_141(Boolean, Z) \ 68.37 - {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \ 68.38 - {CC"put"#Boolean, CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)} 68.39 + {CC "get" #Boolean, CC "(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean)}, \ 68.40 + {CC "put" #Boolean, CC "(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean)} 68.41 68.42 // Note: In 1.5.0, there are volatile versions too 68.43 #define DECLARE_GETSETOOP(Boolean, Z) \ 68.44 - {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \ 68.45 - {CC"put"#Boolean, CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)}, \ 68.46 - {CC"get"#Boolean"Volatile", CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean##Volatile)}, \ 68.47 - {CC"put"#Boolean"Volatile", CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean##Volatile)} 68.48 + {CC "get" #Boolean, CC "(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean)}, \ 68.49 + {CC "put" #Boolean, CC "(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean)}, \ 68.50 + {CC "get" #Boolean "Volatile", CC "(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean##Volatile)}, \ 68.51 + {CC "put" #Boolean "Volatile", CC "(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean##Volatile)} 68.52 68.53 68.54 #define DECLARE_GETSETNATIVE(Byte, B) \ 68.55 - {CC"get"#Byte, CC"("ADR")"#B, FN_PTR(Unsafe_GetNative##Byte)}, \ 68.56 - {CC"put"#Byte, CC"("ADR#B")V", FN_PTR(Unsafe_SetNative##Byte)} 68.57 + {CC "get" #Byte, CC "(" ADR ")" #B, FN_PTR(Unsafe_GetNative##Byte)}, \ 68.58 + {CC "put" #Byte, CC "(" ADR#B ")V", FN_PTR(Unsafe_SetNative##Byte)} 68.59 68.60 68.61 68.62 // These are the methods for 1.4.0 68.63 static JNINativeMethod methods_140[] = { 68.64 - {CC"getObject", CC"("OBJ"I)"OBJ"", FN_PTR(Unsafe_GetObject140)}, 68.65 - {CC"putObject", CC"("OBJ"I"OBJ")V", FN_PTR(Unsafe_SetObject140)}, 68.66 + {CC "getObject", CC "(" OBJ "I)" OBJ "", FN_PTR(Unsafe_GetObject140)}, 68.67 + {CC "putObject", CC "(" OBJ "I" OBJ ")V", FN_PTR(Unsafe_SetObject140)}, 68.68 68.69 DECLARE_GETSETOOP_140(Boolean, Z), 68.70 DECLARE_GETSETOOP_140(Byte, B), 68.71 @@ -1409,33 +1409,33 @@ 68.72 DECLARE_GETSETNATIVE(Float, F), 68.73 DECLARE_GETSETNATIVE(Double, D), 68.74 68.75 - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, 68.76 - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, 68.77 + {CC "getAddress", CC "(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, 68.78 + {CC "putAddress", CC "(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, 68.79 68.80 - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, 68.81 - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, 68.82 - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, 68.83 + {CC "allocateMemory", CC "(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, 68.84 + {CC "reallocateMemory", CC "(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, 68.85 + {CC "freeMemory", CC "(" ADR ")V", FN_PTR(Unsafe_FreeMemory)}, 68.86 68.87 - {CC"fieldOffset", CC"("FLD")I", FN_PTR(Unsafe_FieldOffset)}, 68.88 - {CC"staticFieldBase", CC"("CLS")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)}, 68.89 - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 68.90 - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 68.91 - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, 68.92 - {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, 68.93 - {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, 68.94 + {CC "fieldOffset", CC "(" FLD ")I", FN_PTR(Unsafe_FieldOffset)}, 68.95 + {CC "staticFieldBase", CC "(" CLS ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)}, 68.96 + {CC "ensureClassInitialized",CC "(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 68.97 + {CC "arrayBaseOffset", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 68.98 + {CC "arrayIndexScale", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, 68.99 + {CC "addressSize", CC "()I", FN_PTR(Unsafe_AddressSize)}, 68.100 + {CC "pageSize", CC "()I", FN_PTR(Unsafe_PageSize)}, 68.101 68.102 - {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, 68.103 - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, 68.104 - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, 68.105 - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, 68.106 - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, 68.107 - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)} 68.108 + {CC "defineClass", CC "(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)}, 68.109 + {CC "defineClass", CC "(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)}, 68.110 + {CC "allocateInstance", CC "(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, 68.111 + {CC "monitorEnter", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)}, 68.112 + {CC "monitorExit", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, 68.113 + {CC "throwException", CC "(" THR ")V", FN_PTR(Unsafe_ThrowException)} 68.114 }; 68.115 68.116 // These are the methods prior to the JSR 166 changes in 1.5.0 68.117 static JNINativeMethod methods_141[] = { 68.118 - {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, 68.119 - {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, 68.120 + {CC "getObject", CC "(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)}, 68.121 + {CC "putObject", CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)}, 68.122 68.123 DECLARE_GETSETOOP_141(Boolean, Z), 68.124 DECLARE_GETSETOOP_141(Byte, B), 68.125 @@ -1454,37 +1454,37 @@ 68.126 DECLARE_GETSETNATIVE(Float, F), 68.127 DECLARE_GETSETNATIVE(Double, D), 68.128 68.129 - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, 68.130 - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, 68.131 + {CC "getAddress", CC "(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, 68.132 + {CC "putAddress", CC "(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, 68.133 68.134 - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, 68.135 - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, 68.136 - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, 68.137 + {CC "allocateMemory", CC "(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, 68.138 + {CC "reallocateMemory", CC "(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, 68.139 + {CC "freeMemory", CC "(" ADR ")V", FN_PTR(Unsafe_FreeMemory)}, 68.140 68.141 - {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 68.142 - {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, 68.143 - {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 68.144 - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 68.145 - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 68.146 - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, 68.147 - {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, 68.148 - {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, 68.149 + {CC "objectFieldOffset", CC "(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 68.150 + {CC "staticFieldOffset", CC "(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, 68.151 + {CC "staticFieldBase", CC "(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 68.152 + {CC "ensureClassInitialized",CC "(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 68.153 + {CC "arrayBaseOffset", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 68.154 + {CC "arrayIndexScale", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, 68.155 + {CC "addressSize", CC "()I", FN_PTR(Unsafe_AddressSize)}, 68.156 + {CC "pageSize", CC "()I", FN_PTR(Unsafe_PageSize)}, 68.157 68.158 - {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, 68.159 - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, 68.160 - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, 68.161 - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, 68.162 - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, 68.163 - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)} 68.164 + {CC "defineClass", CC "(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)}, 68.165 + {CC "defineClass", CC "(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)}, 68.166 + {CC "allocateInstance", CC "(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, 68.167 + {CC "monitorEnter", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)}, 68.168 + {CC "monitorExit", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, 68.169 + {CC "throwException", CC "(" THR ")V", FN_PTR(Unsafe_ThrowException)} 68.170 68.171 }; 68.172 68.173 // These are the methods prior to the JSR 166 changes in 1.6.0 68.174 static JNINativeMethod methods_15[] = { 68.175 - {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, 68.176 - {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, 68.177 - {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)}, 68.178 - {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)}, 68.179 + {CC "getObject", CC "(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)}, 68.180 + {CC "putObject", CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)}, 68.181 + {CC "getObjectVolatile",CC "(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)}, 68.182 + {CC "putObjectVolatile",CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)}, 68.183 68.184 68.185 DECLARE_GETSETOOP(Boolean, Z), 68.186 @@ -1504,42 +1504,42 @@ 68.187 DECLARE_GETSETNATIVE(Float, F), 68.188 DECLARE_GETSETNATIVE(Double, D), 68.189 68.190 - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, 68.191 - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, 68.192 + {CC "getAddress", CC "(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, 68.193 + {CC "putAddress", CC "(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, 68.194 68.195 - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, 68.196 - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, 68.197 - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, 68.198 + {CC "allocateMemory", CC "(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, 68.199 + {CC "reallocateMemory", CC "(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, 68.200 + {CC "freeMemory", CC "(" ADR ")V", FN_PTR(Unsafe_FreeMemory)}, 68.201 68.202 - {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 68.203 - {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, 68.204 - {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 68.205 - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 68.206 - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 68.207 - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, 68.208 - {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, 68.209 - {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, 68.210 + {CC "objectFieldOffset", CC "(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 68.211 + {CC "staticFieldOffset", CC "(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, 68.212 + {CC "staticFieldBase", CC "(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 68.213 + {CC "ensureClassInitialized",CC "(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 68.214 + {CC "arrayBaseOffset", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 68.215 + {CC "arrayIndexScale", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, 68.216 + {CC "addressSize", CC "()I", FN_PTR(Unsafe_AddressSize)}, 68.217 + {CC "pageSize", CC "()I", FN_PTR(Unsafe_PageSize)}, 68.218 68.219 - {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, 68.220 - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, 68.221 - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, 68.222 - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, 68.223 - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, 68.224 - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}, 68.225 - {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, 68.226 - {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, 68.227 - {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, 68.228 - {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)}, 68.229 - {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)} 68.230 + {CC "defineClass", CC "(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)}, 68.231 + {CC "defineClass", CC "(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)}, 68.232 + {CC "allocateInstance", CC "(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, 68.233 + {CC "monitorEnter", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)}, 68.234 + {CC "monitorExit", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, 68.235 + {CC "throwException", CC "(" THR ")V", FN_PTR(Unsafe_ThrowException)}, 68.236 + {CC "compareAndSwapObject", CC "(" OBJ "J" OBJ "" OBJ ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, 68.237 + {CC "compareAndSwapInt", CC "(" OBJ "J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, 68.238 + {CC "compareAndSwapLong", CC "(" OBJ "J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, 68.239 + {CC "park", CC "(ZJ)V", FN_PTR(Unsafe_Park)}, 68.240 + {CC "unpark", CC "(" OBJ ")V", FN_PTR(Unsafe_Unpark)} 68.241 68.242 }; 68.243 68.244 // These are the methods for 1.6.0 and 1.7.0 68.245 static JNINativeMethod methods_16[] = { 68.246 - {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, 68.247 - {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, 68.248 - {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)}, 68.249 - {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)}, 68.250 + {CC "getObject", CC "(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)}, 68.251 + {CC "putObject", CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)}, 68.252 + {CC "getObjectVolatile",CC "(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)}, 68.253 + {CC "putObjectVolatile",CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)}, 68.254 68.255 DECLARE_GETSETOOP(Boolean, Z), 68.256 DECLARE_GETSETOOP(Byte, B), 68.257 @@ -1558,45 +1558,45 @@ 68.258 DECLARE_GETSETNATIVE(Float, F), 68.259 DECLARE_GETSETNATIVE(Double, D), 68.260 68.261 - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, 68.262 - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, 68.263 + {CC "getAddress", CC "(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, 68.264 + {CC "putAddress", CC "(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, 68.265 68.266 - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, 68.267 - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, 68.268 - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, 68.269 + {CC "allocateMemory", CC "(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, 68.270 + {CC "reallocateMemory", CC "(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, 68.271 + {CC "freeMemory", CC "(" ADR ")V", FN_PTR(Unsafe_FreeMemory)}, 68.272 68.273 - {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 68.274 - {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, 68.275 - {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 68.276 - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 68.277 - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 68.278 - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, 68.279 - {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, 68.280 - {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, 68.281 + {CC "objectFieldOffset", CC "(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 68.282 + {CC "staticFieldOffset", CC "(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, 68.283 + {CC "staticFieldBase", CC "(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 68.284 + {CC "ensureClassInitialized",CC "(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 68.285 + {CC "arrayBaseOffset", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 68.286 + {CC "arrayIndexScale", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, 68.287 + {CC "addressSize", CC "()I", FN_PTR(Unsafe_AddressSize)}, 68.288 + {CC "pageSize", CC "()I", FN_PTR(Unsafe_PageSize)}, 68.289 68.290 - {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, 68.291 - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, 68.292 - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, 68.293 - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, 68.294 - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, 68.295 - {CC"tryMonitorEnter", CC"("OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)}, 68.296 - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}, 68.297 - {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, 68.298 - {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, 68.299 - {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, 68.300 - {CC"putOrderedObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetOrderedObject)}, 68.301 - {CC"putOrderedInt", CC"("OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)}, 68.302 - {CC"putOrderedLong", CC"("OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)}, 68.303 - {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)}, 68.304 - {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)} 68.305 + {CC "defineClass", CC "(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)}, 68.306 + {CC "defineClass", CC "(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)}, 68.307 + {CC "allocateInstance", CC "(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, 68.308 + {CC "monitorEnter", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)}, 68.309 + {CC "monitorExit", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, 68.310 + {CC "tryMonitorEnter", CC "(" OBJ ")Z", FN_PTR(Unsafe_TryMonitorEnter)}, 68.311 + {CC "throwException", CC "(" THR ")V", FN_PTR(Unsafe_ThrowException)}, 68.312 + {CC "compareAndSwapObject", CC "(" OBJ "J" OBJ "" OBJ ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, 68.313 + {CC "compareAndSwapInt", CC "(" OBJ "J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, 68.314 + {CC "compareAndSwapLong", CC "(" OBJ "J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, 68.315 + {CC "putOrderedObject", CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetOrderedObject)}, 68.316 + {CC "putOrderedInt", CC "(" OBJ "JI)V", FN_PTR(Unsafe_SetOrderedInt)}, 68.317 + {CC "putOrderedLong", CC "(" OBJ "JJ)V", FN_PTR(Unsafe_SetOrderedLong)}, 68.318 + {CC "park", CC "(ZJ)V", FN_PTR(Unsafe_Park)}, 68.319 + {CC "unpark", CC "(" OBJ ")V", FN_PTR(Unsafe_Unpark)} 68.320 }; 68.321 68.322 // These are the methods for 1.8.0 68.323 static JNINativeMethod methods_18[] = { 68.324 - {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, 68.325 - {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, 68.326 - {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)}, 68.327 - {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)}, 68.328 + {CC "getObject", CC "(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)}, 68.329 + {CC "putObject", CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)}, 68.330 + {CC "getObjectVolatile",CC "(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)}, 68.331 + {CC "putObjectVolatile",CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)}, 68.332 68.333 DECLARE_GETSETOOP(Boolean, Z), 68.334 DECLARE_GETSETOOP(Byte, B), 68.335 @@ -1615,71 +1615,71 @@ 68.336 DECLARE_GETSETNATIVE(Float, F), 68.337 DECLARE_GETSETNATIVE(Double, D), 68.338 68.339 - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, 68.340 - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, 68.341 + {CC "getAddress", CC "(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, 68.342 + {CC "putAddress", CC "(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)}, 68.343 68.344 - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, 68.345 - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, 68.346 - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, 68.347 + {CC "allocateMemory", CC "(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, 68.348 + {CC "reallocateMemory", CC "(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, 68.349 + {CC "freeMemory", CC "(" ADR ")V", FN_PTR(Unsafe_FreeMemory)}, 68.350 68.351 - {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 68.352 - {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, 68.353 - {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 68.354 - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 68.355 - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 68.356 - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, 68.357 - {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, 68.358 - {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, 68.359 + {CC "objectFieldOffset", CC "(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)}, 68.360 + {CC "staticFieldOffset", CC "(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)}, 68.361 + {CC "staticFieldBase", CC "(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, 68.362 + {CC "ensureClassInitialized",CC "(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)}, 68.363 + {CC "arrayBaseOffset", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)}, 68.364 + {CC "arrayIndexScale", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)}, 68.365 + {CC "addressSize", CC "()I", FN_PTR(Unsafe_AddressSize)}, 68.366 + {CC "pageSize", CC "()I", FN_PTR(Unsafe_PageSize)}, 68.367 68.368 - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, 68.369 - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, 68.370 - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, 68.371 - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, 68.372 - {CC"tryMonitorEnter", CC"("OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)}, 68.373 - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}, 68.374 - {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, 68.375 - {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, 68.376 - {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, 68.377 - {CC"putOrderedObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetOrderedObject)}, 68.378 - {CC"putOrderedInt", CC"("OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)}, 68.379 - {CC"putOrderedLong", CC"("OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)}, 68.380 - {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)}, 68.381 - {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)} 68.382 + {CC "defineClass", CC "(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)}, 68.383 + {CC "allocateInstance", CC "(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, 68.384 + {CC "monitorEnter", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)}, 68.385 + {CC "monitorExit", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)}, 68.386 + {CC "tryMonitorEnter", CC "(" OBJ ")Z", FN_PTR(Unsafe_TryMonitorEnter)}, 68.387 + {CC "throwException", CC "(" THR ")V", FN_PTR(Unsafe_ThrowException)}, 68.388 + {CC "compareAndSwapObject", CC "(" OBJ "J" OBJ "" OBJ ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, 68.389 + {CC "compareAndSwapInt", CC "(" OBJ "J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, 68.390 + {CC "compareAndSwapLong", CC "(" OBJ "J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, 68.391 + {CC "putOrderedObject", CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetOrderedObject)}, 68.392 + {CC "putOrderedInt", CC "(" OBJ "JI)V", FN_PTR(Unsafe_SetOrderedInt)}, 68.393 + {CC "putOrderedLong", CC "(" OBJ "JJ)V", FN_PTR(Unsafe_SetOrderedLong)}, 68.394 + {CC "park", CC "(ZJ)V", FN_PTR(Unsafe_Park)}, 68.395 + {CC "unpark", CC "(" OBJ ")V", FN_PTR(Unsafe_Unpark)} 68.396 }; 68.397 68.398 JNINativeMethod loadavg_method[] = { 68.399 - {CC"getLoadAverage", CC"([DI)I", FN_PTR(Unsafe_Loadavg)} 68.400 + {CC "getLoadAverage", CC "([DI)I", FN_PTR(Unsafe_Loadavg)} 68.401 }; 68.402 68.403 JNINativeMethod prefetch_methods[] = { 68.404 - {CC"prefetchRead", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)}, 68.405 - {CC"prefetchWrite", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)}, 68.406 - {CC"prefetchReadStatic", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)}, 68.407 - {CC"prefetchWriteStatic",CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)} 68.408 + {CC "prefetchRead", CC "(" OBJ "J)V", FN_PTR(Unsafe_PrefetchRead)}, 68.409 + {CC "prefetchWrite", CC "(" OBJ "J)V", FN_PTR(Unsafe_PrefetchWrite)}, 68.410 + {CC "prefetchReadStatic", CC "(" OBJ "J)V", FN_PTR(Unsafe_PrefetchRead)}, 68.411 + {CC "prefetchWriteStatic",CC "(" OBJ "J)V", FN_PTR(Unsafe_PrefetchWrite)} 68.412 }; 68.413 68.414 JNINativeMethod memcopy_methods_17[] = { 68.415 - {CC"copyMemory", CC"("OBJ"J"OBJ"JJ)V", FN_PTR(Unsafe_CopyMemory2)}, 68.416 - {CC"setMemory", CC"("OBJ"JJB)V", FN_PTR(Unsafe_SetMemory2)} 68.417 + {CC "copyMemory", CC "(" OBJ "J" OBJ "JJ)V", FN_PTR(Unsafe_CopyMemory2)}, 68.418 + {CC "setMemory", CC "(" OBJ "JJB)V", FN_PTR(Unsafe_SetMemory2)} 68.419 }; 68.420 68.421 JNINativeMethod memcopy_methods_15[] = { 68.422 - {CC"setMemory", CC"("ADR"JB)V", FN_PTR(Unsafe_SetMemory)}, 68.423 - {CC"copyMemory", CC"("ADR ADR"J)V", FN_PTR(Unsafe_CopyMemory)} 68.424 + {CC "setMemory", CC "(" ADR "JB)V", FN_PTR(Unsafe_SetMemory)}, 68.425 + {CC "copyMemory", CC "(" ADR ADR "J)V", FN_PTR(Unsafe_CopyMemory)} 68.426 }; 68.427 68.428 JNINativeMethod anonk_methods[] = { 68.429 - {CC"defineAnonymousClass", CC"("DAC_Args")"CLS, FN_PTR(Unsafe_DefineAnonymousClass)}, 68.430 + {CC "defineAnonymousClass", CC "(" DAC_Args ")" CLS, FN_PTR(Unsafe_DefineAnonymousClass)}, 68.431 }; 68.432 68.433 JNINativeMethod lform_methods[] = { 68.434 - {CC"shouldBeInitialized",CC"("CLS")Z", FN_PTR(Unsafe_ShouldBeInitialized)}, 68.435 + {CC "shouldBeInitialized",CC "(" CLS ")Z", FN_PTR(Unsafe_ShouldBeInitialized)}, 68.436 }; 68.437 68.438 JNINativeMethod fence_methods[] = { 68.439 - {CC"loadFence", CC"()V", FN_PTR(Unsafe_LoadFence)}, 68.440 - {CC"storeFence", CC"()V", FN_PTR(Unsafe_StoreFence)}, 68.441 - {CC"fullFence", CC"()V", FN_PTR(Unsafe_FullFence)}, 68.442 + {CC "loadFence", CC "()V", FN_PTR(Unsafe_LoadFence)}, 68.443 + {CC "storeFence", CC "()V", FN_PTR(Unsafe_StoreFence)}, 68.444 + {CC "fullFence", CC "()V", FN_PTR(Unsafe_FullFence)}, 68.445 }; 68.446 68.447 #undef CC
69.1 --- a/src/share/vm/prims/whitebox.cpp Tue Feb 23 18:58:36 2016 -0500 69.2 +++ b/src/share/vm/prims/whitebox.cpp Thu Jun 14 09:15:08 2018 -0700 69.3 @@ -169,8 +169,8 @@ 69.4 69.5 WB_ENTRY(void, WB_PrintHeapSizes(JNIEnv* env, jobject o)) { 69.6 CollectorPolicy * p = Universe::heap()->collector_policy(); 69.7 - gclog_or_tty->print_cr("Minimum heap "SIZE_FORMAT" Initial heap " 69.8 - SIZE_FORMAT" Maximum heap "SIZE_FORMAT" Min alignment "SIZE_FORMAT" Max alignment "SIZE_FORMAT, 69.9 + gclog_or_tty->print_cr("Minimum heap " SIZE_FORMAT " Initial heap " 69.10 + SIZE_FORMAT" Maximum heap " SIZE_FORMAT " Min alignment " SIZE_FORMAT " Max alignment " SIZE_FORMAT, 69.11 p->min_heap_byte_size(), p->initial_heap_byte_size(), p->max_heap_byte_size(), 69.12 p->space_alignment(), p->heap_alignment()); 69.13 } 69.14 @@ -205,8 +205,8 @@ 69.15 Universe::narrow_oop_use_implicit_null_checks() )) { 69.16 tty->print_cr("WB_ReadFromNoaccessArea method is useless:\n " 69.17 "\tUseCompressedOops is %d\n" 69.18 - "\trhs.base() is "PTR_FORMAT"\n" 69.19 - "\tUniverse::narrow_oop_base() is "PTR_FORMAT"\n" 69.20 + "\trhs.base() is " PTR_FORMAT "\n" 69.21 + "\tUniverse::narrow_oop_base() is " PTR_FORMAT "\n" 69.22 "\tUniverse::narrow_oop_use_implicit_null_checks() is %d", 69.23 UseCompressedOops, 69.24 rhs.base(), 69.25 @@ -259,8 +259,8 @@ 69.26 69.27 WB_ENTRY(jint, WB_StressVirtualSpaceResize(JNIEnv* env, jobject o, 69.28 jlong reserved_space_size, jlong magnitude, jlong iterations)) 69.29 - tty->print_cr("reservedSpaceSize="JLONG_FORMAT", magnitude="JLONG_FORMAT", " 69.30 - "iterations="JLONG_FORMAT"\n", reserved_space_size, magnitude, 69.31 + tty->print_cr("reservedSpaceSize=" JLONG_FORMAT ", magnitude=" JLONG_FORMAT ", " 69.32 + "iterations=" JLONG_FORMAT "\n", reserved_space_size, magnitude, 69.33 iterations); 69.34 if (reserved_space_size < 0 || magnitude < 0 || iterations < 0) { 69.35 tty->print_cr("One of variables printed above is negative. Can't proceed.\n");
70.1 --- a/src/share/vm/runtime/deoptimization.cpp Tue Feb 23 18:58:36 2016 -0500 70.2 +++ b/src/share/vm/runtime/deoptimization.cpp Thu Jun 14 09:15:08 2018 -0700 70.3 @@ -1373,7 +1373,7 @@ 70.4 ttyLocker ttyl; 70.5 char buf[100]; 70.6 if (xtty != NULL) { 70.7 - xtty->begin_head("uncommon_trap thread='" UINTX_FORMAT"' %s", 70.8 + xtty->begin_head("uncommon_trap thread='" UINTX_FORMAT "' %s", 70.9 os::current_thread_id(), 70.10 format_trap_request(buf, sizeof(buf), trap_request)); 70.11 nm->log_identity(xtty);
71.1 --- a/src/share/vm/runtime/safepoint.cpp Tue Feb 23 18:58:36 2016 -0500 71.2 +++ b/src/share/vm/runtime/safepoint.cpp Thu Jun 14 09:15:08 2018 -0700 71.3 @@ -914,7 +914,7 @@ 71.4 71.5 case _running: 71.6 default: 71.7 - tty->print_cr("restart thread "INTPTR_FORMAT" with state %d", 71.8 + tty->print_cr("restart thread " INTPTR_FORMAT " with state %d", 71.9 _thread, _type); 71.10 _thread->print(); 71.11 ShouldNotReachHere(); 71.12 @@ -1213,7 +1213,7 @@ 71.13 sstats = &_safepoint_stats[index]; 71.14 tty->print("%.3f: ", sstats->_time_stamp); 71.15 tty->print("%-26s [" 71.16 - INT32_FORMAT_W(8)INT32_FORMAT_W(11)INT32_FORMAT_W(15) 71.17 + INT32_FORMAT_W(8) INT32_FORMAT_W(11) INT32_FORMAT_W(15) 71.18 " ] ", 71.19 sstats->_vmop_type == -1 ? "no vm operation" : 71.20 VM_Operation::name(sstats->_vmop_type), 71.21 @@ -1222,9 +1222,9 @@ 71.22 sstats->_nof_threads_wait_to_block); 71.23 // "/ MICROUNITS " is to convert the unit from nanos to millis. 71.24 tty->print(" [" 71.25 - INT64_FORMAT_W(6)INT64_FORMAT_W(6) 71.26 - INT64_FORMAT_W(6)INT64_FORMAT_W(6) 71.27 - INT64_FORMAT_W(6)" ] ", 71.28 + INT64_FORMAT_W(6) INT64_FORMAT_W(6) 71.29 + INT64_FORMAT_W(6) INT64_FORMAT_W(6) 71.30 + INT64_FORMAT_W(6) " ] ", 71.31 sstats->_time_to_spin / MICROUNITS, 71.32 sstats->_time_to_wait_to_block / MICROUNITS, 71.33 sstats->_time_to_sync / MICROUNITS, 71.34 @@ -1232,9 +1232,9 @@ 71.35 sstats->_time_to_exec_vmop / MICROUNITS); 71.36 71.37 if (need_to_track_page_armed_status) { 71.38 - tty->print(INT32_FORMAT" ", sstats->_page_armed); 71.39 + tty->print(INT32_FORMAT " ", sstats->_page_armed); 71.40 } 71.41 - tty->print_cr(INT32_FORMAT" ", sstats->_nof_threads_hit_page_trap); 71.42 + tty->print_cr(INT32_FORMAT " ", sstats->_nof_threads_hit_page_trap); 71.43 } 71.44 } 71.45 71.46 @@ -1271,17 +1271,17 @@ 71.47 71.48 for (int index = 0; index < VM_Operation::VMOp_Terminating; index++) { 71.49 if (_safepoint_reasons[index] != 0) { 71.50 - tty->print_cr("%-26s"UINT64_FORMAT_W(10), VM_Operation::name(index), 71.51 + tty->print_cr("%-26s" UINT64_FORMAT_W(10), VM_Operation::name(index), 71.52 _safepoint_reasons[index]); 71.53 } 71.54 } 71.55 71.56 - tty->print_cr(UINT64_FORMAT_W(5)" VM operations coalesced during safepoint", 71.57 + tty->print_cr(UINT64_FORMAT_W(5) " VM operations coalesced during safepoint", 71.58 _coalesced_vmop_count); 71.59 - tty->print_cr("Maximum sync time "INT64_FORMAT_W(5)" ms", 71.60 + tty->print_cr("Maximum sync time " INT64_FORMAT_W(5) " ms", 71.61 _max_sync_time / MICROUNITS); 71.62 tty->print_cr("Maximum vm operation time (except for Exit VM operation) " 71.63 - INT64_FORMAT_W(5)" ms", 71.64 + INT64_FORMAT_W(5) " ms", 71.65 _max_vmop_time / MICROUNITS); 71.66 } 71.67
72.1 --- a/src/share/vm/runtime/unhandledOops.cpp Tue Feb 23 18:58:36 2016 -0500 72.2 +++ b/src/share/vm/runtime/unhandledOops.cpp Thu Jun 14 09:15:08 2018 -0700 72.3 @@ -105,7 +105,7 @@ 72.4 _level --; 72.5 if (unhandled_oop_print) { 72.6 for (int i=0; i<_level; i++) tty->print(" "); 72.7 - tty->print_cr("u "INTPTR_FORMAT, op); 72.8 + tty->print_cr("u " INTPTR_FORMAT, op); 72.9 } 72.10 72.11 int i = _oop_list->find_from_end(op, match_oop_entry);
73.1 --- a/src/share/vm/services/diagnosticArgument.cpp Tue Feb 23 18:58:36 2016 -0500 73.2 +++ b/src/share/vm/services/diagnosticArgument.cpp Thu Jun 14 09:15:08 2018 -0700 73.3 @@ -89,7 +89,7 @@ 73.4 size_t len, TRAPS) { 73.5 int scanned = -1; 73.6 if (str == NULL 73.7 - || sscanf(str, JLONG_FORMAT"%n", &_value, &scanned) != 1 73.8 + || sscanf(str, JLONG_FORMAT "%n", &_value, &scanned) != 1 73.9 || (size_t)scanned != len) 73.10 { 73.11 ResourceMark rm;
74.1 --- a/src/share/vm/services/threadService.cpp Tue Feb 23 18:58:36 2016 -0500 74.2 +++ b/src/share/vm/services/threadService.cpp Thu Jun 14 09:15:08 2018 -0700 74.3 @@ -889,7 +889,7 @@ 74.4 st->print(" waiting to lock monitor " INTPTR_FORMAT, waitingToLockMonitor); 74.5 oop obj = (oop)waitingToLockMonitor->object(); 74.6 if (obj != NULL) { 74.7 - st->print(" (object "INTPTR_FORMAT ", a %s)", (address)obj, 74.8 + st->print(" (object " INTPTR_FORMAT ", a %s)", (address)obj, 74.9 (InstanceKlass::cast(obj->klass()))->external_name()); 74.10 74.11 if (!currentThread->current_pending_monitor_is_from_java()) {
75.1 --- a/src/share/vm/trace/traceStream.hpp Tue Feb 23 18:58:36 2016 -0500 75.2 +++ b/src/share/vm/trace/traceStream.hpp Thu Jun 14 09:15:08 2018 -0700 75.3 @@ -40,31 +40,31 @@ 75.4 TraceStream(outputStream& stream): _st(stream) {} 75.5 75.6 void print_val(const char* label, u1 val) { 75.7 - _st.print("%s = "UINT32_FORMAT, label, val); 75.8 + _st.print("%s = " UINT32_FORMAT, label, val); 75.9 } 75.10 75.11 void print_val(const char* label, u2 val) { 75.12 - _st.print("%s = "UINT32_FORMAT, label, val); 75.13 + _st.print("%s = " UINT32_FORMAT, label, val); 75.14 } 75.15 75.16 void print_val(const char* label, s2 val) { 75.17 - _st.print("%s = "INT32_FORMAT, label, val); 75.18 + _st.print("%s = " INT32_FORMAT, label, val); 75.19 } 75.20 75.21 void print_val(const char* label, u4 val) { 75.22 - _st.print("%s = "UINT32_FORMAT, label, val); 75.23 + _st.print("%s = " UINT32_FORMAT, label, val); 75.24 } 75.25 75.26 void print_val(const char* label, s4 val) { 75.27 - _st.print("%s = "INT32_FORMAT, label, val); 75.28 + _st.print("%s = " INT32_FORMAT, label, val); 75.29 } 75.30 75.31 void print_val(const char* label, u8 val) { 75.32 - _st.print("%s = "UINT64_FORMAT, label, val); 75.33 + _st.print("%s = " UINT64_FORMAT, label, val); 75.34 } 75.35 75.36 void print_val(const char* label, s8 val) { 75.37 - _st.print("%s = "INT64_FORMAT, label, (int64_t) val); 75.38 + _st.print("%s = " INT64_FORMAT, label, (int64_t) val); 75.39 } 75.40 75.41 void print_val(const char* label, bool val) {
76.1 --- a/src/share/vm/utilities/ostream.cpp Tue Feb 23 18:58:36 2016 -0500 76.2 +++ b/src/share/vm/utilities/ostream.cpp Thu Jun 14 09:15:08 2018 -0700 76.3 @@ -277,7 +277,7 @@ 76.4 size_t limit = (len + 16) / 16 * 16; 76.5 for (size_t i = 0; i < limit; ++i) { 76.6 if (i % 16 == 0) { 76.7 - indent().print(SIZE_FORMAT_HEX_W(07)":", i); 76.8 + indent().print(SIZE_FORMAT_HEX_W(07) ":", i); 76.9 } 76.10 if (i % 2 == 0) { 76.11 print(" "); 76.12 @@ -945,7 +945,7 @@ 76.13 // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if 76.14 // we ever get round to introduce that method on the os class 76.15 xs->head("hotspot_log version='%d %d'" 76.16 - " process='%d' time_ms='"INT64_FORMAT"'", 76.17 + " process='%d' time_ms='" INT64_FORMAT "'", 76.18 LOG_MAJOR_VERSION, LOG_MINOR_VERSION, 76.19 os::current_process_id(), (int64_t)time_ms); 76.20 // Write VM version header immediately.
