Mercurial > hg > truffle
comparison src/share/vm/runtime/sharedRuntime.cpp @ 8004:df8462fbe585
Merge
author | vladidan |
---|---|
date | Thu, 07 Feb 2013 20:40:14 -0500 |
parents | 9fae07c31641 db9981fd3124 |
children | 5fc51c1ecdeb a5c95fcf7cb7 |
comparison
equal
deleted
inserted
replaced
8000:d05ff4bf41b3 | 8004:df8462fbe585 |
---|---|
54 #include "runtime/vframeArray.hpp" | 54 #include "runtime/vframeArray.hpp" |
55 #include "utilities/copy.hpp" | 55 #include "utilities/copy.hpp" |
56 #include "utilities/dtrace.hpp" | 56 #include "utilities/dtrace.hpp" |
57 #include "utilities/events.hpp" | 57 #include "utilities/events.hpp" |
58 #include "utilities/hashtable.inline.hpp" | 58 #include "utilities/hashtable.inline.hpp" |
59 #include "utilities/macros.hpp" | |
59 #include "utilities/xmlstream.hpp" | 60 #include "utilities/xmlstream.hpp" |
60 #ifdef TARGET_ARCH_x86 | 61 #ifdef TARGET_ARCH_x86 |
61 # include "nativeInst_x86.hpp" | 62 # include "nativeInst_x86.hpp" |
62 # include "vmreg_x86.inline.hpp" | 63 # include "vmreg_x86.inline.hpp" |
63 #endif | 64 #endif |
210 tty->print_cr ("Total IC misses: %7d", tot_misses); | 211 tty->print_cr ("Total IC misses: %7d", tot_misses); |
211 } | 212 } |
212 } | 213 } |
213 #endif // PRODUCT | 214 #endif // PRODUCT |
214 | 215 |
215 #ifndef SERIALGC | 216 #if INCLUDE_ALL_GCS |
216 | 217 |
217 // G1 write-barrier pre: executed before a pointer store. | 218 // G1 write-barrier pre: executed before a pointer store. |
218 JRT_LEAF(void, SharedRuntime::g1_wb_pre(oopDesc* orig, JavaThread *thread)) | 219 JRT_LEAF(void, SharedRuntime::g1_wb_pre(oopDesc* orig, JavaThread *thread)) |
219 if (orig == NULL) { | 220 if (orig == NULL) { |
220 assert(false, "should be optimized out"); | 221 assert(false, "should be optimized out"); |
228 // G1 write-barrier post: executed after a pointer store. | 229 // G1 write-barrier post: executed after a pointer store. |
229 JRT_LEAF(void, SharedRuntime::g1_wb_post(void* card_addr, JavaThread* thread)) | 230 JRT_LEAF(void, SharedRuntime::g1_wb_post(void* card_addr, JavaThread* thread)) |
230 thread->dirty_card_queue().enqueue(card_addr); | 231 thread->dirty_card_queue().enqueue(card_addr); |
231 JRT_END | 232 JRT_END |
232 | 233 |
233 #endif // !SERIALGC | 234 #endif // INCLUDE_ALL_GCS |
234 | 235 |
235 | 236 |
236 JRT_LEAF(jlong, SharedRuntime::lmul(jlong y, jlong x)) | 237 JRT_LEAF(jlong, SharedRuntime::lmul(jlong y, jlong x)) |
237 return x * y; | 238 return x * y; |
238 JRT_END | 239 JRT_END |