src/hotspot/cpu/x86/macroAssembler_x86.cpp

8199604_cardtablemodrefbs_rename

*** 26,36 ****
  #include "jvm.h"
  #include "asm/assembler.hpp"
  #include "asm/assembler.inline.hpp"
  #include "compiler/disassembler.hpp"
  #include "gc/shared/cardTable.hpp"
! #include "gc/shared/cardTableModRefBS.hpp"
  #include "gc/shared/collectedHeap.inline.hpp"
  #include "interpreter/interpreter.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.hpp"
  #include "oops/klass.inline.hpp"
--- 26,36 ----
  #include "jvm.h"
  #include "asm/assembler.hpp"
  #include "asm/assembler.inline.hpp"
  #include "compiler/disassembler.hpp"
  #include "gc/shared/cardTable.hpp"
! #include "gc/shared/cardTableBarrierSet.hpp"
  #include "gc/shared/collectedHeap.inline.hpp"
  #include "interpreter/interpreter.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.hpp"
  #include "oops/klass.inline.hpp"
***************
*** 5407,5418 ****
    Address queue_index(thread, in_bytes(JavaThread::dirty_card_queue_offset() +
                                         DirtyCardQueue::byte_offset_of_index()));
    Address buffer(thread, in_bytes(JavaThread::dirty_card_queue_offset() +
                                         DirtyCardQueue::byte_offset_of_buf()));
  
!   CardTableModRefBS* ctbs =
!     barrier_set_cast<CardTableModRefBS>(Universe::heap()->barrier_set());
    CardTable* ct = ctbs->card_table();
    assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
  
    Label done;
    Label runtime;
--- 5407,5418 ----
    Address queue_index(thread, in_bytes(JavaThread::dirty_card_queue_offset() +
                                         DirtyCardQueue::byte_offset_of_index()));
    Address buffer(thread, in_bytes(JavaThread::dirty_card_queue_offset() +
                                         DirtyCardQueue::byte_offset_of_buf()));
  
!   CardTableBarrierSet* ctbs =
!     barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
    CardTable* ct = ctbs->card_table();
    assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
  
    Label done;
    Label runtime;
***************
*** 5495,5508 ****
  
  void MacroAssembler::store_check(Register obj) {
    // Does a store check for the oop in register obj. The content of
    // register obj is destroyed afterwards.
    BarrierSet* bs = Universe::heap()->barrier_set();
!   assert(bs->kind() == BarrierSet::CardTableModRef,
           "Wrong barrier set kind");
  
!   CardTableModRefBS* ctbs = barrier_set_cast<CardTableModRefBS>(bs);
    CardTable* ct = ctbs->card_table();
    assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
  
    shrptr(obj, CardTable::card_shift);
  
--- 5495,5508 ----
  
  void MacroAssembler::store_check(Register obj) {
    // Does a store check for the oop in register obj. The content of
    // register obj is destroyed afterwards.
    BarrierSet* bs = Universe::heap()->barrier_set();
!   assert(bs->kind() == BarrierSet::CardTableBarrierSet,
           "Wrong barrier set kind");
  
!   CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
    CardTable* ct = ctbs->card_table();
    assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
  
    shrptr(obj, CardTable::card_shift);