equal
deleted
inserted
replaced
24 |
24 |
25 #include "precompiled.hpp" |
25 #include "precompiled.hpp" |
26 #include "asm/assembler.hpp" |
26 #include "asm/assembler.hpp" |
27 #include "assembler_arm.inline.hpp" |
27 #include "assembler_arm.inline.hpp" |
28 #include "gc/shared/cardTable.hpp" |
28 #include "gc/shared/cardTable.hpp" |
29 #include "gc/shared/cardTableModRefBS.hpp" |
29 #include "gc/shared/cardTableBarrierSet.hpp" |
30 #include "interpreter/interpreter.hpp" |
30 #include "interpreter/interpreter.hpp" |
31 #include "nativeInst_arm.hpp" |
31 #include "nativeInst_arm.hpp" |
32 #include "oops/instanceOop.hpp" |
32 #include "oops/instanceOop.hpp" |
33 #include "oops/method.hpp" |
33 #include "oops/method.hpp" |
34 #include "oops/objArrayKlass.hpp" |
34 #include "oops/objArrayKlass.hpp" |
2907 } |
2907 } |
2908 #else |
2908 #else |
2909 __ pop(saved_regs | R9ifScratched); |
2909 __ pop(saved_regs | R9ifScratched); |
2910 #endif // AARCH64 |
2910 #endif // AARCH64 |
2911 } |
2911 } |
2912 case BarrierSet::CardTableModRef: |
2912 case BarrierSet::CardTableBarrierSet: |
2913 break; |
2913 break; |
2914 default: |
2914 default: |
2915 ShouldNotReachHere(); |
2915 ShouldNotReachHere(); |
2916 } |
2916 } |
2917 } |
2917 } |
2960 __ pop(R9); |
2960 __ pop(R9); |
2961 #endif |
2961 #endif |
2962 #endif // !AARCH64 |
2962 #endif // !AARCH64 |
2963 } |
2963 } |
2964 break; |
2964 break; |
2965 case BarrierSet::CardTableModRef: |
2965 case BarrierSet::CardTableBarrierSet: |
2966 { |
2966 { |
2967 BLOCK_COMMENT("CardTablePostBarrier"); |
2967 BLOCK_COMMENT("CardTablePostBarrier"); |
2968 CardTableModRefBS* ctbs = barrier_set_cast<CardTableModRefBS>(bs); |
2968 CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs); |
2969 CardTable* ct = ctbs->card_table(); |
2969 CardTable* ct = ctbs->card_table(); |
2970 assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code"); |
2970 assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code"); |
2971 |
2971 |
2972 Label L_cardtable_loop, L_done; |
2972 Label L_cardtable_loop, L_done; |
2973 |
2973 |