1.1 --- a/src/share/vm/code/codeCache.cpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/share/vm/code/codeCache.cpp Thu May 22 15:52:41 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -81,10 +81,10 @@
1.11 bool is_empty() { return count == 0; }
1.12
1.13 void print(const char* title) {
1.14 - tty->print_cr(" #%d %s = %dK (hdr %d%%, loc %d%%, code %d%%, stub %d%%, [oops %d%%, data %d%%, pcs %d%%])",
1.15 + tty->print_cr(" #%d %s = %dK (hdr %d%%, loc %d%%, code %d%%, stub %d%%, [oops %d%%, metadata %d%%, data %d%%, pcs %d%%])",
1.16 count,
1.17 title,
1.18 - total() / K,
1.19 + (int)(total() / K),
1.20 header_size * 100 / total_size,
1.21 relocation_size * 100 / total_size,
1.22 code_size * 100 / total_size,
1.23 @@ -191,7 +191,7 @@
1.24 }
1.25 if (PrintCodeCacheExtension) {
1.26 ResourceMark rm;
1.27 - tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (%d bytes)",
1.28 + tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" SSIZE_FORMAT " bytes)",
1.29 (intptr_t)_heap->low_boundary(), (intptr_t)_heap->high(),
1.30 (address)_heap->high() - (address)_heap->low_boundary());
1.31 }
1.32 @@ -496,7 +496,7 @@
1.33 if (CompiledIC::is_icholder_call_site(iter.virtual_call_reloc())) {
1.34 CompiledIC *ic = CompiledIC_at(iter.reloc());
1.35 if (TraceCompiledIC) {
1.36 - tty->print("noticed icholder " INTPTR_FORMAT " ", ic->cached_icholder());
1.37 + tty->print("noticed icholder " INTPTR_FORMAT " ", p2i(ic->cached_icholder()));
1.38 ic->print();
1.39 }
1.40 assert(ic->cached_icholder() != NULL, "must be non-NULL");
1.41 @@ -775,7 +775,7 @@
1.42 if (PrintCodeCache2) { // Need to add a new flag
1.43 ResourceMark rm;
1.44 if (size == 0) size = cb->size();
1.45 - tty->print_cr("CodeCache %s: addr: " INTPTR_FORMAT ", size: 0x%x", event, cb, size);
1.46 + tty->print_cr("CodeCache %s: addr: " INTPTR_FORMAT ", size: 0x%x", event, p2i(cb), size);
1.47 }
1.48 }
1.49
1.50 @@ -900,7 +900,7 @@
1.51
1.52 tty->print_cr("CodeCache:");
1.53
1.54 - tty->print_cr("nmethod dependency checking time %f", dependentCheckTime.seconds(),
1.55 + tty->print_cr("nmethod dependency checking time %f, per dependent %f", dependentCheckTime.seconds(),
1.56 dependentCheckTime.seconds() / dependentCheckCount);
1.57
1.58 if (!live.is_empty()) {
1.59 @@ -947,9 +947,9 @@
1.60
1.61 if (detailed) {
1.62 st->print_cr(" bounds [" INTPTR_FORMAT ", " INTPTR_FORMAT ", " INTPTR_FORMAT "]",
1.63 - _heap->low_boundary(),
1.64 - _heap->high(),
1.65 - _heap->high_boundary());
1.66 + p2i(_heap->low_boundary()),
1.67 + p2i(_heap->high()),
1.68 + p2i(_heap->high_boundary()));
1.69 st->print_cr(" total_blobs=" UINT32_FORMAT " nmethods=" UINT32_FORMAT
1.70 " adapters=" UINT32_FORMAT,
1.71 nof_blobs(), nof_nmethods(), nof_adapters());
