*** old/src/cpu/sparc/vm/templateTable_sparc.cpp	Tue Oct 22 15:00:23 2013
--- new/src/cpu/sparc/vm/templateTable_sparc.cpp	Tue Oct 22 15:00:23 2013

*** 2930,2942 ****
--- 2930,2940 ----
    __ srl(flags, ConstantPoolCacheEntry::tos_state_shift, ra);
    // Make sure we don't need to mask flags after the above shift
    ConstantPoolCacheEntry::verify_tos_state_shift();
    // load return address
    {
!     const address table_addr = (is_invokeinterface || is_invokedynamic) ?
          (address)Interpreter::return_5_addrs_by_index_table() :
          (address)Interpreter::return_3_addrs_by_index_table();
!     const address table_addr = (address) Interpreter::invoke_return_entry_table_for(code);
      AddressLiteral table(table_addr);
      __ set(table, temp);
      __ sll(ra, LogBytesPerWord, ra);
      __ ld_ptr(Address(temp, ra), ra);
    }

*** 2982,2992 ****
--- 2980,2990 ----
    __ load_receiver(G4_scratch, O0_recv);  // gets receiverOop
    // receiver is in O0_recv
    __ verify_oop(O0_recv);
  
    // get return address
!   AddressLiteral table(Interpreter::return_3_addrs_by_index_table());
!   AddressLiteral table(Interpreter::invoke_return_entry_table());
    __ set(table, Rtemp);
    __ srl(Rret, ConstantPoolCacheEntry::tos_state_shift, Rret);          // get return type
    // Make sure we don't need to mask Rret after the above shift
    ConstantPoolCacheEntry::verify_tos_state_shift();
    __ sll(Rret,  LogBytesPerWord, Rret);

*** 3024,3034 ****
--- 3022,3032 ----
    __ null_check(O0);
  
    __ profile_final_call(O4);
  
    // get return address
!   AddressLiteral table(Interpreter::return_3_addrs_by_index_table());
!   AddressLiteral table(Interpreter::invoke_return_entry_table());
    __ set(table, Rtemp);
    __ srl(Rret, ConstantPoolCacheEntry::tos_state_shift, Rret);          // get return type
    // Make sure we don't need to mask Rret after the above shift
    ConstantPoolCacheEntry::verify_tos_state_shift();
    __ sll(Rret,  LogBytesPerWord, Rret);