src/hotspot/cpu/x86/stubGenerator_x86_32.cpp

8199604_cardtablemodrefbs_rename

*** 24,34 ****
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "gc/shared/cardTable.hpp"
! #include "gc/shared/cardTableModRefBS.hpp"
  #include "interpreter/interpreter.hpp"
  #include "nativeInst_x86.hpp"
  #include "oops/instanceOop.hpp"
  #include "oops/method.hpp"
  #include "oops/objArrayKlass.hpp"
--- 24,34 ----
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "gc/shared/cardTable.hpp"
! #include "gc/shared/cardTableBarrierSet.hpp"
  #include "interpreter/interpreter.hpp"
  #include "nativeInst_x86.hpp"
  #include "oops/instanceOop.hpp"
  #include "oops/method.hpp"
  #include "oops/objArrayKlass.hpp"
***************
*** 705,715 ****
  
             __ bind(filtered);
           }
          break;
  #endif // INCLUDE_ALL_GCS
!       case BarrierSet::CardTableModRef:
          break;
        default      :
          ShouldNotReachHere();
  
      }
--- 705,715 ----
  
             __ bind(filtered);
           }
          break;
  #endif // INCLUDE_ALL_GCS
!       case BarrierSet::CardTableBarrierSet:
          break;
        default      :
          ShouldNotReachHere();
  
      }
***************
*** 737,749 ****
            __ popa();
          }
          break;
  #endif // INCLUDE_ALL_GCS
  
!       case BarrierSet::CardTableModRef:
          {
!           CardTableModRefBS* ctbs = barrier_set_cast<CardTableModRefBS>(bs);
            CardTable* ct = ctbs->card_table();
            assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
  
            Label L_loop;
            const Register end = count;  // elements count; end == start+count-1
--- 737,749 ----
            __ popa();
          }
          break;
  #endif // INCLUDE_ALL_GCS
  
!       case BarrierSet::CardTableBarrierSet:
          {
!           CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
            CardTable* ct = ctbs->card_table();
            assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
  
            Label L_loop;
            const Register end = count;  // elements count; end == start+count-1