From a2f378737fc70cdfce65a3d08eda1c9a99d89b4d Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 28 Aug 2009 01:21:45 +0000 Subject: [PATCH] * vm_core.h ({GET,INC}_VM_STATE_VERSION): moved from vm_insnhelper.h. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- vm_core.h | 5 +++++ vm_insnhelper.h | 5 ----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82a6b1f353..ceb8fceac7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ -Fri Aug 28 09:34:04 2009 Nobuyoshi Nakada +Fri Aug 28 10:21:30 2009 Nobuyoshi Nakada * iseq.c (iseq_mark): skip outdated cache entries. + * vm_core.h ({GET,INC}_VM_STATE_VERSION): moved from + vm_insnhelper.h. + Fri Aug 28 07:25:25 2009 Yukihiro Matsumoto * enumerator.c (next_i): typo fixed (reached at end -> reached an diff --git a/vm_core.h b/vm_core.h index 40b9933473..9728e98a6b 100644 --- a/vm_core.h +++ b/vm_core.h @@ -529,6 +529,11 @@ typedef struct { /* inline cache */ typedef struct iseq_inline_cache_entry *IC; +extern VALUE ruby_vm_global_state_version; + +#define GET_VM_STATE_VERSION() (ruby_vm_global_state_version) +#define INC_VM_STATE_VERSION() \ + (ruby_vm_global_state_version = (ruby_vm_global_state_version+1) & 0x8fffffff) void rb_vm_change_state(void); typedef VALUE CDHASH; diff --git a/vm_insnhelper.h b/vm_insnhelper.h index d40f3de0a0..055c43c16a 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -58,13 +58,8 @@ enum { }; extern char ruby_vm_redefined_flag[BOP_LAST_]; -extern VALUE ruby_vm_global_state_version; extern VALUE ruby_vm_const_missing_count; -#define GET_VM_STATE_VERSION() (ruby_vm_global_state_version) -#define INC_VM_STATE_VERSION() \ - (ruby_vm_global_state_version = (ruby_vm_global_state_version+1) & 0x8fffffff) - /**********************************************************/ /* deal with stack */