src/hotspot/cpu/s390/stubGenerator_s390.cpp

8199604_cardtablemodrefbs_rename

*** 25,35 ****
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "registerSaver_s390.hpp"
  #include "gc/shared/cardTable.hpp"
! #include "gc/shared/cardTableModRefBS.hpp"
  #include "interpreter/interpreter.hpp"
  #include "interpreter/interp_masm.hpp"
  #include "nativeInst_s390.hpp"
  #include "oops/instanceOop.hpp"
  #include "oops/objArrayKlass.hpp"
--- 25,35 ----
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "registerSaver_s390.hpp"
  #include "gc/shared/cardTable.hpp"
! #include "gc/shared/cardTableBarrierSet.hpp"
  #include "interpreter/interpreter.hpp"
  #include "interpreter/interp_masm.hpp"
  #include "nativeInst_s390.hpp"
  #include "oops/instanceOop.hpp"
  #include "oops/objArrayKlass.hpp"
***************
*** 722,732 ****
            // __ pop_frame();  // implicitly done in restore_live_registers()
  
            __ bind(filtered);
          }
          break;
!       case BarrierSet::CardTableModRef:
        case BarrierSet::ModRef:
          break;
        default:
          ShouldNotReachHere();
      }
--- 722,732 ----
            // __ pop_frame();  // implicitly done in restore_live_registers()
  
            __ bind(filtered);
          }
          break;
!       case BarrierSet::CardTableBarrierSet:
        case BarrierSet::ModRef:
          break;
        default:
          ShouldNotReachHere();
      }
***************
*** 760,775 ****
              __ load_const(Z_R1, entry_point);
              __ z_br(Z_R1); // Branch without linking, callee will return to stub caller.
            }
          }
          break;
!       case BarrierSet::CardTableModRef:
          // These cases formerly known as
          //   void array_store_check(Register addr, Register count, bool branchToEnd).
          {
            NearLabel doXC, done;
!           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(Z_R0, Z_R1, addr, count);
  
            // Nothing to do if count <= 0.
--- 760,775 ----
              __ load_const(Z_R1, entry_point);
              __ z_br(Z_R1); // Branch without linking, callee will return to stub caller.
            }
          }
          break;
!       case BarrierSet::CardTableBarrierSet:
          // These cases formerly known as
          //   void array_store_check(Register addr, Register count, bool branchToEnd).
          {
            NearLabel doXC, done;
!           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(Z_R0, Z_R1, addr, count);
  
            // Nothing to do if count <= 0.