src/share/vm/memory/cardTableModRefBS.cpp

*** 136,150 ****
    if (TraceCardTableModRefBS) {
      gclog_or_tty->print_cr("CardTableModRefBS::CardTableModRefBS: ");
      gclog_or_tty->print_cr("  "
                    "  &_byte_map[0]: " INTPTR_FORMAT
                    "  &_byte_map[_last_valid_index]: " INTPTR_FORMAT,
!                   &_byte_map[0],
!                   &_byte_map[_last_valid_index]);
      gclog_or_tty->print_cr("  "
                    "  byte_map_base: " INTPTR_FORMAT,
!                   byte_map_base);
    }
  }
  
  CardTableModRefBS::~CardTableModRefBS() {
    if (_covered) {
--- 136,150 ----
    if (TraceCardTableModRefBS) {
      gclog_or_tty->print_cr("CardTableModRefBS::CardTableModRefBS: ");
      gclog_or_tty->print_cr("  "
                    "  &_byte_map[0]: " INTPTR_FORMAT
                    "  &_byte_map[_last_valid_index]: " INTPTR_FORMAT,
!                   p2i(&_byte_map[0]),
!                   p2i(&_byte_map[_last_valid_index]));
      gclog_or_tty->print_cr("  "
                    "  byte_map_base: " INTPTR_FORMAT,
!                   p2i(byte_map_base));
    }
  }
  
  CardTableModRefBS::~CardTableModRefBS() {
    if (_covered) {
*** 390,416 ****
    if (TraceCardTableModRefBS) {
      gclog_or_tty->print_cr("CardTableModRefBS::resize_covered_region: ");
      gclog_or_tty->print_cr("  "
                    "  _covered[%d].start(): " INTPTR_FORMAT
                    "  _covered[%d].last(): " INTPTR_FORMAT,
!                   ind, _covered[ind].start(),
!                   ind, _covered[ind].last());
      gclog_or_tty->print_cr("  "
                    "  _committed[%d].start(): " INTPTR_FORMAT
                    "  _committed[%d].last(): " INTPTR_FORMAT,
!                   ind, _committed[ind].start(),
!                   ind, _committed[ind].last());
      gclog_or_tty->print_cr("  "
                    "  byte_for(start): " INTPTR_FORMAT
                    "  byte_for(last): " INTPTR_FORMAT,
!                   byte_for(_covered[ind].start()),
!                   byte_for(_covered[ind].last()));
      gclog_or_tty->print_cr("  "
                    "  addr_for(start): " INTPTR_FORMAT
                    "  addr_for(last): " INTPTR_FORMAT,
!                   addr_for((jbyte*) _committed[ind].start()),
!                   addr_for((jbyte*) _committed[ind].last()));
    }
    // Touch the last card of the covered region to show that it
    // is committed (or SEGV).
    debug_only((void) (*byte_for(_covered[ind].last()));)
    debug_only(verify_guard();)
--- 390,416 ----
    if (TraceCardTableModRefBS) {
      gclog_or_tty->print_cr("CardTableModRefBS::resize_covered_region: ");
      gclog_or_tty->print_cr("  "
                    "  _covered[%d].start(): " INTPTR_FORMAT
                    "  _covered[%d].last(): " INTPTR_FORMAT,
!                   ind, p2i(_covered[ind].start()),
!                   ind, p2i(_covered[ind].last()));
      gclog_or_tty->print_cr("  "
                    "  _committed[%d].start(): " INTPTR_FORMAT
                    "  _committed[%d].last(): " INTPTR_FORMAT,
!                   ind, p2i(_committed[ind].start()),
!                   ind, p2i(_committed[ind].last()));
      gclog_or_tty->print_cr("  "
                    "  byte_for(start): " INTPTR_FORMAT
                    "  byte_for(last): " INTPTR_FORMAT,
!                   p2i(byte_for(_covered[ind].start())),
!                   p2i(byte_for(_covered[ind].last())));
      gclog_or_tty->print_cr("  "
                    "  addr_for(start): " INTPTR_FORMAT
                    "  addr_for(last): " INTPTR_FORMAT,
!                   p2i(addr_for((jbyte*) _committed[ind].start())),
!                   p2i(addr_for((jbyte*) _committed[ind].last())));
    }
    // Touch the last card of the covered region to show that it
    // is committed (or SEGV).
    debug_only((void) (*byte_for(_covered[ind].last()));)
    debug_only(verify_guard();)
*** 655,672 ****
      jbyte curr_val = *curr;
      bool failed = (val_equals) ? (curr_val != val) : (curr_val == val);
      if (failed) {
        if (!failures) {
          tty->cr();
!         tty->print_cr("== CT verification failed: ["PTR_FORMAT","PTR_FORMAT"]", start, end);
          tty->print_cr("==   %sexpecting value: %d",
                        (val_equals) ? "" : "not ", val);
          failures = true;
        }
        tty->print_cr("==   card "PTR_FORMAT" ["PTR_FORMAT","PTR_FORMAT"], "
!                     "val: %d", curr, addr_for(curr),
!                     (HeapWord*) (((size_t) addr_for(curr)) + card_size),
                      (int) curr_val);
      }
    }
    guarantee(!failures, "there should not have been any failures");
  }
--- 655,672 ----
      jbyte curr_val = *curr;
      bool failed = (val_equals) ? (curr_val != val) : (curr_val == val);
      if (failed) {
        if (!failures) {
          tty->cr();
!         tty->print_cr("== CT verification failed: [" PTR_FORMAT "," PTR_FORMAT "]", p2i(start), p2i(end));
          tty->print_cr("==   %sexpecting value: %d",
                        (val_equals) ? "" : "not ", val);
          failures = true;
        }
        tty->print_cr("==   card "PTR_FORMAT" ["PTR_FORMAT","PTR_FORMAT"], "
!                     "val: %d", p2i(curr), p2i(addr_for(curr)),
!                     p2i((HeapWord*) (((size_t) addr_for(curr)) + card_size)),
                      (int) curr_val);
      }
    }
    guarantee(!failures, "there should not have been any failures");
  }
*** 680,690 ****
  }
  #endif
  
  void CardTableModRefBS::print_on(outputStream* st) const {
    st->print_cr("Card table byte_map: [" INTPTR_FORMAT "," INTPTR_FORMAT "] byte_map_base: " INTPTR_FORMAT,
!                _byte_map, _byte_map + _byte_map_size, byte_map_base);
  }
  
  bool CardTableModRefBSForCTRS::card_will_be_scanned(jbyte cv) {
    return
      CardTableModRefBS::card_will_be_scanned(cv) ||
--- 680,690 ----
  }
  #endif
  
  void CardTableModRefBS::print_on(outputStream* st) const {
    st->print_cr("Card table byte_map: [" INTPTR_FORMAT "," INTPTR_FORMAT "] byte_map_base: " INTPTR_FORMAT,
!                p2i(_byte_map), p2i(_byte_map + _byte_map_size), p2i(byte_map_base));
  }
  
  bool CardTableModRefBSForCTRS::card_will_be_scanned(jbyte cv) {
    return
      CardTableModRefBS::card_will_be_scanned(cv) ||