From 2acbd7769526e59767d97a69da7fdac5d88bb5e4 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 28 Jan 2009 11:09:42 +0000 Subject: merges r21659 from trunk into ruby_1_9_1. * vm.c: add a prefix "rb_" to exposed functions vm_get_ruby_level_next_cfp(), rb_vm_make_env_object(), vm_stack_to_heap(), vm_make_proc(), vm_invoke_proc(), vm_get_sourceline(), vm_cref(), vm_localjump_error(), vm_make_jump_tag_but_local_jump(), vm_jump_tag_but_local_jump(). This changes may affect only core because most of renamed functions require a pointer of not-exposed struct such as rb_thread_t or NODE. In short, they are core functions. * cont.c, eval.c, eval_intern.h, load.c, proc.c, thread.c, vm_core.h, vm_dump.c, vm_eval.c, vm_exec.c, vm_insnhelper.c: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- cont.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cont.c') diff --git a/cont.c b/cont.c index f2ba013d9..5e5e8d50a 100644 --- a/cont.c +++ b/cont.c @@ -247,7 +247,7 @@ cont_new(VALUE klass) return cont; } -void vm_stack_to_heap(rb_thread_t *th); +void rb_vm_stack_to_heap(rb_thread_t *th); static VALUE cont_capture(volatile int *stat) @@ -256,7 +256,7 @@ cont_capture(volatile int *stat) rb_thread_t *th = GET_THREAD(), *sth; volatile VALUE contval; - vm_stack_to_heap(th); + rb_vm_stack_to_heap(th); cont = cont_new(rb_cContinuation); contval = cont->self; sth = &cont->saved_thread; @@ -767,7 +767,7 @@ rb_fiber_start(void) th->local_svar = Qnil; fib->status = RUNNING; - cont->value = vm_invoke_proc(th, proc, proc->block.self, argc, argv, 0); + cont->value = rb_vm_invoke_proc(th, proc, proc->block.self, argc, argv, 0); } TH_POP_TAG(); @@ -777,7 +777,7 @@ rb_fiber_start(void) } else { th->thrown_errinfo = - vm_make_jump_tag_but_local_jump(state, th->errinfo); + rb_vm_make_jump_tag_but_local_jump(state, th->errinfo); } RUBY_VM_SET_INTERRUPT(th); } -- cgit