OpenJDK / amber / amber
changeset 41336:b1fe5872f8f0
8161085: PreserveFPRegistersTest fails with 'AssertionError: Final value has changed'
Summary: C1's G1 barriers should save/restore vector registers before calling into the runtime.
Reviewed-by: kvn, vlivanov
| author | thartmann |
|---|---|
| date | Mon, 26 Sep 2016 08:51:36 +0200 |
| parents | 27115e2e42cc |
| children | 4493ad6de04d |
| files | hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp |
| diffstat | 1 files changed, 4 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp Wed Aug 17 18:48:34 2016 +0300 +++ b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp Mon Sep 26 08:51:36 2016 +0200 @@ -881,20 +881,15 @@ __ delayed()->st_ptr(tmp, G2_thread, satb_q_index_byte_offset); __ bind(refill); - __ save_frame(0); - __ mov(pre_val, L0); - __ mov(tmp, L1); - __ mov(tmp2, L2); + save_live_registers(sasm); __ call_VM_leaf(L7_thread_cache, CAST_FROM_FN_PTR(address, SATBMarkQueueSet::handle_zero_index_for_thread), G2_thread); - __ mov(L0, pre_val); - __ mov(L1, tmp); - __ mov(L2, tmp2); + restore_live_registers(sasm); __ br(Assembler::always, /*annul*/false, Assembler::pt, restart); __ delayed()->restore(); @@ -986,20 +981,15 @@ __ delayed()->st_ptr(tmp3, G2_thread, dirty_card_q_index_byte_offset); __ bind(refill); - __ save_frame(0); - __ mov(tmp2, L0); - __ mov(tmp3, L1); - __ mov(tmp4, L2); + save_live_registers(sasm); __ call_VM_leaf(L7_thread_cache, CAST_FROM_FN_PTR(address, DirtyCardQueueSet::handle_zero_index_for_thread), G2_thread); - __ mov(L0, tmp2); - __ mov(L1, tmp3); - __ mov(L2, tmp4); + restore_live_registers(sasm); __ br(Assembler::always, /*annul*/false, Assembler::pt, restart); __ delayed()->restore();