2006-12-31 10:02:22 -05:00
|
|
|
/* -*-c-*- */
|
|
|
|
|
/**********************************************************************
|
|
|
|
|
|
|
|
|
|
vm_evalbody.ci -
|
|
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
|
$Date$
|
|
|
|
|
|
|
|
|
|
Copyright (C) 2004-2006 Koichi Sasada
|
|
|
|
|
|
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
|
|
#include <math.h>
|
|
|
|
|
|
|
|
|
|
#if VMDEBUG > 0
|
|
|
|
|
#define DECL_SC_REG(type, r, reg) register type reg_##r
|
|
|
|
|
|
|
|
|
|
#elif __GNUC__ && __x86_64
|
|
|
|
|
#define DECL_SC_REG(type, r, reg) register type reg_##r asm("r" reg)
|
|
|
|
|
|
|
|
|
|
#elif __GNUC__ && __i386__
|
|
|
|
|
#define DECL_SC_REG(type, r, reg) register type reg_##r asm("e" reg)
|
|
|
|
|
|
|
|
|
|
#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
|
|
|
|
* 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
|
|
|
typedef rb_iseq_t *ISEQ;
|
2006-12-31 10:02:22 -05:00
|
|
|
|
|
|
|
|
#if !OPT_CALL_THREADED_CODE
|
|
|
|
|
VALUE
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
th_eval(rb_thread_t *th, VALUE initial)
|
2006-12-31 10:02:22 -05:00
|
|
|
{
|
|
|
|
|
|
|
|
|
|
#if OPT_STACK_CACHING
|
|
|
|
|
#if 0
|
|
|
|
|
#elif __GNUC__ && __x86_64
|
|
|
|
|
DECL_SC_REG(VALUE, a, "12");
|
|
|
|
|
DECL_SC_REG(VALUE, b, "13");
|
|
|
|
|
#else
|
|
|
|
|
register VALUE reg_a;
|
|
|
|
|
register VALUE reg_b;
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if __GNUC__ && __i386__
|
|
|
|
|
DECL_SC_REG(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
|
|
|
|
|
|
|
|
|
|
#elif __GNUC__ && __x86_64__
|
|
|
|
|
DECL_SC_REG(VALUE *, pc, "14");
|
* 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");
|
2006-12-31 10:02:22 -05:00
|
|
|
#define USE_MACHINE_REGS 1
|
|
|
|
|
|
|
|
|
|
#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;
|
2006-12-31 10:02:22 -05:00
|
|
|
VALUE *reg_pc;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if USE_MACHINE_REGS
|
|
|
|
|
|
|
|
|
|
#undef RESTORE_REGS
|
|
|
|
|
#define RESTORE_REGS() \
|
|
|
|
|
{ \
|
|
|
|
|
REG_CFP = th->cfp; \
|
|
|
|
|
reg_pc = reg_cfp->pc; \
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#undef REG_PC
|
|
|
|
|
#define REG_PC reg_pc
|
|
|
|
|
#undef GET_PC
|
|
|
|
|
#define GET_PC() (reg_pc)
|
|
|
|
|
#undef SET_PC
|
|
|
|
|
#define SET_PC(x) (reg_cfp->pc = REG_PC = (x))
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
ID tmp_id;
|
* 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
|
|
|
rb_block_t *tmp_blockptr;
|
2006-12-31 10:02:22 -05:00
|
|
|
num_t tmp_num;
|
|
|
|
|
|
|
|
|
|
#if OPT_TOKEN_THREADED_CODE || OPT_DIRECT_THREADED_CODE
|
|
|
|
|
#include "vmtc.inc"
|
|
|
|
|
if (th == 0) {
|
|
|
|
|
#if OPT_STACK_CACHING
|
|
|
|
|
yarv_finish_insn_seq[0] = (VALUE)&&LABEL (finish_SC_ax_ax);
|
|
|
|
|
#else
|
|
|
|
|
yarv_finish_insn_seq[0] = (VALUE)&&LABEL (finish);
|
|
|
|
|
#endif
|
|
|
|
|
return (VALUE)insns_address_table;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
reg_cfp = th->cfp;
|
|
|
|
|
reg_pc = reg_cfp->pc;
|
|
|
|
|
|
|
|
|
|
#if OPT_STACK_CACHING
|
|
|
|
|
reg_a = initial;
|
|
|
|
|
reg_b = 0;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
first:
|
|
|
|
|
INSN_DISPATCH();
|
|
|
|
|
/******************/
|
|
|
|
|
#include "vm.inc"
|
|
|
|
|
/******************/
|
|
|
|
|
END_INSNS_DISPATCH();
|
|
|
|
|
|
|
|
|
|
/* unreachable */
|
|
|
|
|
rb_bug("th_eval_iseq: unreachable");
|
|
|
|
|
return Qundef;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
|
|
#include "vm.inc"
|
|
|
|
|
#include "vmtc.inc"
|
|
|
|
|
|
|
|
|
|
void **
|
|
|
|
|
get_insns_address_table()
|
|
|
|
|
{
|
|
|
|
|
return (void **)insns_address_table;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
VALUE
|
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-08 01:37:46 -05:00
|
|
|
th_eval(rb_thread_t *th, VALUE initial)
|
2006-12-31 10:02:22 -05:00
|
|
|
{
|
* 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 = th->cfp;
|
2006-12-31 10:02:22 -05:00
|
|
|
SET_PC(reg_cfp->iseq->iseq_encoded);
|
|
|
|
|
|
|
|
|
|
while (*GET_PC()) {
|
|
|
|
|
reg_cfp = ((insn_func_type) (*GET_PC()))(th, reg_cfp);
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
VALUE ret = *--reg_cfp->sp;
|
|
|
|
|
th->cfp--;
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
