Mercurial > hg > truffle
diff src/share/vm/c1/c1_Runtime1.hpp @ 4137:04b9a2566eec
Merge with hsx23/hotspot.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Sat, 17 Dec 2011 21:40:27 +0100 |
| parents | b648304ba4ff cec1757a0134 |
| children | e29339f342de |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_Runtime1.hpp Sat Dec 17 20:50:09 2011 +0100 +++ b/src/share/vm/c1/c1_Runtime1.hpp Sat Dec 17 21:40:27 2011 +0100 @@ -63,9 +63,9 @@ stub(monitorenter_nofpu) /* optimized version that does not preserve fpu registers */ \ stub(monitorexit) \ stub(monitorexit_nofpu) /* optimized version that does not preserve fpu registers */ \ + stub(deoptimize) \ stub(access_field_patching) \ stub(load_klass_patching) \ - stub(jvmti_exception_throw) \ stub(g1_pre_barrier_slow) \ stub(g1_post_barrier_slow) \ stub(fpu2long_stub) \ @@ -154,7 +154,6 @@ static void unimplemented_entry (JavaThread* thread, StubID id); static address exception_handler_for_pc(JavaThread* thread); - static void post_jvmti_exception_throw(JavaThread* thread); static void throw_range_check_exception(JavaThread* thread, int index); static void throw_index_exception(JavaThread* thread, int index); @@ -170,6 +169,8 @@ static void monitorenter(JavaThread* thread, oopDesc* obj, BasicObjectLock* lock); static void monitorexit (JavaThread* thread, BasicObjectLock* lock); + static void deoptimize(JavaThread* thread); + static int access_field_patching(JavaThread* thread); static int move_klass_patching(JavaThread* thread);