archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 06:14:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7075623: 6990212 broke raiseException in 64 bit

Browse source 
Reviewed-by: kvn, twisti
This commit is contained in:
Tom Rodriguez 2011-08-08 13:19:46 -07:00
parent 6a54c8a55f
commit 9cd1a00e3f
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp
View file

@ -1126,7 +1126,7 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
adjust_SP_and_Gargs_down_by_slots(_masm, 3, noreg, noreg);
__ st_ptr(O0_code, __ argument_address(constant(2), noreg, 0));
__ st (O0_code, __ argument_address(constant(2), noreg, 0));
__ st_ptr(O1_actual, __ argument_address(constant(1), noreg, 0));
__ st_ptr(O2_required, __ argument_address(constant(0), noreg, 0));
jump_from_method_handle(_masm, G5_method, O1_scratch, O2_scratch);

4
hotspot/src/cpu/x86/vm/methodHandles_x86.cpp
View file

@ -1192,11 +1192,11 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
const int jobject_oop_offset = 0;
__ movptr(rbx_method, Address(rbx_method, jobject_oop_offset)); // dereference the jobject
__ movptr(rsi, rsp);
__ movptr(saved_last_sp, rsp);
__ subptr(rsp, 3 * wordSize);
__ push(rax_pc); // restore caller PC
__ movptr(__ argument_address(constant(2)), rarg0_code);
__ movl (__ argument_address(constant(2)), rarg0_code);
__ movptr(__ argument_address(constant(1)), rarg1_actual);
__ movptr(__ argument_address(constant(0)), rarg2_required);
jump_from_method_handle(_masm, rbx_method, rax);