diff --git a/ChangeLog b/ChangeLog
index 13345e1680..fb6df4f699 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul  3 18:35:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (struct rb_iseq_struct): fixed types.
+
+	* vm_core.h (ic_vmstat): VM state version is VALUE.
+
 Fri Jul  3 02:52:20 2009  Tanaka Akira  <akr@fsij.org>
 
 	* time.c (find_time_t): time guess strategy refined again.
diff --git a/vm_core.h b/vm_core.h
index ad9183e27e..43784803db 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -135,7 +135,7 @@ struct rb_iseq_struct {
 
     /* insn info, must be freed */
     struct iseq_insn_info_entry *insn_info_table;
-    unsigned long insn_info_size;
+    size_t insn_info_size;
 
     ID *local_table;		/* must free */
     int local_table_size;
@@ -176,7 +176,7 @@ struct rb_iseq_struct {
     int arg_size;
     VALUE *arg_opt_table;
 
-    int stack_max; /* for stack overflow check */
+    size_t stack_max; /* for stack overflow check */
 
     /* catch table */
     struct iseq_catch_table_entry *catch_table;
@@ -527,7 +527,7 @@ typedef struct {
 #define ic_class  u1.value
 #define ic_method u2.node
 #define ic_value  u2.value
-#define ic_vmstat u3.cnt
+#define ic_vmstat u3.value
 typedef NODE *IC;
 
 void rb_vm_change_state(void);