Mercurial > hg > graal-jvmci-8
comparison src/cpu/sparc/vm/sharedRuntime_sparc.cpp @ 22717:ba7846fcb814
Fix ppc and x86_32 after fetch_unroll_info_helper changes
Changes in 3c1edc9c60d8 only included x86_64 and sparc.
This change also reuses the existing unpack_kind instead of a new
field in UnrollBlock.
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Mon, 02 Nov 2015 15:33:53 +0100 |
parents | 3c1edc9c60d8 |
children | 3ef45d0a6d77 |
comparison
equal
deleted
inserted
replaced
22716:f536aaa5a5d5 | 22717:ba7846fcb814 |
---|---|
3663 | 3663 |
3664 __ mov(O0, O2UnrollBlock->after_save()); | 3664 __ mov(O0, O2UnrollBlock->after_save()); |
3665 | 3665 |
3666 RegisterSaver::restore_result_registers(masm); | 3666 RegisterSaver::restore_result_registers(masm); |
3667 | 3667 |
3668 __ ld(O2UnrollBlock, Deoptimization::UnrollBlock::exec_mode_offset_in_bytes(), G4deopt_mode); | 3668 __ ld(O2UnrollBlock, Deoptimization::UnrollBlock::unpack_kind_offset_in_bytes(), G4deopt_mode); |
3669 Label noException; | 3669 Label noException; |
3670 __ cmp_and_br_short(G4deopt_mode, Deoptimization::Unpack_exception, Assembler::notEqual, Assembler::pt, noException); | 3670 __ cmp_and_br_short(G4deopt_mode, Deoptimization::Unpack_exception, Assembler::notEqual, Assembler::pt, noException); |
3671 | 3671 |
3672 // Move the pending exception from exception_oop to Oexception so | 3672 // Move the pending exception from exception_oop to Oexception so |
3673 // the pending exception will be picked up the interpreter. | 3673 // the pending exception will be picked up the interpreter. |
3797 __ mov(O2UnrollBlock, O2UnrollBlock->after_save()); | 3797 __ mov(O2UnrollBlock, O2UnrollBlock->after_save()); |
3798 __ restore(); | 3798 __ restore(); |
3799 | 3799 |
3800 #ifdef ASSERT | 3800 #ifdef ASSERT |
3801 { Label L; | 3801 { Label L; |
3802 __ ld(O2UnrollBlock, Deoptimization::UnrollBlock::exec_mode_offset_in_bytes(), O1); | 3802 __ ld(O2UnrollBlock, Deoptimization::UnrollBlock::unpack_kind_offset_in_bytes(), O1); |
3803 __ cmp_and_br_short(O1, Deoptimization::Unpack_uncommon_trap, Assembler::equal, Assembler::pt, L); | 3803 __ cmp_and_br_short(O1, Deoptimization::Unpack_uncommon_trap, Assembler::equal, Assembler::pt, L); |
3804 __ stop("SharedRuntime::generate_deopt_blob: expected Unpack_uncommon_trap"); | 3804 __ stop("SharedRuntime::generate_deopt_blob: expected Unpack_uncommon_trap"); |
3805 __ bind(L); | 3805 __ bind(L); |
3806 } | 3806 } |
3807 #endif | 3807 #endif |