mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
0a71db8a74
dfp (dynamic frame pointer) to ep (environment pointer). This change make VM `normal' (similar to other interpreters). Before this commit: Each frame has two env pointers lfp and dfp. lfp points local environment which is method/class/toplevel frame. lfp[0] is block pointer. dfp is block local frame. dfp[0] points previous (parent) environment pointer. lfp == dfp when frame is method/class/toplevel. You can get lfp from dfp by traversing previous environment pointers. After this commit: Each frame has only `ep' to point respective enviornoment. If there is parent environment, then ep[0] points parent envioenment (as dfp). If there are no more environment, then ep[0] points block pointer (as lfp). We call such ep as `LEP' (local EP). We add some macros to get LEP and to detect LEP or not. In short, we replace dfp and lfp with ep and LEP. rb_block_t and rb_binding_t member `lfp' and `dfp' are removed and member `ep' is added. rename rb_thread_t's member `local_lfp' and `local_svar' to `root_lep' and `root_svar'. (VM_EP_PREV_EP(ep)): get previous environment pointer. This macro assume that ep is not LEP. (VM_EP_BLOCK_PTR(ep)): get block pointer. This macro assume that ep is LEP. (VM_EP_LEP_P(ep)): detect ep is LEP or not. (VM_ENVVAL_BLOCK_PTR(ptr)): make block pointer. (VM_ENVVAL_BLOCK_PTR_P(v)): detect v is block pointer. (VM_ENVVAL_PREV_EP_PTR(ptr)): make prev environment pointer. (VM_ENVVAL_PREV_EP_PTR_P(v)): detect v is prev env pointer. * vm.c: apply above changes. (VM_EP_LEP(ep)): get LEP. (VM_CF_LEP(cfp)): get LEP of cfp->ep. (VM_CF_PREV_EP(cfp)): utility function VM_EP_PREV_EP(cfp->ep). (VM_CF_BLOCK_PTR(cfp)): utility function VM_EP_BLOCK_PTR(cfp->ep). * vm.c, vm_eval.c, vm_insnhelper.c, vm_insnhelper.h, insns.def: apply above changes. * cont.c: ditto. * eval.c, eval_intern.h: ditto. * proc.c: ditto. * thread.c: ditto. * vm_dump.c: ditto. * vm_exec.h: fix function name (on vm debug mode). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36030 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
184 lines
4.1 KiB
C
184 lines
4.1 KiB
C
/**********************************************************************
|
|
|
|
vm.h -
|
|
|
|
$Author$
|
|
created at: 04/01/01 16:56:59 JST
|
|
|
|
Copyright (C) 2004-2007 Koichi Sasada
|
|
|
|
**********************************************************************/
|
|
|
|
#ifndef RUBY_VM_EXEC_H
|
|
#define RUBY_VM_EXEC_H
|
|
|
|
typedef long OFFSET;
|
|
typedef unsigned long lindex_t;
|
|
typedef unsigned long dindex_t;
|
|
typedef rb_num_t GENTRY;
|
|
typedef rb_iseq_t *ISEQ;
|
|
|
|
#ifdef COLLECT_USAGE_ANALYSIS
|
|
#define USAGE_ANALYSIS_INSN(insn) vm_analysis_insn(insn)
|
|
#define USAGE_ANALYSIS_OPERAND(insn, n, op) vm_analysis_operand((insn), (n), (VALUE)(op))
|
|
#define USAGE_ANALYSIS_REGISTER(reg, s) vm_analysis_register((reg), (s))
|
|
#else
|
|
#define USAGE_ANALYSIS_INSN(insn) /* none */
|
|
#define USAGE_ANALYSIS_OPERAND(insn, n, op) /* none */
|
|
#define USAGE_ANALYSIS_REGISTER(reg, s) /* none */
|
|
#endif
|
|
|
|
#ifdef __GCC__
|
|
/* TODO: machine dependent prefetch instruction */
|
|
#define PREFETCH(pc)
|
|
#else
|
|
#define PREFETCH(pc)
|
|
#endif
|
|
|
|
#if VMDEBUG > 0
|
|
#define debugs printf
|
|
#define DEBUG_ENTER_INSN(insn) \
|
|
rb_vmdebug_debug_print_pre(th, GET_CFP());
|
|
|
|
#if OPT_STACK_CACHING
|
|
#define SC_REGS() , reg_a, reg_b
|
|
#else
|
|
#define SC_REGS()
|
|
#endif
|
|
|
|
#define DEBUG_END_INSN() \
|
|
rb_vmdebug_debug_print_post(th, GET_CFP() SC_REGS());
|
|
|
|
#else
|
|
|
|
#define debugs
|
|
#define DEBUG_ENTER_INSN(insn)
|
|
#define DEBUG_END_INSN()
|
|
#endif
|
|
|
|
#define throwdebug if(0)printf
|
|
/* #define throwdebug printf */
|
|
|
|
/************************************************/
|
|
#if DISPATCH_XXX
|
|
error !
|
|
/************************************************/
|
|
#elif OPT_CALL_THREADED_CODE
|
|
|
|
#define LABEL(x) insn_func_##x
|
|
#define ELABEL(x)
|
|
#define LABEL_PTR(x) &LABEL(x)
|
|
|
|
#define INSN_ENTRY(insn) \
|
|
static rb_control_frame_t * \
|
|
FUNC_FASTCALL(LABEL(insn))(rb_thread_t *th, rb_control_frame_t *reg_cfp) {
|
|
|
|
#define END_INSN(insn) return reg_cfp;}
|
|
|
|
#define NEXT_INSN() return reg_cfp;
|
|
|
|
/************************************************/
|
|
#elif OPT_TOKEN_THREADED_CODE || OPT_DIRECT_THREADED_CODE
|
|
/* threaded code with gcc */
|
|
|
|
#define LABEL(x) INSN_LABEL_##x
|
|
#define ELABEL(x) INSN_ELABEL_##x
|
|
#define LABEL_PTR(x) &&LABEL(x)
|
|
|
|
#define INSN_ENTRY_SIG(insn)
|
|
|
|
|
|
#define INSN_DISPATCH_SIG(insn)
|
|
|
|
#define INSN_ENTRY(insn) \
|
|
LABEL(insn): \
|
|
INSN_ENTRY_SIG(insn); \
|
|
|
|
/* dispather */
|
|
#if __GNUC__ && (__i386__ || __x86_64__) && __GNUC__ == 3
|
|
#define DISPATCH_ARCH_DEPEND_WAY(addr) \
|
|
asm volatile("jmp *%0;\t# -- inseted by vm.h\t[length = 2]" : : "r" (addr))
|
|
|
|
#else
|
|
#define DISPATCH_ARCH_DEPEND_WAY(addr) \
|
|
/* do nothing */
|
|
|
|
#endif
|
|
|
|
|
|
/**********************************/
|
|
#if OPT_DIRECT_THREADED_CODE
|
|
|
|
/* for GCC 3.4.x */
|
|
#define TC_DISPATCH(insn) \
|
|
INSN_DISPATCH_SIG(insn); \
|
|
goto *(void const *)GET_CURRENT_INSN(); \
|
|
;
|
|
|
|
#else
|
|
/* token threade code */
|
|
|
|
#define TC_DISPATCH(insn) \
|
|
DISPATCH_ARCH_DEPEND_WAY(insns_address_table[GET_CURRENT_INSN()]); \
|
|
INSN_DISPATCH_SIG(insn); \
|
|
goto *insns_address_table[GET_CURRENT_INSN()]; \
|
|
rb_bug("tc error");
|
|
|
|
|
|
#endif /* DISPATCH_DIRECT_THREADED_CODE */
|
|
|
|
#define END_INSN(insn) \
|
|
DEBUG_END_INSN(); \
|
|
TC_DISPATCH(insn); \
|
|
|
|
#define INSN_DISPATCH() \
|
|
TC_DISPATCH(__START__) \
|
|
{
|
|
|
|
#define END_INSNS_DISPATCH() \
|
|
rb_bug("unknown insn: %"PRIdVALUE, GET_CURRENT_INSN()); \
|
|
} /* end of while loop */ \
|
|
|
|
#define NEXT_INSN() TC_DISPATCH(__NEXT_INSN__)
|
|
|
|
/************************************************/
|
|
#else /* no threaded code */
|
|
/* most common method */
|
|
|
|
#define INSN_ENTRY(insn) \
|
|
case BIN(insn):
|
|
|
|
#define END_INSN(insn) \
|
|
DEBUG_END_INSN(); \
|
|
break;
|
|
|
|
|
|
#define INSN_DISPATCH() \
|
|
while(1){ \
|
|
switch(GET_CURRENT_INSN()){
|
|
|
|
#define END_INSNS_DISPATCH() \
|
|
default: \
|
|
SDR(); \
|
|
rb_bug("unknown insn: %ld", GET_CURRENT_INSN()); \
|
|
} /* end of switch */ \
|
|
} /* end of while loop */ \
|
|
|
|
#define NEXT_INSN() goto first
|
|
|
|
#endif
|
|
|
|
#define VM_SP_CNT(th, sp) ((sp) - (th)->stack)
|
|
|
|
#if OPT_CALL_THREADED_CODE
|
|
#define THROW_EXCEPTION(exc) do { \
|
|
th->errinfo = (VALUE)(exc); \
|
|
return 0; \
|
|
} while (0)
|
|
#else
|
|
#define THROW_EXCEPTION(exc) return (VALUE)(exc)
|
|
#endif
|
|
|
|
#define SCREG(r) (reg_##r)
|
|
|
|
#endif /* RUBY_VM_EXEC_H */
|