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

     1.1 --- a/src/cpu/sparc/vm/sparc.ad	Fri Jun 07 11:43:53 2013 -0700
     1.2 +++ b/src/cpu/sparc/vm/sparc.ad	Fri Jun 07 16:46:37 2013 -0700
     1.3 @@ -2778,10 +2778,7 @@
     1.4      Register Rold = reg_to_register_object($old$$reg);
     1.5      Register Rnew = reg_to_register_object($new$$reg);
     1.6  
     1.7 -    // casx_under_lock picks 1 of 3 encodings:
     1.8 -    // For 32-bit pointers you get a 32-bit CAS
     1.9 -    // For 64-bit pointers you get a 64-bit CASX
    1.10 -    __ casn(Rmem, Rold, Rnew); // Swap(*Rmem,Rnew) if *Rmem == Rold
    1.11 +    __ cas_ptr(Rmem, Rold, Rnew); // Swap(*Rmem,Rnew) if *Rmem == Rold
    1.12      __ cmp( Rold, Rnew );
    1.13    %}
    1.14  
    1.15 @@ -3067,7 +3064,7 @@
    1.16      AddressLiteral last_rethrow_addrlit(&last_rethrow);
    1.17      __ sethi(last_rethrow_addrlit, L1);
    1.18      Address addr(L1, last_rethrow_addrlit.low10());
    1.19 -    __ get_pc(L2);
    1.20 +    __ rdpc(L2);
    1.21      __ inc(L2, 3 * BytesPerInstWord);  // skip this & 2 more insns to point at jump_to
    1.22      __ st_ptr(L2, addr);
    1.23      __ restore();