summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-28 01:21:45 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-28 01:21:45 +0000
commit9c8f6e78f5a8749354fb9847368ce10c14151952 (patch)
tree7e8bd998b643295088b5f76431a9196d2c0d7aae
parent0ba71ce9653b00460e838e87f52dce1bf58b43df (diff)
downloadruby-9c8f6e78f5a8749354fb9847368ce10c14151952.tar.gz
ruby-9c8f6e78f5a8749354fb9847368ce10c14151952.tar.xz
ruby-9c8f6e78f5a8749354fb9847368ce10c14151952.zip
* vm_core.h ({GET,INC}_VM_STATE_VERSION): moved from vm_insnhelper.h.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm_core.h5
-rw-r--r--vm_insnhelper.h5
3 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 82a6b1f35..ceb8fceac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
-Fri Aug 28 09:34:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Aug 28 10:21:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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 <matz@ruby-lang.org>
* enumerator.c (next_i): typo fixed (reached at end -> reached an
diff --git a/vm_core.h b/vm_core.h
index 40b993347..9728e98a6 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 d40f3de0a..055c43c16 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 */