equal
deleted
inserted
replaced
73 #include "utilities/macros.hpp" |
73 #include "utilities/macros.hpp" |
74 #include "utilities/xmlstream.hpp" |
74 #include "utilities/xmlstream.hpp" |
75 #ifdef COMPILER1 |
75 #ifdef COMPILER1 |
76 #include "c1/c1_Runtime1.hpp" |
76 #include "c1/c1_Runtime1.hpp" |
77 #endif |
77 #endif |
|
78 #if INCLUDE_ALL_GCS |
|
79 #include "gc/g1/g1ThreadLocalData.hpp" |
|
80 #endif // INCLUDE_ALL_GCS |
78 |
81 |
79 // Shared stub locations |
82 // Shared stub locations |
80 RuntimeStub* SharedRuntime::_wrong_method_blob; |
83 RuntimeStub* SharedRuntime::_wrong_method_blob; |
81 RuntimeStub* SharedRuntime::_wrong_method_abstract_blob; |
84 RuntimeStub* SharedRuntime::_wrong_method_abstract_blob; |
82 RuntimeStub* SharedRuntime::_ic_miss_blob; |
85 RuntimeStub* SharedRuntime::_ic_miss_blob; |
212 assert(false, "should be optimized out"); |
215 assert(false, "should be optimized out"); |
213 return; |
216 return; |
214 } |
217 } |
215 assert(oopDesc::is_oop(orig, true /* ignore mark word */), "Error"); |
218 assert(oopDesc::is_oop(orig, true /* ignore mark word */), "Error"); |
216 // store the original value that was in the field reference |
219 // store the original value that was in the field reference |
217 thread->satb_mark_queue().enqueue(orig); |
220 G1ThreadLocalData::satb_mark_queue(thread).enqueue(orig); |
218 JRT_END |
221 JRT_END |
219 |
222 |
220 // G1 write-barrier post: executed after a pointer store. |
223 // G1 write-barrier post: executed after a pointer store. |
221 JRT_LEAF(void, SharedRuntime::g1_wb_post(void* card_addr, JavaThread* thread)) |
224 JRT_LEAF(void, SharedRuntime::g1_wb_post(void* card_addr, JavaThread* thread)) |
222 thread->dirty_card_queue().enqueue(card_addr); |
225 G1ThreadLocalData::dirty_card_queue(thread).enqueue(card_addr); |
223 JRT_END |
226 JRT_END |
224 |
227 |
225 #endif // INCLUDE_ALL_GCS |
228 #endif // INCLUDE_ALL_GCS |
226 |
229 |
227 |
230 |