equal
deleted
inserted
replaced
749 (int) _coarse_map->get_next_one_offset(_coarse_cur_region_index + 1); |
749 (int) _coarse_map->get_next_one_offset(_coarse_cur_region_index + 1); |
750 if ((size_t)_coarse_cur_region_index < _coarse_map->size()) { |
750 if ((size_t)_coarse_cur_region_index < _coarse_map->size()) { |
751 _coarse_cur_region_cur_card = 0; |
751 _coarse_cur_region_cur_card = 0; |
752 HeapWord* r_bot = |
752 HeapWord* r_bot = |
753 _g1h->region_at((uint) _coarse_cur_region_index)->bottom(); |
753 _g1h->region_at((uint) _coarse_cur_region_index)->bottom(); |
754 _cur_region_card_offset = _bot->index_for(r_bot); |
754 _cur_region_card_offset = _bot->index_for_raw(r_bot); |
755 } else { |
755 } else { |
756 return false; |
756 return false; |
757 } |
757 } |
758 } |
758 } |
759 // If we didn't return false above, then we can yield a card. |
759 // If we didn't return false above, then we can yield a card. |
790 void HeapRegionRemSetIterator::switch_to_prt(PerRegionTable* prt) { |
790 void HeapRegionRemSetIterator::switch_to_prt(PerRegionTable* prt) { |
791 assert(prt != NULL, "Cannot switch to NULL prt"); |
791 assert(prt != NULL, "Cannot switch to NULL prt"); |
792 _fine_cur_prt = prt; |
792 _fine_cur_prt = prt; |
793 |
793 |
794 HeapWord* r_bot = _fine_cur_prt->hr()->bottom(); |
794 HeapWord* r_bot = _fine_cur_prt->hr()->bottom(); |
795 _cur_region_card_offset = _bot->index_for(r_bot); |
795 _cur_region_card_offset = _bot->index_for_raw(r_bot); |
796 |
796 |
797 // The bitmap scan for the PRT always scans from _cur_region_cur_card + 1. |
797 // The bitmap scan for the PRT always scans from _cur_region_cur_card + 1. |
798 // To avoid special-casing this start case, and not miss the first bitmap |
798 // To avoid special-casing this start case, and not miss the first bitmap |
799 // entry, initialize _cur_region_cur_card with -1 instead of 0. |
799 // entry, initialize _cur_region_cur_card with -1 instead of 0. |
800 _cur_card_in_prt = (size_t)-1; |
800 _cur_card_in_prt = (size_t)-1; |