From c317e978f79c920924f70eea8f66e69b40369fa5 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 18 Jul 2014 01:53:18 +0000 Subject: vm_core.h: redefined_flag in rb_vm_t * vm_core.h (struct rb_vm_struct): move redefined_flag from ruby_vm_redefined_flag. * vm_core.h (BASIC_OP_UNREDEFINED_P): move from vm_insnhelper.h. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46858 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_insnhelper.h | 40 ---------------------------------------- 1 file changed, 40 deletions(-) (limited to 'vm_insnhelper.h') diff --git a/vm_insnhelper.h b/vm_insnhelper.h index cc7e2411b5..31f8ffc4e6 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -34,34 +34,6 @@ #define VMDEBUG 3 #endif -enum { - BOP_PLUS, - BOP_MINUS, - BOP_MULT, - BOP_DIV, - BOP_MOD, - BOP_EQ, - BOP_EQQ, - BOP_LT, - BOP_LE, - BOP_LTLT, - BOP_AREF, - BOP_ASET, - BOP_LENGTH, - BOP_SIZE, - BOP_EMPTY_P, - BOP_SUCC, - BOP_GT, - BOP_GE, - BOP_NOT, - BOP_NEQ, - BOP_MATCH, - BOP_FREEZE, - - BOP_LAST_ -}; - -extern short ruby_vm_redefined_flag[BOP_LAST_]; extern VALUE ruby_vm_const_missing_count; #if VM_COLLECT_USAGE_DETAILS @@ -231,18 +203,6 @@ enum vm_regan_acttype { /**********************************************************/ /* optimize insn */ -#define FIXNUM_REDEFINED_OP_FLAG (1 << 0) -#define FLOAT_REDEFINED_OP_FLAG (1 << 1) -#define STRING_REDEFINED_OP_FLAG (1 << 2) -#define ARRAY_REDEFINED_OP_FLAG (1 << 3) -#define HASH_REDEFINED_OP_FLAG (1 << 4) -#define BIGNUM_REDEFINED_OP_FLAG (1 << 5) -#define SYMBOL_REDEFINED_OP_FLAG (1 << 6) -#define TIME_REDEFINED_OP_FLAG (1 << 7) -#define REGEXP_REDEFINED_OP_FLAG (1 << 8) - -#define BASIC_OP_UNREDEFINED_P(op, klass) (LIKELY((ruby_vm_redefined_flag[(op)]&(klass)) == 0)) - #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)) */ -- cgit v1.2.3