comparison src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp @ 356:1ee8caae33af

Merge
author tonyp
date Thu, 21 Aug 2008 23:36:31 -0400
parents 850fdf70db2b
children 98cb887364d3
comparison
equal deleted inserted replaced
355:0edda524b58c 356:1ee8caae33af
1 /* 1 /*
2 * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved. 2 * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
664 // |+ cur committed +++++++++++| 664 // |+ cur committed +++++++++++|
665 // |+ new committed +++++++| 665 // |+ new committed +++++++|
666 666
667 HeapWord* new_end_for_commit = 667 HeapWord* new_end_for_commit =
668 MIN2(cur_committed.end(), _guard_region.start()); 668 MIN2(cur_committed.end(), _guard_region.start());
669 MemRegion new_committed = 669 if(new_start_aligned < new_end_for_commit) {
670 MemRegion(new_start_aligned, new_end_for_commit); 670 MemRegion new_committed =
671 if(!new_committed.is_empty()) { 671 MemRegion(new_start_aligned, new_end_for_commit);
672 if (!os::commit_memory((char*)new_committed.start(), 672 if (!os::commit_memory((char*)new_committed.start(),
673 new_committed.byte_size())) { 673 new_committed.byte_size())) {
674 vm_exit_out_of_memory(new_committed.byte_size(), 674 vm_exit_out_of_memory(new_committed.byte_size(),
675 "card table expansion"); 675 "card table expansion");
676 } 676 }