comparison src/cpu/x86/vm/templateTable_x86_32.cpp @ 13039:42790b7e4d48

Merge
author mgronlun
date Fri, 01 Nov 2013 15:56:06 +0100
parents ea79ab313e98 bd3237e0e18d
children
comparison
equal deleted inserted replaced
13037:c8fc12209830 13039:42790b7e4d48
2927 __ shrl(flags, ConstantPoolCacheEntry::tos_state_shift); 2927 __ shrl(flags, ConstantPoolCacheEntry::tos_state_shift);
2928 // Make sure we don't need to mask flags after the above shift 2928 // Make sure we don't need to mask flags after the above shift
2929 ConstantPoolCacheEntry::verify_tos_state_shift(); 2929 ConstantPoolCacheEntry::verify_tos_state_shift();
2930 // load return address 2930 // load return address
2931 { 2931 {
2932 const address table_addr = (is_invokeinterface || is_invokedynamic) ? 2932 const address table_addr = (address) Interpreter::invoke_return_entry_table_for(code);
2933 (address)Interpreter::return_5_addrs_by_index_table() :
2934 (address)Interpreter::return_3_addrs_by_index_table();
2935 ExternalAddress table(table_addr); 2933 ExternalAddress table(table_addr);
2936 __ movptr(flags, ArrayAddress(table, Address(noreg, flags, Address::times_ptr))); 2934 __ movptr(flags, ArrayAddress(table, Address(noreg, flags, Address::times_ptr)));
2937 } 2935 }
2938 2936
2939 // push return address 2937 // push return address