src/share/vm/memory/cardTableRS.cpp

rev 8333 : 8077842: Remove the level parameter passed around in GenCollectedHeap
Reviewed-by:

*** 101,111 ****
    }
  }
  
  void CardTableRS::younger_refs_iterate(Generation* g,
                                         OopsInGenClosure* blk) {
!   _last_cur_val_in_gen[g->level()+1] = cur_youngergen_card_val();
    g->younger_refs_iterate(blk);
  }
  
  inline bool ClearNoncleanCardWrapper::clear_card(jbyte* entry) {
    if (_is_par) {
--- 101,113 ----
    }
  }
  
  void CardTableRS::younger_refs_iterate(Generation* g,
                                         OopsInGenClosure* blk) {
!   // The indexing in this array is slightly odd. We want to access
!   // the old generation record here, which is at index 2.
!   _last_cur_val_in_gen[2] = cur_youngergen_card_val();
    g->younger_refs_iterate(blk);
  }
  
  inline bool ClearNoncleanCardWrapper::clear_card(jbyte* entry) {
    if (_is_par) {
*** 303,324 ****
  #endif
    _ct_bs->non_clean_card_iterate_possibly_parallel(sp, urasm, cl, this);
  }
  
  void CardTableRS::clear_into_younger(Generation* old_gen) {
!   assert(old_gen->level() == 1, "Should only be called for the old generation");
    // The card tables for the youngest gen need never be cleared.
    // There's a bit of subtlety in the clear() and invalidate()
    // methods that we exploit here and in invalidate_or_clear()
    // below to avoid missing cards at the fringes. If clear() or
    // invalidate() are changed in the future, this code should
    // be revisited. 20040107.ysr
    clear(old_gen->prev_used_region());
  }
  
  void CardTableRS::invalidate_or_clear(Generation* old_gen) {
!   assert(old_gen->level() == 1, "Should only be called for the old generation");
    // Invalidate the cards for the currently occupied part of
    // the old generation and clear the cards for the
    // unoccupied part of the generation (if any, making use
    // of that generation's prev_used_region to determine that
    // region). No need to do anything for the youngest
--- 305,328 ----
  #endif
    _ct_bs->non_clean_card_iterate_possibly_parallel(sp, urasm, cl, this);
  }
  
  void CardTableRS::clear_into_younger(Generation* old_gen) {
!   assert(old_gen == GenCollectedHeap::heap()->old_gen(),
!          "Should only be called for the old generation");
    // The card tables for the youngest gen need never be cleared.
    // There's a bit of subtlety in the clear() and invalidate()
    // methods that we exploit here and in invalidate_or_clear()
    // below to avoid missing cards at the fringes. If clear() or
    // invalidate() are changed in the future, this code should
    // be revisited. 20040107.ysr
    clear(old_gen->prev_used_region());
  }
  
  void CardTableRS::invalidate_or_clear(Generation* old_gen) {
!   assert(old_gen == GenCollectedHeap::heap()->old_gen(),
!          "Should only be called for the old generation");
    // Invalidate the cards for the currently occupied part of
    // the old generation and clear the cards for the
    // unoccupied part of the generation (if any, making use
    // of that generation's prev_used_region to determine that
    // region). No need to do anything for the youngest
*** 380,390 ****
    CardTableRS* _ct;
  public:
    VerifyCTGenClosure(CardTableRS* ct) : _ct(ct) {}
    void do_generation(Generation* gen) {
      // Skip the youngest generation.
!     if (gen->level() == 0) return;
      // Normally, we're interested in pointers to younger generations.
      VerifyCTSpaceClosure blk(_ct, gen->reserved().start());
      gen->space_iterate(&blk, true);
    }
  };
--- 384,396 ----
    CardTableRS* _ct;
  public:
    VerifyCTGenClosure(CardTableRS* ct) : _ct(ct) {}
    void do_generation(Generation* gen) {
      // Skip the youngest generation.
!     if (gen == GenCollectedHeap::heap()->young_gen()) {
!       return;
!     }
      // Normally, we're interested in pointers to younger generations.
      VerifyCTSpaceClosure blk(_ct, gen->reserved().start());
      gen->space_iterate(&blk, true);
    }
  };