diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | insnhelper.ci | 4 | ||||
| -rw-r--r-- | vm.h | 3 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Fri Nov 9 22:04:21 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * vm.h (FRAME_MAGIC_MASK_BITS): bits of FRAME_MAGIC_MASK. + + * insnhelper.ci (vm_call_cfunc, vm_cfunc_flags): use shift operations. + Fri Nov 9 21:46:28 2007 Koichi Sasada <ko1@atdot.net> * eval.c (eval): should be volatile value for GC. diff --git a/insnhelper.ci b/insnhelper.ci index bfbbe6f418..82731829c6 100644 --- a/insnhelper.ci +++ b/insnhelper.ci @@ -355,7 +355,7 @@ vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp, int num, EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, recv, id, klass); { rb_control_frame_t *cfp = - vm_push_frame(th, 0, FRAME_MAGIC_CFUNC | flag * (FRAME_MAGIC_MASK + 1), + vm_push_frame(th, 0, FRAME_MAGIC_CFUNC | (flag << FRAME_MAGIC_MASK_BITS), recv, (VALUE) blockptr, 0, reg_cfp->sp, 0, 1); cfp->method_id = id; @@ -379,7 +379,7 @@ static int vm_cfunc_flags(rb_control_frame_t *cfp) { if (RUBYVM_CFUNC_FRAME_P(cfp)) - return cfp->flag / (FRAME_MAGIC_MASK + 1); + return cfp->flag >> FRAME_MAGIC_MASK_BITS; return 0; } @@ -236,7 +236,8 @@ default: \ #define FRAME_MAGIC_IFUNC 0x81 #define FRAME_MAGIC_EVAL 0x91 #define FRAME_MAGIC_LAMBDA 0xa1 -#define FRAME_MAGIC_MASK 0xff +#define FRAME_MAGIC_MASK_BITS 8 +#define FRAME_MAGIC_MASK (~(~0<<FRAME_MAGIC_MASK_BITS)) #define VM_FRAME_FLAG(type) ((VALUE)((type) & FRAME_MAGIC_MASK)) |