nobu	2008-05-22 18:55:36 +0900 (Thu, 22 May 2008)

  New Revision: 16530

  Modified files:
    trunk/ChangeLog
    trunk/eval_intern.h
    trunk/vm.c

  Log:
    * vm.c (vm_get_ruby_level_cfp): moved from eval_intern.h.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16530&r2=16529&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/vm.c?r1=16530&r2=16529&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/eval_intern.h?r1=16530&r2=16529&diff_format=u

Index: eval_intern.h
===================================================================
--- eval_intern.h	(revision 16529)
+++ eval_intern.h	(revision 16530)
@@ -228,21 +228,8 @@
 NODE *vm_cref_push(rb_thread_t * const th, const VALUE, const int);
 NODE *vm_set_special_cref(rb_thread_t *th, VALUE *lfp, NODE * cref_stack);
 VALUE vm_make_jump_tag_but_local_jump(const int state, VALUE val);
-
 NODE *ruby_cref(void);
-
-static rb_control_frame_t *
-vm_get_ruby_level_cfp(rb_thread_t *th, rb_control_frame_t *cfp)
-{
-    while (!RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(th, cfp)) {
-	if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) {
-	    return cfp;
-	}
-	cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
-    }
-    return 0;
-}
-
+rb_control_frame_t *vm_get_ruby_level_cfp(rb_thread_t *th, rb_control_frame_t *cfp);
 VALUE rb_obj_is_proc(VALUE);
 void rb_vm_check_redefinition_opt_method(NODE * const node);
 VALUE rb_vm_call_cfunc(const VALUE recv, VALUE (* const func)(VALUE),
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16529)
+++ ChangeLog	(revision 16530)
@@ -1,3 +1,7 @@
+Thu May 22 18:55:33 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* vm.c (vm_get_ruby_level_cfp): moved from eval_intern.h.
+
 Thu May 22 17:18:35 2008  Tanaka Akira  <akr@f...>
 
 	* array.c (rb_ary_compact_bang): fix reallocation size.
Index: vm.c
===================================================================
--- vm.c	(revision 16529)
+++ vm.c	(revision 16530)
@@ -94,6 +94,18 @@
     }
 }
 
+rb_control_frame_t *
+vm_get_ruby_level_cfp(rb_thread_t *th, rb_control_frame_t *cfp)
+{
+    while (!RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(th, cfp)) {
+	if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) {
+	    return cfp;
+	}
+	cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+    }
+    return 0;
+}
+
 /* Env */
 
 static void
@@ -787,6 +799,7 @@
     return ary;
 }
 
+#if 0
 static void
 check_svar(void)
 {
@@ -802,6 +815,7 @@
 	cfp++;
     }
 }
+#endif
 
 NODE *
 ruby_cref(void)
@@ -1545,6 +1559,7 @@
 #endif
 }
 
+#ifdef USE_THREAD_RECYCLE
 static rb_thread_t *
 thread_recycle_struct(void)
 {
@@ -1552,6 +1567,7 @@
     memset(p, 0, sizeof(rb_thread_t));
     return p;
 }
+#endif
 
 static void
 thread_free(void * const ptr)
@@ -1721,6 +1737,7 @@
 #endif
 
 /* debug functions */
+#if VMDEBUG
 
 static VALUE
 sdr(void)
@@ -1752,6 +1769,7 @@
 #endif
     return ary;
 }
+#endif
 
 void
 Init_VM(void)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/