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

     1.1 --- a/src/cpu/sparc/vm/jniFastGetField_sparc.cpp	Mon Apr 20 14:48:03 2009 -0700
     1.2 +++ b/src/cpu/sparc/vm/jniFastGetField_sparc.cpp	Tue Apr 21 11:16:30 2009 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright 2004-2006 Sun Microsystems, Inc.  All Rights Reserved.
     1.6 + * Copyright 2004-2009 Sun Microsystems, Inc.  All Rights Reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -57,10 +57,10 @@
    1.11  
    1.12    Label label1, label2;
    1.13  
    1.14 -  address cnt_addr = SafepointSynchronize::safepoint_counter_addr();
    1.15 -  Address ca(O3, cnt_addr);
    1.16 -  __ sethi (ca);
    1.17 -  __ ld (ca, G4);
    1.18 +  AddressLiteral cnt_addrlit(SafepointSynchronize::safepoint_counter_addr());
    1.19 +  __ sethi (cnt_addrlit, O3);
    1.20 +  Address cnt_addr(O3, cnt_addrlit.low10());
    1.21 +  __ ld (cnt_addr, G4);
    1.22    __ andcc (G4, 1, G0);
    1.23    __ br (Assembler::notZero, false, Assembler::pn, label1);
    1.24    __ delayed()->srl (O2, 2, O4);
    1.25 @@ -77,7 +77,7 @@
    1.26      default:        ShouldNotReachHere();
    1.27    }
    1.28  
    1.29 -  __ ld (ca, O5);
    1.30 +  __ ld (cnt_addr, O5);
    1.31    __ cmp (O5, G4);
    1.32    __ br (Assembler::notEqual, false, Assembler::pn, label2);
    1.33    __ delayed()->mov (O7, G1);
    1.34 @@ -136,10 +136,10 @@
    1.35  
    1.36    Label label1, label2;
    1.37  
    1.38 -  address cnt_addr = SafepointSynchronize::safepoint_counter_addr();
    1.39 -  Address ca(G3, cnt_addr);
    1.40 -  __ sethi (ca);
    1.41 -  __ ld (ca, G4);
    1.42 +  AddressLiteral cnt_addrlit(SafepointSynchronize::safepoint_counter_addr());
    1.43 +  __ sethi (cnt_addrlit, G3);
    1.44 +  Address cnt_addr(G3, cnt_addrlit.low10());
    1.45 +  __ ld (cnt_addr, G4);
    1.46    __ andcc (G4, 1, G0);
    1.47    __ br (Assembler::notZero, false, Assembler::pn, label1);
    1.48    __ delayed()->srl (O2, 2, O4);
    1.49 @@ -159,7 +159,7 @@
    1.50    __ ldx (O5, 0, O3);
    1.51  #endif
    1.52  
    1.53 -  __ ld (ca, G1);
    1.54 +  __ ld (cnt_addr, G1);
    1.55    __ cmp (G1, G4);
    1.56    __ br (Assembler::notEqual, false, Assembler::pn, label2);
    1.57    __ delayed()->mov (O7, G1);
    1.58 @@ -208,10 +208,10 @@
    1.59  
    1.60    Label label1, label2;
    1.61  
    1.62 -  address cnt_addr = SafepointSynchronize::safepoint_counter_addr();
    1.63 -  Address ca(O3, cnt_addr);
    1.64 -  __ sethi (ca);
    1.65 -  __ ld (ca, G4);
    1.66 +  AddressLiteral cnt_addrlit(SafepointSynchronize::safepoint_counter_addr());
    1.67 +  __ sethi (cnt_addrlit, O3);
    1.68 +  Address cnt_addr(O3, cnt_addrlit.low10());
    1.69 +  __ ld (cnt_addr, G4);
    1.70    __ andcc (G4, 1, G0);
    1.71    __ br (Assembler::notZero, false, Assembler::pn, label1);
    1.72    __ delayed()->srl (O2, 2, O4);
    1.73 @@ -225,7 +225,7 @@
    1.74      default:       ShouldNotReachHere();
    1.75    }
    1.76  
    1.77 -  __ ld (ca, O5);
    1.78 +  __ ld (cnt_addr, O5);
    1.79    __ cmp (O5, G4);
    1.80    __ br (Assembler::notEqual, false, Assembler::pn, label2);
    1.81    __ delayed()->mov (O7, G1);