1.1 --- a/src/share/vm/prims/methodHandles.hpp Wed Jan 18 16:18:31 2012 +0100 1.2 +++ b/src/share/vm/prims/methodHandles.hpp Thu Jan 19 13:00:11 2012 -0800 1.3 @@ -738,46 +738,6 @@ 1.4 #ifdef TARGET_ARCH_ppc 1.5 # include "methodHandles_ppc.hpp" 1.6 #endif 1.7 - 1.8 -#ifdef TARGET_ARCH_NYI_6939861 1.9 - // Here are some backward compatible declarations until the 6939861 ports are updated. 1.10 - #define _adapter_flyby (_EK_LIMIT + 10) 1.11 - #define _adapter_ricochet (_EK_LIMIT + 11) 1.12 - #define _adapter_opt_spread_1 _adapter_opt_spread_1_ref 1.13 - #define _adapter_opt_spread_more _adapter_opt_spread_ref 1.14 - enum { 1.15 - _INSERT_NO_MASK = -1, 1.16 - _INSERT_REF_MASK = 0, 1.17 - _INSERT_INT_MASK = 1, 1.18 - _INSERT_LONG_MASK = 3 1.19 - }; 1.20 - static void get_ek_bound_mh_info(EntryKind ek, BasicType& arg_type, int& arg_mask, int& arg_slots) { 1.21 - arg_type = ek_bound_mh_arg_type(ek); 1.22 - arg_mask = 0; 1.23 - arg_slots = type2size[arg_type];; 1.24 - } 1.25 - static void get_ek_adapter_opt_swap_rot_info(EntryKind ek, int& swap_bytes, int& rotate) { 1.26 - int swap_slots = ek_adapter_opt_swap_slots(ek); 1.27 - rotate = ek_adapter_opt_swap_mode(ek); 1.28 - swap_bytes = swap_slots * Interpreter::stackElementSize; 1.29 - } 1.30 - static int get_ek_adapter_opt_spread_info(EntryKind ek) { 1.31 - return ek_adapter_opt_spread_count(ek); 1.32 - } 1.33 - 1.34 - static void insert_arg_slots(MacroAssembler* _masm, 1.35 - RegisterOrConstant arg_slots, 1.36 - int arg_mask, 1.37 - Register argslot_reg, 1.38 - Register temp_reg, Register temp2_reg, Register temp3_reg = noreg); 1.39 - 1.40 - static void remove_arg_slots(MacroAssembler* _masm, 1.41 - RegisterOrConstant arg_slots, 1.42 - Register argslot_reg, 1.43 - Register temp_reg, Register temp2_reg, Register temp3_reg = noreg); 1.44 - 1.45 - static void trace_method_handle(MacroAssembler* _masm, const char* adaptername) PRODUCT_RETURN; 1.46 -#endif //TARGET_ARCH_NYI_6939861 1.47 }; 1.48 1.49