1.1 --- a/src/cpu/sparc/vm/templateTable_sparc.cpp Wed Oct 23 19:22:28 2013 +0000
1.2 +++ b/src/cpu/sparc/vm/templateTable_sparc.cpp Thu Oct 24 16:23:07 2013 -0700
1.3 @@ -2932,9 +2932,7 @@
1.4 ConstantPoolCacheEntry::verify_tos_state_shift();
1.5 // load return address
1.6 {
1.7 - const address table_addr = (is_invokeinterface || is_invokedynamic) ?
1.8 - (address)Interpreter::return_5_addrs_by_index_table() :
1.9 - (address)Interpreter::return_3_addrs_by_index_table();
1.10 + const address table_addr = (address) Interpreter::invoke_return_entry_table_for(code);
1.11 AddressLiteral table(table_addr);
1.12 __ set(table, temp);
1.13 __ sll(ra, LogBytesPerWord, ra);
1.14 @@ -2984,7 +2982,7 @@
1.15 __ verify_oop(O0_recv);
1.16
1.17 // get return address
1.18 - AddressLiteral table(Interpreter::return_3_addrs_by_index_table());
1.19 + AddressLiteral table(Interpreter::invoke_return_entry_table());
1.20 __ set(table, Rtemp);
1.21 __ srl(Rret, ConstantPoolCacheEntry::tos_state_shift, Rret); // get return type
1.22 // Make sure we don't need to mask Rret after the above shift
1.23 @@ -3026,7 +3024,7 @@
1.24 __ profile_final_call(O4);
1.25
1.26 // get return address
1.27 - AddressLiteral table(Interpreter::return_3_addrs_by_index_table());
1.28 + AddressLiteral table(Interpreter::invoke_return_entry_table());
1.29 __ set(table, Rtemp);
1.30 __ srl(Rret, ConstantPoolCacheEntry::tos_state_shift, Rret); // get return type
1.31 // Make sure we don't need to mask Rret after the above shift
