Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/cpu/sparc/vm/assembler_sparc.cpp	Fri Jul 10 16:01:20 2009 -0700
     1.2 +++ b/src/cpu/sparc/vm/assembler_sparc.cpp	Tue Jul 14 15:40:39 2009 -0700
     1.3 @@ -4208,6 +4208,7 @@
     1.4                    PtrQueue::byte_offset_of_active()),
     1.5           tmp);
     1.6    }
     1.7 +
     1.8    // Check on whether to annul.
     1.9    br_on_reg_cond(rc_z, /*annul*/false, Assembler::pt, tmp, filtered);
    1.10    delayed() -> nop();
    1.11 @@ -4215,13 +4216,13 @@
    1.12    // satb_log_barrier_work1(tmp, offset);
    1.13    if (index == noreg) {
    1.14      if (Assembler::is_simm13(offset)) {
    1.15 -      ld_ptr(obj, offset, tmp);
    1.16 +      load_heap_oop(obj, offset, tmp);
    1.17      } else {
    1.18        set(offset, tmp);
    1.19 -      ld_ptr(obj, tmp, tmp);
    1.20 +      load_heap_oop(obj, tmp, tmp);
    1.21      }
    1.22    } else {
    1.23 -    ld_ptr(obj, index, tmp);
    1.24 +    load_heap_oop(obj, index, tmp);
    1.25    }
    1.26  
    1.27    // satb_log_barrier_work2(obj, tmp, offset);