src/hotspot/cpu/sparc/stubGenerator_sparc.cpp

8199604_cardtablemodrefbs_rename

*** 23,33 ****
   */
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "gc/shared/cardTable.hpp"
! #include "gc/shared/cardTableModRefBS.hpp"
  #include "interpreter/interpreter.hpp"
  #include "nativeInst_sparc.hpp"
  #include "oops/instanceOop.hpp"
  #include "oops/method.hpp"
  #include "oops/objArrayKlass.hpp"
--- 23,33 ----
   */
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "gc/shared/cardTable.hpp"
! #include "gc/shared/cardTableBarrierSet.hpp"
  #include "interpreter/interpreter.hpp"
  #include "nativeInst_sparc.hpp"
  #include "oops/instanceOop.hpp"
  #include "oops/method.hpp"
  #include "oops/objArrayKlass.hpp"
***************
*** 875,885 ****
  
            __ bind(filtered);
            DEBUG_ONLY(__ set(0xDEADC0DE, tmp);) // we have killed tmp
          }
          break;
!       case BarrierSet::CardTableModRef:
          break;
        default:
          ShouldNotReachHere();
      }
    }
--- 875,885 ----
  
            __ bind(filtered);
            DEBUG_ONLY(__ set(0xDEADC0DE, tmp);) // we have killed tmp
          }
          break;
!       case BarrierSet::CardTableBarrierSet:
          break;
        default:
          ShouldNotReachHere();
      }
    }
***************
*** 906,918 ****
            __ call(CAST_FROM_FN_PTR(address, BarrierSet::static_write_ref_array_post));
            __ delayed()->mov(count->after_save(), O1);
            __ restore();
          }
          break;
!       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");
            assert_different_registers(addr, count, tmp);
  
            Label L_loop, L_done;
--- 906,918 ----
            __ call(CAST_FROM_FN_PTR(address, BarrierSet::static_write_ref_array_post));
            __ delayed()->mov(count->after_save(), O1);
            __ restore();
          }
          break;
!       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");
            assert_different_registers(addr, count, tmp);
  
            Label L_loop, L_done;