--- old/src/cpu/sparc/vm/assembler_sparc.cpp	2009-10-05 10:00:00.105714712 -0700
+++ new/src/cpu/sparc/vm/assembler_sparc.cpp	2009-10-05 09:59:59.885679519 -0700
@@ -2631,13 +2631,13 @@
       (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());
+    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_rs2(dest, temp), temp);
+    add(src.as_register(), ensure_simm13_or_reg(dest, temp), temp);
     dest = RegisterOrConstant(temp); // side effect seen by caller
   }
 }
@@ -2710,7 +2710,7 @@
   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);
+  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) {