*** old/src/cpu/sparc/vm/assembler_sparc.hpp	Mon Oct  5 10:00:02 2009
--- new/src/cpu/sparc/vm/assembler_sparc.hpp	Mon Oct  5 10:00:02 2009

*** 1277,1286 ****
--- 1277,1287 ----
    void jmpl( Register s1, Register s2, Register d );
    void jmpl( Register s1, int simm13a, Register d, RelocationHolder const& rspec = RelocationHolder() );
  
    // 171
  
+   inline void ldf(FloatRegisterImpl::Width w, Register s1, RegisterOrConstant s2, FloatRegister d);
    inline void ldf(FloatRegisterImpl::Width w, Register s1, Register s2, FloatRegister d);
    inline void ldf(FloatRegisterImpl::Width w, Register s1, int simm13a, FloatRegister d, RelocationHolder const& rspec = RelocationHolder());
  
    inline void ldf(FloatRegisterImpl::Width w, const Address& a, FloatRegister d, int offset = 0);
  

*** 1533,1543 ****
--- 1534,1545 ----
  
    void stbar() { emit_long( op(arith_op) | op3(membar_op3) | u_field(15, 18, 14)); }
  
    // pp 222
  
!   inline void stf(    FloatRegisterImpl::Width w, FloatRegister d, Register s1, Register s2 );
!   inline void stf(    FloatRegisterImpl::Width w, FloatRegister d, Register s1, RegisterOrConstant s2);
+   inline void stf(    FloatRegisterImpl::Width w, FloatRegister d, Register s1, Register s2);
    inline void stf(    FloatRegisterImpl::Width w, FloatRegister d, Register s1, int simm13a);
    inline void stf(    FloatRegisterImpl::Width w, FloatRegister d, const Address& a, int offset = 0);
  
    inline void stfsr(  Register s1, Register s2 );
    inline void stfsr(  Register s1, int simm13a);

*** 2047,2062 ****
--- 2049,2065 ----
    // the temp argument is required, and is used to materialize the constant.
    void regcon_inc_ptr( RegisterOrConstant& dest, RegisterOrConstant src,
                         Register temp = noreg );
    void regcon_sll_ptr( RegisterOrConstant& dest, RegisterOrConstant src,
                         Register temp = noreg );
    RegisterOrConstant ensure_rs2(RegisterOrConstant rs2, Register sethi_temp) {
      guarantee(sethi_temp != noreg, "constant offset overflow");
      if (is_simm13(rs2.constant_or_zero()))
        return rs2;               // register or short constant
      set(rs2.as_constant(), sethi_temp);
!     return sethi_temp;
+ 
+   RegisterOrConstant ensure_simm13_or_reg(RegisterOrConstant roc, Register Rtemp) {
+     guarantee(Rtemp != noreg, "constant offset overflow");
+     if (is_simm13(roc.constant_or_zero()))
+       return roc;               // register or short constant
!     set(roc.as_constant(), Rtemp);
+     return RegisterOrConstant(Rtemp);
    }
  
    // --------------------------------------------------
  
   public: