src/cpu/sparc/vm/assembler_sparc.cpp

*** 2629,2645 ****
    assert(dest.register_or_noreg() != G0, "lost side effect");
    if ((src.is_constant() && src.as_constant() == 0) ||
        (src.is_register() && src.as_register() == G0)) {
      // do nothing
    } else if (dest.is_register()) {
!     add(dest.as_register(), ensure_rs2(src, temp), dest.as_register());
    } else if (src.is_constant()) {
      intptr_t res = dest.as_constant() + src.as_constant();
      dest = RegisterOrConstant(res); // side effect seen by caller
    } else {
      assert(temp != noreg, "cannot handle constant += register");
!     add(src.as_register(), ensure_rs2(dest, temp), temp);
      dest = RegisterOrConstant(temp); // side effect seen by caller
    }
  }
  
  void MacroAssembler::regcon_sll_ptr( RegisterOrConstant& dest, RegisterOrConstant src, Register temp ) {
--- 2629,2645 ----
    assert(dest.register_or_noreg() != G0, "lost side effect");
    if ((src.is_constant() && src.as_constant() == 0) ||
        (src.is_register() && src.as_register() == G0)) {
      // do nothing
    } else if (dest.is_register()) {
!     add(dest.as_register(), ensure_simm13_or_reg(src, temp), dest.as_register());
    } else if (src.is_constant()) {
      intptr_t res = dest.as_constant() + src.as_constant();
      dest = RegisterOrConstant(res); // side effect seen by caller
    } else {
      assert(temp != noreg, "cannot handle constant += register");
!     add(src.as_register(), ensure_simm13_or_reg(dest, temp), temp);
      dest = RegisterOrConstant(temp); // side effect seen by caller
    }
  }
  
  void MacroAssembler::regcon_sll_ptr( RegisterOrConstant& dest, RegisterOrConstant src, Register temp ) {
*** 2708,2718 ****
  
    // Adjust recv_klass by scaled itable_index, so we can free itable_index.
    RegisterOrConstant itable_offset = itable_index;
    regcon_sll_ptr(itable_offset, exact_log2(itableMethodEntry::size() * wordSize));
    regcon_inc_ptr(itable_offset, itableMethodEntry::method_offset_in_bytes());
!   add(recv_klass, ensure_rs2(itable_offset, sethi_temp), recv_klass);
  
    // for (scan = klass->itable(); scan->interface() != NULL; scan += scan_step) {
    //   if (scan->interface() == intf) {
    //     result = (klass + scan->offset() + itable_index);
    //   }
--- 2708,2718 ----
  
    // Adjust recv_klass by scaled itable_index, so we can free itable_index.
    RegisterOrConstant itable_offset = itable_index;
    regcon_sll_ptr(itable_offset, exact_log2(itableMethodEntry::size() * wordSize));
    regcon_inc_ptr(itable_offset, itableMethodEntry::method_offset_in_bytes());
!   add(recv_klass, ensure_simm13_or_reg(itable_offset, sethi_temp), recv_klass);
  
    // for (scan = klass->itable(); scan->interface() != NULL; scan += scan_step) {
    //   if (scan->interface() == intf) {
    //     result = (klass + scan->offset() + itable_index);
    //   }