Mercurial > hg > graal-jvmci-8
diff src/cpu/x86/vm/sharedRuntime_x86_64.cpp @ 10409:36bcc10e01c0
merge fixes
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 19 Jun 2013 15:37:32 +0200 |
parents | 01958088b87d |
children | 3489047ffea2 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Wed Jun 19 10:45:56 2013 +0200 +++ b/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Wed Jun 19 15:37:32 2013 +0200 @@ -3357,8 +3357,7 @@ #ifdef GRAAL int implicit_exception_uncommon_trap_offset = __ pc() - start; - // pc where the exception happened is in ScratchA - __ pushptr(Address(r15_thread, in_bytes(JavaThread::ScratchA_offset()))); + __ pushptr(Address(r15_thread, in_bytes(JavaThread::graal_implicit_exception_pc_offset()))); int uncommon_trap_offset = __ pc() - start;