*** old/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	Tue Apr 29 16:52:54 2014
--- new/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	Tue Apr 29 16:52:53 2014

*** 425,435 ****
--- 425,435 ----
  }
  
  void LinearAllocBlock::print_on(outputStream* st) const {
    st->print_cr(" LinearAllocBlock: ptr = " PTR_FORMAT ", word_size = " SIZE_FORMAT
              ", refillsize = " SIZE_FORMAT ", allocation_size_limit = " SIZE_FORMAT,
!             p2i(_ptr), _word_size, _refillSize, _allocation_size_limit);
  }
  
  void CompactibleFreeListSpace::print_on(outputStream* st) const {
    st->print_cr("COMPACTIBLE FREELIST SPACE");
    st->print_cr(" Space:");

*** 456,466 ****
--- 456,466 ----
    for (size_t i = IndexSetStart; i < IndexSetSize; i += IndexSetStride) {
      _indexedFreeList[i].print_on(gclog_or_tty);
      for (FreeChunk* fc = _indexedFreeList[i].head(); fc != NULL;
           fc = fc->next()) {
        gclog_or_tty->print_cr("\t[" PTR_FORMAT "," PTR_FORMAT ")  %s",
!                           fc, (HeapWord*)fc + i,
!                           p2i(fc), p2i((HeapWord*)fc + i),
                            fc->cantCoalesce() ? "\t CC" : "");
      }
    }
  }
  

*** 500,520 ****
--- 500,520 ----
    size_t sz = _sp->block_size_no_stall(addr, _collector);
    assert(sz != 0, "Should always be able to compute a size");
    if (_sp->block_is_obj(addr)) {
      const bool dead = _post_remark && !_live_bit_map->isMarked(addr);
      _st->print_cr(PTR_FORMAT ": %s object of size " SIZE_FORMAT "%s",
!       p2i(addr),
        dead ? "dead" : "live",
        sz,
        (!dead && CMSPrintObjectsInDump) ? ":" : ".");
      if (CMSPrintObjectsInDump && !dead) {
        oop(addr)->print_on(_st);
        _st->print_cr("--------------------------------------");
      }
    } else { // free block
      _st->print_cr(PTR_FORMAT ": free block of size " SIZE_FORMAT "%s",
!       p2i(addr), sz, CMSPrintChunksInDump ? ":" : ".");
      if (CMSPrintChunksInDump) {
        ((FreeChunk*)addr)->print_on(_st);
        _st->print_cr("--------------------------------------");
      }
    }

*** 1980,1990 ****
--- 1980,1990 ----
    MemRegion ur    = used_region();
    MemRegion urasm = used_region_at_save_marks();
    assert(ur.contains(urasm),
           err_msg(" Error at save_marks(): [" PTR_FORMAT "," PTR_FORMAT ")"
                   " should contain [" PTR_FORMAT "," PTR_FORMAT ")",
!                  ur.start(), ur.end(), urasm.start(), urasm.end()));
!                  p2i(ur.start()), p2i(ur.end()), p2i(urasm.start()), p2i(urasm.end())));
  #endif
    // inform allocator that promotions should be tracked.
    assert(_promoInfo.noPromotions(), "_promoInfo inconsistency");
    _promoInfo.startTrackingPromotions();
  }

*** 2203,2213 ****
--- 2203,2213 ----
  
  void CompactibleFreeListSpace::endSweepFLCensus(size_t sweep_count) {
    if (PrintFLSStatistics > 0) {
      HeapWord* largestAddr = (HeapWord*) dictionary()->find_largest_dict();
      gclog_or_tty->print_cr("CMS: Large block " PTR_FORMAT,
!                            p2i(largestAddr));
    }
    setFLSurplus();
    setFLHints();
    if (PrintGC && PrintFLSCensus > 0) {
      printFLCensus(sweep_count);

*** 2352,2363 ****
--- 2352,2363 ----
      if (res == 0) {
        gclog_or_tty->print_cr("Livelock: no rank reduction!");
        gclog_or_tty->print_cr(
          " Current:  addr = " PTR_FORMAT ", size = " SIZE_FORMAT ", obj = %s, live = %s \n"
          " Previous: addr = " PTR_FORMAT ", size = " SIZE_FORMAT ", obj = %s, live = %s \n",
!         p2i(addr),       res,        was_obj      ?"true":"false", was_live      ?"true":"false",
!         p2i(_last_addr), _last_size, _last_was_obj?"true":"false", _last_was_live?"true":"false");
        _sp->print_on(gclog_or_tty);
        guarantee(false, "Seppuku!");
      }
      _last_addr = addr;
      _last_size = res;