Mercurial > hg > graal-jvmci-8
diff src/cpu/x86/vm/graalRuntime_x86.cpp @ 8976:4fc644c79b9f
Correctly restore registers after runtime calls that create exceptions.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 09 Apr 2013 21:55:58 +0200 |
parents | e41c32a4d573 |
children | bb2447c64055 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/graalRuntime_x86.cpp Tue Apr 09 20:00:30 2013 +0200 +++ b/src/cpu/x86/vm/graalRuntime_x86.cpp Tue Apr 09 21:55:58 2013 +0200 @@ -930,6 +930,7 @@ OopMap* oop_map = save_live_registers(sasm, 0); int call_offset = __ call_RT(rax, noreg, (address)create_null_exception, 0); oop_maps->add_gc_map(call_offset, oop_map); + restore_live_registers_except_rax(sasm); __ leave(); __ ret(0); break; @@ -938,9 +939,10 @@ case create_out_of_bounds_exception_id: { __ enter(); oop_maps = new OopMapSet(); - OopMap* oop_map = save_live_registers(sasm, 0); + OopMap* oop_map = save_live_registers(sasm, 1); int call_offset = __ call_RT(rax, noreg, (address)create_out_of_bounds_exception, j_rarg0); oop_maps->add_gc_map(call_offset, oop_map); + restore_live_registers_except_rax(sasm); __ leave(); __ ret(0); break; @@ -949,7 +951,7 @@ case vm_error_id: { __ enter(); oop_maps = new OopMapSet(); - OopMap* oop_map = save_live_registers(sasm, 0); + OopMap* oop_map = save_live_registers(sasm, 3); int call_offset = __ call_RT(noreg, noreg, (address)vm_error, j_rarg0, j_rarg1, j_rarg2); oop_maps->add_gc_map(call_offset, oop_map); restore_live_registers(sasm); @@ -961,7 +963,7 @@ case log_printf_id: { __ enter(); oop_maps = new OopMapSet(); - OopMap* oop_map = save_live_registers(sasm, 0); + OopMap* oop_map = save_live_registers(sasm, 4); int call_offset = __ call_RT(noreg, noreg, (address)log_printf, j_rarg0, j_rarg1, j_rarg2, j_rarg3); oop_maps->add_gc_map(call_offset, oop_map); restore_live_registers(sasm); @@ -973,7 +975,7 @@ case log_primitive_id: { __ enter(); oop_maps = new OopMapSet(); - OopMap* oop_map = save_live_registers(sasm, 0); + OopMap* oop_map = save_live_registers(sasm, 3); int call_offset = __ call_RT(noreg, noreg, (address)log_primitive, j_rarg0, j_rarg1, j_rarg2); oop_maps->add_gc_map(call_offset, oop_map); restore_live_registers(sasm); @@ -985,7 +987,7 @@ case log_object_id: { __ enter(); oop_maps = new OopMapSet(); - OopMap* oop_map = save_live_registers(sasm, 0); + OopMap* oop_map = save_live_registers(sasm, 2); int call_offset = __ call_RT(noreg, noreg, (address)log_object, j_rarg0, j_rarg1); oop_maps->add_gc_map(call_offset, oop_map); restore_live_registers(sasm);