1.1 --- a/src/share/vm/memory/cardTableModRefBS.hpp Tue Feb 23 18:58:36 2016 -0500
1.2 +++ b/src/share/vm/memory/cardTableModRefBS.hpp Thu Jun 14 09:15:08 2018 -0700
1.3 @@ -158,8 +158,8 @@
1.4 // Mapping from address to card marking array entry
1.5 jbyte* byte_for(const void* p) const {
1.6 assert(_whole_heap.contains(p),
1.7 - err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of "
1.8 - " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
1.9 + err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of "
1.10 + " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
1.11 p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
1.12 jbyte* result = &byte_map_base[uintptr_t(p) >> card_shift];
1.13 assert(result >= _byte_map && result < _byte_map + _byte_map_size,
1.14 @@ -436,8 +436,8 @@
1.15 size_t delta = pointer_delta(p, byte_map_base, sizeof(jbyte));
1.16 HeapWord* result = (HeapWord*) (delta << card_shift);
1.17 assert(_whole_heap.contains(result),
1.18 - err_msg("Returning result = "PTR_FORMAT" out of bounds of "
1.19 - " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
1.20 + err_msg("Returning result = " PTR_FORMAT " out of bounds of "
1.21 + " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
1.22 p2i(result), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
1.23 return result;
1.24 }
1.25 @@ -445,8 +445,8 @@
1.26 // Mapping from address to card marking array index.
1.27 size_t index_for(void* p) {
1.28 assert(_whole_heap.contains(p),
1.29 - err_msg("Attempt to access p = "PTR_FORMAT" out of bounds of "
1.30 - " card marking array's _whole_heap = ["PTR_FORMAT","PTR_FORMAT")",
1.31 + err_msg("Attempt to access p = " PTR_FORMAT " out of bounds of "
1.32 + " card marking array's _whole_heap = [" PTR_FORMAT "," PTR_FORMAT ")",
1.33 p2i(p), p2i(_whole_heap.start()), p2i(_whole_heap.end())));
1.34 return byte_for(p) - _byte_map;
1.35 }
