# HG changeset patch
# User kamg
# Date 1226506993 18000
# Node ID 295f2d955792cf6a1f0e180665cb948c7679e825
# Parent  72de50c44b5517c0afc99c20485b718ad0d8cafe# Parent  31edf09c01e55122bdd262098f6a7c763ca700d3
Merge

diff -r 72de50c44b55 -r 295f2d955792 hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp
--- a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp	Fri Nov 07 13:55:14 2008 -0800
+++ b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp	Wed Nov 12 11:23:13 2008 -0500
@@ -906,7 +906,7 @@
 
   // load next super to check
   if (UseCompressedOops) {
-    ld( Rtmp2, arrayOopDesc::base_offset_in_bytes(T_OBJECT), Rtmp3);
+    lduw( Rtmp2, arrayOopDesc::base_offset_in_bytes(T_OBJECT), Rtmp3);
     // Bump array pointer forward one oop
     add( Rtmp2, 4, Rtmp2 );
   } else {
diff -r 72de50c44b55 -r 295f2d955792 hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp
--- a/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp	Fri Nov 07 13:55:14 2008 -0800
+++ b/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp	Wed Nov 12 11:23:13 2008 -0500
@@ -956,7 +956,7 @@
     // Load a little early; will load 1 off the end of the array.
     // Ok for now; revisit if we have other uses of this routine.
     if (UseCompressedOops) {
-      __ ld(L1_ary_ptr,0,L2_super);// Will load a little early
+      __ lduw(L1_ary_ptr,0,L2_super);// Will load a little early
     } else {
       __ ld_ptr(L1_ary_ptr,0,L2_super);// Will load a little early
     }
@@ -973,7 +973,7 @@
 #ifdef  _LP64
       __ subcc(L2_super,L4_ooptmp,Rret);   // Check for match; zero in Rret for a hit
       __ br( Assembler::notEqual, false, Assembler::pt, loop );
-      __ delayed()->ld(L1_ary_ptr,0,L2_super);// Will load a little early
+      __ delayed()->lduw(L1_ary_ptr,0,L2_super);// Will load a little early
 #else
       ShouldNotReachHere();
 #endif