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

     1.1 --- a/src/cpu/sparc/vm/assembler_sparc.hpp	Wed Aug 10 14:06:57 2011 -0700
     1.2 +++ b/src/cpu/sparc/vm/assembler_sparc.hpp	Thu Aug 11 12:08:11 2011 -0700
     1.3 @@ -1192,6 +1192,8 @@
     1.4      assert(offset() == 0 || !cbcond_before(), "cbcond should not follow an other cbcond");
     1.5    }
     1.6  
     1.7 +public:
     1.8 +
     1.9    bool use_cbcond(Label& L) {
    1.10      if (!UseCBCond || cbcond_before()) return false;
    1.11      intptr_t x = intptr_t(target_distance(L)) - intptr_t(pc());
    1.12 @@ -1199,7 +1201,6 @@
    1.13      return is_simm(x, 12);
    1.14    }
    1.15  
    1.16 -public:
    1.17    // Tells assembler you know that next instruction is delayed
    1.18    Assembler* delayed() {
    1.19  #ifdef CHECK_DELAY
    1.20 @@ -1248,37 +1249,37 @@
    1.21    inline void bpr(RCondition c, bool a, Predict p, Register s1, address d, relocInfo::relocType rt = relocInfo::none);
    1.22    inline void bpr(RCondition c, bool a, Predict p, Register s1, Label& L);
    1.23  
    1.24 - protected: // use MacroAssembler::br instead
    1.25 -
    1.26 -  // pp 138
    1.27 -
    1.28 -  inline void fb( Condition c, bool a, address d, relocInfo::relocType rt = relocInfo::none );
    1.29 -  inline void fb( Condition c, bool a, Label& L );
    1.30 -
    1.31 -  // pp 141
    1.32 -
    1.33 -  inline void fbp( Condition c, bool a, CC cc, Predict p, address d, relocInfo::relocType rt = relocInfo::none );
    1.34 -  inline void fbp( Condition c, bool a, CC cc, Predict p, Label& L );
    1.35 -
    1.36 -  // pp 144
    1.37 -
    1.38 -  inline void br( Condition c, bool a, address d, relocInfo::relocType rt = relocInfo::none );
    1.39 -  inline void br( Condition c, bool a, Label& L );
    1.40 -
    1.41 -  // pp 146
    1.42 -
    1.43 -  inline void bp( Condition c, bool a, CC cc, Predict p, address d, relocInfo::relocType rt = relocInfo::none );
    1.44 -  inline void bp( Condition c, bool a, CC cc, Predict p, Label& L );
    1.45 -
    1.46 -  // pp 121 (V8)
    1.47 -
    1.48 -  inline void cb( Condition c, bool a, address d, relocInfo::relocType rt = relocInfo::none );
    1.49 -  inline void cb( Condition c, bool a, Label& L );
    1.50 -
    1.51    // compare and branch
    1.52    inline void cbcond(Condition c, CC cc, Register s1, Register s2, Label& L);
    1.53    inline void cbcond(Condition c, CC cc, Register s1, int simm5, Label& L);
    1.54  
    1.55 + protected: // use MacroAssembler::br instead
    1.56 +
    1.57 +  // pp 138
    1.58 +
    1.59 +  inline void fb( Condition c, bool a, address d, relocInfo::relocType rt = relocInfo::none );
    1.60 +  inline void fb( Condition c, bool a, Label& L );
    1.61 +
    1.62 +  // pp 141
    1.63 +
    1.64 +  inline void fbp( Condition c, bool a, CC cc, Predict p, address d, relocInfo::relocType rt = relocInfo::none );
    1.65 +  inline void fbp( Condition c, bool a, CC cc, Predict p, Label& L );
    1.66 +
    1.67 +  // pp 144
    1.68 +
    1.69 +  inline void br( Condition c, bool a, address d, relocInfo::relocType rt = relocInfo::none );
    1.70 +  inline void br( Condition c, bool a, Label& L );
    1.71 +
    1.72 +  // pp 146
    1.73 +
    1.74 +  inline void bp( Condition c, bool a, CC cc, Predict p, address d, relocInfo::relocType rt = relocInfo::none );
    1.75 +  inline void bp( Condition c, bool a, CC cc, Predict p, Label& L );
    1.76 +
    1.77 +  // pp 121 (V8)
    1.78 +
    1.79 +  inline void cb( Condition c, bool a, address d, relocInfo::relocType rt = relocInfo::none );
    1.80 +  inline void cb( Condition c, bool a, Label& L );
    1.81 +
    1.82    // pp 149
    1.83  
    1.84    inline void call( address d,  relocInfo::relocType rt = relocInfo::runtime_call_type );