Mercurial > hg > icedtea7-forest > hotspot

changeset 6452:b6971126dc0f icedtea-2.7.0pre07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR2938: Fix build of 8148487 backport Summary: ztos case in templateTable_ppc_64.cpp needs to match other cases in 7
author andrew
date Tue, 19 Apr 2016 21:44:54 +0100
parents 71fdc2163e4e
children 8d4e845ef74b
files src/cpu/ppc/vm/templateTable_ppc_64.cpp
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/ppc/vm/templateTable_ppc_64.cpp	Mon Apr 18 07:12:53 2016 +0100
+++ b/src/cpu/ppc/vm/templateTable_ppc_64.cpp	Tue Apr 19 21:44:54 2016 +0100
@@ -2898,9 +2898,10 @@
   __ stbx(R17_tos, Rclass_or_obj, Roffset);
   if (!is_static) { patch_bytecode(Bytecodes::_fast_zputfield, Rbc, Rscratch, true, byte_no); }
   if (!support_IRIW_for_not_multiple_copy_atomic_cpu) {
-    __ beq(CR_is_vol, Lvolatile); // Volatile?
+    __ bne(CR_is_vol, Lexit); // Non-volatile?
+    __ fence();
   }
-  __ dispatch_epilog(vtos, Bytecodes::length_for(bytecode()));
+  __ b(Lexit);
 
   __ align(32, 28, 28); // Align pop.
   // __ bind(Lctos);