1.1 --- a/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp Thu Jan 06 23:50:02 2011 -0800
1.2 +++ b/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp Wed Jan 12 13:06:00 2011 -0500
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 2011, 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 @@ -352,11 +352,6 @@
1.11 // The following methods are useful and optimized for a
1.12 // general, non-contiguous space.
1.13
1.14 - // The given arguments are required to be the starts of adjacent ("blk1"
1.15 - // before "blk2") well-formed blocks covered by "this". After this call,
1.16 - // they should be considered to form one block.
1.17 - virtual void join_blocks(HeapWord* blk1, HeapWord* blk2);
1.18 -
1.19 // Given a block [blk_start, blk_start + full_blk_size), and
1.20 // a left_blk_size < full_blk_size, adjust the BOT to show two
1.21 // blocks [blk_start, blk_start + left_blk_size) and
1.22 @@ -429,6 +424,12 @@
1.23 verify_single_block(blk, blk + size);
1.24 }
1.25
1.26 + // Used by region verification. Checks that the contents of the
1.27 + // BOT reflect that there's a single object that spans the address
1.28 + // range [obj_start, obj_start + word_size); returns true if this is
1.29 + // the case, returns false if it's not.
1.30 + bool verify_for_object(HeapWord* obj_start, size_t word_size) const;
1.31 +
1.32 // Verify that the given block is before _unallocated_block
1.33 inline void verify_not_unallocated(HeapWord* blk_start,
1.34 HeapWord* blk_end) const {
1.35 @@ -444,7 +445,7 @@
1.36
1.37 void check_all_cards(size_t left_card, size_t right_card) const;
1.38
1.39 - virtual void set_for_starts_humongous(HeapWord* new_end);
1.40 + virtual void print_on(outputStream* out) PRODUCT_RETURN;
1.41 };
1.42
1.43 // A subtype of BlockOffsetArray that takes advantage of the fact
1.44 @@ -494,7 +495,9 @@
1.45 HeapWord* block_start_unsafe(const void* addr);
1.46 HeapWord* block_start_unsafe_const(const void* addr) const;
1.47
1.48 - virtual void set_for_starts_humongous(HeapWord* new_end);
1.49 + void set_for_starts_humongous(HeapWord* new_top);
1.50 +
1.51 + virtual void print_on(outputStream* out) PRODUCT_RETURN;
1.52 };
1.53
1.54 #endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1BLOCKOFFSETTABLE_HPP
