Mercurial > hg > graal-jvmci-8

diff src/cpu/sparc/vm/sharedRuntime_sparc.cpp @ 22717:ba7846fcb814

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Fri Oct 30 12:28:17 2015 +0100
+++ b/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Mon Nov 02 15:33:53 2015 +0100
@@ -3665,7 +3665,7 @@
 
   RegisterSaver::restore_result_registers(masm);
 
-  __ ld(O2UnrollBlock, Deoptimization::UnrollBlock::exec_mode_offset_in_bytes(), G4deopt_mode);
+  __ ld(O2UnrollBlock, Deoptimization::UnrollBlock::unpack_kind_offset_in_bytes(), G4deopt_mode);
   Label noException;
   __ cmp_and_br_short(G4deopt_mode, Deoptimization::Unpack_exception, Assembler::notEqual, Assembler::pt, noException);
 
@@ -3799,7 +3799,7 @@
 
 #ifdef ASSERT
   { Label L;
-    __ ld(O2UnrollBlock, Deoptimization::UnrollBlock::exec_mode_offset_in_bytes(), O1);
+    __ ld(O2UnrollBlock, Deoptimization::UnrollBlock::unpack_kind_offset_in_bytes(), O1);
     __  cmp_and_br_short(O1, Deoptimization::Unpack_uncommon_trap, Assembler::equal, Assembler::pt, L);
     __ stop("SharedRuntime::generate_deopt_blob: expected Unpack_uncommon_trap");
     __ bind(L);