From 7cd730b33c917f27c68eb269c195de458cf420d8 Mon Sep 17 00:00:00 2001 From: ko1 Date: Wed, 3 Aug 2016 00:28:12 +0000 Subject: * vm_core.h: rename macros and make them inline functions. * rename VM_FRAME_TYPE_FINISH_P() to VM_FRAME_FINISHED_P(). * rename VM_FRAME_TYPE_BMETHOD_P() to VM_FRAME_BMETHOD_P(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55803 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_core.h | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'vm_core.h') diff --git a/vm_core.h b/vm_core.h index 385c482698..d7cf0bb2d8 100644 --- a/vm_core.h +++ b/vm_core.h @@ -986,11 +986,6 @@ enum { VM_ENV_FLAG_WB_REQUIRED = 0x0008 }; -static inline void VM_FORCE_WRITE_SPECIAL_CONST(const VALUE *ptr, VALUE special_const_value); - -#define VM_FRAME_TYPE_FINISH_P(cfp) (VM_ENV_FLAGS((cfp)->ep, VM_FRAME_FLAG_FINISH ) != 0) -#define VM_FRAME_TYPE_BMETHOD_P(cfp) (VM_ENV_FLAGS((cfp)->ep, VM_FRAME_FLAG_BMETHOD) != 0) - #define VM_ENV_DATA_SIZE ( 3) #define VM_ENV_DATA_INDEX_ME_CREF (-2) /* ep[-2] */ @@ -1001,6 +996,8 @@ static inline void VM_FORCE_WRITE_SPECIAL_CONST(const VALUE *ptr, VALUE special_ #define VM_ENV_INDEX_LAST_LVAR (-VM_ENV_DATA_SIZE) +static inline void VM_FORCE_WRITE_SPECIAL_CONST(const VALUE *ptr, VALUE special_const_value); + static inline void VM_ENV_FLAGS_SET(const VALUE *ep, VALUE flag) { @@ -1031,6 +1028,18 @@ VM_FRAME_TYPE(const rb_control_frame_t *cfp) return VM_ENV_FLAGS(cfp->ep, VM_FRAME_MAGIC_MASK); } +static inline int +VM_FRAME_FINISHED_P(const rb_control_frame_t *cfp) +{ + return VM_ENV_FLAGS(cfp->ep, VM_FRAME_FLAG_FINISH ) != 0; +} + +static inline int +VM_FRAME_BMETHOD_P(const rb_control_frame_t *cfp) +{ + return VM_ENV_FLAGS(cfp->ep, VM_FRAME_FLAG_BMETHOD) != 0; +} + #define RUBYVM_CFUNC_FRAME_P(cfp) \ (VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_CFUNC) -- cgit v1.2.3