src/hotspot/cpu/x86/stubGenerator_x86_64.cpp

8199604_cardtablemodrefbs_rename

*** 25,35 ****
  #include "precompiled.hpp"
  #include "asm/macroAssembler.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "ci/ciUtilities.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"
--- 25,35 ----
  #include "precompiled.hpp"
  #include "asm/macroAssembler.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "ci/ciUtilities.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"
***************
*** 1233,1243 ****
             __ popa();
  
             __ bind(filtered);
          }
           break;
!       case BarrierSet::CardTableModRef:
          break;
        default:
          ShouldNotReachHere();
  
      }
--- 1233,1243 ----
             __ popa();
  
             __ bind(filtered);
          }
           break;
!       case BarrierSet::CardTableBarrierSet:
          break;
        default:
          ShouldNotReachHere();
  
      }
***************
*** 1271,1281 ****
            }
            __ call_VM_leaf(CAST_FROM_FN_PTR(address, BarrierSet::static_write_ref_array_post), 2);
            __ popa();
          }
          break;
!       case BarrierSet::CardTableModRef:
          {
            Label L_loop, L_done;
            const Register end = count;
  
            __ testl(count, count);
--- 1271,1281 ----
            }
            __ call_VM_leaf(CAST_FROM_FN_PTR(address, BarrierSet::static_write_ref_array_post), 2);
            __ popa();
          }
          break;
!       case BarrierSet::CardTableBarrierSet:
          {
            Label L_loop, L_done;
            const Register end = count;
  
            __ testl(count, count);