# HG changeset patch
# User iveresov
# Date 1301968129 25200
# Node ID a54519951ff6bb50d54b182882219a89e82a8a5c
# Parent  bb22629531fa20ed1c757cef29d05b8f3864b2ba# Parent  8b2317d732ec7484d71df6aff7c3c1e02db9d8a6
Merge

diff -r 8b2317d732ec -r a54519951ff6 src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
--- a/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp	Mon Apr 04 12:57:04 2011 -0700
+++ b/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp	Mon Apr 04 18:48:49 2011 -0700
@@ -2058,6 +2058,13 @@
   BasicType basic_type = default_type != NULL ? default_type->element_type()->basic_type() : T_ILLEGAL;
   if (basic_type == T_ARRAY) basic_type = T_OBJECT;
 
+#ifdef _LP64
+  // higher 32bits must be null
+  __ sra(dst_pos, 0, dst_pos);
+  __ sra(src_pos, 0, src_pos);
+  __ sra(length, 0, length);
+#endif
+
   // set up the arraycopy stub information
   ArrayCopyStub* stub = op->stub();
 
@@ -2151,11 +2158,6 @@
     __ delayed()->nop();
   }
 
-#ifndef _LP64
-  __ sra(dst_pos, 0, dst_pos); //higher 32bits must be null
-  __ sra(src_pos, 0, src_pos); //higher 32bits must be null
-#endif
-
   int shift = shift_amount(basic_type);
 
   if (flags & LIR_OpArrayCopy::type_check) {
@@ -2243,7 +2245,6 @@
           __ sll(dst_pos, shift, tmp);
           __ add(dst_ptr, tmp, dst_ptr);
         }
-        LP64_ONLY( __ sra(length, 0, length)); //higher 32bits must be null
         __ mov(length, len);
         __ load_klass(dst, tmp);