Mercurial > hg > graal-compiler
diff src/cpu/sparc/vm/templateInterpreter_sparc.cpp @ 6266:1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
6984705: JSR 292 method handle creation should not go through JNI
Summary: remove assembly code for JDK 7 chained method handles
Reviewed-by: jrose, twisti, kvn, mhaupt
Contributed-by: John Rose <john.r.rose@oracle.com>, Christian Thalinger <christian.thalinger@oracle.com>, Michael Haupt <michael.haupt@oracle.com>
| author | twisti |
|---|---|
| date | Tue, 24 Jul 2012 10:51:00 -0700 |
| parents | 2fe087c3e814 |
| children | da91efe96a93 |
line wrap: on
line diff
--- a/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Mon Jul 23 13:04:59 2012 -0700 +++ b/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Tue Jul 24 10:51:00 2012 -0700 @@ -694,9 +694,9 @@ // Need to differentiate between igetfield, agetfield, bgetfield etc. // because they are different sizes. // Get the type from the constant pool cache - __ srl(G1_scratch, ConstantPoolCacheEntry::tosBits, G1_scratch); - // Make sure we don't need to mask G1_scratch for tosBits after the above shift - ConstantPoolCacheEntry::verify_tosBits(); + __ srl(G1_scratch, ConstantPoolCacheEntry::tos_state_shift, G1_scratch); + // Make sure we don't need to mask G1_scratch after the above shift + ConstantPoolCacheEntry::verify_tos_state_shift(); __ cmp(G1_scratch, atos ); __ br(Assembler::equal, true, Assembler::pt, xreturn_path); __ delayed()->ld_ptr(Otos_i, G3_scratch, Otos_i); @@ -1662,7 +1662,7 @@ int computed_sp_adjustment = (delta > 0) ? round_to(delta, WordsPerLong) : 0; *interpreter_frame->register_addr(I5_savedSP) = (intptr_t) (fp + computed_sp_adjustment) - STACK_BIAS; } else { - assert(caller->is_compiled_frame() || caller->is_entry_frame() || caller->is_ricochet_frame(), "only possible cases"); + assert(caller->is_compiled_frame() || caller->is_entry_frame(), "only possible cases"); // Don't have Lesp available; lay out locals block in the caller // adjacent to the register window save area. //