Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE
java-1_8_0-openjdk.6879
java-1_8_0-openjdk-gcc6.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File java-1_8_0-openjdk-gcc6.patch of Package java-1_8_0-openjdk.6879
--- openjdk/hotspot/src/share/vm/classfile/dictionary.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/classfile/dictionary.hpp 2017-01-29 21:33:14.341347702 +0100 @@ -373,7 +373,7 @@ void print_on(outputStream* st) const { symbol()->print_value_on(st); - st->print("/mode="INTX_FORMAT, symbol_mode()); + st->print("/mode=" INTX_FORMAT, symbol_mode()); st->print(" -> "); bool printed = false; if (method() != NULL) { --- openjdk/hotspot/src/share/vm/code/dependencies.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/code/dependencies.hpp 2017-01-29 21:33:14.341347702 +0100 @@ -166,7 +166,7 @@ LG2_TYPE_LIMIT = 4, // assert(TYPE_LIMIT <= (1<<LG2_TYPE_LIMIT)) // handy categorizations of dependency types: - all_types = ((1 << TYPE_LIMIT) - 1) & ((-1) << FIRST_TYPE), + all_types = (int)(((1 << TYPE_LIMIT) - 1) & ((unsigned)(-1) << FIRST_TYPE)), non_klass_types = (1 << call_site_target_value), klass_types = all_types & ~non_klass_types, --- openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.cpp 2017-01-29 21:33:14.341347702 +0100 @@ -186,7 +186,7 @@ void ImplicitExceptionTable::print(address base) const { tty->print("{"); for( uint i=0; i<len(); i++ ) - tty->print("< "INTPTR_FORMAT", "INTPTR_FORMAT" > ",base + *adr(i), base + *(adr(i)+1)); + tty->print("< " INTPTR_FORMAT ", " INTPTR_FORMAT " > ",base + *adr(i), base + *(adr(i)+1)); tty->print_cr("}"); } --- openjdk/hotspot/src/share/vm/code/nmethod.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/code/nmethod.cpp 2017-01-29 21:33:14.341347702 +0100 @@ -2721,7 +2721,7 @@ _nm->print_nmethod(true); _ok = false; } - tty->print_cr("*** non-oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)", + tty->print_cr("*** non-oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)", (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm)); } virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); } @@ -2845,7 +2845,7 @@ _nm->print_nmethod(true); _ok = false; } - tty->print_cr("*** scavengable oop "PTR_FORMAT" found at "PTR_FORMAT" (offset %d)", + tty->print_cr("*** scavengable oop " PTR_FORMAT " found at " PTR_FORMAT " (offset %d)", (void *)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm)); (*p)->print(); } @@ -2890,7 +2890,7 @@ print_on(tty, NULL); if (WizardMode) { - tty->print("((nmethod*) "INTPTR_FORMAT ") ", this); + tty->print("((nmethod*) " INTPTR_FORMAT ") ", this); tty->print(" for method " INTPTR_FORMAT , (address)method()); tty->print(" { "); if (is_in_use()) tty->print("in_use "); --- openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp 2017-01-29 21:33:14.341347702 +0100 @@ -203,7 +203,7 @@ } void log_nmethod(JavaThread* thread, nmethod* nm) { - log(thread, "nmethod %d%s " INTPTR_FORMAT " code ["INTPTR_FORMAT ", " INTPTR_FORMAT "]", + log(thread, "nmethod %d%s " INTPTR_FORMAT " code [" INTPTR_FORMAT ", " INTPTR_FORMAT "]", nm->compile_id(), nm->is_osr_method() ? "%" : "", p2i(nm), p2i(nm->code_begin()), p2i(nm->code_end())); } --- openjdk/hotspot/src/share/vm/compiler/disassembler.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/compiler/disassembler.cpp 2017-01-29 21:33:14.341347702 +0100 @@ -63,7 +63,7 @@ Disassembler::decode_func_virtual Disassembler::_decode_instructions_virtual = NULL; Disassembler::decode_func Disassembler::_decode_instructions = NULL; -static const char hsdis_library_name[] = "hsdis-"HOTSPOT_LIB_ARCH; +static const char hsdis_library_name[] = "hsdis-" HOTSPOT_LIB_ARCH; static const char decode_instructions_virtual_name[] = "decode_instructions_virtual"; static const char decode_instructions_name[] = "decode_instructions"; static bool use_new_version = true; --- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2017-01-29 21:33:14.345347611 +0100 @@ -844,18 +844,18 @@ GenCollectedHeap* gch = GenCollectedHeap::heap(); if (PrintGCDetails) { if (Verbose) { - gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"("SIZE_FORMAT")]", + gclog_or_tty->print("[%d %s-%s: " SIZE_FORMAT "(" SIZE_FORMAT ")]", level(), short_name(), s, used(), capacity()); } else { - gclog_or_tty->print("[%d %s-%s: "SIZE_FORMAT"K("SIZE_FORMAT"K)]", + gclog_or_tty->print("[%d %s-%s: " SIZE_FORMAT "K(" SIZE_FORMAT "K)]", level(), short_name(), s, used() / K, capacity() / K); } } if (Verbose) { - gclog_or_tty->print(" "SIZE_FORMAT"("SIZE_FORMAT")", + gclog_or_tty->print(" " SIZE_FORMAT "(" SIZE_FORMAT ")", gch->used(), gch->capacity()); } else { - gclog_or_tty->print(" "SIZE_FORMAT"K("SIZE_FORMAT"K)", + gclog_or_tty->print(" " SIZE_FORMAT "K(" SIZE_FORMAT "K)", gch->used() / K, gch->capacity() / K); } } @@ -885,8 +885,8 @@ bool res = (available >= av_promo) || (available >= max_promotion_in_bytes); if (Verbose && PrintGCDetails) { gclog_or_tty->print_cr( - "CMS: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT")," - "max_promo("SIZE_FORMAT")", + "CMS: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT ")," + "max_promo(" SIZE_FORMAT ")", res? "":" not", available, res? ">=":"<", av_promo, max_promotion_in_bytes); } @@ -972,8 +972,8 @@ desired_free_percentage); gclog_or_tty->print_cr(" Maximum free fraction %f", maximum_free_percentage); - gclog_or_tty->print_cr(" Capactiy "SIZE_FORMAT, capacity()/1000); - gclog_or_tty->print_cr(" Desired capacity "SIZE_FORMAT, + gclog_or_tty->print_cr(" Capactiy " SIZE_FORMAT, capacity()/1000); + gclog_or_tty->print_cr(" Desired capacity " SIZE_FORMAT, desired_capacity/1000); int prev_level = level() - 1; if (prev_level >= 0) { @@ -981,14 +981,14 @@ GenCollectedHeap* gch = GenCollectedHeap::heap(); Generation* prev_gen = gch->_gens[prev_level]; prev_size = prev_gen->capacity(); - gclog_or_tty->print_cr(" Younger gen size "SIZE_FORMAT, + gclog_or_tty->print_cr(" Younger gen size " SIZE_FORMAT, prev_size/1000); } - gclog_or_tty->print_cr(" unsafe_max_alloc_nogc "SIZE_FORMAT, + gclog_or_tty->print_cr(" unsafe_max_alloc_nogc " SIZE_FORMAT, unsafe_max_alloc_nogc()/1000); - gclog_or_tty->print_cr(" contiguous available "SIZE_FORMAT, + gclog_or_tty->print_cr(" contiguous available " SIZE_FORMAT, contiguous_available()/1000); - gclog_or_tty->print_cr(" Expand by "SIZE_FORMAT" (bytes)", + gclog_or_tty->print_cr(" Expand by " SIZE_FORMAT " (bytes)", expand_bytes); } // safe if expansion fails @@ -1519,8 +1519,8 @@ stats().print_on(gclog_or_tty); gclog_or_tty->print_cr("time_until_cms_gen_full %3.7f", stats().time_until_cms_gen_full()); - gclog_or_tty->print_cr("free="SIZE_FORMAT, _cmsGen->free()); - gclog_or_tty->print_cr("contiguous_available="SIZE_FORMAT, + gclog_or_tty->print_cr("free=" SIZE_FORMAT, _cmsGen->free()); + gclog_or_tty->print_cr("contiguous_available=" SIZE_FORMAT, _cmsGen->contiguous_available()); gclog_or_tty->print_cr("promotion_rate=%g", stats().promotion_rate()); gclog_or_tty->print_cr("cms_allocation_rate=%g", stats().cms_allocation_rate()); @@ -2804,8 +2804,8 @@ assert(_numObjectsPromoted == 0, "check"); assert(_numWordsPromoted == 0, "check"); if (Verbose && PrintGC) { - gclog_or_tty->print("Allocated "SIZE_FORMAT" objects, " - SIZE_FORMAT" bytes concurrently", + gclog_or_tty->print("Allocated " SIZE_FORMAT " objects, " + SIZE_FORMAT " bytes concurrently", _numObjectsAllocated, _numWordsAllocated*sizeof(HeapWord)); } _numObjectsAllocated = 0; @@ -2891,8 +2891,8 @@ assert(_numObjectsAllocated == 0, "check"); assert(_numWordsAllocated == 0, "check"); if (Verbose && PrintGC) { - gclog_or_tty->print("Promoted "SIZE_FORMAT" objects, " - SIZE_FORMAT" bytes", + gclog_or_tty->print("Promoted " SIZE_FORMAT " objects, " + SIZE_FORMAT " bytes", _numObjectsPromoted, _numWordsPromoted*sizeof(HeapWord)); } _numObjectsPromoted = 0; @@ -2902,7 +2902,7 @@ if (PrintGC && Verbose) { // Call down the chain in contiguous_available needs the freelistLock // so print this out before releasing the freeListLock. - gclog_or_tty->print(" Contiguous available "SIZE_FORMAT" bytes ", + gclog_or_tty->print(" Contiguous available " SIZE_FORMAT " bytes ", contiguous_available()); } } @@ -2990,7 +2990,7 @@ HeapWord* addr = _marks->offsetToHeapWord(offset); if (!_marks->isMarked(addr)) { oop(addr)->print_on(gclog_or_tty); - gclog_or_tty->print_cr(" ("INTPTR_FORMAT" should have been marked)", addr); + gclog_or_tty->print_cr(" (" INTPTR_FORMAT " should have been marked)", addr); _failed = true; } return true; @@ -5051,7 +5051,7 @@ SpecializationStats::clear(); if (PrintGCDetails) { - gclog_or_tty->print("[YG occupancy: "SIZE_FORMAT" K ("SIZE_FORMAT" K)]", + gclog_or_tty->print("[YG occupancy: " SIZE_FORMAT " K (" SIZE_FORMAT " K)]", _young_gen->used() / K, _young_gen->capacity() / K); } @@ -5184,8 +5184,8 @@ if (ser_ovflw > 0) { if (PrintCMSStatistics != 0) { gclog_or_tty->print_cr("Marking stack overflow (benign) " - "(pmc_pc="SIZE_FORMAT", pmc_rm="SIZE_FORMAT", kac="SIZE_FORMAT - ", kac_preclean="SIZE_FORMAT")", + "(pmc_pc=" SIZE_FORMAT ", pmc_rm=" SIZE_FORMAT ", kac=" SIZE_FORMAT + ", kac_preclean=" SIZE_FORMAT ")", _ser_pmc_preclean_ovflw, _ser_pmc_remark_ovflw, _ser_kac_ovflw, _ser_kac_preclean_ovflw); } @@ -5198,7 +5198,7 @@ if (_par_pmc_remark_ovflw > 0 || _par_kac_ovflw > 0) { if (PrintCMSStatistics != 0) { gclog_or_tty->print_cr("Work queue overflow (benign) " - "(pmc_rm="SIZE_FORMAT", kac="SIZE_FORMAT")", + "(pmc_rm=" SIZE_FORMAT ", kac=" SIZE_FORMAT ")", _par_pmc_remark_ovflw, _par_kac_ovflw); } _par_pmc_remark_ovflw = 0; @@ -5206,12 +5206,12 @@ } if (PrintCMSStatistics != 0) { if (_markStack._hit_limit > 0) { - gclog_or_tty->print_cr(" (benign) Hit max stack size limit ("SIZE_FORMAT")", + gclog_or_tty->print_cr(" (benign) Hit max stack size limit (" SIZE_FORMAT ")", _markStack._hit_limit); } if (_markStack._failed_double > 0) { - gclog_or_tty->print_cr(" (benign) Failed stack doubling ("SIZE_FORMAT")," - " current capacity "SIZE_FORMAT, + gclog_or_tty->print_cr(" (benign) Failed stack doubling (" SIZE_FORMAT ")," + " current capacity " SIZE_FORMAT, _markStack._failed_double, _markStack.capacity()); } @@ -5975,7 +5975,7 @@ &markFromDirtyCardsClosure); verify_work_stacks_empty(); if (PrintCMSStatistics != 0) { - gclog_or_tty->print(" (re-scanned "SIZE_FORMAT" dirty cards in cms gen) ", + gclog_or_tty->print(" (re-scanned " SIZE_FORMAT " dirty cards in cms gen) ", markFromDirtyCardsClosure.num_dirty_cards()); } } @@ -6905,8 +6905,8 @@ } else if (_failed_double++ == 0 && !CMSConcurrentMTEnabled && PrintGCDetails) { // Failed to double capacity, continue; // we print a detail message only once per CMS cycle. - gclog_or_tty->print(" (benign) Failed to expand marking stack from "SIZE_FORMAT"K to " - SIZE_FORMAT"K", + gclog_or_tty->print(" (benign) Failed to expand marking stack from " SIZE_FORMAT "K to " + SIZE_FORMAT "K", _capacity / K, new_capacity / K); } } @@ -8228,25 +8228,25 @@ ShouldNotReachHere(); } if (Verbose && PrintGC) { - gclog_or_tty->print("Collected "SIZE_FORMAT" objects, " SIZE_FORMAT " bytes", + gclog_or_tty->print("Collected " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes", _numObjectsFreed, _numWordsFreed*sizeof(HeapWord)); - gclog_or_tty->print_cr("\nLive "SIZE_FORMAT" objects, " - SIZE_FORMAT" bytes " - "Already free "SIZE_FORMAT" objects, "SIZE_FORMAT" bytes", + gclog_or_tty->print_cr("\nLive " SIZE_FORMAT " objects, " + SIZE_FORMAT " bytes " + "Already free " SIZE_FORMAT " objects, " SIZE_FORMAT " bytes", _numObjectsLive, _numWordsLive*sizeof(HeapWord), _numObjectsAlreadyFree, _numWordsAlreadyFree*sizeof(HeapWord)); size_t totalBytes = (_numWordsFreed + _numWordsLive + _numWordsAlreadyFree) * sizeof(HeapWord); - gclog_or_tty->print_cr("Total sweep: "SIZE_FORMAT" bytes", totalBytes); + gclog_or_tty->print_cr("Total sweep: " SIZE_FORMAT " bytes", totalBytes); if (PrintCMSStatistics && CMSVerifyReturnedBytes) { size_t indexListReturnedBytes = _sp->sumIndexedFreeListArrayReturnedBytes(); size_t dict_returned_bytes = _sp->dictionary()->sum_dict_returned_bytes(); size_t returned_bytes = indexListReturnedBytes + dict_returned_bytes; - gclog_or_tty->print("Returned "SIZE_FORMAT" bytes", returned_bytes); - gclog_or_tty->print(" Indexed List Returned "SIZE_FORMAT" bytes", + gclog_or_tty->print("Returned " SIZE_FORMAT " bytes", returned_bytes); + gclog_or_tty->print(" Indexed List Returned " SIZE_FORMAT " bytes", indexListReturnedBytes); - gclog_or_tty->print_cr(" Dictionary Returned "SIZE_FORMAT" bytes", + gclog_or_tty->print_cr(" Dictionary Returned " SIZE_FORMAT " bytes", dict_returned_bytes); } } @@ -8325,13 +8325,13 @@ // coalesced chunk to the appropriate free list. if (inFreeRange()) { assert(freeFinger() >= _sp->bottom() && freeFinger() < _limit, - err_msg("freeFinger() " PTR_FORMAT" is out-of-bounds", freeFinger())); + err_msg("freeFinger() " PTR_FORMAT " is out-of-bounds", freeFinger())); flush_cur_free_chunk(freeFinger(), pointer_delta(addr, freeFinger())); if (CMSTraceSweeper) { gclog_or_tty->print("Sweep: last chunk: "); - gclog_or_tty->print("put_free_blk 0x%x ("SIZE_FORMAT") " - "[coalesced:"SIZE_FORMAT"]\n", + gclog_or_tty->print("put_free_blk 0x%x (" SIZE_FORMAT ") " + "[coalesced:" SIZE_FORMAT "]\n", freeFinger(), pointer_delta(addr, freeFinger()), lastFreeRangeCoalesced()); } --- openjdk/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp 2017-01-29 21:33:14.345347611 +0100 @@ -92,7 +92,7 @@ regions_at_put(_curr_index, NULL); assert(hr->reclaimable_bytes() <= _remaining_reclaimable_bytes, err_msg("remaining reclaimable bytes inconsistent " - "from region: "SIZE_FORMAT" remaining: "SIZE_FORMAT, + "from region: " SIZE_FORMAT " remaining: " SIZE_FORMAT, hr->reclaimable_bytes(), _remaining_reclaimable_bytes)); _remaining_reclaimable_bytes -= hr->reclaimable_bytes(); _curr_index += 1; --- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2017-01-29 21:33:14.345347611 +0100 @@ -284,7 +284,7 @@ if (PrintGCDetails && Verbose) { // Failed to double capacity, continue; gclog_or_tty->print(" (benign) Failed to expand marking stack capacity from " - SIZE_FORMAT"K to " SIZE_FORMAT"K", + SIZE_FORMAT "K to " SIZE_FORMAT "K", _capacity / K, new_capacity / K); } } @@ -581,7 +581,7 @@ _verbose_level = verbose_level; if (verbose_low()) { - gclog_or_tty->print_cr("[global] init, heap start = "PTR_FORMAT", " + gclog_or_tty->print_cr("[global] init, heap start = " PTR_FORMAT ", " "heap end = " INTPTR_FORMAT, p2i(_heap_start), p2i(_heap_end)); } @@ -838,7 +838,7 @@ // in a STW phase. assert(!concurrent_marking_in_progress(), "invariant"); assert(out_of_regions(), - err_msg("only way to get here: _finger: "PTR_FORMAT", _heap_end: "PTR_FORMAT, + err_msg("only way to get here: _finger: " PTR_FORMAT ", _heap_end: " PTR_FORMAT, p2i(_finger), p2i(_heap_end))); } } @@ -1453,7 +1453,7 @@ assert(start <= hr->end() && start <= ntams && ntams <= hr->end(), err_msg("Preconditions not met - " - "start: "PTR_FORMAT", ntams: "PTR_FORMAT", end: "PTR_FORMAT, + "start: " PTR_FORMAT ", ntams: " PTR_FORMAT ", end: " PTR_FORMAT, p2i(start), p2i(ntams), p2i(hr->end()))); // Find the first marked object at or after "start". @@ -1770,10 +1770,10 @@ } assert(end_idx <= _card_bm->size(), - err_msg("oob: end_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT, + err_msg("oob: end_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT, end_idx, _card_bm->size())); assert(start_idx < _card_bm->size(), - err_msg("oob: start_idx= "SIZE_FORMAT", bitmap size= "SIZE_FORMAT, + err_msg("oob: start_idx= " SIZE_FORMAT ", bitmap size= " SIZE_FORMAT, start_idx, _card_bm->size())); _cm->set_card_bitmap_range(_card_bm, start_idx, end_idx, true /* is_par */); @@ -2278,7 +2278,7 @@ oop obj = oopDesc::load_decode_heap_oop(p); if (_cm->verbose_high()) { gclog_or_tty->print_cr("\t[%u] we're looking at location " - "*"PTR_FORMAT" = "PTR_FORMAT, + "*" PTR_FORMAT " = " PTR_FORMAT, _task->worker_id(), p2i(p), p2i((void*) obj)); } @@ -2847,7 +2847,7 @@ } } - _out->print_cr(" "PTR_FORMAT": "PTR_FORMAT"%s%s", + _out->print_cr(" " PTR_FORMAT ": " PTR_FORMAT "%s%s", p2i(p), p2i((void*) obj), str, str2); } }; @@ -2874,7 +2874,7 @@ bool print_it = _all || over_tams || marked; if (print_it) { - _out->print_cr(" "PTR_FORMAT"%s", + _out->print_cr(" " PTR_FORMAT "%s", p2i((void *)o), (over_tams) ? " >" : (marked) ? " M" : ""); PrintReachableOopClosure oopCl(_out, _vo, _all); o->oop_iterate_no_header(&oopCl); @@ -2895,7 +2895,7 @@ HeapWord* e = hr->end(); HeapWord* t = hr->top(); HeapWord* p = _g1h->top_at_mark_start(hr, _vo); - _out->print_cr("** ["PTR_FORMAT", "PTR_FORMAT"] top: "PTR_FORMAT" " + _out->print_cr("** [" PTR_FORMAT ", " PTR_FORMAT "] top: " PTR_FORMAT " " "TAMS: " PTR_FORMAT, p2i(b), p2i(e), p2i(t), p2i(p)); _out->cr(); @@ -3019,9 +3019,9 @@ HeapWord* limit = curr_region->next_top_at_mark_start(); if (verbose_low()) { - gclog_or_tty->print_cr("[%u] curr_region = "PTR_FORMAT" " - "["PTR_FORMAT", "PTR_FORMAT"), " - "limit = "PTR_FORMAT, + gclog_or_tty->print_cr("[%u] curr_region = " PTR_FORMAT " " + "[" PTR_FORMAT ", " PTR_FORMAT "), " + "limit = " PTR_FORMAT, worker_id, p2i(curr_region), p2i(bottom), p2i(end), p2i(limit)); } @@ -3036,7 +3036,7 @@ if (limit > bottom) { if (verbose_low()) { - gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is not empty, " + gclog_or_tty->print_cr("[%u] region " PTR_FORMAT " is not empty, " "returning it ", worker_id, p2i(curr_region)); } return curr_region; @@ -3044,7 +3044,7 @@ assert(limit == bottom, "the region limit should be at bottom"); if (verbose_low()) { - gclog_or_tty->print_cr("[%u] region "PTR_FORMAT" is empty, " + gclog_or_tty->print_cr("[%u] region " PTR_FORMAT " is empty, " "returning NULL", worker_id, p2i(curr_region)); } // we return NULL and the caller should try calling @@ -3056,13 +3056,13 @@ if (verbose_low()) { if (curr_region == NULL) { gclog_or_tty->print_cr("[%u] found uncommitted region, moving finger, " - "global finger = "PTR_FORMAT", " - "our finger = "PTR_FORMAT, + "global finger = " PTR_FORMAT ", " + "our finger = " PTR_FORMAT, worker_id, p2i(_finger), p2i(finger)); } else { gclog_or_tty->print_cr("[%u] somebody else moved the finger, " - "global finger = "PTR_FORMAT", " - "our finger = "PTR_FORMAT, + "global finger = " PTR_FORMAT", " + "our finger = " PTR_FORMAT, worker_id, p2i(_finger), p2i(finger)); } } @@ -3098,7 +3098,7 @@ void do_object_work(oop obj) { guarantee(!_g1h->obj_in_cs(obj), - err_msg("obj: "PTR_FORMAT" in CSet, phase: %s, info: %d", + err_msg("obj: " PTR_FORMAT " in CSet, phase: %s, info: %d", p2i((void*) obj), phase_str(), _info)); } @@ -3159,7 +3159,7 @@ // here. HeapRegion* global_hr = _g1h->heap_region_containing_raw(global_finger); guarantee(global_hr == NULL || global_finger == global_hr->bottom(), - err_msg("global finger: "PTR_FORMAT" region: "HR_FORMAT, + err_msg("global finger: " PTR_FORMAT " region: " HR_FORMAT, p2i(global_finger), HR_FORMAT_PARAMS(global_hr))); } @@ -3173,7 +3173,7 @@ HeapRegion* task_hr = _g1h->heap_region_containing_raw(task_finger); guarantee(task_hr == NULL || task_finger == task_hr->bottom() || !task_hr->in_collection_set(), - err_msg("task finger: "PTR_FORMAT" region: "HR_FORMAT, + err_msg("task finger: " PTR_FORMAT " region: " HR_FORMAT, p2i(task_finger), HR_FORMAT_PARAMS(task_hr))); } } @@ -3215,8 +3215,8 @@ assert(start <= limit && limit <= hr->top() && hr->top() <= hr->end(), err_msg("Preconditions not met - " - "start: "PTR_FORMAT", limit: "PTR_FORMAT", " - "top: "PTR_FORMAT", end: "PTR_FORMAT, + "start: " PTR_FORMAT ", limit: " PTR_FORMAT ", " + "top: " PTR_FORMAT ", end: " PTR_FORMAT, p2i(start), p2i(limit), p2i(hr->top()), p2i(hr->end()))); assert(hr->next_marked_bytes() == 0, "Precondition"); @@ -3495,7 +3495,7 @@ #ifndef PRODUCT // for debugging purposes void ConcurrentMark::print_finger() { - gclog_or_tty->print_cr("heap ["PTR_FORMAT", "PTR_FORMAT"), global finger = "PTR_FORMAT, + gclog_or_tty->print_cr("heap [" PTR_FORMAT ", " PTR_FORMAT "), global finger = " PTR_FORMAT, p2i(_heap_start), p2i(_heap_end), p2i(_finger)); for (uint i = 0; i < _max_worker_id; ++i) { gclog_or_tty->print(" %u: " PTR_FORMAT, i, p2i(_tasks[i]->finger())); @@ -3580,7 +3580,7 @@ "claim_region() should have filtered out continues humongous regions"); if (_cm->verbose_low()) { - gclog_or_tty->print_cr("[%u] setting up for region "PTR_FORMAT, + gclog_or_tty->print_cr("[%u] setting up for region " PTR_FORMAT, _worker_id, p2i(hr)); } @@ -3597,7 +3597,7 @@ if (limit == bottom) { if (_cm->verbose_low()) { gclog_or_tty->print_cr("[%u] found an empty region " - "["PTR_FORMAT", "PTR_FORMAT")", + "[" PTR_FORMAT ", " PTR_FORMAT ")", _worker_id, p2i(bottom), p2i(limit)); } // The region was collected underneath our feet. @@ -3629,7 +3629,7 @@ void CMTask::giveup_current_region() { assert(_curr_region != NULL, "invariant"); if (_cm->verbose_low()) { - gclog_or_tty->print_cr("[%u] giving up region "PTR_FORMAT, + gclog_or_tty->print_cr("[%u] giving up region " PTR_FORMAT, _worker_id, p2i(_curr_region)); } clear_region_fields(); @@ -3751,7 +3751,7 @@ if (_cm->verbose_medium()) { gclog_or_tty->print_cr("[%u] regular clock, interval = %1.2lfms, " - "scanned = "SIZE_FORMAT"%s, refs reached = "SIZE_FORMAT"%s", + "scanned = " SIZE_FORMAT "%s, refs reached = " SIZE_FORMAT "%s", _worker_id, last_interval_ms, _words_scanned, (_words_scanned >= _words_scanned_limit) ? " (*)" : "", @@ -3920,7 +3920,7 @@ statsOnly( ++_local_pops ); if (_cm->verbose_high()) { - gclog_or_tty->print_cr("[%u] popped "PTR_FORMAT, _worker_id, + gclog_or_tty->print_cr("[%u] popped " PTR_FORMAT, _worker_id, p2i((void*) obj)); } @@ -4273,8 +4273,8 @@ if (_cm->verbose_low()) { gclog_or_tty->print_cr("[%u] we're scanning part " - "["PTR_FORMAT", "PTR_FORMAT") " - "of region "HR_FORMAT, + "[" PTR_FORMAT ", " PTR_FORMAT ") " + "of region " HR_FORMAT, _worker_id, p2i(_finger), p2i(_region_limit), HR_FORMAT_PARAMS(_curr_region)); } @@ -4361,7 +4361,7 @@ if (_cm->verbose_low()) { gclog_or_tty->print_cr("[%u] we successfully claimed " - "region "PTR_FORMAT, + "region " PTR_FORMAT, _worker_id, p2i(claimed_region)); } @@ -4422,7 +4422,7 @@ if (_cm->try_stealing(_worker_id, &_hash_seed, obj)) { if (_cm->verbose_medium()) { - gclog_or_tty->print_cr("[%u] stolen "PTR_FORMAT" successfully", + gclog_or_tty->print_cr("[%u] stolen " PTR_FORMAT " successfully", _worker_id, p2i((void*) obj)); } @@ -4630,7 +4630,7 @@ // identify them easily in a large log file. #define G1PPRL_LINE_PREFIX "###" -#define G1PPRL_ADDR_BASE_FORMAT " "PTR_FORMAT"-"PTR_FORMAT +#define G1PPRL_ADDR_BASE_FORMAT " " PTR_FORMAT "-" PTR_FORMAT #ifdef _LP64 #define G1PPRL_ADDR_BASE_H_FORMAT " %37s" #else // _LP64 @@ -4640,16 +4640,16 @@ // For per-region info #define G1PPRL_TYPE_FORMAT " %-4s" #define G1PPRL_TYPE_H_FORMAT " %4s" -#define G1PPRL_BYTE_FORMAT " "SIZE_FORMAT_W(9) +#define G1PPRL_BYTE_FORMAT " " SIZE_FORMAT_W(9) #define G1PPRL_BYTE_H_FORMAT " %9s" #define G1PPRL_DOUBLE_FORMAT " %14.1f" #define G1PPRL_DOUBLE_H_FORMAT " %14s" // For summary info -#define G1PPRL_SUM_ADDR_FORMAT(tag) " "tag":"G1PPRL_ADDR_BASE_FORMAT -#define G1PPRL_SUM_BYTE_FORMAT(tag) " "tag": "SIZE_FORMAT -#define G1PPRL_SUM_MB_FORMAT(tag) " "tag": %1.2f MB" -#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag)" / %1.2f %%" +#define G1PPRL_SUM_ADDR_FORMAT(tag) " " tag ":" G1PPRL_ADDR_BASE_FORMAT +#define G1PPRL_SUM_BYTE_FORMAT(tag) " " tag ": " SIZE_FORMAT +#define G1PPRL_SUM_MB_FORMAT(tag) " " tag ": %1.2f MB" +#define G1PPRL_SUM_MB_PERC_FORMAT(tag) G1PPRL_SUM_MB_FORMAT(tag) " / %1.2f %%" G1PrintRegionLivenessInfoClosure:: G1PrintRegionLivenessInfoClosure(outputStream* out, const char* phase_name) --- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp 2017-01-29 21:33:14.349347519 +0100 @@ -196,8 +196,8 @@ assert(_bmStartWord <= (addr) && (addr) < (_bmStartWord + _bmWordSize), \ "outside underlying space?"); \ assert(G1CollectedHeap::heap()->is_in_exact(addr), \ - err_msg("Trying to access not available bitmap "PTR_FORMAT \ - " corresponding to "PTR_FORMAT" (%u)", \ + err_msg("Trying to access not available bitmap " PTR_FORMAT \ + " corresponding to " PTR_FORMAT " (%u)", \ p2i(this), p2i(addr), G1CollectedHeap::heap()->addr_to_region(addr))); inline void CMBitMap::mark(HeapWord* addr) { @@ -343,7 +343,7 @@ inline void CMTask::deal_with_reference(oop obj) { if (_cm->verbose_high()) { - gclog_or_tty->print_cr("[%u] we're dealing with reference = "PTR_FORMAT, + gclog_or_tty->print_cr("[%u] we're dealing with reference = " PTR_FORMAT, _worker_id, p2i((void*) obj)); } @@ -392,7 +392,7 @@ // assert that word_size is under an upper bound which is its // containing region's capacity. assert(word_size * HeapWordSize <= hr->capacity(), - err_msg("size: "SIZE_FORMAT" capacity: "SIZE_FORMAT" "HR_FORMAT, + err_msg("size: " SIZE_FORMAT " capacity: " SIZE_FORMAT " " HR_FORMAT, word_size * HeapWordSize, hr->capacity(), HR_FORMAT_PARAMS(hr))); --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1Allocator.hpp 2017-01-29 21:33:14.349347519 +0100 @@ -73,7 +73,7 @@ void decrease_used(size_t bytes) { assert(_summary_bytes_used >= bytes, - err_msg("invariant: _summary_bytes_used: "SIZE_FORMAT" should be >= bytes: "SIZE_FORMAT, + err_msg("invariant: _summary_bytes_used: " SIZE_FORMAT " should be >= bytes: " SIZE_FORMAT, _summary_bytes_used, bytes)); _summary_bytes_used -= bytes; } --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp 2017-01-29 21:33:14.349347519 +0100 @@ -140,7 +140,7 @@ } void G1AllocRegion::fill_in_ext_msg(ar_ext_msg* msg, const char* message) { - msg->append("[%s] %s c: %u b: %s r: "PTR_FORMAT" u: "SIZE_FORMAT, + msg->append("[%s] %s c: %u b: %s r: " PTR_FORMAT " u: " SIZE_FORMAT, _name, message, _count, BOOL_TO_STR(_bot_updates), p2i(_alloc_region), _used_bytes_before); } @@ -217,7 +217,7 @@ if (G1_ALLOC_REGION_TRACING > 1) { if (result != NULL) { - jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT" "PTR_FORMAT, + jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT " " PTR_FORMAT, word_size, result); } else if (word_size != 0) { jio_snprintf(rest_buffer, buffer_length, SIZE_FORMAT, word_size); --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp 2017-01-29 21:33:14.349347519 +0100 @@ -385,11 +385,11 @@ HeapWord* card_addr = _array->address_for_index(card); HeapWord* block_start = block_start_const(card_addr); if (block_start != obj_start) { - gclog_or_tty->print_cr("block start: "PTR_FORMAT" is incorrect - " - "card index: "SIZE_FORMAT" " - "card addr: "PTR_FORMAT" BOT entry: %u " - "obj: "PTR_FORMAT" word size: "SIZE_FORMAT" " - "cards: ["SIZE_FORMAT","SIZE_FORMAT"]", + gclog_or_tty->print_cr("block start: " PTR_FORMAT " is incorrect - " + "card index: " SIZE_FORMAT " " + "card addr: " PTR_FORMAT " BOT entry: %u " + "obj: " PTR_FORMAT " word size: " SIZE_FORMAT " " + "cards: [" SIZE_FORMAT "," SIZE_FORMAT "]", block_start, card, card_addr, _array->offset_array(card), obj_start, word_size, first_card, last_card); @@ -404,11 +404,11 @@ G1BlockOffsetArray::print_on(outputStream* out) { size_t from_index = _array->index_for(_bottom); size_t to_index = _array->index_for(_end); - out->print_cr(">> BOT for area ["PTR_FORMAT","PTR_FORMAT") " - "cards ["SIZE_FORMAT","SIZE_FORMAT")", + out->print_cr(">> BOT for area [" PTR_FORMAT "," PTR_FORMAT ") " + "cards [" SIZE_FORMAT "," SIZE_FORMAT ")", _bottom, _end, from_index, to_index); for (size_t i = from_index; i < to_index; ++i) { - out->print_cr(" entry "SIZE_FORMAT_W(8)" | "PTR_FORMAT" : %3u", + out->print_cr(" entry " SIZE_FORMAT_W(8) " | " PTR_FORMAT " : %3u", i, _array->address_for_index(i), (uint) _array->offset_array(i)); } --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp 2017-01-29 21:33:14.349347519 +0100 @@ -49,10 +49,10 @@ #define check_index(index, msg) \ assert((index) < (_reserved.word_size() >> LogN_words), \ - err_msg("%s - index: "SIZE_FORMAT", _vs.committed_size: "SIZE_FORMAT, \ + err_msg("%s - index: " SIZE_FORMAT ", _vs.committed_size: " SIZE_FORMAT, \ msg, (index), (_reserved.word_size() >> LogN_words))); \ assert(G1CollectedHeap::heap()->is_in_exact(address_for_index_raw(index)), \ - err_msg("Index "SIZE_FORMAT" corresponding to "PTR_FORMAT \ + err_msg("Index " SIZE_FORMAT " corresponding to " PTR_FORMAT \ " (%u) is not in committed area.", \ (index), \ p2i(address_for_index_raw(index)), \ --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp 2017-01-29 21:33:14.349347519 +0100 @@ -44,7 +44,7 @@ void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) { if (has_count_table()) { assert(from_card_num < to_card_num, - err_msg("Wrong order? from: " SIZE_FORMAT ", to: "SIZE_FORMAT, + err_msg("Wrong order? from: " SIZE_FORMAT ", to: " SIZE_FORMAT, from_card_num, to_card_num)); Copy::fill_to_bytes(&_card_counts[from_card_num], (to_card_num - from_card_num)); } @@ -87,7 +87,7 @@ if (has_count_table()) { size_t card_num = ptr_2_card_num(card_ptr); assert(card_num < _reserved_max_card_num, - err_msg("Card "SIZE_FORMAT" outside of card counts table (max size "SIZE_FORMAT")", + err_msg("Card " SIZE_FORMAT " outside of card counts table (max size " SIZE_FORMAT ")", card_num, _reserved_max_card_num)); count = (uint) _card_counts[card_num]; if (count < G1ConcRSHotCardLimit) { --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp 2017-01-29 21:33:14.349347519 +0100 @@ -91,7 +91,7 @@ jbyte* card_num_2_ptr(size_t card_num) { assert(card_num >= 0 && card_num < _reserved_max_card_num, - err_msg("card num out of range: "SIZE_FORMAT, card_num)); + err_msg("card num out of range: " SIZE_FORMAT, card_num)); return (jbyte*) (_ct_bot + card_num); } --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2017-01-29 21:33:14.349347519 +0100 @@ -230,7 +230,7 @@ HeapRegion* last = NULL; while (curr != NULL) { if (!curr->is_young()) { - gclog_or_tty->print_cr("### YOUNG REGION "PTR_FORMAT"-"PTR_FORMAT" " + gclog_or_tty->print_cr("### YOUNG REGION " PTR_FORMAT "-" PTR_FORMAT " " "incorrectly tagged (y: %d, surv: %d)", curr->bottom(), curr->end(), curr->is_young(), curr->is_survivor()); @@ -359,7 +359,7 @@ if (curr == NULL) gclog_or_tty->print_cr(" empty"); while (curr != NULL) { - gclog_or_tty->print_cr(" "HR_FORMAT", P: "PTR_FORMAT ", N: "PTR_FORMAT", age: %4d", + gclog_or_tty->print_cr(" " HR_FORMAT ", P: " PTR_FORMAT ", N: " PTR_FORMAT ", age: %4d", HR_FORMAT_PARAMS(curr), curr->prev_top_at_mark_start(), curr->next_top_at_mark_start(), @@ -490,7 +490,7 @@ gclog_or_tty->print_cr("Log entries = %d, dirty cards = %d.", clear.num_processed(), orig_count); guarantee(redirty.num_processed() == clear.num_processed(), - err_msg("Redirtied "SIZE_FORMAT" cards, bug cleared "SIZE_FORMAT, + err_msg("Redirtied " SIZE_FORMAT " cards, bug cleared " SIZE_FORMAT, redirty.num_processed(), clear.num_processed())); CountNonCleanMemRegionClosure count3(this); @@ -528,7 +528,7 @@ HeapRegion* res = _hrm.allocate_free_region(is_old); if (G1ConcRegionFreeingVerbose) { gclog_or_tty->print_cr("G1ConcRegionFreeing [region alloc] : " - "allocated "HR_FORMAT" from secondary_free_list", + "allocated " HR_FORMAT " from secondary_free_list", HR_FORMAT_PARAMS(res)); } return res; @@ -1597,8 +1597,8 @@ // This assert only makes sense here, before we adjust them // with respect to the min and max heap size. assert(minimum_desired_capacity <= maximum_desired_capacity, - err_msg("minimum_desired_capacity = "SIZE_FORMAT", " - "maximum_desired_capacity = "SIZE_FORMAT, + err_msg("minimum_desired_capacity = " SIZE_FORMAT ", " + "maximum_desired_capacity = " SIZE_FORMAT, minimum_desired_capacity, maximum_desired_capacity)); // Should not be greater than the heap max size. No need to adjust @@ -2991,10 +2991,10 @@ if (!oopDesc::is_null(heap_oop)) { oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); if (_g1h->is_obj_dead_cond(obj, _vo)) { - gclog_or_tty->print_cr("Root location "PTR_FORMAT" " - "points to dead obj "PTR_FORMAT, p, (void*) obj); + gclog_or_tty->print_cr("Root location " PTR_FORMAT " " + "points to dead obj " PTR_FORMAT, p, (void*) obj); if (_vo == VerifyOption_G1UseMarkWord) { - gclog_or_tty->print_cr(" Mark word: "PTR_FORMAT, (void*)(obj->mark())); + gclog_or_tty->print_cr(" Mark word: " PTR_FORMAT, (void*)(obj->mark())); } obj->print_on(gclog_or_tty); _failures = true; @@ -3041,9 +3041,9 @@ // Verify that the strong code root list for this region // contains the nmethod if (!hrrs->strong_code_roots_list_contains(_nm)) { - gclog_or_tty->print_cr("Code root location "PTR_FORMAT" " - "from nmethod "PTR_FORMAT" not in strong " - "code roots for region ["PTR_FORMAT","PTR_FORMAT")", + gclog_or_tty->print_cr("Code root location " PTR_FORMAT " " + "from nmethod " PTR_FORMAT " not in strong " + "code roots for region [" PTR_FORMAT "," PTR_FORMAT ")", p, _nm, hr->bottom(), hr->end()); _failures = true; } @@ -3173,7 +3173,7 @@ if (o != NULL) { HeapWord *start = (HeapWord *) o; size_t word_sz = o->size(); - gclog_or_tty->print("\nPrinting obj "PTR_FORMAT" of size " SIZE_FORMAT + gclog_or_tty->print("\nPrinting obj " PTR_FORMAT " of size " SIZE_FORMAT " isMarkedPrev %d isMarkedNext %d isAllocSince %d\n", (void*) o, word_sz, _g1->isMarkedPrev(o), @@ -3184,7 +3184,7 @@ int *val; for (cur = start; cur < end; cur++) { val = (int *) cur; - gclog_or_tty->print("\t "PTR_FORMAT":"PTR_FORMAT"\n", val, *val); + gclog_or_tty->print("\t " PTR_FORMAT ":" PTR_FORMAT "\n", val, *val); } } } @@ -3219,9 +3219,9 @@ r->object_iterate(¬_dead_yet_cl); if (_vo != VerifyOption_G1UseNextMarking) { if (r->max_live_bytes() < not_dead_yet_cl.live_bytes()) { - gclog_or_tty->print_cr("["PTR_FORMAT","PTR_FORMAT"] " - "max_live_bytes "SIZE_FORMAT" " - "< calculated "SIZE_FORMAT, + gclog_or_tty->print_cr("[" PTR_FORMAT "," PTR_FORMAT "] " + "max_live_bytes " SIZE_FORMAT " " + "< calculated " SIZE_FORMAT, r->bottom(), r->end(), r->max_live_bytes(), not_dead_yet_cl.live_bytes()); @@ -4416,7 +4416,7 @@ G1CollectedHeap::handle_evacuation_failure_par(G1ParScanThreadState* _par_scan_state, oop old) { assert(obj_in_cs(old), - err_msg("obj: "PTR_FORMAT" should still be in the CSet", + err_msg("obj: " PTR_FORMAT " should still be in the CSet", (HeapWord*) old)); markOop m = old->mark(); oop forward_ptr = old->forward_to_atomic(old); @@ -4450,7 +4450,7 @@ // space for this object (old != forward_ptr) or they beat us in // self-forwarding it (old == forward_ptr). assert(old == forward_ptr || !obj_in_cs(forward_ptr), - err_msg("obj: "PTR_FORMAT" forwarded to: "PTR_FORMAT" " + err_msg("obj: " PTR_FORMAT " forwarded to: " PTR_FORMAT " " "should not be in the CSet", (HeapWord*) old, (HeapWord*) forward_ptr)); return forward_ptr; @@ -4837,16 +4837,16 @@ ~G1StringSymbolTableUnlinkTask() { guarantee(!_process_strings || !_do_in_parallel || StringTable::parallel_claimed_index() >= _initial_string_table_size, - err_msg("claim value "INT32_FORMAT" after unlink less than initial string table size "INT32_FORMAT, + err_msg("claim value " INT32_FORMAT " after unlink less than initial string table size " INT32_FORMAT, StringTable::parallel_claimed_index(), _initial_string_table_size)); guarantee(!_process_symbols || !_do_in_parallel || SymbolTable::parallel_claimed_index() >= _initial_symbol_table_size, - err_msg("claim value "INT32_FORMAT" after unlink less than initial symbol table size "INT32_FORMAT, + err_msg("claim value " INT32_FORMAT " after unlink less than initial symbol table size " INT32_FORMAT, SymbolTable::parallel_claimed_index(), _initial_symbol_table_size)); if (G1TraceStringSymbolTableScrubbing) { gclog_or_tty->print_cr("Cleaned string and symbol table, " - "strings: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed, " - "symbols: "SIZE_FORMAT" processed, "SIZE_FORMAT" removed", + "strings: " SIZE_FORMAT " processed, " SIZE_FORMAT " removed, " + "symbols: " SIZE_FORMAT " processed, " SIZE_FORMAT " removed", strings_processed(), strings_removed(), symbols_processed(), symbols_removed()); } @@ -6029,13 +6029,13 @@ bool G1CollectedHeap::verify_no_bits_over_tams(const char* bitmap_name, CMBitMapRO* bitmap, HeapWord* tams, HeapWord* end) { guarantee(tams <= end, - err_msg("tams: "PTR_FORMAT" end: "PTR_FORMAT, tams, end)); + err_msg("tams: " PTR_FORMAT " end: " PTR_FORMAT, tams, end)); HeapWord* result = bitmap->getNextMarkedWordAddress(tams, end); if (result < end) { gclog_or_tty->cr(); - gclog_or_tty->print_cr("## wrong marked address on %s bitmap: "PTR_FORMAT, + gclog_or_tty->print_cr("## wrong marked address on %s bitmap: " PTR_FORMAT, bitmap_name, result); - gclog_or_tty->print_cr("## %s tams: "PTR_FORMAT" end: "PTR_FORMAT, + gclog_or_tty->print_cr("## %s tams: " PTR_FORMAT " end: " PTR_FORMAT, bitmap_name, tams, end); return false; } @@ -6061,7 +6061,7 @@ res_n = verify_no_bits_over_tams("next", next_bitmap, ntams, end); } if (!res_p || !res_n) { - gclog_or_tty->print_cr("#### Bitmap verification failed for "HR_FORMAT, + gclog_or_tty->print_cr("#### Bitmap verification failed for " HR_FORMAT, HR_FORMAT_PARAMS(hr)); gclog_or_tty->print_cr("#### Caller: %s", caller); return false; @@ -6373,7 +6373,7 @@ !r->rem_set()->is_empty()) { if (G1TraceEagerReclaimHumongousObjects) { - 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", + 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", region_idx, obj->size()*HeapWordSize, r->bottom(), @@ -6395,7 +6395,7 @@ r->bottom())); if (G1TraceEagerReclaimHumongousObjects) { - 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", + 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", region_idx, obj->size()*HeapWordSize, r->bottom(), @@ -6551,7 +6551,7 @@ NoYoungRegionsClosure() : _success(true) { } bool doHeapRegion(HeapRegion* r) { if (r->is_young()) { - gclog_or_tty->print_cr("Region ["PTR_FORMAT", "PTR_FORMAT") tagged as young", + gclog_or_tty->print_cr("Region [" PTR_FORMAT ", " PTR_FORMAT ") tagged as young", r->bottom(), r->end()); _success = false; } @@ -6680,7 +6680,7 @@ } assert(_allocator->used_unlocked() == recalculate_used(), err_msg("inconsistent _allocator->used_unlocked(), " - "value: "SIZE_FORMAT" recalculated: "SIZE_FORMAT, + "value: " SIZE_FORMAT " recalculated: " SIZE_FORMAT, _allocator->used_unlocked(), recalculate_used())); } @@ -6901,8 +6901,8 @@ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); HeapRegion* hr = _g1h->heap_region_containing(obj); assert(!hr->continuesHumongous(), - err_msg("trying to add code root "PTR_FORMAT" in continuation of humongous region "HR_FORMAT - " starting at "HR_FORMAT, + err_msg("trying to add code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT + " starting at " HR_FORMAT, _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()))); // HeapRegion::add_strong_code_root_locked() avoids adding duplicate entries. @@ -6928,8 +6928,8 @@ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop); HeapRegion* hr = _g1h->heap_region_containing(obj); assert(!hr->continuesHumongous(), - err_msg("trying to remove code root "PTR_FORMAT" in continuation of humongous region "HR_FORMAT - " starting at "HR_FORMAT, + err_msg("trying to remove code root " PTR_FORMAT " in continuation of humongous region " HR_FORMAT + " starting at " HR_FORMAT, _nm, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()))); hr->remove_strong_code_root(_nm); --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp 2017-01-29 21:33:14.353347428 +0100 @@ -81,7 +81,7 @@ inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const { assert(is_in_reserved(addr), - err_msg("Cannot calculate region index for address "PTR_FORMAT" that is outside of the heap ["PTR_FORMAT", "PTR_FORMAT")", + err_msg("Cannot calculate region index for address " PTR_FORMAT " that is outside of the heap [" PTR_FORMAT ", " PTR_FORMAT ")", p2i(addr), p2i(_reserved.start()), p2i(_reserved.end()))); return (uint)(pointer_delta(addr, _reserved.start(), sizeof(uint8_t)) >> HeapRegion::LogOfHRGrainBytes); } @@ -94,7 +94,7 @@ inline HeapRegion* G1CollectedHeap::heap_region_containing_raw(const T addr) const { assert(addr != NULL, "invariant"); assert(is_in_g1_reserved((const void*) addr), - err_msg("Address "PTR_FORMAT" is outside of the heap ranging from ["PTR_FORMAT" to "PTR_FORMAT")", + err_msg("Address " PTR_FORMAT " is outside of the heap ranging from [" PTR_FORMAT " to " PTR_FORMAT ")", p2i((void*)addr), p2i(g1_reserved().start()), p2i(g1_reserved().end()))); return _hrm.addr_to_region((HeapWord*) addr); } --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 2017-01-29 21:33:14.353347428 +0100 @@ -199,7 +199,7 @@ const size_t region_size = HeapRegion::GrainWords; if (YoungPLABSize > region_size || OldPLABSize > region_size) { char buffer[128]; - jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most "SIZE_FORMAT, + jio_snprintf(buffer, sizeof(buffer), "%sPLABSize should be at most " SIZE_FORMAT, OldPLABSize > region_size ? "Old" : "Young", region_size); vm_exit_during_initialization(buffer); } @@ -846,7 +846,7 @@ update_survivors_policy(); assert(_g1->used() == _g1->recalculate_used(), - err_msg("sanity, used: "SIZE_FORMAT" recalculate_used: "SIZE_FORMAT, + err_msg("sanity, used: " SIZE_FORMAT " recalculate_used: " SIZE_FORMAT, _g1->used(), _g1->recalculate_used())); double s_w_t_ms = (start_time_sec - _stop_world_start) * 1000.0; @@ -1231,10 +1231,10 @@ (_young_list_target_length * HeapRegion::GrainBytes) - survivor_used_bytes_after_gc; gclog_or_tty->print( - " [Eden: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT") " - "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" " - "Heap: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->" - EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")]", + " [Eden: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->" EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ") " + "Survivors: " EXT_SIZE_FORMAT "->" EXT_SIZE_FORMAT " " + "Heap: " EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")->" + EXT_SIZE_FORMAT "(" EXT_SIZE_FORMAT ")]", EXT_SIZE_PARAMS(_eden_used_bytes_before_gc), EXT_SIZE_PARAMS(_eden_capacity_bytes_before_gc), EXT_SIZE_PARAMS(eden_used_bytes_after_gc), --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp 2017-01-29 21:33:14.353347428 +0100 @@ -121,15 +121,15 @@ // Single parameter format strings #define ergo_format_str(_name_) ", " _name_ ": %s" #define ergo_format_region(_name_) ", " _name_ ": %u regions" -#define ergo_format_byte(_name_) ", " _name_ ": "SIZE_FORMAT" bytes" +#define ergo_format_byte(_name_) ", " _name_ ": " SIZE_FORMAT " bytes" #define ergo_format_double(_name_) ", " _name_ ": %1.2f" #define ergo_format_perc(_name_) ", " _name_ ": %1.2f %%" #define ergo_format_ms(_name_) ", " _name_ ": %1.2f ms" -#define ergo_format_size(_name_) ", " _name_ ": "SIZE_FORMAT +#define ergo_format_size(_name_) ", " _name_ ": " SIZE_FORMAT // Double parameter format strings #define ergo_format_byte_perc(_name_) \ - ", " _name_ ": "SIZE_FORMAT" bytes (%1.2f %%)" + ", " _name_ ": " SIZE_FORMAT " bytes (%1.2f %%)" // Generates the format string #define ergo_format(_extra_format_) \ --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp 2017-01-29 21:33:14.353347428 +0100 @@ -332,7 +332,7 @@ } void G1GCPhaseTimes::print_stats(int level, const char* str, size_t value) { - LineBuffer(level).append_and_print_cr("[%s: "SIZE_FORMAT"]", str, value); + LineBuffer(level).append_and_print_cr("[%s: " SIZE_FORMAT "]", str, value); } void G1GCPhaseTimes::print_stats(int level, const char* str, double value, uint workers) { @@ -452,7 +452,7 @@ if (phase->_thread_work_items != NULL) { LineBuffer buf2(phase->_thread_work_items->_indent_level); - buf2.append_and_print_cr("[%s: "SIZE_FORMAT"]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id)); + buf2.append_and_print_cr("[%s: " SIZE_FORMAT "]", phase->_thread_work_items->_title, _phase_times->sum_thread_work_items(phase_id)); } } --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp 2017-01-29 21:33:14.353347428 +0100 @@ -84,18 +84,18 @@ if (type_str != NULL) { if (top != NULL) { - gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT" "PTR_FORMAT, + gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT " " PTR_FORMAT, action_str, type_str, bottom, top); } else { - gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) "PTR_FORMAT, + gclog_or_tty->print_cr(G1HR_PREFIX" %s(%s) " PTR_FORMAT, action_str, type_str, bottom); } } else { if (top != NULL) { - gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT" "PTR_FORMAT, + gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT " " PTR_FORMAT, action_str, bottom, top); } else { - gclog_or_tty->print_cr(G1HR_PREFIX" %s "PTR_FORMAT, + gclog_or_tty->print_cr(G1HR_PREFIX" %s " PTR_FORMAT, action_str, bottom); } } @@ -104,11 +104,11 @@ void G1HRPrinter::print(ActionType action, HeapWord* bottom, HeapWord* end) { const char* action_str = action_name(action); - gclog_or_tty->print_cr(G1HR_PREFIX" %s ["PTR_FORMAT","PTR_FORMAT"]", + gclog_or_tty->print_cr(G1HR_PREFIX" %s [" PTR_FORMAT "," PTR_FORMAT "]", action_str, bottom, end); } void G1HRPrinter::print(PhaseType phase, size_t phase_num) { const char* phase_str = phase_name(phase); - gclog_or_tty->print_cr(G1HR_PREFIX" #%s "SIZE_FORMAT, phase_str, phase_num); + gclog_or_tty->print_cr(G1HR_PREFIX" #%s " SIZE_FORMAT, phase_str, phase_num); } --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp 2017-01-29 21:33:14.353347428 +0100 @@ -118,7 +118,7 @@ oop obj = oopDesc::load_decode_heap_oop(p); if (_cm->verbose_high()) { gclog_or_tty->print_cr("[%u] we're looking at location " - "*"PTR_FORMAT" = "PTR_FORMAT, + "*" PTR_FORMAT " = " PTR_FORMAT, _task->worker_id(), p2i(p), p2i((void*) obj)); } _task->deal_with_reference(obj); --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp 2017-01-29 21:33:14.353347428 +0100 @@ -442,7 +442,7 @@ bool G1RemSet::refine_card(jbyte* card_ptr, uint worker_i, bool check_for_refs_into_cset) { assert(_g1->is_in_exact(_ct_bs->addr_for(card_ptr)), - err_msg("Card at "PTR_FORMAT" index "SIZE_FORMAT" representing heap at "PTR_FORMAT" (%u) must be in committed heap", + err_msg("Card at " PTR_FORMAT " index " SIZE_FORMAT " representing heap at " PTR_FORMAT " (%u) must be in committed heap", p2i(card_ptr), _ct_bs->index_for(_ct_bs->addr_for(card_ptr)), _ct_bs->addr_for(card_ptr), --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 2017-01-29 21:36:52.804380756 +0100 @@ -183,26 +183,26 @@ size_t code_root_elems() const { return _code_root_elems; } void print_rs_mem_info_on(outputStream * out, size_t total) { - out->print_cr(" "SIZE_FORMAT_W(8) "%s (%5.1f%%) by "SIZE_FORMAT" %s regions", + out->print_cr(" " SIZE_FORMAT_W(8) "%s (%5.1f%%) by " SIZE_FORMAT " %s regions", byte_size_in_proper_unit(rs_mem_size()), proper_unit_for_byte_size(rs_mem_size()), rs_mem_size_percent_of(total), amount(), _name); } void print_cards_occupied_info_on(outputStream * out, size_t total) { - out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) entries by "SIZE_FORMAT" %s regions", + out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) entries by " SIZE_FORMAT " %s regions", cards_occupied(), cards_occupied_percent_of(total), amount(), _name); } void print_code_root_mem_info_on(outputStream * out, size_t total) { - out->print_cr(" "SIZE_FORMAT_W(8) "%s (%5.1f%%) by "SIZE_FORMAT" %s regions", + out->print_cr(" " SIZE_FORMAT_W(8) "%s (%5.1f%%) by " SIZE_FORMAT " %s regions", byte_size_in_proper_unit(code_root_mem_size()), proper_unit_for_byte_size(code_root_mem_size()), code_root_mem_size_percent_of(total), amount(), _name); } void print_code_root_elems_info_on(outputStream * out, size_t total) { - out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) elements by "SIZE_FORMAT" %s regions", + out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) elements by " SIZE_FORMAT " %s regions", code_root_elems(), code_root_elems_percent_of(total), amount(), _name); } }; @@ -298,7 +298,7 @@ byte_size_in_proper_unit(HeapRegionRemSet::fl_mem_size()), proper_unit_for_byte_size(HeapRegionRemSet::fl_mem_size())); - out->print_cr(" "SIZE_FORMAT" occupied cards represented.", + out->print_cr(" " SIZE_FORMAT " occupied cards represented.", total_cards_occupied()); for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) { (*current)->print_cards_occupied_info_on(out, total_cards_occupied()); @@ -306,8 +306,8 @@ // Largest sized rem set region statistics HeapRegionRemSet* rem_set = max_rs_mem_sz_region()->rem_set(); - out->print_cr(" Region with largest rem set = "HR_FORMAT", " - "size = "SIZE_FORMAT "%s, occupied = "SIZE_FORMAT "%s.", + out->print_cr(" Region with largest rem set = " HR_FORMAT ", " + "size = " SIZE_FORMAT "%s, occupied = " SIZE_FORMAT "%s.", HR_FORMAT_PARAMS(max_rs_mem_sz_region()), byte_size_in_proper_unit(rem_set->mem_size()), proper_unit_for_byte_size(rem_set->mem_size()), @@ -326,14 +326,14 @@ (*current)->print_code_root_mem_info_on(out, total_code_root_mem_sz()); } - out->print_cr(" "SIZE_FORMAT" code roots represented.", + out->print_cr(" " SIZE_FORMAT " code roots represented.", total_code_root_elems()); for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) { (*current)->print_code_root_elems_info_on(out, total_code_root_elems()); } - out->print_cr(" Region with largest amount of code roots = "HR_FORMAT", " - "size = "SIZE_FORMAT "%s, num_elems = "SIZE_FORMAT".", + out->print_cr(" Region with largest amount of code roots = " HR_FORMAT ", " + "size = " SIZE_FORMAT "%s, num_elems = " SIZE_FORMAT ".", HR_FORMAT_PARAMS(max_code_root_mem_sz_region()), byte_size_in_proper_unit(max_code_root_rem_set->strong_code_roots_mem_size()), proper_unit_for_byte_size(max_code_root_rem_set->strong_code_roots_mem_size()), @@ -344,16 +344,16 @@ void G1RemSetSummary::print_on(outputStream* out) { out->print_cr("\n Recent concurrent refinement statistics"); - out->print_cr(" Processed "SIZE_FORMAT" cards", + out->print_cr(" Processed " SIZE_FORMAT " cards", num_concurrent_refined_cards()); - out->print_cr(" Of "SIZE_FORMAT" completed buffers:", num_processed_buf_total()); - out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) by concurrent RS threads.", + out->print_cr(" Of " SIZE_FORMAT " completed buffers:", num_processed_buf_total()); + out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) by concurrent RS threads.", num_processed_buf_total(), percent_of(num_processed_buf_rs_threads(), num_processed_buf_total())); - out->print_cr(" "SIZE_FORMAT_W(8)" (%5.1f%%) by mutator threads.", + out->print_cr(" " SIZE_FORMAT_W(8) " (%5.1f%%) by mutator threads.", num_processed_buf_mutator(), percent_of(num_processed_buf_mutator(), num_processed_buf_total())); - out->print_cr(" Did "SIZE_FORMAT" coarsenings.", num_coarsenings()); + out->print_cr(" Did " SIZE_FORMAT " coarsenings.", num_coarsenings()); out->print_cr(" Concurrent RS threads times (s)"); out->print(" "); for (uint i = 0; i < _num_vtimes; i++) { --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp 2017-01-29 21:33:14.353347428 +0100 @@ -151,7 +151,7 @@ void G1StringDedupQueue::print_statistics(outputStream* st) { st->print_cr( " [Queue]\n" - " [Dropped: "UINTX_FORMAT"]", _queue->_dropped); + " [Dropped: " UINTX_FORMAT "]", _queue->_dropped); } void G1StringDedupQueue::verify() { --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupStat.cpp 2017-01-29 21:33:14.353347428 +0100 @@ -80,8 +80,8 @@ st->stamp(PrintGCTimeStamps); st->print_cr( "[GC concurrent-string-deduplication, " - G1_STRDEDUP_BYTES_FORMAT_NS"->"G1_STRDEDUP_BYTES_FORMAT_NS"("G1_STRDEDUP_BYTES_FORMAT_NS"), avg " - G1_STRDEDUP_PERCENT_FORMAT_NS", "G1_STRDEDUP_TIME_FORMAT"]", + G1_STRDEDUP_BYTES_FORMAT_NS "->" G1_STRDEDUP_BYTES_FORMAT_NS "(" G1_STRDEDUP_BYTES_FORMAT_NS "), avg " + G1_STRDEDUP_PERCENT_FORMAT_NS ", " G1_STRDEDUP_TIME_FORMAT "]", G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes), G1_STRDEDUP_BYTES_PARAM(last_stat._new_bytes - last_stat._deduped_bytes), G1_STRDEDUP_BYTES_PARAM(last_stat._deduped_bytes), @@ -135,22 +135,22 @@ if (total) { st->print_cr( - " [Total Exec: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT", Idle: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT", Blocked: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT"]", + " [Total Exec: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT ", Idle: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT ", Blocked: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT "]", stat._exec, stat._exec_elapsed, stat._idle, stat._idle_elapsed, stat._block, stat._block_elapsed); } else { st->print_cr( - " [Last Exec: "G1_STRDEDUP_TIME_FORMAT", Idle: "G1_STRDEDUP_TIME_FORMAT", Blocked: "UINTX_FORMAT"/"G1_STRDEDUP_TIME_FORMAT"]", + " [Last Exec: " G1_STRDEDUP_TIME_FORMAT ", Idle: " G1_STRDEDUP_TIME_FORMAT ", Blocked: " UINTX_FORMAT "/" G1_STRDEDUP_TIME_FORMAT "]", stat._exec_elapsed, stat._idle_elapsed, stat._block, stat._block_elapsed); } st->print_cr( - " [Inspected: "G1_STRDEDUP_OBJECTS_FORMAT"]\n" - " [Skipped: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" - " [Hashed: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" - " [Known: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" - " [New: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"]\n" - " [Deduplicated: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" - " [Young: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]\n" - " [Old: "G1_STRDEDUP_OBJECTS_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT") "G1_STRDEDUP_BYTES_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT")]", + " [Inspected: " G1_STRDEDUP_OBJECTS_FORMAT "]\n" + " [Skipped: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" + " [Hashed: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" + " [Known: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" + " [New: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "]\n" + " [Deduplicated: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" + " [Young: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]\n" + " [Old: " G1_STRDEDUP_OBJECTS_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ") " G1_STRDEDUP_BYTES_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT ")]", stat._inspected, stat._skipped, skipped_percent, stat._hashed, hashed_percent, --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp 2017-01-29 21:33:14.353347428 +0100 @@ -596,12 +596,12 @@ void G1StringDedupTable::print_statistics(outputStream* st) { st->print_cr( " [Table]\n" - " [Memory Usage: "G1_STRDEDUP_BYTES_FORMAT_NS"]\n" - " [Size: "SIZE_FORMAT", Min: "SIZE_FORMAT", Max: "SIZE_FORMAT"]\n" - " [Entries: "UINTX_FORMAT", Load: "G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " UINTX_FORMAT ", Added: "UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n" - " [Resize Count: "UINTX_FORMAT", Shrink Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS"), Grow Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS")]\n" - " [Rehash Count: "UINTX_FORMAT", Rehash Threshold: "UINTX_FORMAT", Hash Seed: 0x%x]\n" - " [Age Threshold: "UINTX_FORMAT"]", + " [Memory Usage: " G1_STRDEDUP_BYTES_FORMAT_NS "]\n" + " [Size: " SIZE_FORMAT ", Min: " SIZE_FORMAT ", Max: " SIZE_FORMAT "]\n" + " [Entries: " UINTX_FORMAT ", Load: " G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " UINTX_FORMAT ", Added: " UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n" + " [Resize Count: " UINTX_FORMAT ", Shrink Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS "), Grow Threshold: " UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS ")]\n" + " [Rehash Count: " UINTX_FORMAT ", Rehash Threshold: " UINTX_FORMAT ", Hash Seed: 0x%x]\n" + " [Age Threshold: " UINTX_FORMAT "]", G1_STRDEDUP_BYTES_PARAM(_table->_size * sizeof(G1StringDedupEntry*) + (_table->_entries + _entry_cache->size()) * sizeof(G1StringDedupEntry)), _table->_size, _min_size, _max_size, _table->_entries, (double)_table->_entries / (double)_table->_size * 100.0, _entry_cache->size(), _entries_added, _entries_removed, --- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2017-01-29 21:33:14.353347428 +0100 @@ -333,7 +333,7 @@ bool during_conc_mark, size_t marked_bytes) { assert(0 <= marked_bytes && marked_bytes <= used(), - err_msg("marked: "SIZE_FORMAT" used: "SIZE_FORMAT, + err_msg("marked: " SIZE_FORMAT " used: " SIZE_FORMAT, marked_bytes, used())); _prev_top_at_mark_start = top(); _prev_marked_bytes = marked_bytes; @@ -514,9 +514,9 @@ // Object is in the region. Check that its less than top if (_hr->top() <= (HeapWord*)obj) { // Object is above top - gclog_or_tty->print_cr("Object "PTR_FORMAT" in region " - "["PTR_FORMAT", "PTR_FORMAT") is above " - "top "PTR_FORMAT, + gclog_or_tty->print_cr("Object " PTR_FORMAT " in region " + "[" PTR_FORMAT ", " PTR_FORMAT ") is above " + "top " PTR_FORMAT, (void *)obj, _hr->bottom(), _hr->end(), _hr->top()); _failures = true; return; @@ -550,22 +550,22 @@ if (nm != NULL) { // Verify that the nemthod is live if (!nm->is_alive()) { - gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has dead nmethod " - PTR_FORMAT" in its strong code roots", + gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has dead nmethod " + PTR_FORMAT " in its strong code roots", _hr->bottom(), _hr->end(), nm); _failures = true; } else { VerifyStrongCodeRootOopClosure oop_cl(_hr, nm); nm->oops_do(&oop_cl); if (!oop_cl.has_oops_in_region()) { - gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has nmethod " - PTR_FORMAT" in its strong code roots " + gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has nmethod " + PTR_FORMAT " in its strong code roots " "with no pointers into region", _hr->bottom(), _hr->end(), nm); _failures = true; } else if (oop_cl.failures()) { - gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] has other " - "failures for nmethod "PTR_FORMAT, + gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] has other " + "failures for nmethod " PTR_FORMAT, _hr->bottom(), _hr->end(), nm); _failures = true; } @@ -599,8 +599,8 @@ // on its strong code root list if (is_empty()) { if (strong_code_roots_length > 0) { - gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is empty " - "but has "SIZE_FORMAT" code root entries", + gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] is empty " + "but has " SIZE_FORMAT " code root entries", bottom(), end(), strong_code_roots_length); *failures = true; } @@ -609,8 +609,8 @@ if (continuesHumongous()) { if (strong_code_roots_length > 0) { - gclog_or_tty->print_cr("region "HR_FORMAT" is a continuation of a humongous " - "region but has "SIZE_FORMAT" code root entries", + gclog_or_tty->print_cr("region " HR_FORMAT " is a continuation of a humongous " + "region but has " SIZE_FORMAT " code root entries", HR_FORMAT_PARAMS(this), strong_code_roots_length); *failures = true; } @@ -634,7 +634,7 @@ else st->print(" "); st->print(" TS %5d", _gc_time_stamp); - st->print(" PTAMS "PTR_FORMAT" NTAMS "PTR_FORMAT, + st->print(" PTAMS " PTR_FORMAT " NTAMS " PTR_FORMAT, prev_top_at_mark_start(), next_top_at_mark_start()); G1OffsetTableContigSpace::print_on(st); } @@ -708,25 +708,25 @@ } if (!_g1h->is_in_closed_subset(obj)) { HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p); - gclog_or_tty->print_cr("Field "PTR_FORMAT - " of live obj "PTR_FORMAT" in region " - "["PTR_FORMAT", "PTR_FORMAT")", + gclog_or_tty->print_cr("Field " PTR_FORMAT + " of live obj " PTR_FORMAT " in region " + "[" PTR_FORMAT ", " PTR_FORMAT ")", p, (void*) _containing_obj, from->bottom(), from->end()); print_object(gclog_or_tty, _containing_obj); - gclog_or_tty->print_cr("points to obj "PTR_FORMAT" not in the heap", + gclog_or_tty->print_cr("points to obj " PTR_FORMAT " not in the heap", (void*) obj); } else { HeapRegion* from = _g1h->heap_region_containing((HeapWord*)p); HeapRegion* to = _g1h->heap_region_containing((HeapWord*)obj); - gclog_or_tty->print_cr("Field "PTR_FORMAT - " of live obj "PTR_FORMAT" in region " - "["PTR_FORMAT", "PTR_FORMAT")", + gclog_or_tty->print_cr("Field " PTR_FORMAT + " of live obj " PTR_FORMAT " in region " + "[" PTR_FORMAT ", " PTR_FORMAT ")", p, (void*) _containing_obj, from->bottom(), from->end()); print_object(gclog_or_tty, _containing_obj); - gclog_or_tty->print_cr("points to dead obj "PTR_FORMAT" in region " - "["PTR_FORMAT", "PTR_FORMAT")", + gclog_or_tty->print_cr("points to dead obj " PTR_FORMAT " in region " + "[" PTR_FORMAT ", " PTR_FORMAT ")", (void*) obj, to->bottom(), to->end()); print_object(gclog_or_tty, obj); } @@ -784,14 +784,14 @@ gclog_or_tty->print_cr("----------"); } gclog_or_tty->print_cr("Missing rem set entry:"); - gclog_or_tty->print_cr("Field "PTR_FORMAT" " - "of obj "PTR_FORMAT", " - "in region "HR_FORMAT, + gclog_or_tty->print_cr("Field " PTR_FORMAT " " + "of obj " PTR_FORMAT ", " + "in region " HR_FORMAT, p, (void*) _containing_obj, HR_FORMAT_PARAMS(from)); _containing_obj->print_on(gclog_or_tty); - gclog_or_tty->print_cr("points to obj "PTR_FORMAT" " - "in region "HR_FORMAT, + gclog_or_tty->print_cr("points to obj " PTR_FORMAT " " + "in region " HR_FORMAT, (void*) obj, HR_FORMAT_PARAMS(to)); if (obj->is_oop()) { @@ -830,8 +830,8 @@ if (is_humongous != g1->isHumongous(obj_size) && !g1->is_obj_dead(obj, this)) { // Dead objects may have bigger block_size since they span several objects. - gclog_or_tty->print_cr("obj "PTR_FORMAT" is of %shumongous size (" - SIZE_FORMAT" words) in a %shumongous region", + gclog_or_tty->print_cr("obj " PTR_FORMAT " is of %shumongous size (" + SIZE_FORMAT " words) in a %shumongous region", p, g1->isHumongous(obj_size) ? "" : "non-", obj_size, is_humongous ? "" : "non-"); *failures = true; @@ -854,12 +854,12 @@ (vo == VerifyOption_G1UsePrevMarking && ClassLoaderDataGraph::unload_list_contains(klass)); if (!is_metaspace_object) { - gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" " + gclog_or_tty->print_cr("klass " PTR_FORMAT " of object " PTR_FORMAT " " "not metadata", klass, (void *)obj); *failures = true; return; } else if (!klass->is_klass()) { - gclog_or_tty->print_cr("klass "PTR_FORMAT" of object "PTR_FORMAT" " + gclog_or_tty->print_cr("klass " PTR_FORMAT " of object " PTR_FORMAT " " "not a klass", klass, (void *)obj); *failures = true; return; @@ -891,7 +891,7 @@ } } } else { - gclog_or_tty->print_cr(PTR_FORMAT" not an oop", (void *)obj); + gclog_or_tty->print_cr(PTR_FORMAT " not an oop", (void *)obj); *failures = true; return; } @@ -901,8 +901,8 @@ } if (p != top()) { - gclog_or_tty->print_cr("end of last object "PTR_FORMAT" " - "does not match top "PTR_FORMAT, p, top()); + gclog_or_tty->print_cr("end of last object " PTR_FORMAT " " + "does not match top " PTR_FORMAT, p, top()); *failures = true; return; } @@ -917,8 +917,8 @@ HeapWord* addr_1 = p; HeapWord* b_start_1 = _offsets.block_start_const(addr_1); if (b_start_1 != p) { - gclog_or_tty->print_cr("BOT look up for top: "PTR_FORMAT" " - " yielded "PTR_FORMAT", expecting "PTR_FORMAT, + gclog_or_tty->print_cr("BOT look up for top: " PTR_FORMAT " " + " yielded " PTR_FORMAT ", expecting " PTR_FORMAT, addr_1, b_start_1, p); *failures = true; return; @@ -929,8 +929,8 @@ if (addr_2 < the_end) { HeapWord* b_start_2 = _offsets.block_start_const(addr_2); if (b_start_2 != p) { - gclog_or_tty->print_cr("BOT look up for top + 1: "PTR_FORMAT" " - " yielded "PTR_FORMAT", expecting "PTR_FORMAT, + gclog_or_tty->print_cr("BOT look up for top + 1: " PTR_FORMAT " " + " yielded " PTR_FORMAT ", expecting " PTR_FORMAT, addr_2, b_start_2, p); *failures = true; return; @@ -943,8 +943,8 @@ if (addr_3 < the_end) { HeapWord* b_start_3 = _offsets.block_start_const(addr_3); if (b_start_3 != p) { - gclog_or_tty->print_cr("BOT look up for top + diff: "PTR_FORMAT" " - " yielded "PTR_FORMAT", expecting "PTR_FORMAT, + gclog_or_tty->print_cr("BOT look up for top + diff: " PTR_FORMAT " " + " yielded " PTR_FORMAT ", expecting " PTR_FORMAT, addr_3, b_start_3, p); *failures = true; return; @@ -955,8 +955,8 @@ HeapWord* addr_4 = the_end - 1; HeapWord* b_start_4 = _offsets.block_start_const(addr_4); if (b_start_4 != p) { - gclog_or_tty->print_cr("BOT look up for end - 1: "PTR_FORMAT" " - " yielded "PTR_FORMAT", expecting "PTR_FORMAT, + gclog_or_tty->print_cr("BOT look up for end - 1: " PTR_FORMAT " " + " yielded " PTR_FORMAT ", expecting " PTR_FORMAT, addr_4, b_start_4, p); *failures = true; return; @@ -964,8 +964,8 @@ } if (is_humongous && object_num > 1) { - gclog_or_tty->print_cr("region ["PTR_FORMAT","PTR_FORMAT"] is humongous " - "but has "SIZE_FORMAT", objects", + gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] is humongous " + "but has " SIZE_FORMAT ", objects", bottom(), end(), object_num); *failures = true; return; --- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp 2017-01-29 21:33:14.353347428 +0100 @@ -52,7 +52,7 @@ class HeapRegionSetBase; class nmethod; -#define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]" +#define HR_FORMAT "%u:(%s)[" PTR_FORMAT "," PTR_FORMAT "," PTR_FORMAT "]" #define HR_FORMAT_PARAMS(_hr_) \ (_hr_)->hrm_index(), \ (_hr_)->get_short_type_str(), \ @@ -534,8 +534,8 @@ void set_containing_set(HeapRegionSetBase* containing_set) { assert((containing_set == NULL && _containing_set != NULL) || (containing_set != NULL && _containing_set == NULL), - err_msg("containing_set: "PTR_FORMAT" " - "_containing_set: "PTR_FORMAT, + err_msg("containing_set: " PTR_FORMAT " " + "_containing_set: " PTR_FORMAT, p2i(containing_set), p2i(_containing_set))); _containing_set = containing_set; --- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp 2017-01-29 21:33:14.353347428 +0100 @@ -112,7 +112,7 @@ assert(ClassUnloadingWithConcurrentMark, err_msg("All blocks should be objects if G1 Class Unloading isn't used. " - "HR: ["PTR_FORMAT", "PTR_FORMAT", "PTR_FORMAT") " + "HR: [" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT ") " "addr: " PTR_FORMAT, p2i(bottom()), p2i(top()), p2i(end()), p2i(addr))); --- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.cpp 2017-01-29 21:33:14.353347428 +0100 @@ -432,7 +432,7 @@ HeapRegion* hr = _regions.get_by_index(i); guarantee(hr != NULL, err_msg("invariant: i: %u", i)); guarantee(!prev_committed || hr->bottom() == prev_end, - err_msg("invariant i: %u "HR_FORMAT" prev_end: "PTR_FORMAT, + err_msg("invariant i: %u " HR_FORMAT " prev_end: " PTR_FORMAT, i, HR_FORMAT_PARAMS(hr), p2i(prev_end))); guarantee(hr->hrm_index() == i, err_msg("invariant: i: %u hrm_index(): %u", i, hr->hrm_index())); --- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionManager.inline.hpp 2017-01-29 21:33:14.353347428 +0100 @@ -31,9 +31,9 @@ inline HeapRegion* HeapRegionManager::addr_to_region(HeapWord* addr) const { assert(addr < heap_end(), - err_msg("addr: "PTR_FORMAT" end: "PTR_FORMAT, p2i(addr), p2i(heap_end()))); + err_msg("addr: " PTR_FORMAT " end: " PTR_FORMAT, p2i(addr), p2i(heap_end()))); assert(addr >= heap_bottom(), - err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT, p2i(addr), p2i(heap_bottom()))); + err_msg("addr: " PTR_FORMAT " bottom: " PTR_FORMAT, p2i(addr), p2i(heap_bottom()))); HeapRegion* hr = _regions.get_by_address(addr); return hr; --- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2017-01-29 21:33:14.353347428 +0100 @@ -381,7 +381,7 @@ void FromCardCache::invalidate(uint start_idx, size_t new_num_regions) { guarantee((size_t)start_idx + new_num_regions <= max_uintx, - err_msg("Trying to invalidate beyond maximum region, from %u size "SIZE_FORMAT, + err_msg("Trying to invalidate beyond maximum region, from %u size " SIZE_FORMAT, start_idx, new_num_regions)); for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) { uint end_idx = (start_idx + (uint)new_num_regions); @@ -396,7 +396,7 @@ void FromCardCache::print(outputStream* out) { for (uint i = 0; i < HeapRegionRemSet::num_par_rem_sets(); i++) { for (uint j = 0; j < _max_regions; j++) { - out->print_cr("_from_card_cache["UINT32_FORMAT"]["UINT32_FORMAT"] = "INT32_FORMAT".", + out->print_cr("_from_card_cache[" UINT32_FORMAT "][" UINT32_FORMAT "] = " INT32_FORMAT ".", i, j, at(i, j)); } } @@ -436,7 +436,7 @@ int from_card = (int)(uintptr_t(from) >> CardTableModRefBS::card_shift); if (G1TraceHeapRegionRememberedSet) { - gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = "INT32_FORMAT")", + gclog_or_tty->print_cr("Table for [" PTR_FORMAT "...): card %d (cache = " INT32_FORMAT ")", hr()->bottom(), from_card, FromCardCache::at((uint)tid, cur_hrm_ind)); } @@ -642,13 +642,13 @@ assert(_coarse_map.size() == region_bm->size(), "Precondition"); if (G1RSScrubVerbose) { - gclog_or_tty->print(" Coarse map: before = "SIZE_FORMAT"...", + gclog_or_tty->print(" Coarse map: before = " SIZE_FORMAT "...", _n_coarse_entries); } _coarse_map.set_intersection(*region_bm); _n_coarse_entries = _coarse_map.count_one_bits(); if (G1RSScrubVerbose) { - gclog_or_tty->print_cr(" after = "SIZE_FORMAT".", _n_coarse_entries); + gclog_or_tty->print_cr(" after = " SIZE_FORMAT ".", _n_coarse_entries); } // Now do the fine-grained maps. @@ -1044,7 +1044,7 @@ card_index = _cur_region_card_offset + _cur_card_in_prt; guarantee(_cur_card_in_prt < HeapRegion::CardsPerRegion, - err_msg("Card index "SIZE_FORMAT" must be within the region", _cur_card_in_prt)); + err_msg("Card index " SIZE_FORMAT " must be within the region", _cur_card_in_prt)); return true; } @@ -1213,8 +1213,8 @@ size_t min_prt_size = sizeof(void*) + dummy->bm()->size_in_words() * HeapWordSize; assert(dummy->mem_size() > min_prt_size, - err_msg("PerRegionTable memory usage is suspiciously small, only has "SIZE_FORMAT" bytes. " - "Should be at least "SIZE_FORMAT" bytes.", dummy->mem_size(), min_prt_size)); + err_msg("PerRegionTable memory usage is suspiciously small, only has " SIZE_FORMAT " bytes. " + "Should be at least " SIZE_FORMAT " bytes.", dummy->mem_size(), min_prt_size)); free(dummy); guarantee(dummy->mem_size() == fl_mem_size(), "fl_mem_size() does not return the correct element size"); // try to reset the state --- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp 2017-01-29 21:33:14.357347336 +0100 @@ -32,7 +32,7 @@ uint FreeRegionList::_unrealistically_long_length = 0; void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) { - msg->append("[%s] %s ln: %u cy: "SIZE_FORMAT, + msg->append("[%s] %s ln: %u cy: " SIZE_FORMAT, name(), message, length(), total_capacity_bytes()); fill_in_ext_msg_extra(msg); } @@ -84,13 +84,13 @@ void HeapRegionSetBase::print_on(outputStream* out, bool print_contents) { out->cr(); - out->print_cr("Set: %s ("PTR_FORMAT")", name(), this); + out->print_cr("Set: %s (" PTR_FORMAT ")", name(), this); out->print_cr(" Region Assumptions"); out->print_cr(" humongous : %s", BOOL_TO_STR(regions_humongous())); out->print_cr(" free : %s", BOOL_TO_STR(regions_free())); out->print_cr(" Attributes"); out->print_cr(" length : %14u", length()); - out->print_cr(" total capacity : "SIZE_FORMAT_W(14)" bytes", + out->print_cr(" total capacity : " SIZE_FORMAT_W(14) " bytes", total_capacity_bytes()); } @@ -106,7 +106,7 @@ } void FreeRegionList::fill_in_ext_msg_extra(hrs_ext_msg* msg) { - msg->append(" hd: "PTR_FORMAT" tl: "PTR_FORMAT, _head, _tail); + msg->append(" hd: " PTR_FORMAT " tl: " PTR_FORMAT, _head, _tail); } void FreeRegionList::remove_all() { @@ -277,8 +277,8 @@ void FreeRegionList::print_on(outputStream* out, bool print_contents) { HeapRegionSetBase::print_on(out, print_contents); out->print_cr(" Linking"); - out->print_cr(" head : "PTR_FORMAT, _head); - out->print_cr(" tail : "PTR_FORMAT, _tail); + out->print_cr(" head : " PTR_FORMAT, _head); + out->print_cr(" tail : " PTR_FORMAT, _tail); if (print_contents) { out->print_cr(" Contents"); @@ -306,7 +306,7 @@ count++; guarantee(count < _unrealistically_long_length, - 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())); + 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())); if (curr->next() != NULL) { guarantee(curr->next()->prev() == curr, "Next or prev pointers messed up"); --- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2017-01-29 21:33:14.357347336 +0100 @@ -668,7 +668,7 @@ jlong ret_val = now - _time_of_last_gc; // XXX See note in genCollectedHeap::millis_since_last_gc(). if (ret_val < 0) { - NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);) + NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);) return 0; } return ret_val; --- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2017-01-29 21:33:14.357347336 +0100 @@ -3307,7 +3307,7 @@ jlong ret_val = now - _time_of_last_gc; // XXX See note in genCollectedHeap::millis_since_last_gc(). if (ret_val < 0) { - NOT_PRODUCT(warning("time warp: "INT64_FORMAT, ret_val);) + NOT_PRODUCT(warning("time warp: " INT64_FORMAT, ret_val);) return 0; } return ret_val; --- openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2017-01-29 21:33:14.357347336 +0100 @@ -86,7 +86,7 @@ while (words_left_to_fill > 0) { size_t words_to_fill = MIN2(words_left_to_fill, CollectedHeap::filler_array_max_size()); assert(words_to_fill >= CollectedHeap::min_fill_size(), - err_msg("Remaining size ("SIZE_FORMAT ") is too small to fill (based on " SIZE_FORMAT " and " SIZE_FORMAT ")", + err_msg("Remaining size (" SIZE_FORMAT ") is too small to fill (based on " SIZE_FORMAT " and " SIZE_FORMAT ")", words_to_fill, words_left_to_fill, CollectedHeap::filler_array_max_size())); CollectedHeap::fill_with_object((HeapWord*)cur_top, words_to_fill); if (!os::numa_has_static_binding()) { --- openjdk/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp 2017-01-29 21:33:14.357347336 +0100 @@ -98,10 +98,10 @@ if (_allocated == 0) { assert(_unused == 0, err_msg("Inconsistency in PLAB stats: " - "_allocated: "SIZE_FORMAT", " - "_wasted: "SIZE_FORMAT", " - "_unused: "SIZE_FORMAT", " - "_used : "SIZE_FORMAT, + "_allocated: " SIZE_FORMAT ", " + "_wasted: " SIZE_FORMAT ", " + "_unused: " SIZE_FORMAT ", " + "_used : " SIZE_FORMAT, _allocated, _wasted, _unused, _used)); _allocated = 1; --- openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2017-01-29 21:33:14.357347336 +0100 @@ -158,8 +158,8 @@ // Mapping from address to card marking array entry jbyte* byte_for(const void* p) const { assert(_whole_heap.contains(p), - err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of " - " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")", + err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of " + " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")", p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end()))); jbyte* result = &byte_map_base[uintptr_t(p) >> card_shift]; assert(result >= _byte_map && result < _byte_map + _byte_map_size, @@ -436,8 +436,8 @@ size_t delta = pointer_delta(p, byte_map_base, sizeof(jbyte)); HeapWord* result = (HeapWord*) (delta << card_shift); assert(_whole_heap.contains(result), - err_msg("Returning result = "PTR_FORMAT" out of bounds of " - " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")", + err_msg("Returning result = " PTR_FORMAT " out of bounds of " + " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")", p2i(result), p2i(_whole_heap.start()), p2i(_whole_heap.end()))); return result; } @@ -445,8 +445,8 @@ // Mapping from address to card marking array index. size_t index_for(void* p) { assert(_whole_heap.contains(p), - err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of " - " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")", + err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of " + " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")", p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end()))); return byte_for(p) - _byte_map; } --- openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp 2017-01-29 21:33:14.357347336 +0100 @@ -1403,7 +1403,7 @@ // back a time later than 'now'. jlong retVal = now - tolgc_cl.time(); if (retVal < 0) { - NOT_PRODUCT(warning("time warp: "INT64_FORMAT, (int64_t) retVal);) + NOT_PRODUCT(warning("time warp: " INT64_FORMAT, (int64_t) retVal);) return 0; } return retVal; --- openjdk/hotspot/src/share/vm/memory/generation.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/memory/generation.cpp 2017-01-29 21:33:14.357347336 +0100 @@ -193,7 +193,7 @@ bool res = (available >= max_promotion_in_bytes); if (PrintGC && Verbose) { gclog_or_tty->print_cr( - "Generation: promo attempt is%s safe: available("SIZE_FORMAT") %s max_promo("SIZE_FORMAT")", + "Generation: promo attempt is%s safe: available(" SIZE_FORMAT ") %s max_promo(" SIZE_FORMAT ")", res? "":" not", available, res? ">=":"<", max_promotion_in_bytes); } --- openjdk/hotspot/src/share/vm/memory/generation.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/memory/generation.hpp 2017-01-29 21:33:14.357347336 +0100 @@ -422,7 +422,7 @@ // have to guard against non-monotonicity. NOT_PRODUCT( if (now < _time_of_last_gc) { - warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now); + warning("time warp: " INT64_FORMAT " to " INT64_FORMAT, (int64_t)_time_of_last_gc, (int64_t)now); } ) return _time_of_last_gc; --- openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp 2017-01-29 21:33:14.357347336 +0100 @@ -161,7 +161,7 @@ NOT_PRODUCT( if (now < _soft_ref_timestamp_clock) { - warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, + warning("time warp: " INT64_FORMAT " to " INT64_FORMAT, _soft_ref_timestamp_clock, now); } ) --- openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2017-01-29 21:33:14.357347336 +0100 @@ -306,8 +306,8 @@ bool res = (available >= av_promo) || (available >= max_promotion_in_bytes); if (PrintGC && Verbose) { gclog_or_tty->print_cr( - "Tenured: promo attempt is%s safe: available("SIZE_FORMAT") %s av_promo("SIZE_FORMAT")," - "max_promo("SIZE_FORMAT")", + "Tenured: promo attempt is%s safe: available(" SIZE_FORMAT ") %s av_promo(" SIZE_FORMAT ")," + "max_promo(" SIZE_FORMAT ")", res? "":" not", available, res? ">=":"<", av_promo, max_promotion_in_bytes); } --- openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp 2017-01-29 21:33:14.357347336 +0100 @@ -94,10 +94,10 @@ if (PrintTLAB && Verbose) { Thread* thrd = myThread(); - gclog_or_tty->print("TLAB: %s thread: "INTPTR_FORMAT" [id: %2d]" - " obj: "SIZE_FORMAT - " free: "SIZE_FORMAT - " waste: "SIZE_FORMAT"\n", + gclog_or_tty->print("TLAB: %s thread: " INTPTR_FORMAT " [id: %2d]" + " obj: " SIZE_FORMAT + " free: " SIZE_FORMAT + " waste: " SIZE_FORMAT "\n", "slow", p2i(thrd), thrd->osthread()->thread_id(), obj_size, free(), refill_waste_limit()); } --- openjdk/hotspot/src/share/vm/memory/universe.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/memory/universe.cpp 2017-01-29 21:33:14.357347336 +0100 @@ -926,7 +926,7 @@ // Reserve the Java heap, which is now the same for all GCs. ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) { assert(alignment <= Arguments::conservative_max_heap_alignment(), - err_msg("actual alignment "SIZE_FORMAT" must be within maximum heap alignment "SIZE_FORMAT, + err_msg("actual alignment " SIZE_FORMAT " must be within maximum heap alignment " SIZE_FORMAT, alignment, Arguments::conservative_max_heap_alignment())); size_t total_reserved = align_size_up(heap_size, alignment); assert(!UseCompressedOops || (total_reserved <= (OopEncodingHeapMax - os::vm_page_size())), --- openjdk/hotspot/src/share/vm/oops/constantPool.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/oops/constantPool.cpp 2017-01-29 21:33:14.357347336 +0100 @@ -1494,7 +1494,7 @@ } case JVM_CONSTANT_Long: { u8 val = Bytes::get_Java_u8(bytes); - printf("long "INT64_FORMAT, (int64_t) *(jlong *) &val); + printf("long " INT64_FORMAT, (int64_t) *(jlong *) &val); ent_size = 8; idx++; // Long takes two cpool slots break; --- openjdk/hotspot/src/share/vm/oops/cpCache.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/oops/cpCache.cpp 2017-01-29 21:33:14.357347336 +0100 @@ -305,7 +305,7 @@ adapter->size_of_parameters()); if (TraceInvokeDynamic) { - tty->print_cr("set_method_handle bc=%d appendix="PTR_FORMAT"%s method_type="PTR_FORMAT"%s method="PTR_FORMAT" ", + tty->print_cr("set_method_handle bc=%d appendix=" PTR_FORMAT "%s method_type=" PTR_FORMAT "%s method=" PTR_FORMAT " ", invoke_code, (void *)appendix(), (has_appendix ? "" : " (unused)"), (void *)method_type(), (has_method_type ? "" : " (unused)"), @@ -536,12 +536,12 @@ // print separator if (index == 0) st->print_cr(" -------------"); // print entry - st->print("%3d ("PTR_FORMAT") ", index, (intptr_t)this); + st->print("%3d (" PTR_FORMAT ") ", index, (intptr_t)this); st->print_cr("[%02x|%02x|%5d]", bytecode_2(), bytecode_1(), constant_pool_index()); - st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f1); - st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f2); - st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_flags); + st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f1); + st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_f2); + st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)_flags); st->print_cr(" -------------"); } --- openjdk/hotspot/src/share/vm/oops/cpCache.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/oops/cpCache.hpp 2017-01-29 21:33:14.357347336 +0100 @@ -192,7 +192,7 @@ field_index_mask = right_n_bits(field_index_bits), parameter_size_bits = 8, // subset of field_index_mask, range is 0..255 parameter_size_mask = right_n_bits(parameter_size_bits), - option_bits_mask = ~(((-1) << tos_state_shift) | (field_index_mask | parameter_size_mask)) + option_bits_mask = (int)(~(((unsigned)(-1) << tos_state_shift) | (field_index_mask | parameter_size_mask))) }; // specific bit definitions for the indices field: --- openjdk/hotspot/src/share/vm/oops/markOop.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/oops/markOop.cpp 2017-01-29 21:33:14.357347336 +0100 @@ -49,7 +49,7 @@ st->print("monitor=NULL"); else { BasicLock * bl = (BasicLock *) mon->owner(); - st->print("monitor={count="INTPTR_FORMAT",waiters="INTPTR_FORMAT",recursions="INTPTR_FORMAT",owner="INTPTR_FORMAT"}", + st->print("monitor={count=" INTPTR_FORMAT ",waiters=" INTPTR_FORMAT ",recursions=" INTPTR_FORMAT ",owner=" INTPTR_FORMAT "}", mon->count(), mon->waiters(), mon->recursions(), p2i(bl)); } } else { --- openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp 2017-01-29 21:33:14.361347245 +0100 @@ -657,7 +657,7 @@ if (i > max_objArray_print_length) { st->print("..."); break; } - st->print(" "INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i)); + st->print(" " INTPTR_FORMAT, (intptr_t)(void*)objArrayOop(obj)->obj_at(i)); } st->print(" }"); } --- openjdk/hotspot/src/share/vm/oops/oop.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/oops/oop.cpp 2017-01-29 21:33:14.361347245 +0100 @@ -46,7 +46,7 @@ void oopDesc::print_address_on(outputStream* st) const { if (PrintOopAddress) { - st->print("{"INTPTR_FORMAT"}", this); + st->print("{" INTPTR_FORMAT "}", this); } } --- openjdk/hotspot/src/share/vm/prims/methodHandles.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/prims/methodHandles.cpp 2017-01-29 21:33:14.361347245 +0100 @@ -1321,27 +1321,27 @@ // These are the native methods on java.lang.invoke.MethodHandleNatives. static JNINativeMethod MHN_methods[] = { - {CC"init", CC"("MEM""OBJ")V", FN_PTR(MHN_init_Mem)}, - {CC"expand", CC"("MEM")V", FN_PTR(MHN_expand_Mem)}, - {CC"resolve", CC"("MEM""CLS")"MEM, FN_PTR(MHN_resolve_Mem)}, + {CC"init", CC"(" MEM"" OBJ")V", FN_PTR(MHN_init_Mem)}, + {CC"expand", CC"(" MEM")V", FN_PTR(MHN_expand_Mem)}, + {CC"resolve", CC"(" MEM"" CLS")" MEM, FN_PTR(MHN_resolve_Mem)}, {CC"getConstant", CC"(I)I", FN_PTR(MHN_getConstant)}, // static native int getNamedCon(int which, Object[] name) - {CC"getNamedCon", CC"(I["OBJ")I", FN_PTR(MHN_getNamedCon)}, + {CC"getNamedCon", CC"(I[" OBJ")I", FN_PTR(MHN_getNamedCon)}, // static native int getMembers(Class<?> defc, String matchName, String matchSig, // int matchFlags, Class<?> caller, int skip, MemberName[] results); - {CC"getMembers", CC"("CLS""STRG""STRG"I"CLS"I["MEM")I", FN_PTR(MHN_getMembers)}, - {CC"objectFieldOffset", CC"("MEM")J", FN_PTR(MHN_objectFieldOffset)}, - {CC"setCallSiteTargetNormal", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetNormal)}, - {CC"setCallSiteTargetVolatile", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetVolatile)}, - {CC"staticFieldOffset", CC"("MEM")J", FN_PTR(MHN_staticFieldOffset)}, - {CC"staticFieldBase", CC"("MEM")"OBJ, FN_PTR(MHN_staticFieldBase)}, - {CC"getMemberVMInfo", CC"("MEM")"OBJ, FN_PTR(MHN_getMemberVMInfo)} + {CC"getMembers", CC"(" CLS"" STRG"" STRG"I" CLS"I[" MEM")I", FN_PTR(MHN_getMembers)}, + {CC"objectFieldOffset", CC"(" MEM")J", FN_PTR(MHN_objectFieldOffset)}, + {CC"setCallSiteTargetNormal", CC"(" CS"" MH")V", FN_PTR(MHN_setCallSiteTargetNormal)}, + {CC"setCallSiteTargetVolatile", CC"(" CS"" MH")V", FN_PTR(MHN_setCallSiteTargetVolatile)}, + {CC"staticFieldOffset", CC"(" MEM")J", FN_PTR(MHN_staticFieldOffset)}, + {CC"staticFieldBase", CC"(" MEM")" OBJ, FN_PTR(MHN_staticFieldBase)}, + {CC"getMemberVMInfo", CC"(" MEM")" OBJ, FN_PTR(MHN_getMemberVMInfo)} }; static JNINativeMethod MH_methods[] = { // UnsupportedOperationException throwers - {CC"invoke", CC"(["OBJ")"OBJ, FN_PTR(MH_invoke_UOE)}, - {CC"invokeExact", CC"(["OBJ")"OBJ, FN_PTR(MH_invokeExact_UOE)} + {CC"invoke", CC"([" OBJ")" OBJ, FN_PTR(MH_invoke_UOE)}, + {CC"invokeExact", CC"([" OBJ")" OBJ, FN_PTR(MH_invokeExact_UOE)} }; /** --- openjdk/hotspot/src/share/vm/prims/perf.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/prims/perf.cpp 2017-01-29 21:33:14.361347245 +0100 @@ -290,13 +290,13 @@ #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f) #define BB "Ljava/nio/ByteBuffer;" #define JLS "Ljava/lang/String;" -#define CL_ARGS CC"("JLS"IIJ)"BB -#define CBA_ARGS CC"("JLS"II[BI)"BB +#define CL_ARGS CC"(" JLS"IIJ)" BB +#define CBA_ARGS CC"(" JLS"II[BI)" BB static JNINativeMethod perfmethods[] = { - {CC"attach", CC"("JLS"II)"BB, FN_PTR(Perf_Attach)}, - {CC"detach", CC"("BB")V", FN_PTR(Perf_Detach)}, + {CC"attach", CC"(" JLS"II)" BB, FN_PTR(Perf_Attach)}, + {CC"detach", CC"(" BB")V", FN_PTR(Perf_Detach)}, {CC"createLong", CL_ARGS, FN_PTR(Perf_CreateLong)}, {CC"createByteArray", CBA_ARGS, FN_PTR(Perf_CreateByteArray)}, {CC"highResCounter", CC"()J", FN_PTR(Perf_HighResCounter)}, --- openjdk/hotspot/src/share/vm/prims/unsafe.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/prims/unsafe.cpp 2017-01-29 21:33:14.361347245 +0100 @@ -1057,7 +1057,7 @@ UNSAFE_END -#define DAC_Args CLS"[B["OBJ +#define DAC_Args CLS"[B[" OBJ // define a class but do not make it known to the class loader or system dictionary // - host_class: supplies context for linkage, access control, protection domain, and class loader // - data: bytes of a class file, a raw memory address (length gives the number of bytes) @@ -1422,47 +1422,47 @@ #define LANG "Ljava/lang/" -#define OBJ LANG"Object;" -#define CLS LANG"Class;" -#define CTR LANG"reflect/Constructor;" -#define FLD LANG"reflect/Field;" -#define MTH LANG"reflect/Method;" -#define THR LANG"Throwable;" +#define OBJ LANG "Object;" +#define CLS LANG "Class;" +#define CTR LANG "reflect/Constructor;" +#define FLD LANG "reflect/Field;" +#define MTH LANG "reflect/Method;" +#define THR LANG "Throwable;" -#define DC0_Args LANG"String;[BII" -#define DC_Args DC0_Args LANG"ClassLoader;" "Ljava/security/ProtectionDomain;" +#define DC0_Args LANG "String;[BII" +#define DC_Args DC0_Args LANG "ClassLoader;" "Ljava/security/ProtectionDomain;" #define CC (char*) /*cast a literal from (const char*)*/ #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f) // define deprecated accessors for compabitility with 1.4.0 #define DECLARE_GETSETOOP_140(Boolean, Z) \ - {CC"get"#Boolean, CC"("OBJ"I)"#Z, FN_PTR(Unsafe_Get##Boolean##140)}, \ - {CC"put"#Boolean, CC"("OBJ"I"#Z")V", FN_PTR(Unsafe_Set##Boolean##140)} + {CC"get"#Boolean, CC"(" OBJ"I)"#Z, FN_PTR(Unsafe_Get##Boolean##140)}, \ + {CC"put"#Boolean, CC"(" OBJ"I"#Z")V", FN_PTR(Unsafe_Set##Boolean##140)} // Note: In 1.4.1, getObject and kin take both int and long offsets. #define DECLARE_GETSETOOP_141(Boolean, Z) \ - {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \ - {CC"put"#Boolean, CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)} + {CC"get"#Boolean, CC"(" OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \ + {CC"put"#Boolean, CC"(" OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)} // Note: In 1.5.0, there are volatile versions too #define DECLARE_GETSETOOP(Boolean, Z) \ - {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \ - {CC"put"#Boolean, CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)}, \ - {CC"get"#Boolean"Volatile", CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean##Volatile)}, \ - {CC"put"#Boolean"Volatile", CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean##Volatile)} + {CC"get"#Boolean, CC"(" OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \ + {CC"put"#Boolean, CC"(" OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)}, \ + {CC"get"#Boolean"Volatile", CC"(" OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean##Volatile)}, \ + {CC"put"#Boolean"Volatile", CC"(" OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean##Volatile)} #define DECLARE_GETSETNATIVE(Byte, B) \ - {CC"get"#Byte, CC"("ADR")"#B, FN_PTR(Unsafe_GetNative##Byte)}, \ - {CC"put"#Byte, CC"("ADR#B")V", FN_PTR(Unsafe_SetNative##Byte)} + {CC"get"#Byte, CC"(" ADR")"#B, FN_PTR(Unsafe_GetNative##Byte)}, \ + {CC"put"#Byte, CC"(" ADR#B")V", FN_PTR(Unsafe_SetNative##Byte)} // These are the methods for 1.4.0 static JNINativeMethod methods_140[] = { - {CC"getObject", CC"("OBJ"I)"OBJ"", FN_PTR(Unsafe_GetObject140)}, - {CC"putObject", CC"("OBJ"I"OBJ")V", FN_PTR(Unsafe_SetObject140)}, + {CC"getObject", CC"(" OBJ"I)" OBJ"", FN_PTR(Unsafe_GetObject140)}, + {CC"putObject", CC"(" OBJ"I" OBJ")V", FN_PTR(Unsafe_SetObject140)}, DECLARE_GETSETOOP_140(Boolean, Z), DECLARE_GETSETOOP_140(Byte, B), @@ -1481,33 +1481,33 @@ DECLARE_GETSETNATIVE(Float, F), DECLARE_GETSETNATIVE(Double, D), - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, + {CC"getAddress", CC"(" ADR")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, + {CC"putAddress", CC"(" ADR"" ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, - - {CC"fieldOffset", CC"("FLD")I", FN_PTR(Unsafe_FieldOffset)}, - {CC"staticFieldBase", CC"("CLS")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)}, - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, + {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, + {CC"reallocateMemory", CC"(" ADR"J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, + {CC"freeMemory", CC"(" ADR")V", FN_PTR(Unsafe_FreeMemory)}, + + {CC"fieldOffset", CC"(" FLD")I", FN_PTR(Unsafe_FieldOffset)}, + {CC"staticFieldBase", CC"(" CLS")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)}, + {CC"ensureClassInitialized",CC"(" CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, + {CC"arrayBaseOffset", CC"(" CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, + {CC"arrayIndexScale", CC"(" CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, - {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)} + {CC"defineClass", CC"(" DC0_Args")" CLS, FN_PTR(Unsafe_DefineClass0)}, + {CC"defineClass", CC"(" DC_Args")" CLS, FN_PTR(Unsafe_DefineClass)}, + {CC"allocateInstance", CC"(" CLS")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, + {CC"monitorEnter", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, + {CC"monitorExit", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorExit)}, + {CC"throwException", CC"(" THR")V", FN_PTR(Unsafe_ThrowException)} }; // These are the methods prior to the JSR 166 changes in 1.5.0 static JNINativeMethod methods_141[] = { - {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, - {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, + {CC"getObject", CC"(" OBJ"J)" OBJ"", FN_PTR(Unsafe_GetObject)}, + {CC"putObject", CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetObject)}, DECLARE_GETSETOOP_141(Boolean, Z), DECLARE_GETSETOOP_141(Byte, B), @@ -1526,37 +1526,37 @@ DECLARE_GETSETNATIVE(Float, F), DECLARE_GETSETNATIVE(Double, D), - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, + {CC"getAddress", CC"(" ADR")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, + {CC"putAddress", CC"(" ADR"" ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, - - {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, - {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, - {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, + {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, + {CC"reallocateMemory", CC"(" ADR"J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, + {CC"freeMemory", CC"(" ADR")V", FN_PTR(Unsafe_FreeMemory)}, + + {CC"objectFieldOffset", CC"(" FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, + {CC"staticFieldOffset", CC"(" FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, + {CC"staticFieldBase", CC"(" FLD")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, + {CC"ensureClassInitialized",CC"(" CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, + {CC"arrayBaseOffset", CC"(" CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, + {CC"arrayIndexScale", CC"(" CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, - {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)} + {CC"defineClass", CC"(" DC0_Args")" CLS, FN_PTR(Unsafe_DefineClass0)}, + {CC"defineClass", CC"(" DC_Args")" CLS, FN_PTR(Unsafe_DefineClass)}, + {CC"allocateInstance", CC"(" CLS")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, + {CC"monitorEnter", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, + {CC"monitorExit", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorExit)}, + {CC"throwException", CC"(" THR")V", FN_PTR(Unsafe_ThrowException)} }; // These are the methods prior to the JSR 166 changes in 1.6.0 static JNINativeMethod methods_15[] = { - {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, - {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, - {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)}, - {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)}, + {CC"getObject", CC"(" OBJ"J)" OBJ"", FN_PTR(Unsafe_GetObject)}, + {CC"putObject", CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetObject)}, + {CC"getObjectVolatile",CC"(" OBJ"J)" OBJ"", FN_PTR(Unsafe_GetObjectVolatile)}, + {CC"putObjectVolatile",CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)}, DECLARE_GETSETOOP(Boolean, Z), @@ -1576,42 +1576,42 @@ DECLARE_GETSETNATIVE(Float, F), DECLARE_GETSETNATIVE(Double, D), - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, + {CC"getAddress", CC"(" ADR")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, + {CC"putAddress", CC"(" ADR"" ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, - - {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, - {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, - {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, + {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, + {CC"reallocateMemory", CC"(" ADR"J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, + {CC"freeMemory", CC"(" ADR")V", FN_PTR(Unsafe_FreeMemory)}, + + {CC"objectFieldOffset", CC"(" FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, + {CC"staticFieldOffset", CC"(" FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, + {CC"staticFieldBase", CC"(" FLD")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, + {CC"ensureClassInitialized",CC"(" CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, + {CC"arrayBaseOffset", CC"(" CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, + {CC"arrayIndexScale", CC"(" CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, - {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}, - {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, - {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, - {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, + {CC"defineClass", CC"(" DC0_Args")" CLS, FN_PTR(Unsafe_DefineClass0)}, + {CC"defineClass", CC"(" DC_Args")" CLS, FN_PTR(Unsafe_DefineClass)}, + {CC"allocateInstance", CC"(" CLS")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, + {CC"monitorEnter", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, + {CC"monitorExit", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorExit)}, + {CC"throwException", CC"(" THR")V", FN_PTR(Unsafe_ThrowException)}, + {CC"compareAndSwapObject", CC"(" OBJ"J" OBJ"" OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, + {CC"compareAndSwapInt", CC"(" OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, + {CC"compareAndSwapLong", CC"(" OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)}, - {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)} + {CC"unpark", CC"(" OBJ")V", FN_PTR(Unsafe_Unpark)} }; // These are the methods for 1.6.0 and 1.7.0 static JNINativeMethod methods_16[] = { - {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, - {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, - {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)}, - {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)}, + {CC"getObject", CC"(" OBJ"J)" OBJ"", FN_PTR(Unsafe_GetObject)}, + {CC"putObject", CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetObject)}, + {CC"getObjectVolatile",CC"(" OBJ"J)" OBJ"", FN_PTR(Unsafe_GetObjectVolatile)}, + {CC"putObjectVolatile",CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)}, DECLARE_GETSETOOP(Boolean, Z), DECLARE_GETSETOOP(Byte, B), @@ -1630,45 +1630,45 @@ DECLARE_GETSETNATIVE(Float, F), DECLARE_GETSETNATIVE(Double, D), - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, + {CC"getAddress", CC"(" ADR")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, + {CC"putAddress", CC"(" ADR"" ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, - - {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, - {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, - {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, + {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, + {CC"reallocateMemory", CC"(" ADR"J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, + {CC"freeMemory", CC"(" ADR")V", FN_PTR(Unsafe_FreeMemory)}, + + {CC"objectFieldOffset", CC"(" FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, + {CC"staticFieldOffset", CC"(" FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, + {CC"staticFieldBase", CC"(" FLD")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, + {CC"ensureClassInitialized",CC"(" CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, + {CC"arrayBaseOffset", CC"(" CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, + {CC"arrayIndexScale", CC"(" CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, - {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)}, - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, - {CC"tryMonitorEnter", CC"("OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)}, - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}, - {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, - {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, - {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, - {CC"putOrderedObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetOrderedObject)}, - {CC"putOrderedInt", CC"("OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)}, - {CC"putOrderedLong", CC"("OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)}, + {CC"defineClass", CC"(" DC0_Args")" CLS, FN_PTR(Unsafe_DefineClass0)}, + {CC"defineClass", CC"(" DC_Args")" CLS, FN_PTR(Unsafe_DefineClass)}, + {CC"allocateInstance", CC"(" CLS")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, + {CC"monitorEnter", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, + {CC"monitorExit", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorExit)}, + {CC"tryMonitorEnter", CC"(" OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)}, + {CC"throwException", CC"(" THR")V", FN_PTR(Unsafe_ThrowException)}, + {CC"compareAndSwapObject", CC"(" OBJ"J" OBJ"" OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, + {CC"compareAndSwapInt", CC"(" OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, + {CC"compareAndSwapLong", CC"(" OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, + {CC"putOrderedObject", CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetOrderedObject)}, + {CC"putOrderedInt", CC"(" OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)}, + {CC"putOrderedLong", CC"(" OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)}, {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)}, - {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)} + {CC"unpark", CC"(" OBJ")V", FN_PTR(Unsafe_Unpark)} }; // These are the methods for 1.8.0 static JNINativeMethod methods_18[] = { - {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)}, - {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)}, - {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)}, - {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)}, + {CC"getObject", CC"(" OBJ"J)" OBJ"", FN_PTR(Unsafe_GetObject)}, + {CC"putObject", CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetObject)}, + {CC"getObjectVolatile",CC"(" OBJ"J)" OBJ"", FN_PTR(Unsafe_GetObjectVolatile)}, + {CC"putObjectVolatile",CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)}, DECLARE_GETSETOOP(Boolean, Z), DECLARE_GETSETOOP(Byte, B), @@ -1687,36 +1687,36 @@ DECLARE_GETSETNATIVE(Float, F), DECLARE_GETSETNATIVE(Double, D), - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)}, - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, + {CC"getAddress", CC"(" ADR")" ADR, FN_PTR(Unsafe_GetNativeAddress)}, + {CC"putAddress", CC"(" ADR"" ADR")V", FN_PTR(Unsafe_SetNativeAddress)}, - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)}, - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)}, - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, - - {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, - {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, - {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, + {CC"allocateMemory", CC"(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, + {CC"reallocateMemory", CC"(" ADR"J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, + {CC"freeMemory", CC"(" ADR")V", FN_PTR(Unsafe_FreeMemory)}, + + {CC"objectFieldOffset", CC"(" FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)}, + {CC"staticFieldOffset", CC"(" FLD")J", FN_PTR(Unsafe_StaticFieldOffset)}, + {CC"staticFieldBase", CC"(" FLD")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)}, + {CC"ensureClassInitialized",CC"(" CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)}, + {CC"arrayBaseOffset", CC"(" CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)}, + {CC"arrayIndexScale", CC"(" CLS")I", FN_PTR(Unsafe_ArrayIndexScale)}, {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)}, {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)}, - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)}, - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)}, - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)}, - {CC"tryMonitorEnter", CC"("OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)}, - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}, - {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, - {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, - {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, - {CC"putOrderedObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetOrderedObject)}, - {CC"putOrderedInt", CC"("OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)}, - {CC"putOrderedLong", CC"("OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)}, + {CC"defineClass", CC"(" DC_Args")" CLS, FN_PTR(Unsafe_DefineClass)}, + {CC"allocateInstance", CC"(" CLS")" OBJ, FN_PTR(Unsafe_AllocateInstance)}, + {CC"monitorEnter", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorEnter)}, + {CC"monitorExit", CC"(" OBJ")V", FN_PTR(Unsafe_MonitorExit)}, + {CC"tryMonitorEnter", CC"(" OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)}, + {CC"throwException", CC"(" THR")V", FN_PTR(Unsafe_ThrowException)}, + {CC"compareAndSwapObject", CC"(" OBJ"J" OBJ"" OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)}, + {CC"compareAndSwapInt", CC"(" OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)}, + {CC"compareAndSwapLong", CC"(" OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)}, + {CC"putOrderedObject", CC"(" OBJ"J" OBJ")V", FN_PTR(Unsafe_SetOrderedObject)}, + {CC"putOrderedInt", CC"(" OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)}, + {CC"putOrderedLong", CC"(" OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)}, {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)}, - {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)} + {CC"unpark", CC"(" OBJ")V", FN_PTR(Unsafe_Unpark)} }; JNINativeMethod loadavg_method[] = { @@ -1724,38 +1724,38 @@ }; JNINativeMethod prefetch_methods[] = { - {CC"prefetchRead", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)}, - {CC"prefetchWrite", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)}, - {CC"prefetchReadStatic", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)}, - {CC"prefetchWriteStatic",CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)} + {CC"prefetchRead", CC "(" OBJ "J)V", FN_PTR(Unsafe_PrefetchRead)}, + {CC"prefetchWrite", CC "(" OBJ "J)V", FN_PTR(Unsafe_PrefetchWrite)}, + {CC"prefetchReadStatic", CC "(" OBJ "J)V", FN_PTR(Unsafe_PrefetchRead)}, + {CC"prefetchWriteStatic",CC "(" OBJ "J)V", FN_PTR(Unsafe_PrefetchWrite)} }; JNINativeMethod memcopy_methods_17[] = { - {CC"copyMemory", CC"("OBJ"J"OBJ"JJ)V", FN_PTR(Unsafe_CopyMemory2)}, + {CC"copyMemory", CC "(" OBJ "J" OBJ "JJ)V", FN_PTR(Unsafe_CopyMemory2)}, {CC"copySwapMemory0", CC "(" OBJ "J" OBJ "JJJ)V", FN_PTR(Unsafe_CopySwapMemory0)}, - {CC"setMemory", CC"("OBJ"JJB)V", FN_PTR(Unsafe_SetMemory2)} + {CC"setMemory", CC "(" OBJ "JJB)V", FN_PTR(Unsafe_SetMemory2)} }; JNINativeMethod memcopy_methods_15[] = { - {CC"setMemory", CC"("ADR"JB)V", FN_PTR(Unsafe_SetMemory)}, - {CC"copyMemory", CC"("ADR ADR"J)V", FN_PTR(Unsafe_CopyMemory)} + {CC"setMemory", CC "(" ADR "JB)V", FN_PTR(Unsafe_SetMemory)}, + {CC"copyMemory", CC "(" ADR ADR "J)V", FN_PTR(Unsafe_CopyMemory)} }; JNINativeMethod anonk_methods[] = { - {CC"defineAnonymousClass", CC"("DAC_Args")"CLS, FN_PTR(Unsafe_DefineAnonymousClass)}, + {CC"defineAnonymousClass", CC "(" DAC_Args ")" CLS, FN_PTR(Unsafe_DefineAnonymousClass)}, }; JNINativeMethod lform_methods[] = { - {CC"shouldBeInitialized",CC"("CLS")Z", FN_PTR(Unsafe_ShouldBeInitialized)}, + {CC"shouldBeInitialized",CC "(" CLS ")Z", FN_PTR(Unsafe_ShouldBeInitialized)}, }; JNINativeMethod fence_methods[] = { - {CC"loadFence", CC"()V", FN_PTR(Unsafe_LoadFence)}, - {CC"storeFence", CC"()V", FN_PTR(Unsafe_StoreFence)}, - {CC"fullFence", CC"()V", FN_PTR(Unsafe_FullFence)}, + {CC"loadFence", CC "()V", FN_PTR(Unsafe_LoadFence)}, + {CC"storeFence", CC "()V", FN_PTR(Unsafe_StoreFence)}, + {CC"fullFence", CC "()V", FN_PTR(Unsafe_FullFence)}, - {CC"isBigEndian0", CC"()Z", FN_PTR(Unsafe_isBigEndian0)}, - {CC"unalignedAccess0", CC"()Z", FN_PTR(Unsafe_unalignedAccess0)} + {CC"isBigEndian0", CC "()Z", FN_PTR(Unsafe_isBigEndian0)}, + {CC"unalignedAccess0", CC "()Z", FN_PTR(Unsafe_unalignedAccess0)} }; #undef CC --- openjdk/hotspot/src/share/vm/runtime/safepoint.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/runtime/safepoint.cpp 2017-01-29 21:33:14.361347245 +0100 @@ -918,7 +918,7 @@ case _running: default: - tty->print_cr("restart thread "INTPTR_FORMAT" with state %d", + tty->print_cr("restart thread " INTPTR_FORMAT " with state %d", _thread, _type); _thread->print(); ShouldNotReachHere(); @@ -1217,7 +1217,7 @@ sstats = &_safepoint_stats[index]; tty->print("%.3f: ", sstats->_time_stamp); tty->print("%-26s [" - INT32_FORMAT_W(8)INT32_FORMAT_W(11)INT32_FORMAT_W(15) + INT32_FORMAT_W(8) INT32_FORMAT_W(11) INT32_FORMAT_W(15) " ] ", sstats->_vmop_type == -1 ? "no vm operation" : VM_Operation::name(sstats->_vmop_type), @@ -1226,8 +1226,8 @@ sstats->_nof_threads_wait_to_block); // "/ MICROUNITS " is to convert the unit from nanos to millis. tty->print(" [" - INT64_FORMAT_W(6)INT64_FORMAT_W(6) - INT64_FORMAT_W(6)INT64_FORMAT_W(6) + INT64_FORMAT_W(6) INT64_FORMAT_W(6) + INT64_FORMAT_W(6) INT64_FORMAT_W(6) INT64_FORMAT_W(6)" ] ", sstats->_time_to_spin / MICROUNITS, sstats->_time_to_wait_to_block / MICROUNITS, @@ -1236,9 +1236,9 @@ sstats->_time_to_exec_vmop / MICROUNITS); if (need_to_track_page_armed_status) { - tty->print(INT32_FORMAT" ", sstats->_page_armed); + tty->print(INT32_FORMAT " ", sstats->_page_armed); } - tty->print_cr(INT32_FORMAT" ", sstats->_nof_threads_hit_page_trap); + tty->print_cr(INT32_FORMAT " ", sstats->_nof_threads_hit_page_trap); } } @@ -1275,17 +1275,17 @@ for (int index = 0; index < VM_Operation::VMOp_Terminating; index++) { if (_safepoint_reasons[index] != 0) { - tty->print_cr("%-26s"UINT64_FORMAT_W(10), VM_Operation::name(index), + tty->print_cr("%-26s" UINT64_FORMAT_W(10), VM_Operation::name(index), _safepoint_reasons[index]); } } - tty->print_cr(UINT64_FORMAT_W(5)" VM operations coalesced during safepoint", + tty->print_cr(UINT64_FORMAT_W(5) " VM operations coalesced during safepoint", _coalesced_vmop_count); - tty->print_cr("Maximum sync time "INT64_FORMAT_W(5)" ms", + tty->print_cr("Maximum sync time " INT64_FORMAT_W(5) " ms", _max_sync_time / MICROUNITS); tty->print_cr("Maximum vm operation time (except for Exit VM operation) " - INT64_FORMAT_W(5)" ms", + INT64_FORMAT_W(5) " ms", _max_vmop_time / MICROUNITS); } --- openjdk/hotspot/src/share/vm/services/threadService.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/services/threadService.cpp 2017-01-29 21:33:14.361347245 +0100 @@ -889,7 +889,7 @@ st->print(" waiting to lock monitor " INTPTR_FORMAT, waitingToLockMonitor); oop obj = (oop)waitingToLockMonitor->object(); if (obj != NULL) { - st->print(" (object "INTPTR_FORMAT ", a %s)", (address)obj, + st->print(" (object " INTPTR_FORMAT ", a %s)", (address)obj, (InstanceKlass::cast(obj->klass()))->external_name()); if (!currentThread->current_pending_monitor_is_from_java()) { --- openjdk/hotspot/src/share/vm/trace/traceStream.hpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/trace/traceStream.hpp 2017-01-29 21:33:14.361347245 +0100 @@ -40,31 +40,31 @@ TraceStream(outputStream& stream): _st(stream) {} void print_val(const char* label, u1 val) { - _st.print("%s = "UINT32_FORMAT, label, val); + _st.print("%s = " UINT32_FORMAT, label, val); } void print_val(const char* label, u2 val) { - _st.print("%s = "UINT32_FORMAT, label, val); + _st.print("%s = " UINT32_FORMAT, label, val); } void print_val(const char* label, s2 val) { - _st.print("%s = "INT32_FORMAT, label, val); + _st.print("%s = " INT32_FORMAT, label, val); } void print_val(const char* label, u4 val) { - _st.print("%s = "UINT32_FORMAT, label, val); + _st.print("%s = " UINT32_FORMAT, label, val); } void print_val(const char* label, s4 val) { - _st.print("%s = "INT32_FORMAT, label, val); + _st.print("%s = " INT32_FORMAT, label, val); } void print_val(const char* label, u8 val) { - _st.print("%s = "UINT64_FORMAT, label, val); + _st.print("%s = " UINT64_FORMAT, label, val); } void print_val(const char* label, s8 val) { - _st.print("%s = "INT64_FORMAT, label, (int64_t) val); + _st.print("%s = " INT64_FORMAT, label, (int64_t) val); } void print_val(const char* label, bool val) { --- openjdk/hotspot/src/share/vm/utilities/ostream.cpp 2016-11-30 13:10:08.000000000 +0100 +++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp 2017-01-29 21:33:14.361347245 +0100 @@ -277,7 +277,7 @@ size_t limit = (len + 16) / 16 * 16; for (size_t i = 0; i < limit; ++i) { if (i % 16 == 0) { - indent().print(SIZE_FORMAT_HEX_W(07)":", i); + indent().print(SIZE_FORMAT_HEX_W(07) ":", i); } if (i % 2 == 0) { print(" "); @@ -945,7 +945,7 @@ // %%% Should be: jlong time_ms = os::start_time_milliseconds(), if // we ever get round to introduce that method on the os class xs->head("hotspot_log version='%d %d'" - " process='%d' time_ms='"INT64_FORMAT"'", + " process='%d' time_ms='" INT64_FORMAT "'", LOG_MAJOR_VERSION, LOG_MINOR_VERSION, os::current_process_id(), (int64_t)time_ms); // Write VM version header immediately. --- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h 2017-01-25 05:22:03.000000000 +0100 +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h 2017-01-29 21:33:14.361347245 +0100 @@ -223,7 +223,7 @@ AO_HAVE_FIELD_FLAGS_HI = 1<<10, AO_HAVE_METHOD_FLAGS_HI = 1<<11, AO_HAVE_CODE_FLAGS_HI = 1<<12, - AO_UNUSED_MBZ = (-1)<<13, // options bits reserved for future use. + AO_UNUSED_MBZ = (int)((unsigned)(-1)<<13), // options bits reserved for future use. #define ARCHIVE_BIT_DO(F) \ F(AO_HAVE_SPECIAL_FORMATS) \
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
