stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Keith McGuigan 2008-11-12 11:23:13 -05:00
commit 8db365aa80
2 changed files with 3 additions and 3 deletions

2
hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp

@ -906,7 +906,7 @@ void InterpreterMacroAssembler::gen_subtype_check(Register Rsub_klass,
// load next super to check // load next super to check
if (UseCompressedOops) { 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 // Bump array pointer forward one oop
add( Rtmp2, 4, Rtmp2 ); add( Rtmp2, 4, Rtmp2 );
} else { } else {

4
hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp

@ -956,7 +956,7 @@ class StubGenerator: public StubCodeGenerator {
// Load a little early; will load 1 off the end of the array. // 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. // Ok for now; revisit if we have other uses of this routine.
if (UseCompressedOops) { 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 { } else {
__ ld_ptr(L1_ary_ptr,0,L2_super);// Will load a little early __ ld_ptr(L1_ary_ptr,0,L2_super);// Will load a little early
} }
@ -973,7 +973,7 @@ class StubGenerator: public StubCodeGenerator {
#ifdef _LP64 #ifdef _LP64
__ subcc(L2_super,L4_ooptmp,Rret); // Check for match; zero in Rret for a hit __ subcc(L2_super,L4_ooptmp,Rret); // Check for match; zero in Rret for a hit
__ br( Assembler::notEqual, false, Assembler::pt, loop ); __ 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 #else
ShouldNotReachHere(); ShouldNotReachHere();
#endif #endif