equal
deleted
inserted
replaced
29 #include "gc/g1/g1CardTable.hpp" |
29 #include "gc/g1/g1CardTable.hpp" |
30 #include "gc/g1/g1BarrierSet.hpp" |
30 #include "gc/g1/g1BarrierSet.hpp" |
31 #include "gc/g1/g1BarrierSetAssembler.hpp" |
31 #include "gc/g1/g1BarrierSetAssembler.hpp" |
32 #include "gc/g1/g1ThreadLocalData.hpp" |
32 #include "gc/g1/g1ThreadLocalData.hpp" |
33 #include "gc/g1/heapRegion.hpp" |
33 #include "gc/g1/heapRegion.hpp" |
34 #include "gc/shared/collectedHeap.hpp" |
|
35 #include "interpreter/interp_masm.hpp" |
34 #include "interpreter/interp_masm.hpp" |
36 #include "runtime/sharedRuntime.hpp" |
35 #include "runtime/sharedRuntime.hpp" |
37 |
36 |
38 #define __ masm-> |
37 #define __ masm-> |
39 |
38 |
259 |
258 |
260 assert_different_registers(Rstore_addr, Rnew_val, Rtmp1, Rtmp2); // Most probably, Rnew_val == Rtmp3. |
259 assert_different_registers(Rstore_addr, Rnew_val, Rtmp1, Rtmp2); // Most probably, Rnew_val == Rtmp3. |
261 |
260 |
262 Label callRuntime, filtered; |
261 Label callRuntime, filtered; |
263 |
262 |
264 CardTableBarrierSet* ct = barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set()); |
263 CardTableBarrierSet* ct = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set()); |
265 assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code"); |
264 assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code"); |
266 |
265 |
267 BLOCK_COMMENT("g1_write_barrier_post {"); |
266 BLOCK_COMMENT("g1_write_barrier_post {"); |
268 |
267 |
269 // Does store cross heap regions? |
268 // Does store cross heap regions? |