Mercurial > hg > truffle

diff src/cpu/sparc/vm/templateTable_sparc.cpp @ 3284:286c498ae0d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Fri, 29 Apr 2011 11:15:30 -0700
parents 08ccee2c4dbf 92add02409c9
children 81d815b05abb
line wrap: on
line diff
--- a/src/cpu/sparc/vm/templateTable_sparc.cpp	Thu Apr 28 14:00:13 2011 -0700
+++ b/src/cpu/sparc/vm/templateTable_sparc.cpp	Fri Apr 29 11:15:30 2011 -0700
@@ -57,7 +57,11 @@
     case BarrierSet::G1SATBCT:
     case BarrierSet::G1SATBCTLogging:
       {
-        __ g1_write_barrier_pre( base, index, offset, tmp, /*preserve_o_regs*/true);
+        // Load and record the previous value.
+        __ g1_write_barrier_pre(base, index, offset,
+                                noreg /* pre_val */,
+                                tmp, true /*preserve_o_regs*/);
+
         if (index == noreg ) {
           assert(Assembler::is_simm13(offset), "fix this code");
           __ store_heap_oop(val, base, offset);