Mercurial > hg > graal-jvmci-8
comparison src/cpu/x86/vm/runtime_x86_32.cpp @ 23286:dd9cc155639c
Merge with jdk8u66-b17
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Thu, 07 Jan 2016 17:28:46 +0100 |
parents | e8260b6328fb |
children |
comparison
equal
deleted
inserted
replaced
22786:ac649db7fec4 | 23286:dd9cc155639c |
---|---|
124 __ addptr(rsp, return_off * wordSize); // Epilog! | 124 __ addptr(rsp, return_off * wordSize); // Epilog! |
125 __ pop(rdx); // Exception pc | 125 __ pop(rdx); // Exception pc |
126 | 126 |
127 // rax: exception handler for given <exception oop/exception pc> | 127 // rax: exception handler for given <exception oop/exception pc> |
128 | 128 |
129 // Restore SP from BP if the exception PC is a MethodHandle call site. | |
130 __ cmpl(Address(rcx, JavaThread::is_method_handle_return_offset()), 0); | |
131 __ cmovptr(Assembler::notEqual, rsp, rbp_mh_SP_save); | |
132 | |
133 // We have a handler in rax, (could be deopt blob) | 129 // We have a handler in rax, (could be deopt blob) |
134 // rdx - throwing pc, deopt blob will need it. | 130 // rdx - throwing pc, deopt blob will need it. |
135 | 131 |
136 __ push(rax); | 132 __ push(rax); |
137 | 133 |