diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-18 02:29:58 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-18 02:29:58 +0000 |
| commit | 52e35469f0a057ce31c04a36116e7a5563c2665b (patch) | |
| tree | 57533092543b0adf68b2c505850f58715a9ba832 /vm_core.h | |
| parent | aa358ac11cc7224eb2bf2c02e85a0956543726f2 (diff) | |
vm_core.h: extract VM_STACK_OVERFLOWED_P
* vm_core.h (VM_STACK_OVERFLOWED_P, WHEN_VM_STACK_OVERFLOWED): extract
condition from CHECK_VM_STACK_OVERFLOW.
* vm_exec.c (vm_stack_overflow_for_insn): move rb_bug call.
* vm_exec.h (CHECK_VM_STACK_OVERFLOW_FOR_INSN): share the condition
with CHECK_VM_STACK_OVERFLOW.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43702 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_core.h')
| -rw-r--r-- | vm_core.h | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -889,13 +889,17 @@ int rb_autoloading_value(VALUE mod, ID id, VALUE* value); #define sysstack_error GET_VM()->special_exceptions[ruby_error_sysstack] -#define CHECK_VM_STACK_OVERFLOW0(cfp, sp, margin) do { \ - if ((VALUE *)((char *)((VALUE *)(sp) + (margin)) + sizeof(rb_control_frame_t)) >= ((VALUE *)(cfp))) { \ - vm_stackoverflow(); \ - } \ -} while (0) - -#define CHECK_VM_STACK_OVERFLOW(cfp, margin) CHECK_VM_STACK_OVERFLOW0((cfp), (cfp)->sp, margin) +#define RUBY_CONST_ASSERT(expr) (1/!!(expr)) /* expr must be a compile-time constant */ +#define VM_STACK_OVERFLOWED_P(cfp, sp, margin) \ + (!RUBY_CONST_ASSERT(sizeof(*(sp)) == sizeof(VALUE)) || \ + !RUBY_CONST_ASSERT(sizeof(*(cfp)) == sizeof(rb_control_frame_t)) || \ + ((rb_control_frame_t *)((sp) + (margin)) + 1) >= (cfp)) +#define WHEN_VM_STACK_OVERFLOWED(cfp, sp, margin) \ + if (LIKELY(!VM_STACK_OVERFLOWED_P(cfp, sp, margin))) {(void)0;} else /* overflowed */ +#define CHECK_VM_STACK_OVERFLOW0(cfp, sp, margin) \ + WHEN_VM_STACK_OVERFLOWED(cfp, sp, margin) vm_stackoverflow() +#define CHECK_VM_STACK_OVERFLOW(cfp, margin) \ + WHEN_VM_STACK_OVERFLOWED(cfp, (cfp)->sp, margin) vm_stackoverflow() /* for thread */ |