Mercurial > hg > truffle
diff src/cpu/x86/vm/sharedRuntime_x86_64.cpp @ 5111:422c979ff392
fixed two cases where DeoptAction was invalid
| author | Christian Haeubl <christian.haeubl@oracle.com> |
|---|---|
| date | Thu, 15 Mar 2012 16:34:31 -0700 |
| parents | 6766253384bf |
| children | 957c266d8bc5 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Thu Mar 15 15:31:34 2012 -0700 +++ b/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Thu Mar 15 16:34:31 2012 -0700 @@ -3015,9 +3015,9 @@ #ifdef GRAAL __ jmp(cont); - int jmp_uncommon_trap_offset = __ pc() - start; + int implicit_exception_uncommon_trap_offset = __ pc() - start; __ pushptr(Address(r15_thread, in_bytes(JavaThread::ScratchA_offset()))); - __ movptr(rscratch1, 2); // InvalidateRecompile + __ movptr(rscratch1, Address(r15_thread, in_bytes(JavaThread::ScratchB_offset()))); int uncommon_trap_offset = __ pc() - start; @@ -3244,7 +3244,7 @@ _deopt_blob->set_unpack_with_exception_in_tls_offset(exception_in_tls_offset); #ifdef GRAAL _deopt_blob->set_uncommon_trap_offset(uncommon_trap_offset); - _deopt_blob->set_jmp_uncommon_trap_offset(jmp_uncommon_trap_offset); + _deopt_blob->set_implicit_exception_uncommon_trap_offset(implicit_exception_uncommon_trap_offset); #endif }