1.1 --- a/src/share/vm/gc_implementation/g1/g1BiasedArray.hpp Thu May 15 18:23:26 2014 -0400
1.2 +++ b/src/share/vm/gc_implementation/g1/g1BiasedArray.hpp Thu May 22 15:52:41 2014 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2013, 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 @@ -55,7 +55,7 @@
1.11 void initialize_base(address base, size_t length, size_t bias, size_t elem_size, uint shift_by) {
1.12 assert(base != NULL, "just checking");
1.13 assert(length > 0, "just checking");
1.14 - assert(shift_by < sizeof(uintptr_t) * 8, err_msg("Shifting by %zd, larger than word size?", shift_by));
1.15 + assert(shift_by < sizeof(uintptr_t) * 8, err_msg("Shifting by " SSIZE_FORMAT ", larger than word size?", (size_t) shift_by));
1.16 _base = base;
1.17 _length = length;
1.18 _biased_base = base - (bias * elem_size);
1.19 @@ -70,11 +70,11 @@
1.20 assert(is_power_of_2(mapping_granularity_in_bytes),
1.21 err_msg("mapping granularity must be power of 2, is %zd", mapping_granularity_in_bytes));
1.22 assert((uintptr_t)bottom % mapping_granularity_in_bytes == 0,
1.23 - err_msg("bottom mapping area address must be a multiple of mapping granularity %zd, is "PTR_FORMAT,
1.24 - mapping_granularity_in_bytes, bottom));
1.25 + err_msg("bottom mapping area address must be a multiple of mapping granularity %zd, is " PTR_FORMAT,
1.26 + mapping_granularity_in_bytes, p2i(bottom)));
1.27 assert((uintptr_t)end % mapping_granularity_in_bytes == 0,
1.28 - err_msg("end mapping area address must be a multiple of mapping granularity %zd, is "PTR_FORMAT,
1.29 - mapping_granularity_in_bytes, end));
1.30 + err_msg("end mapping area address must be a multiple of mapping granularity %zd, is " PTR_FORMAT,
1.31 + mapping_granularity_in_bytes, p2i(end)));
1.32 size_t num_target_elems = (end - bottom) / (mapping_granularity_in_bytes / HeapWordSize);
1.33 idx_t bias = (uintptr_t)bottom / mapping_granularity_in_bytes;
1.34 address base = create_new_base_array(num_target_elems, target_elem_size_in_bytes);
