< prev index next >

src/hotspot/cpu/arm/stubGenerator_arm.cpp

8199604_cardtablemodrefbs_rename

*** 24,34 **** #include "precompiled.hpp" #include "asm/assembler.hpp" #include "assembler_arm.inline.hpp" #include "gc/shared/cardTable.hpp" ! #include "gc/shared/cardTableModRefBS.hpp" #include "interpreter/interpreter.hpp" #include "nativeInst_arm.hpp" #include "oops/instanceOop.hpp" #include "oops/method.hpp" #include "oops/objArrayKlass.hpp" --- 24,34 ---- #include "precompiled.hpp" #include "asm/assembler.hpp" #include "assembler_arm.inline.hpp" #include "gc/shared/cardTable.hpp" ! #include "gc/shared/cardTableBarrierSet.hpp" #include "interpreter/interpreter.hpp" #include "nativeInst_arm.hpp" #include "oops/instanceOop.hpp" #include "oops/method.hpp" #include "oops/objArrayKlass.hpp" ***************
*** 2907,2917 **** } #else __ pop(saved_regs | R9ifScratched); #endif // AARCH64 } ! case BarrierSet::CardTableModRef: break; default: ShouldNotReachHere(); } } --- 2907,2917 ---- } #else __ pop(saved_regs | R9ifScratched); #endif // AARCH64 } ! case BarrierSet::CardTableBarrierSet: break; default: ShouldNotReachHere(); } } ***************
*** 2960,2973 **** __ pop(R9); #endif #endif // !AARCH64 } break; ! case BarrierSet::CardTableModRef: { BLOCK_COMMENT("CardTablePostBarrier"); ! CardTableModRefBS* ctbs = barrier_set_cast<CardTableModRefBS>(bs); CardTable* ct = ctbs->card_table(); assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code"); Label L_cardtable_loop, L_done; --- 2960,2973 ---- __ pop(R9); #endif #endif // !AARCH64 } break; ! case BarrierSet::CardTableBarrierSet: { BLOCK_COMMENT("CardTablePostBarrier"); ! CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs); CardTable* ct = ctbs->card_table(); assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code"); Label L_cardtable_loop, L_done;
< prev index next >