1.1 --- a/src/share/vm/memory/blockOffsetTable.cpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/share/vm/memory/blockOffsetTable.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 @@ -59,12 +59,12 @@
1.11 " rs.base(): " INTPTR_FORMAT
1.12 " rs.size(): " INTPTR_FORMAT
1.13 " rs end(): " INTPTR_FORMAT,
1.14 - rs.base(), rs.size(), rs.base() + rs.size());
1.15 + p2i(rs.base()), rs.size(), p2i(rs.base() + rs.size()));
1.16 gclog_or_tty->print_cr(" "
1.17 " _vs.low_boundary(): " INTPTR_FORMAT
1.18 " _vs.high_boundary(): " INTPTR_FORMAT,
1.19 - _vs.low_boundary(),
1.20 - _vs.high_boundary());
1.21 + p2i(_vs.low_boundary()),
1.22 + p2i(_vs.high_boundary()));
1.23 }
1.24 }
1.25
1.26 @@ -537,10 +537,10 @@
1.27 q -= (N_words * n_cards_back);
1.28 assert(q >= _sp->bottom(),
1.29 err_msg("q = " PTR_FORMAT " crossed below bottom = " PTR_FORMAT,
1.30 - q, _sp->bottom()));
1.31 + p2i(q), p2i(_sp->bottom())));
1.32 assert(q < _sp->end(),
1.33 err_msg("q = " PTR_FORMAT " crossed above end = " PTR_FORMAT,
1.34 - q, _sp->end()));
1.35 + p2i(q), p2i(_sp->end())));
1.36 index -= n_cards_back;
1.37 offset = _array->offset_array(index);
1.38 }
1.39 @@ -549,10 +549,10 @@
1.40 q -= offset;
1.41 assert(q >= _sp->bottom(),
1.42 err_msg("q = " PTR_FORMAT " crossed below bottom = " PTR_FORMAT,
1.43 - q, _sp->bottom()));
1.44 + p2i(q), p2i(_sp->bottom())));
1.45 assert(q < _sp->end(),
1.46 err_msg("q = " PTR_FORMAT " crossed above end = " PTR_FORMAT,
1.47 - q, _sp->end()));
1.48 + p2i(q), p2i(_sp->end())));
1.49 HeapWord* n = q;
1.50
1.51 while (n <= addr) {
1.52 @@ -563,14 +563,14 @@
1.53 err_msg("Looping at n = " PTR_FORMAT " with last = " PTR_FORMAT","
1.54 " while querying blk_start(" PTR_FORMAT ")"
1.55 " on _sp = [" PTR_FORMAT "," PTR_FORMAT ")",
1.56 - n, last, addr, _sp->bottom(), _sp->end()));
1.57 + p2i(n), p2i(last), p2i(addr), p2i(_sp->bottom()), p2i(_sp->end())));
1.58 }
1.59 assert(q <= addr,
1.60 err_msg("wrong order for current (" INTPTR_FORMAT ")" " <= arg (" INTPTR_FORMAT ")",
1.61 - q, addr));
1.62 + p2i(q), p2i(addr)));
1.63 assert(addr <= n,
1.64 err_msg("wrong order for arg (" INTPTR_FORMAT ") <= next (" INTPTR_FORMAT ")",
1.65 - addr, n));
1.66 + p2i(addr), p2i(n)));
1.67 return q;
1.68 }
1.69
