1.1 --- a/src/share/vm/memory/cardTableModRefBS.cpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/share/vm/memory/cardTableModRefBS.cpp Thu May 22 15:52:41 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2000, 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 @@ -138,11 +138,11 @@
1.11 gclog_or_tty->print_cr(" "
1.12 " &_byte_map[0]: " INTPTR_FORMAT
1.13 " &_byte_map[_last_valid_index]: " INTPTR_FORMAT,
1.14 - &_byte_map[0],
1.15 - &_byte_map[_last_valid_index]);
1.16 + p2i(&_byte_map[0]),
1.17 + p2i(&_byte_map[_last_valid_index]));
1.18 gclog_or_tty->print_cr(" "
1.19 " byte_map_base: " INTPTR_FORMAT,
1.20 - byte_map_base);
1.21 + p2i(byte_map_base));
1.22 }
1.23 }
1.24
1.25 @@ -392,23 +392,23 @@
1.26 gclog_or_tty->print_cr(" "
1.27 " _covered[%d].start(): " INTPTR_FORMAT
1.28 " _covered[%d].last(): " INTPTR_FORMAT,
1.29 - ind, _covered[ind].start(),
1.30 - ind, _covered[ind].last());
1.31 + ind, p2i(_covered[ind].start()),
1.32 + ind, p2i(_covered[ind].last()));
1.33 gclog_or_tty->print_cr(" "
1.34 " _committed[%d].start(): " INTPTR_FORMAT
1.35 " _committed[%d].last(): " INTPTR_FORMAT,
1.36 - ind, _committed[ind].start(),
1.37 - ind, _committed[ind].last());
1.38 + ind, p2i(_committed[ind].start()),
1.39 + ind, p2i(_committed[ind].last()));
1.40 gclog_or_tty->print_cr(" "
1.41 " byte_for(start): " INTPTR_FORMAT
1.42 " byte_for(last): " INTPTR_FORMAT,
1.43 - byte_for(_covered[ind].start()),
1.44 - byte_for(_covered[ind].last()));
1.45 + p2i(byte_for(_covered[ind].start())),
1.46 + p2i(byte_for(_covered[ind].last())));
1.47 gclog_or_tty->print_cr(" "
1.48 " addr_for(start): " INTPTR_FORMAT
1.49 " addr_for(last): " INTPTR_FORMAT,
1.50 - addr_for((jbyte*) _committed[ind].start()),
1.51 - addr_for((jbyte*) _committed[ind].last()));
1.52 + p2i(addr_for((jbyte*) _committed[ind].start())),
1.53 + p2i(addr_for((jbyte*) _committed[ind].last())));
1.54 }
1.55 // Touch the last card of the covered region to show that it
1.56 // is committed (or SEGV).
1.57 @@ -657,14 +657,14 @@
1.58 if (failed) {
1.59 if (!failures) {
1.60 tty->cr();
1.61 - tty->print_cr("== CT verification failed: ["PTR_FORMAT","PTR_FORMAT"]", start, end);
1.62 + tty->print_cr("== CT verification failed: [" INTPTR_FORMAT "," INTPTR_FORMAT "]", p2i(start), p2i(end));
1.63 tty->print_cr("== %sexpecting value: %d",
1.64 (val_equals) ? "" : "not ", val);
1.65 failures = true;
1.66 }
1.67 tty->print_cr("== card "PTR_FORMAT" ["PTR_FORMAT","PTR_FORMAT"], "
1.68 - "val: %d", curr, addr_for(curr),
1.69 - (HeapWord*) (((size_t) addr_for(curr)) + card_size),
1.70 + "val: %d", p2i(curr), p2i(addr_for(curr)),
1.71 + p2i((HeapWord*) (((size_t) addr_for(curr)) + card_size)),
1.72 (int) curr_val);
1.73 }
1.74 }
1.75 @@ -682,7 +682,7 @@
1.76
1.77 void CardTableModRefBS::print_on(outputStream* st) const {
1.78 st->print_cr("Card table byte_map: [" INTPTR_FORMAT "," INTPTR_FORMAT "] byte_map_base: " INTPTR_FORMAT,
1.79 - _byte_map, _byte_map + _byte_map_size, byte_map_base);
1.80 + p2i(_byte_map), p2i(_byte_map + _byte_map_size), p2i(byte_map_base));
1.81 }
1.82
1.83 bool CardTableModRefBSForCTRS::card_will_be_scanned(jbyte cv) {
