Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP1:Update
java-1_7_0-openjdk.2990
java-1_7_0-openjdk-gcc6.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File java-1_7_0-openjdk-gcc6.patch of Package java-1_7_0-openjdk.2990
--- openjdk/hotspot/src/os/posix/vm/os_posix.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/os/posix/vm/os_posix.cpp 2016-05-30 12:15:55.139839654 +0200 @@ -459,7 +459,7 @@ strncpy(buffer, "none", size); const struct { - int i; + unsigned i; const char* s; } flaginfo [] = { { SA_NOCLDSTOP, "SA_NOCLDSTOP" }, --- openjdk/hotspot/src/share/vm/classfile/dictionary.hpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/classfile/dictionary.hpp 2016-05-30 11:51:19.728269861 +0200 @@ -259,7 +259,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 (property_oop() != NULL) { --- openjdk/hotspot/src/share/vm/code/dependencies.hpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/code/dependencies.hpp 2016-05-27 11:55:49.301400871 +0200 @@ -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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/code/exceptionHandlerTable.cpp 2016-05-30 11:52:40.274514225 +0200 @@ -184,7 +184,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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/code/nmethod.cpp 2016-05-30 12:53:57.461520054 +0200 @@ -2256,7 +2256,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)", (intptr_t)(*p), (intptr_t)p, (int)((intptr_t)p - (intptr_t)_nm)); } virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); } @@ -2418,7 +2418,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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp 2016-05-30 11:39:05.016282402 +0200 @@ -207,7 +207,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() ? "%" : "", nm, nm->code_begin(), nm->code_end()); } --- openjdk/hotspot/src/share/vm/compiler/disassembler.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/compiler/disassembler.cpp 2016-05-30 11:51:56.175475439 +0200 @@ -60,7 +60,7 @@ // This routine is in the shared library: 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_name[] = "decode_instructions"; #define COMMENT_COLUMN 40 LP64_ONLY(+8) /*could be an option*/ --- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2016-05-30 11:21:37.687103057 +0200 @@ -872,18 +872,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); } } @@ -913,8 +913,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); } @@ -981,8 +981,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(" Capacity " 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) { @@ -990,14 +990,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 @@ -1523,8 +1523,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()); @@ -2760,8 +2760,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; @@ -2847,8 +2847,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; @@ -2858,7 +2858,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()); } } @@ -2929,7 +2929,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; @@ -5021,7 +5021,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); } @@ -5155,8 +5155,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); } @@ -5169,7 +5169,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; @@ -5177,12 +5177,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()); } @@ -5880,7 +5880,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()); } } @@ -5895,7 +5895,7 @@ &markFromDirtyCardsClosure); verify_work_stacks_empty(); if (PrintCMSStatistics != 0) { - gclog_or_tty->print(" (re-scanned "SIZE_FORMAT" dirty cards in perm gen) ", + gclog_or_tty->print(" (re-scanned " SIZE_FORMAT " dirty cards in perm gen) ", markFromDirtyCardsClosure.num_dirty_cards()); } } @@ -6824,8 +6824,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); } } @@ -8302,8 +8302,8 @@ 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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp 2016-05-30 11:28:06.522629529 +0200 @@ -92,7 +92,7 @@ regions_at_put(_curr_index, NULL); assert(hr->reclaimable_bytes() <= _remaining_reclaimable_bytes, err_msg("remaining reclaimable bytes inconsistent " - "from region: "SIZE_FORMAT" remaining: "SIZE_FORMAT, + "from region: " SIZE_FORMAT " remaining: " SIZE_FORMAT, hr->reclaimable_bytes(), _remaining_reclaimable_bytes)); _remaining_reclaimable_bytes -= hr->reclaimable_bytes(); _curr_index += 1; --- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2016-05-30 11:49:03.319243049 +0200 @@ -465,8 +465,8 @@ _verbose_level = verbose_level; if (verbose_low()) { - gclog_or_tty->print_cr("[global] init, heap start = "PTR_FORMAT", " - "heap end = "PTR_FORMAT, _heap_start, _heap_end); + gclog_or_tty->print_cr("[global] init, heap start = " PTR_FORMAT ", " + "heap end = " PTR_FORMAT, _heap_start, _heap_end); } _markStack.allocate(MarkStackSize); @@ -696,7 +696,7 @@ // in a STW phase. assert(!concurrent_marking_in_progress(), "invariant"); assert(_finger == _heap_end, - 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, _finger, _heap_end)); update_g1_committed(true); } @@ -1297,7 +1297,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, start, ntams, hr->end())); // Find the first marked object at or after "start". @@ -1614,10 +1614,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 */); @@ -2113,7 +2113,7 @@ oop obj = oopDesc::load_decode_heap_oop(p); if (_cm->verbose_high()) { gclog_or_tty->print_cr("\t[%d] we're looking at location " - "*"PTR_FORMAT" = "PTR_FORMAT, + "*" PTR_FORMAT " = " PTR_FORMAT, _task->task_id(), p, (void*) obj); } @@ -2725,9 +2725,9 @@ HeapWord* limit = curr_region->next_top_at_mark_start(); if (verbose_low()) { - gclog_or_tty->print_cr("[%d] curr_region = "PTR_FORMAT" " - "["PTR_FORMAT", "PTR_FORMAT"), " - "limit = "PTR_FORMAT, + gclog_or_tty->print_cr("[%d] curr_region = " PTR_FORMAT " " + "[" PTR_FORMAT ", " PTR_FORMAT "), " + "limit = " PTR_FORMAT, task_num, curr_region, bottom, end, limit); } @@ -2747,7 +2747,7 @@ if (limit > bottom) { if (verbose_low()) { - gclog_or_tty->print_cr("[%d] region "PTR_FORMAT" is not empty, " + gclog_or_tty->print_cr("[%d] region " PTR_FORMAT " is not empty, " "returning it ", task_num, curr_region); } return curr_region; @@ -2755,7 +2755,7 @@ assert(limit == bottom, "the region limit should be at bottom"); if (verbose_low()) { - gclog_or_tty->print_cr("[%d] region "PTR_FORMAT" is empty, " + gclog_or_tty->print_cr("[%d] region " PTR_FORMAT " is empty, " "returning NULL", task_num, curr_region); } // we return NULL and the caller should try calling @@ -2766,8 +2766,8 @@ assert(_finger > finger, "the finger should have moved forward"); if (verbose_low()) { gclog_or_tty->print_cr("[%d] somebody else moved the finger, " - "global finger = "PTR_FORMAT", " - "our finger = "PTR_FORMAT, + "global finger = " PTR_FORMAT ", " + "our finger = " PTR_FORMAT, task_num, _finger, finger); } @@ -2942,8 +2942,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, start, limit, hr->top(), hr->end())); assert(hr->next_marked_bytes() == 0, "Precondition"); @@ -3209,10 +3209,10 @@ #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, _heap_start, _heap_end, _finger); for (int i = 0; i < (int) _max_task_num; ++i) { - gclog_or_tty->print(" %d: "PTR_FORMAT, i, _tasks[i]->finger()); + gclog_or_tty->print(" %d: " PTR_FORMAT, i, _tasks[i]->finger()); } gclog_or_tty->print_cr(""); } @@ -3222,7 +3222,7 @@ assert(_nextMarkBitMap->isMarked((HeapWord*) obj), "invariant"); if (_cm->verbose_high()) { - gclog_or_tty->print_cr("[%d] we're scanning object "PTR_FORMAT, + gclog_or_tty->print_cr("[%d] we're scanning object " PTR_FORMAT, _task_id, (void*) obj); } @@ -3302,7 +3302,7 @@ "claim_region() should have filtered out continues humongous regions"); if (_cm->verbose_low()) { - gclog_or_tty->print_cr("[%d] setting up for region "PTR_FORMAT, + gclog_or_tty->print_cr("[%d] setting up for region " PTR_FORMAT, _task_id, hr); } @@ -3319,7 +3319,7 @@ if (limit == bottom) { if (_cm->verbose_low()) { gclog_or_tty->print_cr("[%d] found an empty region " - "["PTR_FORMAT", "PTR_FORMAT")", + "[" PTR_FORMAT ", " PTR_FORMAT ")", _task_id, bottom, limit); } // The region was collected underneath our feet. @@ -3351,7 +3351,7 @@ void CMTask::giveup_current_region() { assert(_curr_region != NULL, "invariant"); if (_cm->verbose_low()) { - gclog_or_tty->print_cr("[%d] giving up region "PTR_FORMAT, + gclog_or_tty->print_cr("[%d] giving up region " PTR_FORMAT, _task_id, _curr_region); } clear_region_fields(); @@ -3642,7 +3642,7 @@ statsOnly( ++_local_pops ); if (_cm->verbose_high()) { - gclog_or_tty->print_cr("[%d] popped "PTR_FORMAT, _task_id, + gclog_or_tty->print_cr("[%d] popped " PTR_FORMAT, _task_id, (void*) obj); } @@ -4026,8 +4026,8 @@ if (_cm->verbose_low()) { gclog_or_tty->print_cr("[%d] we're scanning part " - "["PTR_FORMAT", "PTR_FORMAT") " - "of region "PTR_FORMAT, + "[" PTR_FORMAT ", " PTR_FORMAT ") " + "of region " PTR_FORMAT, _task_id, _finger, _region_limit, _curr_region); } @@ -4093,7 +4093,7 @@ if (_cm->verbose_low()) { gclog_or_tty->print_cr("[%d] we successfully claimed " - "region "PTR_FORMAT, + "region " PTR_FORMAT, _task_id, claimed_region); } @@ -4154,7 +4154,7 @@ if (_cm->try_stealing(_task_id, &_hash_seed, obj)) { if (_cm->verbose_medium()) { - gclog_or_tty->print_cr("[%d] stolen "PTR_FORMAT" successfully", + gclog_or_tty->print_cr("[%d] stolen " PTR_FORMAT " successfully", _task_id, (void*) obj); } @@ -4362,7 +4362,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 @@ -4372,15 +4372,15 @@ // 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_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:: --- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp 2016-05-30 11:41:43.620826045 +0200 @@ -279,7 +279,7 @@ assert(_nextMarkBitMap->isMarked(objAddr), "invariant"); if (_cm->verbose_high()) { - gclog_or_tty->print_cr("[%d] pushing "PTR_FORMAT, _task_id, (void*) obj); + gclog_or_tty->print_cr("[%d] pushing " PTR_FORMAT, _task_id, (void*) obj); } if (!_task_queue->push(obj)) { @@ -318,7 +318,7 @@ inline void CMTask::deal_with_reference(oop obj) { if (_cm->verbose_high()) { - gclog_or_tty->print_cr("[%d] we're dealing with reference = "PTR_FORMAT, + gclog_or_tty->print_cr("[%d] we're dealing with reference = " PTR_FORMAT, _task_id, (void*) obj); } @@ -335,7 +335,7 @@ HeapRegion* hr = _g1h->heap_region_containing_raw(obj); if (!hr->obj_allocated_since_next_marking(obj)) { if (_cm->verbose_high()) { - gclog_or_tty->print_cr("[%d] "PTR_FORMAT" is not considered marked", + gclog_or_tty->print_cr("[%d] " PTR_FORMAT " is not considered marked", _task_id, (void*) obj); } @@ -350,7 +350,7 @@ if (_finger != NULL && objAddr < _finger) { if (_cm->verbose_high()) { - gclog_or_tty->print_cr("[%d] below the local finger ("PTR_FORMAT"), " + gclog_or_tty->print_cr("[%d] below the local finger (" PTR_FORMAT "), " "pushing it", _task_id, _finger); } push(obj); @@ -368,7 +368,7 @@ if (_cm->verbose_high()) { gclog_or_tty->print_cr("[%d] below the global finger " - "("PTR_FORMAT"), pushing it", + "(" PTR_FORMAT "), pushing it", _task_id, global_finger); } push(obj); @@ -422,7 +422,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/g1AllocRegion.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp 2016-05-30 11:53:16.901715867 +0200 @@ -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), _alloc_region, _used_bytes_before); } --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp 2016-05-30 11:54:32.212074321 +0200 @@ -580,11 +580,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); @@ -599,11 +599,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/g1CardCounts.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp 2016-05-30 12:17:52.845246037 +0200 @@ -34,14 +34,14 @@ void G1CardCounts::clear_range(size_t from_card_num, size_t to_card_num) { if (has_count_table()) { check_card_num(from_card_num, - err_msg("from card num out of range: "SIZE_FORMAT, from_card_num)); + err_msg("from card num out of range: " SIZE_FORMAT, from_card_num)); 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)); assert(to_card_num <= _committed_max_card_num, err_msg("to card num out of range: " - "to: "SIZE_FORMAT ", " - "max: "SIZE_FORMAT, + "to: " SIZE_FORMAT ", " + "max: " SIZE_FORMAT, to_card_num, _committed_max_card_num)); to_card_num = MIN2(_committed_max_card_num, to_card_num); @@ -109,8 +109,8 @@ assert(prev_committed_card_num == _committed_max_card_num, err_msg("Card mismatch: " "prev: " SIZE_FORMAT ", " - "committed: "SIZE_FORMAT", " - "reserved: "SIZE_FORMAT, + "committed: " SIZE_FORMAT ", " + "reserved: " SIZE_FORMAT, prev_committed_card_num, _committed_max_card_num, _reserved_max_card_num)); size_t new_size = (heap_capacity >> CardTableModRefBS::card_shift) * sizeof(jbyte); --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.hpp 2016-05-30 11:39:48.519334393 +0200 @@ -90,7 +90,7 @@ jbyte* card_num_2_ptr(size_t card_num) { check_card_num(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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2016-05-30 12:29:23.590064358 +0200 @@ -242,7 +242,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()); @@ -371,7 +371,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(), @@ -543,7 +543,7 @@ HeapRegion* res = _free_list.remove_head(); 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; @@ -1589,8 +1589,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 @@ -3160,10 +3160,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; @@ -3211,9 +3211,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; } @@ -3316,7 +3316,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), @@ -3327,7 +3327,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); } } } @@ -3362,9 +3362,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()); @@ -4460,7 +4460,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); @@ -4494,7 +4494,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; @@ -5224,10 +5224,10 @@ ~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)); } @@ -5279,8 +5279,8 @@ } 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", g1_unlink_task.strings_processed(), g1_unlink_task.strings_removed(), g1_unlink_task.symbols_processed(), g1_unlink_task.symbols_removed()); } @@ -6021,7 +6021,7 @@ i += 1; } assert(hr_pre_used == hr_used, - err_msg("hr_pre_used: "SIZE_FORMAT" and hr_used: "SIZE_FORMAT" " + err_msg("hr_pre_used: " SIZE_FORMAT " and hr_used: " SIZE_FORMAT " " "should be the same", hr_pre_used, hr_used)); *pre_used += hr_pre_used; } @@ -6035,8 +6035,8 @@ Mutex* lock = (par) ? ParGCRareEvent_lock : NULL; MutexLockerEx x(lock, Mutex::_no_safepoint_check_flag); assert(_summary_bytes_used >= pre_used, - err_msg("invariant: _summary_bytes_used: "SIZE_FORMAT" " - "should be >= pre_used: "SIZE_FORMAT, + err_msg("invariant: _summary_bytes_used: " SIZE_FORMAT " " + "should be >= pre_used: " SIZE_FORMAT, _summary_bytes_used, pre_used)); _summary_bytes_used -= pre_used; } @@ -6364,7 +6364,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; } @@ -6483,7 +6483,7 @@ } assert(_summary_bytes_used == recalculate_used(), err_msg("inconsistent _summary_bytes_used, " - "value: "SIZE_FORMAT" recalculated: "SIZE_FORMAT, + "value: " SIZE_FORMAT " recalculated: " SIZE_FORMAT, _summary_bytes_used, recalculate_used())); } @@ -6769,8 +6769,8 @@ return; } 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() avoids adding duplicate @@ -6778,7 +6778,7 @@ // as visited when we scan the strong code root lists during the GC. hr->add_strong_code_root(_nm); assert(hr->rem_set()->strong_code_roots_list_contains(_nm), - err_msg("failed to add code root "PTR_FORMAT" to remembered set of region "HR_FORMAT, + err_msg("failed to add code root " PTR_FORMAT " to remembered set of region " HR_FORMAT, _nm, HR_FORMAT_PARAMS(hr))); } } @@ -6806,13 +6806,13 @@ return; } 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); assert(!hr->rem_set()->strong_code_roots_list_contains(_nm), - err_msg("failed to remove code root "PTR_FORMAT" of region "HR_FORMAT, + err_msg("failed to remove code root " PTR_FORMAT " of region " HR_FORMAT, _nm, HR_FORMAT_PARAMS(hr))); } } @@ -6844,7 +6844,7 @@ public: bool doHeapRegion(HeapRegion *hr) { assert(!hr->isHumongous(), - err_msg("humongous region "HR_FORMAT" should not have been added to collection set", + err_msg("humongous region " HR_FORMAT " should not have been added to collection set", HR_FORMAT_PARAMS(hr))); hr->migrate_strong_code_roots(); return false; @@ -6928,8 +6928,8 @@ if (hr->continuesHumongous()) { // Code roots should never be attached to a continuation of a humongous region assert(hrrs->strong_code_roots_list_length() == 0, - err_msg("code roots should never be attached to continuations of humongous region "HR_FORMAT - " starting at "HR_FORMAT", but has "INT32_FORMAT, + err_msg("code roots should never be attached to continuations of humongous region " HR_FORMAT + " starting at " HR_FORMAT ", but has " INT32_FORMAT, HR_FORMAT_PARAMS(hr), HR_FORMAT_PARAMS(hr->humongous_start_region()), hrrs->strong_code_roots_list_length())); return false; --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 2016-05-30 12:31:01.055926154 +0200 @@ -187,7 +187,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); } @@ -800,7 +800,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; @@ -1190,10 +1190,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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp 2016-05-30 11:38:30.673030791 +0200 @@ -121,15 +121,15 @@ // Single parameter format strings #define ergo_format_str(_name_) ", " _name_ ": %s" #define ergo_format_region(_name_) ", " _name_ ": %u regions" -#define ergo_format_byte(_name_) ", " _name_ ": "SIZE_FORMAT" bytes" +#define ergo_format_byte(_name_) ", " _name_ ": " SIZE_FORMAT " bytes" #define ergo_format_double(_name_) ", " _name_ ": %1.2f" #define ergo_format_perc(_name_) ", " _name_ ": %1.2f %%" #define ergo_format_ms(_name_) ", " _name_ ": %1.2f ms" -#define ergo_format_size(_name_) ", " _name_ ": "SIZE_FORMAT +#define ergo_format_size(_name_) ", " _name_ ": " SIZE_FORMAT // Double parameter format strings #define ergo_format_byte_perc(_name_) \ - ", " _name_ ": "SIZE_FORMAT" bytes (%1.2f %%)" + ", " _name_ ": " SIZE_FORMAT " bytes (%1.2f %%)" // Generates the format string #define ergo_format(_extra_format_) \ --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1HotCardCache.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1HotCardCache.cpp 2016-05-30 12:33:25.256763992 +0200 @@ -123,7 +123,7 @@ // In this case worker_i should be the id of a GC worker thread assert(SafepointSynchronize::is_at_safepoint(), "Should be at a safepoint"); assert(worker_i < (int) (ParallelGCThreads == 0 ? 1 : ParallelGCThreads), - err_msg("incorrect worker id: "INT32_FORMAT, worker_i)); + err_msg("incorrect worker id: " INT32_FORMAT, worker_i)); into_cset_dcq->enqueue(card_ptr); } --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp 2016-05-30 12:32:05.334516414 +0200 @@ -82,18 +82,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); } } @@ -102,11 +102,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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp 2016-05-30 11:43:04.579061700 +0200 @@ -113,7 +113,7 @@ oop obj = oopDesc::load_decode_heap_oop(p); if (_cm->verbose_high()) { gclog_or_tty->print_cr("[%d] we're looking at location " - "*"PTR_FORMAT" = "PTR_FORMAT, + "*" PTR_FORMAT " = " PTR_FORMAT, _task->task_id(), p, (void*) obj); } _task->deal_with_reference(obj); --- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 2016-05-30 12:36:51.104252334 +0200 @@ -187,22 +187,22 @@ 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)"K (%5.1f%%) by "SIZE_FORMAT" %s regions", + out->print_cr(" " SIZE_FORMAT_W(8) "K (%5.1f%%) by " SIZE_FORMAT " %s regions", round_to_K(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)"K (%5.1f%%) by "SIZE_FORMAT" %s regions", + out->print_cr(" " SIZE_FORMAT_W(8) "K (%5.1f%%) by " SIZE_FORMAT " %s regions", round_to_K(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); } }; @@ -277,19 +277,19 @@ RegionTypeCounter* counters[] = { &_young, &_humonguous, &_free, &_old, NULL }; out->print_cr("\n Current rem set statistics"); - out->print_cr(" Total per region rem sets sizes = "SIZE_FORMAT"K." - " Max = "SIZE_FORMAT"K.", + out->print_cr(" Total per region rem sets sizes = " SIZE_FORMAT "K." + " Max = " SIZE_FORMAT "K.", round_to_K(total_rs_mem_sz()), round_to_K(max_rs_mem_sz())); for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) { (*current)->print_rs_mem_info_on(out, total_rs_mem_sz()); } - out->print_cr(" Static structures = "SIZE_FORMAT"K," - " free_lists = "SIZE_FORMAT"K.", + out->print_cr(" Static structures = " SIZE_FORMAT "K," + " free_lists = " SIZE_FORMAT "K.", round_to_K(HeapRegionRemSet::static_mem_size()), round_to_K(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()); @@ -297,30 +297,30 @@ // 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 "K, occupied = "SIZE_FORMAT"K.", + out->print_cr(" Region with largest rem set = " HR_FORMAT ", " + "size = " SIZE_FORMAT "K, occupied = " SIZE_FORMAT "K.", HR_FORMAT_PARAMS(max_rs_mem_sz_region()), round_to_K(rem_set->mem_size()), round_to_K(rem_set->occupied())); // Strong code root statistics HeapRegionRemSet* max_code_root_rem_set = max_code_root_mem_sz_region()->rem_set(); - out->print_cr(" Total heap region code root sets sizes = "SIZE_FORMAT"K." - " Max = "SIZE_FORMAT"K.", + out->print_cr(" Total heap region code root sets sizes = " SIZE_FORMAT "K." + " Max = " SIZE_FORMAT "K.", round_to_K(total_code_root_mem_sz()), round_to_K(max_code_root_rem_set->strong_code_roots_mem_size())); for (RegionTypeCounter** current = &counters[0]; *current != NULL; current++) { (*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 "K, num_elems = "SIZE_FORMAT".", + out->print_cr(" Region with largest amount of code roots = " HR_FORMAT ", " + "size = " SIZE_FORMAT "K, num_elems = " SIZE_FORMAT ".", HR_FORMAT_PARAMS(max_code_root_mem_sz_region()), round_to_K(max_code_root_rem_set->strong_code_roots_mem_size()), round_to_K(max_code_root_rem_set->strong_code_roots_list_length())); @@ -329,16 +329,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/heapRegion.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2016-05-30 12:42:25.244933530 +0200 @@ -451,7 +451,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_marked_bytes = marked_bytes; } @@ -614,7 +614,7 @@ void HeapRegion::migrate_strong_code_roots() { assert(in_collection_set(), "only collection set regions"); assert(!isHumongous(), - err_msg("humongous region "HR_FORMAT" should not have been added to collection set", + err_msg("humongous region " HR_FORMAT " should not have been added to collection set", HR_FORMAT_PARAMS(this))); HeapRegionRemSet* hrrs = rem_set(); @@ -643,9 +643,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, obj, _hr->bottom(), _hr->end(), _hr->top()); _failures = true; return; @@ -679,22 +679,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; } @@ -728,8 +728,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 "INT32_FORMAT" code root entries", + gclog_or_tty->print_cr("region [" PTR_FORMAT "," PTR_FORMAT "] is empty " + "but has " INT32_FORMAT " code root entries", bottom(), end(), strong_code_roots_length); *failures = true; } @@ -738,8 +738,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 "INT32_FORMAT" code root entries", + gclog_or_tty->print_cr("region " HR_FORMAT " is a continuation of a humongous " + "region but has " INT32_FORMAT " code root entries", HR_FORMAT_PARAMS(this), strong_code_roots_length); *failures = true; } @@ -777,7 +777,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); } @@ -842,25 +842,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); } @@ -896,14 +896,14 @@ gclog_or_tty->print_cr("----------"); } gclog_or_tty->print_cr("Missing rem set entry:"); - gclog_or_tty->print_cr("Field "PTR_FORMAT" " - "of obj "PTR_FORMAT", " - "in region "HR_FORMAT, + gclog_or_tty->print_cr("Field " PTR_FORMAT " " + "of obj " PTR_FORMAT ", " + "in region " HR_FORMAT, p, (void*) _containing_obj, HR_FORMAT_PARAMS(from)); _containing_obj->print_on(gclog_or_tty); - gclog_or_tty->print_cr("points to obj "PTR_FORMAT" " - "in region "HR_FORMAT, + gclog_or_tty->print_cr("points to obj " PTR_FORMAT " " + "in region " HR_FORMAT, (void*) obj, HR_FORMAT_PARAMS(to)); obj->print_on(gclog_or_tty); @@ -939,8 +939,8 @@ object_num += 1; if (is_humongous != g1->isHumongous(obj_size)) { - 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; @@ -958,12 +958,12 @@ if (obj->is_oop()) { klassOop klass = obj->klass(); if (!klass->is_perm()) { - 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 in perm", klass, 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, obj); *failures = true; return; @@ -979,7 +979,7 @@ } } } else { - gclog_or_tty->print_cr(PTR_FORMAT" no an oop", obj); + gclog_or_tty->print_cr(PTR_FORMAT " no an oop", obj); *failures = true; return; } @@ -989,8 +989,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; } @@ -1005,8 +1005,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; @@ -1017,8 +1017,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; @@ -1031,8 +1031,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; @@ -1043,8 +1043,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; @@ -1052,8 +1052,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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp 2016-05-30 11:26:48.104337666 +0200 @@ -53,7 +53,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_)->hrs_index(), \ (_hr_)->is_survivor() ? "S" : (_hr_)->is_young() ? "E" : \ --- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2016-05-30 12:44:11.038617277 +0200 @@ -614,13 +614,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. @@ -977,12 +977,12 @@ // we must have self forwarded the object assert(obj->is_forwarded(), err_msg("code roots should be immediately evacuated. " - "Ref: "PTR_FORMAT", " - "Obj: "PTR_FORMAT", " - "Region: "HR_FORMAT, + "Ref: " PTR_FORMAT ", " + "Obj: " PTR_FORMAT ", " + "Region: " HR_FORMAT, p, (void*) obj, HR_FORMAT_PARAMS(_from))); assert(obj->forwardee() == obj, - err_msg("not self forwarded? obj = "PTR_FORMAT, (void*)obj)); + err_msg("not self forwarded? obj = " PTR_FORMAT, (void*)obj)); // The object has been self forwarded. // Note, if we're during an initial mark pause, there is @@ -1010,7 +1010,7 @@ void HeapRegionRemSet::migrate_strong_code_roots() { assert(hr()->in_collection_set(), "only collection set regions"); assert(!hr()->isHumongous(), - err_msg("humongous region "HR_FORMAT" should not have been added to the collection set", + err_msg("humongous region " HR_FORMAT " should not have been added to the collection set", HR_FORMAT_PARAMS(hr()))); ResourceMark rm; --- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp 2016-05-30 11:28:52.649624722 +0200 @@ -30,7 +30,7 @@ inline uintx HeapRegionSeq::addr_to_index_biased(HeapWord* addr) const { assert(_heap_bottom <= addr && addr < _heap_end, - err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT" end: "PTR_FORMAT, + err_msg("addr: " PTR_FORMAT " bottom: " PTR_FORMAT " end: " PTR_FORMAT, addr, _heap_bottom, _heap_end)); uintx index = (uintx) addr >> _region_shift; return index; @@ -38,7 +38,7 @@ inline HeapRegion* HeapRegionSeq::addr_to_region_unsafe(HeapWord* addr) const { assert(_heap_bottom <= addr && addr < _heap_end, - err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT" end: "PTR_FORMAT, + err_msg("addr: " PTR_FORMAT " bottom: " PTR_FORMAT " end: " PTR_FORMAT, addr, _heap_bottom, _heap_end)); uintx index_biased = addr_to_index_biased(addr); HeapRegion* hr = _regions_biased[index_biased]; @@ -49,7 +49,7 @@ inline HeapRegion* HeapRegionSeq::addr_to_region(HeapWord* addr) const { if (addr != NULL && addr < _heap_end) { assert(addr >= _heap_bottom, - err_msg("addr: "PTR_FORMAT" bottom: "PTR_FORMAT, addr, _heap_bottom)); + err_msg("addr: " PTR_FORMAT " bottom: " PTR_FORMAT, addr, _heap_bottom)); return addr_to_region_unsafe(addr); } return NULL; --- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.cpp 2016-05-30 12:47:14.914546061 +0200 @@ -36,7 +36,7 @@ } void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) { - msg->append("[%s] %s ln: %u rn: %u cy: "SIZE_FORMAT" ud: "SIZE_FORMAT, + msg->append("[%s] %s ln: %u rn: %u cy: " SIZE_FORMAT " ud: " SIZE_FORMAT, name(), message, length(), region_num(), total_capacity_bytes(), total_used_bytes()); fill_in_ext_msg_extra(msg); @@ -82,12 +82,12 @@ outputStream* out = tty; out->cr(); out->print_cr("## [%s] %s", name(), error_message); - out->print_cr("## Offending Region: "PTR_FORMAT, hr); - out->print_cr(" "HR_FORMAT, HR_FORMAT_PARAMS(hr)); + out->print_cr("## Offending Region: " PTR_FORMAT, hr); + out->print_cr(" " HR_FORMAT, HR_FORMAT_PARAMS(hr)); #ifdef ASSERT - out->print_cr(" containing set: "PTR_FORMAT, hr->containing_set()); + out->print_cr(" containing set: " PTR_FORMAT, hr->containing_set()); #endif // ASSERT - out->print_cr("## Offending Region Set: "PTR_FORMAT, this); + out->print_cr("## Offending Region Set: " PTR_FORMAT, this); print_on(out); return false; } else { @@ -164,14 +164,14 @@ name(), region_num(), _calc_region_num)); guarantee(total_capacity_bytes() == _calc_total_capacity_bytes, - hrs_err_msg("[%s] capacity bytes: "SIZE_FORMAT" should be == " - "calc capacity bytes: "SIZE_FORMAT, + hrs_err_msg("[%s] capacity bytes: " SIZE_FORMAT " should be == " + "calc capacity bytes: " SIZE_FORMAT, name(), total_capacity_bytes(), _calc_total_capacity_bytes)); guarantee(total_used_bytes() == _calc_total_used_bytes, - hrs_err_msg("[%s] used bytes: "SIZE_FORMAT" should be == " - "calc used bytes: "SIZE_FORMAT, + hrs_err_msg("[%s] used bytes: " SIZE_FORMAT " should be == " + "calc used bytes: " SIZE_FORMAT, name(), total_used_bytes(), _calc_total_used_bytes)); _verify_in_progress = false; @@ -190,16 +190,16 @@ 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(" empty : %s", BOOL_TO_STR(regions_empty())); out->print_cr(" Attributes"); out->print_cr(" length : %14u", length()); out->print_cr(" region num : %14u", region_num()); - out->print_cr(" total capacity : "SIZE_FORMAT_W(14)" bytes", + out->print_cr(" total capacity : " SIZE_FORMAT_W(14) " bytes", total_capacity_bytes()); - out->print_cr(" total used : "SIZE_FORMAT_W(14)" bytes", + out->print_cr(" total used : " SIZE_FORMAT_W(14) " bytes", total_used_bytes()); } @@ -237,8 +237,8 @@ _region_num -= proxy_set->region_num(); assert(proxy_set->total_used_bytes() <= _total_used_bytes, - hrs_err_msg("[%s] proxy set used bytes: "SIZE_FORMAT" " - "should be <= used bytes: "SIZE_FORMAT, + hrs_err_msg("[%s] proxy set used bytes: " SIZE_FORMAT " " + "should be <= used bytes: " SIZE_FORMAT, name(), proxy_set->total_used_bytes(), _total_used_bytes)); _total_used_bytes -= proxy_set->total_used_bytes(); @@ -252,7 +252,7 @@ //////////////////// HeapRegionLinkedList //////////////////// void HeapRegionLinkedList::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 HeapRegionLinkedList::add_as_head(HeapRegionLinkedList* from_list) { @@ -433,8 +433,8 @@ 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", + "curr: " PTR_FORMAT " prev0: " PTR_FORMAT " " + "prev1: " PTR_FORMAT " length: %u", name(), count, curr, prev0, prev1, length())); prev1 = prev0; @@ -456,8 +456,8 @@ void HeapRegionLinkedList::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"); --- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp 2016-05-30 11:27:27.791473199 +0200 @@ -59,8 +59,8 @@ size_t used_bytes = hr->used(); assert(used_bytes <= _total_used_bytes, - hrs_err_msg("[%s] region's used bytes: "SIZE_FORMAT" " - "should be <= used bytes: "SIZE_FORMAT, + hrs_err_msg("[%s] region's used bytes: " SIZE_FORMAT " " + "should be <= used bytes: " SIZE_FORMAT, name(), used_bytes, _total_used_bytes)); _total_used_bytes -= used_bytes; } --- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2016-05-30 13:08:35.997830916 +0200 @@ -681,7 +681,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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2016-05-30 13:09:07.801120695 +0200 @@ -3547,7 +3547,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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2016-05-30 12:53:03.910718890 +0200 @@ -99,7 +99,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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp 2016-05-30 12:55:34.587339119 +0200 @@ -92,10 +92,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/interpreter/linkResolver.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/interpreter/linkResolver.cpp 2016-05-30 12:47:52.141709894 +0200 @@ -1295,7 +1295,7 @@ THREAD); if (HAS_PENDING_EXCEPTION) { if (TraceMethodHandles) { - tty->print_cr("invokedynamic throws BSME for "INTPTR_FORMAT, PENDING_EXCEPTION); + tty->print_cr("invokedynamic throws BSME for " INTPTR_FORMAT, PENDING_EXCEPTION); PENDING_EXCEPTION->print(); } if (PENDING_EXCEPTION->is_a(SystemDictionary::BootstrapMethodError_klass())) { --- openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2016-05-30 11:25:06.422552362 +0200 @@ -153,8 +153,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 ")", p, _whole_heap.start(), _whole_heap.end())); jbyte* result = &byte_map_base[uintptr_t(p) >> card_shift]; assert(result >= _byte_map && result < _byte_map + _byte_map_size, @@ -434,8 +434,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 ")", result, _whole_heap.start(), _whole_heap.end())); return result; } @@ -443,8 +443,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 ")", p, _whole_heap.start(), _whole_heap.end())); return byte_for(p) - _byte_map; } --- openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/memory/genCollectedHeap.cpp 2016-05-30 13:05:22.698151217 +0200 @@ -1452,7 +1452,7 @@ // back a time later than 'now'. jlong retVal = now - tolgc_cl.time(); if (retVal < 0) { - NOT_PRODUCT(warning("time warp: "INT64_FORMAT, retVal);) + NOT_PRODUCT(warning("time warp: " INT64_FORMAT, retVal);) return 0; } return retVal; --- openjdk/hotspot/src/share/vm/memory/generation.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/memory/generation.cpp 2016-05-30 12:37:45.715055810 +0200 @@ -191,7 +191,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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/memory/generation.hpp 2016-05-30 11:22:35.981830274 +0200 @@ -419,7 +419,7 @@ // have to guard against non-monotonicity. NOT_PRODUCT( if (now < _time_of_last_gc) { - warning("time warp: "INT64_FORMAT" to "INT64_FORMAT, _time_of_last_gc, now); + warning("time warp: " INT64_FORMAT " to " INT64_FORMAT, _time_of_last_gc, now); } ) return _time_of_last_gc; --- openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/memory/referenceProcessor.cpp 2016-05-30 13:09:39.040423225 +0200 @@ -166,7 +166,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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/memory/tenuredGeneration.cpp 2016-05-30 13:11:12.114346088 +0200 @@ -446,8 +446,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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp 2016-05-30 11:23:13.265016753 +0200 @@ -94,10 +94,10 @@ if (PrintTLAB && Verbose) { Thread* thrd = myThread(); - gclog_or_tty->print("TLAB: %s thread: "INTPTR_FORMAT" [id: %2d]" - " obj: "SIZE_FORMAT - " free: "SIZE_FORMAT - " waste: "SIZE_FORMAT"\n", + gclog_or_tty->print("TLAB: %s thread: " INTPTR_FORMAT " [id: %2d]" + " obj: " SIZE_FORMAT + " free: " SIZE_FORMAT + " waste: " SIZE_FORMAT "\n", "slow", thrd, thrd->osthread()->thread_id(), obj_size, free(), refill_waste_limit()); } --- openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/oops/constantPoolOop.cpp 2016-05-30 11:49:43.894358677 +0200 @@ -1513,7 +1513,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/cpCacheOop.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/oops/cpCacheOop.cpp 2016-05-30 11:50:47.880964016 +0200 @@ -316,7 +316,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, (intptr_t)appendix(), (has_appendix ? "" : " (unused)"), (intptr_t)method_type(), (has_method_type ? "" : " (unused)"), @@ -634,14 +634,14 @@ // 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); if (is_secondary_entry()) st->print_cr("[%5d|secondary]", main_entry_index()); else st->print_cr("[%02x|%02x|%5d]", bytecode_2(), bytecode_1(), constant_pool_index()); - st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)(oop)_f1); - st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f2); - st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_flags); + st->print_cr(" [ " PTR_FORMAT "]", (intptr_t)(oop)_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/cpCacheOop.hpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/oops/cpCacheOop.hpp 2016-05-27 11:55:03.622440398 +0200 @@ -187,7 +187,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/objArrayKlass.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.cpp 2016-05-30 12:54:31.704753649 +0200 @@ -534,7 +534,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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/oops/oop.cpp 2016-05-30 12:55:02.756055038 +0200 @@ -57,7 +57,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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/prims/methodHandles.cpp 2016-05-30 13:06:02.725256077 +0200 @@ -1338,40 +1338,40 @@ #define LANG "Ljava/lang/" #define JLINV "Ljava/lang/invoke/" -#define OBJ LANG"Object;" -#define CLS LANG"Class;" -#define STRG LANG"String;" -#define CS JLINV"CallSite;" -#define MT JLINV"MethodType;" -#define MH JLINV"MethodHandle;" -#define MEM JLINV"MemberName;" +#define OBJ LANG "Object;" +#define CLS LANG "Class;" +#define STRG LANG "String;" +#define CS JLINV "CallSite;" +#define MT JLINV "MethodType;" +#define MH JLINV "MethodHandle;" +#define MEM JLINV "MemberName;" #define CC (char*) /*cast a literal from (const char*)*/ #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f) // 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"getConstant", CC"(I)I", FN_PTR(MHN_getConstant)}, + {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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/prims/perf.cpp 2016-05-30 13:07:46.694932255 +0200 @@ -290,17 +290,17 @@ #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"createLong", CL_ARGS, FN_PTR(Perf_CreateLong)}, - {CC"createByteArray", CBA_ARGS, FN_PTR(Perf_CreateByteArray)}, - {CC"highResCounter", CC"()J", FN_PTR(Perf_HighResCounter)}, - {CC"highResFrequency", CC"()J", FN_PTR(Perf_HighResFrequency)} + {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)}, + {CC "highResFrequency", CC "()J", FN_PTR(Perf_HighResFrequency)} }; #undef CBA_ARGS --- openjdk/hotspot/src/share/vm/prims/unsafe.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/prims/unsafe.cpp 2016-05-30 13:32:01.422530985 +0200 @@ -959,7 +959,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) @@ -1317,40 +1317,40 @@ #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 DC1_Args DC0_Args LANG"ClassLoader;" "Ljava/security/ProtectionDomain;" +#define DC0_Args LANG "String;[BII" +#define DC1_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)} @@ -1358,8 +1358,8 @@ // contain the necessarily updated Unsafe.java. 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), @@ -1378,36 +1378,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"setMemory", CC"("ADR"JB)V", FN_PTR(Unsafe_SetMemory)}, -// {CC"copyMemory", CC"("ADR ADR"J)V", FN_PTR(Unsafe_CopyMemory)}, - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)}, - - {CC"fieldOffset", CC"("FLD")I", FN_PTR(Unsafe_FieldOffset)}, //deprecated - {CC"staticFieldBase", CC"("CLS")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)}, //deprecated - {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"("DC1_Args")"CLS, FN_PTR(Unsafe_DefineClass1)}, - {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 "allocateMemory", CC "(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, + {CC "reallocateMemory", CC "(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, +// {CC "setMemory", CC "(" ADR "JB)V", FN_PTR(Unsafe_SetMemory)}, +// {CC "copyMemory", CC "(" ADR ADR "J)V", FN_PTR(Unsafe_CopyMemory)}, + {CC "freeMemory", CC "(" ADR ")V", FN_PTR(Unsafe_FreeMemory)}, + + {CC "fieldOffset", CC "(" FLD ")I", FN_PTR(Unsafe_FieldOffset)}, //deprecated + {CC "staticFieldBase", CC "(" CLS ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)}, //deprecated + {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 "(" DC1_Args ")" CLS, FN_PTR(Unsafe_DefineClass1)}, + {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 old 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), @@ -1426,40 +1426,40 @@ 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"setMemory", CC"("ADR"JB)V", FN_PTR(Unsafe_SetMemory)}, -// {CC"copyMemory", CC"("ADR ADR"J)V", FN_PTR(Unsafe_CopyMemory)}, - {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"("DC1_Args")"CLS, FN_PTR(Unsafe_DefineClass1)}, - {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 "allocateMemory", CC "(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, + {CC "reallocateMemory", CC "(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, +// {CC "setMemory", CC "(" ADR "JB)V", FN_PTR(Unsafe_SetMemory)}, +// {CC "copyMemory", CC "(" ADR ADR "J)V", FN_PTR(Unsafe_CopyMemory)}, + {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 "(" DC1_Args ")" CLS, FN_PTR(Unsafe_DefineClass1)}, + {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 old 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), @@ -1479,45 +1479,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"setMemory", CC"("ADR"JB)V", FN_PTR(Unsafe_SetMemory)}, -// {CC"copyMemory", CC"("ADR ADR"J)V", FN_PTR(Unsafe_CopyMemory)}, - {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"("DC1_Args")"CLS, FN_PTR(Unsafe_DefineClass1)}, - {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 "allocateMemory", CC "(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, + {CC "reallocateMemory", CC "(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, +// {CC "setMemory", CC "(" ADR "JB)V", FN_PTR(Unsafe_SetMemory)}, +// {CC "copyMemory", CC "(" ADR ADR "J)V", FN_PTR(Unsafe_CopyMemory)}, + {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 "(" DC1_Args ")" CLS, FN_PTR(Unsafe_DefineClass1)}, + {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)} }; // These are the correct methods, moving forward: static JNINativeMethod methods[] = { - {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), @@ -1537,76 +1537,76 @@ 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"setMemory", CC"("ADR"JB)V", FN_PTR(Unsafe_SetMemory)}, -// {CC"copyMemory", CC"("ADR ADR"J)V", FN_PTR(Unsafe_CopyMemory)}, - {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"("DC1_Args")"CLS, FN_PTR(Unsafe_DefineClass1)}, - {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"getLoadAverage", CC"([DI)I", FN_PTR(Unsafe_Loadavg)}, - -// {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 "allocateMemory", CC "(J)" ADR, FN_PTR(Unsafe_AllocateMemory)}, + {CC "reallocateMemory", CC "(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)}, +// {CC "setMemory", CC "(" ADR "JB)V", FN_PTR(Unsafe_SetMemory)}, +// {CC "copyMemory", CC "(" ADR ADR "J)V", FN_PTR(Unsafe_CopyMemory)}, + {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 "(" DC1_Args ")" CLS, FN_PTR(Unsafe_DefineClass1)}, + {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 "getLoadAverage", CC "([DI)I", FN_PTR(Unsafe_Loadavg)}, + +// {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 loadavg_method[] = { - {CC"getLoadAverage", CC"([DI)I", FN_PTR(Unsafe_Loadavg)} + {CC "getLoadAverage", CC "([DI)I", FN_PTR(Unsafe_Loadavg)} }; 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[] = { - {CC"copyMemory", CC"("OBJ"J"OBJ"JJ)V", FN_PTR(Unsafe_CopyMemory2)}, - {CC"setMemory", CC"("OBJ"JJB)V", FN_PTR(Unsafe_SetMemory2)} + {CC "copyMemory", CC "(" OBJ "J" OBJ "JJ)V", FN_PTR(Unsafe_CopyMemory2)}, + {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)}, }; #undef CC --- openjdk/hotspot/src/share/vm/runtime/safepoint.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/runtime/safepoint.cpp 2016-05-30 13:10:32.543229038 +0200 @@ -993,7 +993,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(); @@ -1350,14 +1350,14 @@ for (int index = 0; index < VM_Operation::VMOp_Terminating; index++) { if (_safepoint_reasons[index] != 0) { - tty->print_cr("%-26s"UINT64_FORMAT_W(10), VM_Operation::name(index), + tty->print_cr("%-26s" UINT64_FORMAT_W(10), VM_Operation::name(index), _safepoint_reasons[index]); } } tty->print_cr(UINT64_FORMAT_W(5)" VM operations coalesced during safepoint", _coalesced_vmop_count); - tty->print_cr("Maximum sync time "INT64_FORMAT_W(5)" ms", + tty->print_cr("Maximum sync time " INT64_FORMAT_W(5) " ms", _max_sync_time / MICROUNITS); tty->print_cr("Maximum vm operation time (except for Exit VM operation) " INT64_FORMAT_W(5)" ms", --- openjdk/hotspot/src/share/vm/services/threadService.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/services/threadService.cpp 2016-05-30 13:11:43.757640198 +0200 @@ -831,7 +831,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-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/trace/traceStream.hpp 2016-05-30 11:26:03.897300551 +0200 @@ -41,31 +41,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, val); + _st.print("%s = " INT64_FORMAT, label, val); } void print_val(const char* label, bool val) { --- openjdk/hotspot/src/share/vm/utilities/ostream.cpp 2016-04-19 22:44:54.000000000 +0200 +++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp 2016-05-30 12:56:08.446577852 +0200 @@ -844,7 +844,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(), time_ms); // Write VM version header immediately.
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
