From 24b1b433c5abf02e9f9c7eb3851f4417dc5d8751 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Fri, 28 Dec 2018 01:06:04 +0000 Subject: vm_insnhelper.c: delete unused macros - FIXNUM_2_P: moved to vm_insnhelper.c because that is the only place this macro is used. - FLONUM_2_P: ditto. - FLOAT_HEAP_P: not used anywhere. - FLOAT_INSTANCE_P: ditto. - GET_TOS: ditto. - USE_IC_FOR_SPECIALIZED_METHOD: ditto. - rb_obj_hidden_p: ditto. - REG_A: ditto. - REG_B: ditto. - GET_CONST_INLINE_CACHE: ditto. - vm_regan_regtype: moved inside of VM_COLLECT_USAGE_DETAILS because that os the only place this enum is used. - vm_regan_acttype: ditto. - GET_GLOBAL: used only once. Removed with replacing that usage. - SET_GLOBAL: ditto. - rb_method_definition_create: declaration moved to vm_insnhelper.c because that is the only place this declaration makes sense. - rb_method_definition_set: ditto. - rb_method_definition_eq: ditto. - rb_make_no_method_exception: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_insnhelper.h | 49 +------------------------------------------------ 1 file changed, 1 insertion(+), 48 deletions(-) (limited to 'vm_insnhelper.h') diff --git a/vm_insnhelper.h b/vm_insnhelper.h index 02745de01a..7541b02276 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -36,25 +36,12 @@ RUBY_SYMBOL_EXPORT_END /* deal with stack */ /**********************************************************/ -static inline int -rb_obj_hidden_p(VALUE obj) -{ - if (SPECIAL_CONST_P(obj)) { - return FALSE; - } - else { - return RBASIC_CLASS(obj) ? FALSE : TRUE; - } -} - #define PUSH(x) (SET_SV(x), INC_SP(1)) #define TOPN(n) (*(GET_SP()-(n)-1)) #define POPN(n) (DEC_SP(n)) #define POP() (DEC_SP(1)) #define STACK_ADDR_FROM_TOP(n) (GET_SP()-(n)) -#define GET_TOS() (tos) /* dummy */ - /**********************************************************/ /* deal with registers */ /**********************************************************/ @@ -68,9 +55,7 @@ rb_obj_hidden_p(VALUE obj) VM_REG_CFP = ec->cfp; \ } while (0) -#define REG_A reg_a -#define REG_B reg_b - +#if VM_COLLECT_USAGE_DETAILS enum vm_regan_regtype { VM_REGAN_PC = 0, VM_REGAN_SP = 1, @@ -84,7 +69,6 @@ enum vm_regan_acttype { VM_REGAN_ACT_SET = 1 }; -#if VM_COLLECT_USAGE_DETAILS #define COLLECT_USAGE_REGISTER_HELPER(a, b, v) \ (COLLECT_USAGE_REGISTER((VM_REGAN_##a), (VM_REGAN_ACT_##b)), (v)) #else @@ -122,11 +106,6 @@ enum vm_regan_acttype { #define GET_PREV_EP(ep) ((VALUE *)((ep)[VM_ENV_DATA_INDEX_SPECVAL] & ~0x03)) -#define GET_GLOBAL(entry) rb_gvar_get((struct rb_global_entry*)(entry)) -#define SET_GLOBAL(entry, val) rb_gvar_set((struct rb_global_entry*)(entry), (val)) - -#define GET_CONST_INLINE_CACHE(dst) ((IC) * (GET_PC() + (dst) + 2)) - /**********************************************************/ /* deal with values */ /**********************************************************/ @@ -175,20 +154,6 @@ enum vm_regan_acttype { /* others */ /**********************************************************/ -/* optimize insn */ -#define FIXNUM_2_P(a, b) ((a) & (b) & 1) -#if USE_FLONUM -#define FLONUM_2_P(a, b) (((((a)^2) | ((b)^2)) & 3) == 0) /* (FLONUM_P(a) && FLONUM_P(b)) */ -#else -#define FLONUM_2_P(a, b) 0 -#endif -#define FLOAT_HEAP_P(x) (!SPECIAL_CONST_P(x) && RBASIC_CLASS(x) == rb_cFloat) -#define FLOAT_INSTANCE_P(x) (FLONUM_P(x) || FLOAT_HEAP_P(x)) - -#ifndef USE_IC_FOR_SPECIALIZED_METHOD -#define USE_IC_FOR_SPECIALIZED_METHOD 1 -#endif - #ifndef MJIT_HEADER #define CALL_SIMPLE_METHOD() do { \ rb_snum_t x = leaf ? INSN_ATTR(width) : 0; \ @@ -205,13 +170,6 @@ enum vm_regan_acttype { #define GET_GLOBAL_CONSTANT_STATE() (ruby_vm_global_constant_state) #define INC_GLOBAL_CONSTANT_STATE() (++ruby_vm_global_constant_state) -extern rb_method_definition_t *rb_method_definition_create(rb_method_type_t type, ID mid); -extern void rb_method_definition_set(const rb_method_entry_t *me, rb_method_definition_t *def, void *opts); -extern int rb_method_definition_eq(const rb_method_definition_t *d1, const rb_method_definition_t *d2); - -extern VALUE rb_make_no_method_exception(VALUE exc, VALUE format, VALUE obj, - int argc, const VALUE *argv, int priv); - static inline struct vm_throw_data * THROW_DATA_NEW(VALUE val, const rb_control_frame_t *cf, VALUE st) { @@ -272,9 +230,4 @@ THROW_DATA_CONSUMED_SET(struct vm_throw_data *obj) #define IS_ARGS_SPLAT(ci) ((ci)->flag & VM_CALL_ARGS_SPLAT) #define IS_ARGS_KEYWORD(ci) ((ci)->flag & VM_CALL_KWARG) -#define CALLER_SETUP_ARG(cfp, calling, ci) do { \ - if (UNLIKELY(IS_ARGS_SPLAT(ci))) vm_caller_setup_arg_splat((cfp), (calling)); \ - if (UNLIKELY(IS_ARGS_KEYWORD(ci))) vm_caller_setup_arg_kw((cfp), (calling), (ci)); \ -} while (0) - #endif /* RUBY_INSNHELPER_H */ -- cgit v1.2.1