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

     1.1 --- a/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Fri Feb 05 11:07:40 2010 -0800
     1.2 +++ b/src/cpu/sparc/vm/sharedRuntime_sparc.cpp	Sun Feb 07 12:15:06 2010 -0800
     1.3 @@ -851,10 +851,10 @@
     1.4        __ set(reg2offset(r_1) + extraspace + bias, ld_off);
     1.5  #else
     1.6        int ld_off = reg2offset(r_1) + extraspace + bias;
     1.7 +#endif // _LP64
     1.8  #ifdef ASSERT
     1.9        G1_forced = true;
    1.10  #endif // ASSERT
    1.11 -#endif // _LP64
    1.12        r_1 = G1_scratch->as_VMReg();// as part of the load/store shuffle
    1.13        if (!r_2->is_valid()) __ ld (base, ld_off, G1_scratch);
    1.14        else                  __ ldx(base, ld_off, G1_scratch);
    1.15 @@ -865,9 +865,11 @@
    1.16        if (sig_bt[i] == T_OBJECT || sig_bt[i] == T_ARRAY) {
    1.17          store_c2i_object(r, base, st_off);
    1.18        } else if (sig_bt[i] == T_LONG || sig_bt[i] == T_DOUBLE) {
    1.19 +#ifndef _LP64
    1.20          if (TieredCompilation) {
    1.21            assert(G1_forced || sig_bt[i] != T_LONG, "should not use register args for longs");
    1.22          }
    1.23 +#endif // _LP64
    1.24          store_c2i_long(r, base, st_off, r_2->is_stack());
    1.25        } else {
    1.26          store_c2i_int(r, base, st_off);