Mercurial > hg > graal-compiler
changeset 437:491a904952f2
Merge
author | kvn |
---|---|
date | Wed, 19 Nov 2008 09:09:31 -0800 |
parents | 81a0cbe3b284 (diff) 87559db65269 (current diff) |
children | b5e603f2e024 |
files | |
diffstat | 4 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Nov 18 14:47:36 2008 -0800 +++ b/.hgtags Wed Nov 19 09:09:31 2008 -0800 @@ -13,3 +13,4 @@ e91159f921a58af3698e6479ea1fc5818da66d09 jdk7-b36 9ee9cf798b59e7d51f8c0a686959f313867a55d6 jdk7-b37 d9bc824aa078573829bb66572af847e26e1bd12e jdk7-b38 +49ca90d77f34571b0757ebfcb8a7848ef2696b88 jdk7-b39
--- a/make/hotspot_version Tue Nov 18 14:47:36 2008 -0800 +++ b/make/hotspot_version Wed Nov 19 09:09:31 2008 -0800 @@ -35,7 +35,7 @@ HS_MAJOR_VER=14 HS_MINOR_VER=0 -HS_BUILD_NUMBER=06 +HS_BUILD_NUMBER=07 JDK_MAJOR_VER=1 JDK_MINOR_VER=7
--- a/src/cpu/sparc/vm/interp_masm_sparc.cpp Tue Nov 18 14:47:36 2008 -0800 +++ b/src/cpu/sparc/vm/interp_masm_sparc.cpp Wed Nov 19 09:09:31 2008 -0800 @@ -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 {
--- a/src/cpu/sparc/vm/stubGenerator_sparc.cpp Tue Nov 18 14:47:36 2008 -0800 +++ b/src/cpu/sparc/vm/stubGenerator_sparc.cpp Wed Nov 19 09:09:31 2008 -0800 @@ -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