src/hotspot/cpu/ppc/macroAssembler_ppc.cpp

G1BarrierSet_merge

*** 42,54 ****
  #include "runtime/safepointMechanism.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
  #include "gc/g1/g1CardTable.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
- #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc/g1/heapRegion.hpp"
  #endif // INCLUDE_ALL_GCS
  #ifdef COMPILER2
  #include "opto/intrinsicnode.hpp"
  #endif
--- 42,54 ----
  #include "runtime/safepointMechanism.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
+ #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1CardTable.hpp"
  #include "gc/g1/g1CollectedHeap.inline.hpp"
  #include "gc/g1/heapRegion.hpp"
  #endif // INCLUDE_ALL_GCS
  #ifdef COMPILER2
  #include "opto/intrinsicnode.hpp"
  #endif
***************
*** 3169,3180 ****
  void MacroAssembler::g1_write_barrier_post(Register Rstore_addr, Register Rnew_val, Register Rtmp1, Register Rtmp2, Register Rtmp3, Label *filtered_ext) {
    Label runtime, filtered_int;
    Label& filtered = (filtered_ext != NULL) ? *filtered_ext : filtered_int;
    assert_different_registers(Rstore_addr, Rnew_val, Rtmp1, Rtmp2);
  
!   G1SATBCardTableLoggingModRefBS* bs =
!     barrier_set_cast<G1SATBCardTableLoggingModRefBS>(Universe::heap()->barrier_set());
    CardTable* ct = bs->card_table();
  
    // Does store cross heap regions?
    if (G1RSBarrierRegionFilter) {
      xorr(Rtmp1, Rstore_addr, Rnew_val);
--- 3169,3180 ----
  void MacroAssembler::g1_write_barrier_post(Register Rstore_addr, Register Rnew_val, Register Rtmp1, Register Rtmp2, Register Rtmp3, Label *filtered_ext) {
    Label runtime, filtered_int;
    Label& filtered = (filtered_ext != NULL) ? *filtered_ext : filtered_int;
    assert_different_registers(Rstore_addr, Rnew_val, Rtmp1, Rtmp2);
  
!   G1BarrierSet* bs =
!     barrier_set_cast<G1BarrierSet>(Universe::heap()->barrier_set());
    CardTable* ct = bs->card_table();
  
    // Does store cross heap regions?
    if (G1RSBarrierRegionFilter) {
      xorr(Rtmp1, Rstore_addr, Rnew_val);