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

     1.1 --- a/src/cpu/sparc/vm/vtableStubs_sparc.cpp	Thu Jul 21 08:38:25 2011 -0700
     1.2 +++ b/src/cpu/sparc/vm/vtableStubs_sparc.cpp	Thu Jul 21 11:25:07 2011 -0700
     1.3 @@ -76,9 +76,7 @@
     1.4      Label L;
     1.5      // check offset vs vtable length
     1.6      __ ld(G3_scratch, instanceKlass::vtable_length_offset()*wordSize, G5);
     1.7 -    __ cmp(G5, vtable_index*vtableEntry::size());
     1.8 -    __ br(Assembler::greaterUnsigned, false, Assembler::pt, L);
     1.9 -    __ delayed()->nop();
    1.10 +    __ cmp_and_br_short(G5, vtable_index*vtableEntry::size(), Assembler::greaterUnsigned, Assembler::pt, L);
    1.11      __ set(vtable_index, O2);
    1.12      __ call_VM(noreg, CAST_FROM_FN_PTR(address, bad_compiled_vtable_index), O0, O2);
    1.13      __ bind(L);
    1.14 @@ -95,8 +93,7 @@
    1.15  #ifndef PRODUCT
    1.16    if (DebugVtables) {
    1.17      Label L;
    1.18 -    __ br_notnull(G5_method, false, Assembler::pt, L);
    1.19 -    __ delayed()->nop();
    1.20 +    __ br_notnull_short(G5_method, Assembler::pt, L);
    1.21      __ stop("Vtable entry is ZERO");
    1.22      __ bind(L);
    1.23    }
    1.24 @@ -177,8 +174,7 @@
    1.25  #ifndef PRODUCT
    1.26    if (DebugVtables) {
    1.27      Label L01;
    1.28 -    __ bpr(Assembler::rc_nz, false, Assembler::pt, L5_method, L01);
    1.29 -    __ delayed()->nop();
    1.30 +    __ br_notnull_short(L5_method, Assembler::pt, L01);
    1.31      __ stop("methodOop is null");
    1.32      __ bind(L01);
    1.33      __ verify_oop(L5_method);