2006-12-31 10:02:22 -05:00
|
|
|
/* -*-c-*- */
|
|
|
|
/**********************************************************************
|
|
|
|
|
2008-11-14 06:31:10 -05:00
|
|
|
vm_exec.c -
|
2006-12-31 10:02:22 -05:00
|
|
|
|
|
|
|
$Author$
|
|
|
|
|
* blockinlining.c, compile.c, compile.h, debug.c, debug.h,
id.c, insnhelper.h, insns.def, thread.c, thread_pthread.ci,
thread_pthread.h, thread_win32.ci, thread_win32.h, vm.h,
vm_dump.c, vm_evalbody.ci, vm_opts.h: fix comments and
copyright year.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-13 17:13:04 -05:00
|
|
|
Copyright (C) 2004-2007 Koichi Sasada
|
2006-12-31 10:02:22 -05:00
|
|
|
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
#include <math.h>
|
|
|
|
|
2012-12-03 06:38:43 -05:00
|
|
|
#if VM_COLLECT_USAGE_DETAILS
|
2012-12-03 06:00:37 -05:00
|
|
|
static void vm_analysis_insn(int insn);
|
2012-12-03 06:38:43 -05:00
|
|
|
#endif
|
* probes.d: add DTrace probe declarations. [ruby-core:27448]
* array.c (empty_ary_alloc, ary_new): added array create DTrace probe.
* compile.c (rb_insns_name): allowing DTrace probes to access
instruction sequence name.
* Makefile.in: translate probes.d file to appropriate header file.
* common.mk: declare dependencies on the DTrace header.
* configure.in: add a test for existence of DTrace.
* eval.c (setup_exception): add a probe for when an exception is
raised.
* gc.c: Add DTrace probes for mark begin and end, and sweep begin and
end.
* hash.c (empty_hash_alloc): Add a probe for hash allocation.
* insns.def: Add probes for function entry and return.
* internal.h: function declaration for compile.c change.
* load.c (rb_f_load): add probes for `load` entry and exit, require
entry and exit, and wrapping search_required for load path search.
* object.c (rb_obj_alloc): added a probe for general object creation.
* parse.y (yycompile0): added a probe around parse and compile phase.
* string.c (empty_str_alloc, str_new): DTrace probes for string
allocation.
* test/dtrace/*: tests for DTrace probes.
* vm.c (vm_invoke_proc): add probes for function return on exception
raise, hash create, and instruction sequence execution.
* vm_core.h: add probe declarations for function entry and exit.
* vm_dump.c: add probes header file.
* vm_eval.c (vm_call0_cfunc, vm_call0_cfunc_with_frame): add probe on
function entry and return.
* vm_exec.c: expose instruction number to instruction name function.
* vm_insnshelper.c: add function entry and exit probes for cfunc
methods.
* vm_insnhelper.h: vm usage information is always collected, so
uncomment the functions.
12 19:14:50 2012 Akinori MUSHA <knu@iDaemons.org>
* configure.in (isinf, isnan): isinf() and isnan() are macros on
DragonFly which cannot be found by AC_REPLACE_FUNCS(). This
workaround enforces the fact that they exist on DragonFly.
12 15:59:38 2012 Shugo Maeda <shugo@ruby-lang.org>
* vm_core.h (rb_call_info_t::refinements), compile.c (new_callinfo),
vm_insnhelper.c (vm_search_method): revert r37616 because it's too
slow. [ruby-dev:46477]
* test/ruby/test_refinement.rb (test_inline_method_cache): skip
the test until the bug is fixed efficiently.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-12 16:52:12 -05:00
|
|
|
|
2011-05-30 22:08:58 -04:00
|
|
|
#if VMDEBUG > 0
|
2006-12-31 10:02:22 -05:00
|
|
|
#define DECL_SC_REG(type, r, reg) register type reg_##r
|
|
|
|
|
2013-03-17 21:45:12 -04:00
|
|
|
#elif defined(__GNUC__) && defined(__x86_64__)
|
2008-04-22 03:25:28 -04:00
|
|
|
#define DECL_SC_REG(type, r, reg) register type reg_##r __asm__("r" reg)
|
2006-12-31 10:02:22 -05:00
|
|
|
|
2012-07-25 02:49:35 -04:00
|
|
|
#elif defined(__GNUC__) && defined(__i386__)
|
2008-04-22 03:25:28 -04:00
|
|
|
#define DECL_SC_REG(type, r, reg) register type reg_##r __asm__("e" reg)
|
2006-12-31 10:02:22 -05:00
|
|
|
|
2014-08-11 23:59:39 -04:00
|
|
|
#elif defined(__GNUC__) && defined(__powerpc64__)
|
|
|
|
#define DECL_SC_REG(type, r, reg) register type reg_##r __asm__("r" reg)
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#else
|
|
|
|
#define DECL_SC_REG(type, r, reg) register type reg_##r
|
|
|
|
#endif
|
* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
range.c, regenc.h, ruby.h, signal.c, thread.c, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fixed indents and non-C90 comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-02 11:26:04 -05:00
|
|
|
/* #define DECL_SC_REG(r, reg) VALUE reg_##r */
|
2006-12-31 10:02:22 -05:00
|
|
|
|
2013-12-18 00:33:50 -05:00
|
|
|
#if VM_DEBUG_STACKOVERFLOW
|
2013-11-17 21:29:58 -05:00
|
|
|
NORETURN(static void vm_stack_overflow_for_insn(void));
|
|
|
|
static void
|
|
|
|
vm_stack_overflow_for_insn(void)
|
|
|
|
{
|
|
|
|
rb_bug("CHECK_VM_STACK_OVERFLOW_FOR_INSN: should not overflow here. "
|
|
|
|
"Please contact ruby-core/dev with your (a part of) script. "
|
|
|
|
"This check will be removed soon.");
|
|
|
|
}
|
2013-12-18 00:33:50 -05:00
|
|
|
#endif
|
2013-11-17 21:29:58 -05:00
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#if !OPT_CALL_THREADED_CODE
|
* eval_method.c: renamed from vm_method.c. "vm_method.c" is included
by "vm.c".
* vm_eval.c: added. Some codes are moved from "eval.c"
* common.mk: fix for above changes.
* compile.c: make a vm_eval(0)
* eval.c, eval_error.c, eval_intern.h, eval_jump.c, proc.c, vm.c,
id.c, id.h, vm_core.h, vm_dump.c, vm_evalbody.c, vm_insnhelper.c,
blockinlining.c: fix for above changes. and do some refactoring.
this changes improve rb_yield() performance.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-05-24 13:50:17 -04:00
|
|
|
static VALUE
|
* common.mk: clean up
- remove blockinlining.$(OBJEXT) to built
- make ENCODING_H_INCLDUES variable (include/ruby/encoding.h)
- make VM_CORE_H_INCLUDES variable (vm_core.h)
- simplify rules.
- make depends rule to output depend status using gcc -MM.
* include/ruby/mvm.h, include/ruby/vm.h: rename mvm.h to vm.h.
* include/ruby.h: ditto.
* load.c: add inclusion explicitly.
* enumerator.c, object.c, parse.y, thread.c, vm_dump.c:
remove useless inclusion.
* eval_intern.h: cleanup inclusion.
* vm_core.h: rb_thread_t should be defined in this file.
* vm_evalbody.c, vm_exec.c: rename vm_evalbody.c to vm_exec.c.
* vm.h, vm_exec.h: rename vm.h to vm_exec.h.
* insnhelper.h, vm_insnhelper.h: rename insnhelper.h to vm_insnhelper.h.
* vm.c, vm_insnhelper.c, vm_insnhelper.h:
- rename vm_eval() to vm_exec_core().
- rename vm_eval_body() to vm_exec().
- cleanup include order.
* vm_method.c: fix comment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-22 20:20:28 -04:00
|
|
|
vm_exec_core(rb_thread_t *th, VALUE initial)
|
2006-12-31 10:02:22 -05:00
|
|
|
{
|
|
|
|
|
|
|
|
#if OPT_STACK_CACHING
|
|
|
|
#if 0
|
2014-01-13 21:32:45 -05:00
|
|
|
#elif __GNUC__ && __x86_64__ && !defined(__native_client__)
|
2006-12-31 10:02:22 -05:00
|
|
|
DECL_SC_REG(VALUE, a, "12");
|
|
|
|
DECL_SC_REG(VALUE, b, "13");
|
|
|
|
#else
|
|
|
|
register VALUE reg_a;
|
|
|
|
register VALUE reg_b;
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
2012-07-25 02:49:35 -04:00
|
|
|
#if defined(__GNUC__) && defined(__i386__)
|
2015-07-23 05:34:31 -04:00
|
|
|
DECL_SC_REG(const VALUE *, pc, "di");
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
DECL_SC_REG(rb_control_frame_t *, cfp, "si");
|
2006-12-31 10:02:22 -05:00
|
|
|
#define USE_MACHINE_REGS 1
|
|
|
|
|
2012-07-25 02:49:35 -04:00
|
|
|
#elif defined(__GNUC__) && defined(__x86_64__)
|
2015-07-23 05:34:31 -04:00
|
|
|
DECL_SC_REG(const VALUE *, pc, "14");
|
2014-01-10 04:22:37 -05:00
|
|
|
# if defined(__native_client__)
|
2014-01-13 21:32:45 -05:00
|
|
|
DECL_SC_REG(rb_control_frame_t *, cfp, "13");
|
2014-01-10 04:22:37 -05:00
|
|
|
# else
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
DECL_SC_REG(rb_control_frame_t *, cfp, "15");
|
2014-01-10 04:22:37 -05:00
|
|
|
# endif
|
2006-12-31 10:02:22 -05:00
|
|
|
#define USE_MACHINE_REGS 1
|
|
|
|
|
2014-08-11 23:59:39 -04:00
|
|
|
#elif defined(__GNUC__) && defined(__powerpc64__)
|
2015-07-23 05:34:31 -04:00
|
|
|
DECL_SC_REG(const VALUE *, pc, "14");
|
2014-08-11 23:59:39 -04:00
|
|
|
DECL_SC_REG(rb_control_frame_t *, cfp, "15");
|
|
|
|
#define USE_MACHINE_REGS 1
|
|
|
|
|
2006-12-31 10:02:22 -05:00
|
|
|
#else
|
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
* yarv_*_t -> rb_*_t
* yarv_*_struct -> rb_*_struct
* yarv_tag -> rb_vm_tag
* YARV_* -> RUBY_VM_*
* proc.c, vm.c: move functions about env object creation
from proc.c to vm.c.
* proc.c, yarvcore.c: fix rb_cVM initialization place.
* inits.c: change Init_ISeq() order (after Init_VM).
* ruby.h, proc.c: change declaration place of rb_cEnv
from proc.c to ruby.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-06 14:00:03 -05:00
|
|
|
register rb_control_frame_t *reg_cfp;
|
2015-07-23 05:34:31 -04:00
|
|
|
const VALUE *reg_pc;
|
2006-12-31 10:02:22 -05:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if USE_MACHINE_REGS
|
|
|
|
|
|
|
|
#undef RESTORE_REGS
|
|
|
|
#define RESTORE_REGS() \
|
|
|
|
{ \
|
2017-05-09 01:06:41 -04:00
|
|
|
VM_REG_CFP = th->ec.cfp; \
|
2006-12-31 10:02:22 -05:00
|
|
|
reg_pc = reg_cfp->pc; \
|
|
|
|
}
|
|
|
|
|
2016-11-05 12:31:25 -04:00
|
|
|
#undef VM_REG_PC
|
|
|
|
#define VM_REG_PC reg_pc
|
2006-12-31 10:02:22 -05:00
|
|
|
#undef GET_PC
|
|
|
|
#define GET_PC() (reg_pc)
|
|
|
|
#undef SET_PC
|
2016-11-05 12:31:25 -04:00
|
|
|
#define SET_PC(x) (reg_cfp->pc = VM_REG_PC = (x))
|
2006-12-31 10:02:22 -05:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if OPT_TOKEN_THREADED_CODE || OPT_DIRECT_THREADED_CODE
|
|
|
|
#include "vmtc.inc"
|
2008-09-28 03:13:06 -04:00
|
|
|
if (UNLIKELY(th == 0)) {
|
2006-12-31 10:02:22 -05:00
|
|
|
return (VALUE)insns_address_table;
|
|
|
|
}
|
|
|
|
#endif
|
2017-05-09 01:06:41 -04:00
|
|
|
reg_cfp = th->ec.cfp;
|
2006-12-31 10:02:22 -05:00
|
|
|
reg_pc = reg_cfp->pc;
|
|
|
|
|
|
|
|
#if OPT_STACK_CACHING
|
|
|
|
reg_a = initial;
|
|
|
|
reg_b = 0;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
first:
|
|
|
|
INSN_DISPATCH();
|
* vm.c: some refactoring.
* rename th_* to vm_*.
* remove unused variables functions.
* add prototypes.
* blockinlining.c, compile.c, cont.c, eval.c, eval_intern.h,
eval_jump.h, eval_load.c, inits.c, insns.def, iseq.c, parse.y,
proc.c, process.c, signal.c, thread.c, vm.c, vm_dump.c,
vm_evalbody.ci, yarvcore.c, yarvcore.h: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-24 11:42:41 -04:00
|
|
|
/*****************/
|
|
|
|
#include "vm.inc"
|
|
|
|
/*****************/
|
2006-12-31 10:02:22 -05:00
|
|
|
END_INSNS_DISPATCH();
|
|
|
|
|
|
|
|
/* unreachable */
|
* vm.c: some refactoring.
* rename th_* to vm_*.
* remove unused variables functions.
* add prototypes.
* blockinlining.c, compile.c, cont.c, eval.c, eval_intern.h,
eval_jump.h, eval_load.c, inits.c, insns.def, iseq.c, parse.y,
proc.c, process.c, signal.c, thread.c, vm.c, vm_dump.c,
vm_evalbody.ci, yarvcore.c, yarvcore.h: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-24 11:42:41 -04:00
|
|
|
rb_bug("vm_eval: unreachable");
|
2007-08-23 02:48:28 -04:00
|
|
|
goto first;
|
2006-12-31 10:02:22 -05:00
|
|
|
}
|
|
|
|
|
* common.mk: clean up
- remove blockinlining.$(OBJEXT) to built
- make ENCODING_H_INCLDUES variable (include/ruby/encoding.h)
- make VM_CORE_H_INCLUDES variable (vm_core.h)
- simplify rules.
- make depends rule to output depend status using gcc -MM.
* include/ruby/mvm.h, include/ruby/vm.h: rename mvm.h to vm.h.
* include/ruby.h: ditto.
* load.c: add inclusion explicitly.
* enumerator.c, object.c, parse.y, thread.c, vm_dump.c:
remove useless inclusion.
* eval_intern.h: cleanup inclusion.
* vm_core.h: rb_thread_t should be defined in this file.
* vm_evalbody.c, vm_exec.c: rename vm_evalbody.c to vm_exec.c.
* vm.h, vm_exec.h: rename vm.h to vm_exec.h.
* insnhelper.h, vm_insnhelper.h: rename insnhelper.h to vm_insnhelper.h.
* vm.c, vm_insnhelper.c, vm_insnhelper.h:
- rename vm_eval() to vm_exec_core().
- rename vm_eval_body() to vm_exec().
- cleanup include order.
* vm_method.c: fix comment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-22 20:20:28 -04:00
|
|
|
const void **
|
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@21659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-18 21:38:11 -05:00
|
|
|
rb_vm_get_insns_address_table(void)
|
* common.mk: clean up
- remove blockinlining.$(OBJEXT) to built
- make ENCODING_H_INCLDUES variable (include/ruby/encoding.h)
- make VM_CORE_H_INCLUDES variable (vm_core.h)
- simplify rules.
- make depends rule to output depend status using gcc -MM.
* include/ruby/mvm.h, include/ruby/vm.h: rename mvm.h to vm.h.
* include/ruby.h: ditto.
* load.c: add inclusion explicitly.
* enumerator.c, object.c, parse.y, thread.c, vm_dump.c:
remove useless inclusion.
* eval_intern.h: cleanup inclusion.
* vm_core.h: rb_thread_t should be defined in this file.
* vm_evalbody.c, vm_exec.c: rename vm_evalbody.c to vm_exec.c.
* vm.h, vm_exec.h: rename vm.h to vm_exec.h.
* insnhelper.h, vm_insnhelper.h: rename insnhelper.h to vm_insnhelper.h.
* vm.c, vm_insnhelper.c, vm_insnhelper.h:
- rename vm_eval() to vm_exec_core().
- rename vm_eval_body() to vm_exec().
- cleanup include order.
* vm_method.c: fix comment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-22 20:20:28 -04:00
|
|
|
{
|
|
|
|
return (const void **)vm_exec_core(0, 0);
|
|
|
|
}
|
|
|
|
|
2012-08-07 07:13:57 -04:00
|
|
|
#else /* OPT_CALL_THREADED_CODE */
|
2006-12-31 10:02:22 -05:00
|
|
|
|
|
|
|
#include "vm.inc"
|
|
|
|
#include "vmtc.inc"
|
|
|
|
|
2012-08-07 07:13:57 -04:00
|
|
|
const void **
|
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@21659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-18 21:38:11 -05:00
|
|
|
rb_vm_get_insns_address_table(void)
|
2006-12-31 10:02:22 -05:00
|
|
|
{
|
2012-08-07 07:13:57 -04:00
|
|
|
return (const void **)insns_address_table;
|
2006-12-31 10:02:22 -05:00
|
|
|
}
|
|
|
|
|
* common.mk: clean up
- remove blockinlining.$(OBJEXT) to built
- make ENCODING_H_INCLDUES variable (include/ruby/encoding.h)
- make VM_CORE_H_INCLUDES variable (vm_core.h)
- simplify rules.
- make depends rule to output depend status using gcc -MM.
* include/ruby/mvm.h, include/ruby/vm.h: rename mvm.h to vm.h.
* include/ruby.h: ditto.
* load.c: add inclusion explicitly.
* enumerator.c, object.c, parse.y, thread.c, vm_dump.c:
remove useless inclusion.
* eval_intern.h: cleanup inclusion.
* vm_core.h: rb_thread_t should be defined in this file.
* vm_evalbody.c, vm_exec.c: rename vm_evalbody.c to vm_exec.c.
* vm.h, vm_exec.h: rename vm.h to vm_exec.h.
* insnhelper.h, vm_insnhelper.h: rename insnhelper.h to vm_insnhelper.h.
* vm.c, vm_insnhelper.c, vm_insnhelper.h:
- rename vm_eval() to vm_exec_core().
- rename vm_eval_body() to vm_exec().
- cleanup include order.
* vm_method.c: fix comment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-22 20:20:28 -04:00
|
|
|
static VALUE
|
|
|
|
vm_exec_core(rb_thread_t *th, VALUE initial)
|
2006-12-31 10:02:22 -05:00
|
|
|
{
|
2017-05-09 01:06:41 -04:00
|
|
|
register rb_control_frame_t *reg_cfp = th->ec.cfp;
|
2006-12-31 10:02:22 -05:00
|
|
|
|
2012-08-07 07:13:57 -04:00
|
|
|
while (1) {
|
2007-06-30 14:02:24 -04:00
|
|
|
reg_cfp = ((rb_insn_func_t) (*GET_PC()))(th, reg_cfp);
|
2007-06-27 04:21:21 -04:00
|
|
|
|
2012-08-07 07:13:57 -04:00
|
|
|
if (UNLIKELY(reg_cfp == 0)) {
|
|
|
|
break;
|
2007-06-27 04:21:21 -04:00
|
|
|
}
|
2006-12-31 10:02:22 -05:00
|
|
|
}
|
2007-06-27 04:21:21 -04:00
|
|
|
|
2012-08-07 07:13:57 -04:00
|
|
|
if (th->retval != Qundef) {
|
|
|
|
VALUE ret = th->retval;
|
|
|
|
th->retval = Qundef;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
else {
|
2017-06-28 10:27:49 -04:00
|
|
|
VALUE err = th->ec.errinfo;
|
|
|
|
th->ec.errinfo = Qnil;
|
2012-08-07 07:13:57 -04:00
|
|
|
return err;
|
2006-12-31 10:02:22 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|