Mercurial > hg > truffle

diff src/cpu/x86/vm/templateTable_x86_64.cpp @ 13039:42790b7e4d48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author mgronlun
date Fri, 01 Nov 2013 15:56:06 +0100
parents ea79ab313e98 bd3237e0e18d
children 096c224171c4 c86519f8d826
line wrap: on
line diff
--- a/src/cpu/x86/vm/templateTable_x86_64.cpp	Thu Oct 31 14:11:02 2013 -0400
+++ b/src/cpu/x86/vm/templateTable_x86_64.cpp	Fri Nov 01 15:56:06 2013 +0100
@@ -2984,9 +2984,7 @@
   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);
     ExternalAddress table(table_addr);
     __ lea(rscratch1, table);
     __ movptr(flags, Address(rscratch1, flags, Address::times_ptr));