< prev index next >

src/hotspot/cpu/sparc/macroAssembler_sparc.cpp

G1BarrierSet_merge

*** 43,55 **** #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" #include "utilities/align.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 --- 43,55 ---- #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" #include "utilities/align.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 ***************
*** 3662,3673 **** Label filtered; MacroAssembler* post_filter_masm = this; if (new_val == G0) return; ! G1SATBCardTableLoggingModRefBS* bs = ! barrier_set_cast<G1SATBCardTableLoggingModRefBS>(Universe::heap()->barrier_set()); CardTable* ct = bs->card_table(); if (G1RSBarrierRegionFilter) { xor3(store_addr, new_val, tmp); srlx(tmp, HeapRegion::LogOfHRGrainBytes, tmp); --- 3662,3673 ---- Label filtered; MacroAssembler* post_filter_masm = this; if (new_val == G0) return; ! G1BarrierSet* bs = ! barrier_set_cast<G1BarrierSet>(Universe::heap()->barrier_set()); CardTable* ct = bs->card_table(); if (G1RSBarrierRegionFilter) { xor3(store_addr, new_val, tmp); srlx(tmp, HeapRegion::LogOfHRGrainBytes, tmp); ***************
*** 3703,3714 **** void g1_barrier_stubs_init() { CollectedHeap* heap = Universe::heap(); if (heap->kind() == CollectedHeap::G1CollectedHeap) { // Only needed for G1 if (dirty_card_log_enqueue == 0) { ! G1SATBCardTableLoggingModRefBS* bs = ! barrier_set_cast<G1SATBCardTableLoggingModRefBS>(heap->barrier_set()); CardTable *ct = bs->card_table(); generate_dirty_card_log_enqueue(ct->byte_map_base()); assert(dirty_card_log_enqueue != 0, "postcondition."); } if (satb_log_enqueue_with_frame == 0) { --- 3703,3714 ---- void g1_barrier_stubs_init() { CollectedHeap* heap = Universe::heap(); if (heap->kind() == CollectedHeap::G1CollectedHeap) { // Only needed for G1 if (dirty_card_log_enqueue == 0) { ! G1BarrierSet* bs = ! barrier_set_cast<G1BarrierSet>(heap->barrier_set()); CardTable *ct = bs->card_table(); generate_dirty_card_log_enqueue(ct->byte_map_base()); assert(dirty_card_log_enqueue != 0, "postcondition."); } if (satb_log_enqueue_with_frame == 0) {
< prev index next >