diff options
Diffstat (limited to 'vm_exec.h')
| -rw-r--r-- | vm_exec.h | 102 |
1 files changed, 55 insertions, 47 deletions
@@ -1,3 +1,5 @@ +#ifndef RUBY_VM_EXEC_H +#define RUBY_VM_EXEC_H /********************************************************************** vm.h - @@ -9,31 +11,17 @@ **********************************************************************/ -#ifndef RUBY_VM_EXEC_H -#define RUBY_VM_EXEC_H - typedef long OFFSET; typedef unsigned long lindex_t; typedef VALUE GENTRY; typedef rb_iseq_t *ISEQ; -#ifdef __GNUC__ -/* 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(ec, GET_CFP(), GET_PC()); -#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(ec, GET_CFP() SC_REGS()); @@ -45,8 +33,8 @@ typedef rb_iseq_t *ISEQ; #define DEBUG_END_INSN() #endif -#define throwdebug if(0)printf -/* #define throwdebug printf */ +#define throwdebug if(0)ruby_debug_printf +/* #define throwdebug ruby_debug_printf */ /************************************************/ #if defined(DISPATCH_XXX) @@ -78,11 +66,13 @@ error ! #define LABEL_PTR(x) RB_GNUC_EXTENSION(&&LABEL(x)) #define INSN_ENTRY_SIG(insn) \ - if (0) fprintf(stderr, "exec: %s@(%d, %d)@%s:%d\n", #insn, \ - (int)(reg_pc - reg_cfp->iseq->body->iseq_encoded), \ - (int)(reg_cfp->pc - reg_cfp->iseq->body->iseq_encoded), \ - RSTRING_PTR(rb_iseq_path(reg_cfp->iseq)), \ - (int)(rb_iseq_line_no(reg_cfp->iseq, reg_pc - reg_cfp->iseq->body->iseq_encoded))); + if (0) { \ + ruby_debug_printf("exec: %s@(%"PRIdPTRDIFF", %"PRIdPTRDIFF")@%s:%u\n", #insn, \ + (reg_pc - ISEQ_BODY(reg_cfp->iseq)->iseq_encoded), \ + (reg_cfp->pc - ISEQ_BODY(reg_cfp->iseq)->iseq_encoded), \ + RSTRING_PTR(rb_iseq_path(reg_cfp->iseq)), \ + rb_iseq_line_no(reg_cfp->iseq, reg_pc - ISEQ_BODY(reg_cfp->iseq)->iseq_encoded)); \ + } #define INSN_DISPATCH_SIG(insn) @@ -90,16 +80,6 @@ error ! LABEL(insn): \ INSN_ENTRY_SIG(insn); \ -/* dispatcher */ -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && __GNUC__ == 3 -#define DISPATCH_ARCH_DEPEND_WAY(addr) \ - __asm__ __volatile__("jmp *%0;\t# -- inserted by vm.h\t[length = 2]" : : "r" (addr)) - -#else -#define DISPATCH_ARCH_DEPEND_WAY(addr) \ - /* do nothing */ -#endif - /**********************************/ #if OPT_DIRECT_THREADED_CODE @@ -112,14 +92,22 @@ error ! #else /* token threaded code */ +/* dispatcher */ +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && __GNUC__ == 3 +#define DISPATCH_ARCH_DEPEND_WAY(addr) \ + __asm__ __volatile__("jmp *%0;\t# -- inserted by vm.h\t[length = 2]" : : "r" (addr)) + +#else +#define DISPATCH_ARCH_DEPEND_WAY(addr) \ + /* do nothing */ +#endif #define TC_DISPATCH(insn) \ DISPATCH_ARCH_DEPEND_WAY(insns_address_table[GET_CURRENT_INSN()]); \ INSN_DISPATCH_SIG(insn); \ RB_GNUC_EXTENSION_BLOCK(goto *insns_address_table[GET_CURRENT_INSN()]); \ rb_bug("tc error"); - -#endif /* DISPATCH_DIRECT_THREADED_CODE */ +#endif /* OPT_DIRECT_THREADED_CODE */ #define END_INSN(insn) \ DEBUG_END_INSN(); \ @@ -135,9 +123,6 @@ error ! #define NEXT_INSN() TC_DISPATCH(__NEXT_INSN__) -#define START_OF_ORIGINAL_INSN(x) start_of_##x: -#define DISPATCH_ORIGINAL_INSN(x) goto start_of_##x; - /************************************************/ #else /* no threaded code */ /* most common method */ @@ -162,19 +147,15 @@ default: \ #define NEXT_INSN() goto first -#define START_OF_ORIGINAL_INSN(x) start_of_##x: -#define DISPATCH_ORIGINAL_INSN(x) goto start_of_##x; +#endif +#ifndef START_OF_ORIGINAL_INSN +#define START_OF_ORIGINAL_INSN(x) if (0) goto start_of_##x; start_of_##x: +#define DISPATCH_ORIGINAL_INSN(x) goto start_of_##x; #endif #define VM_SP_CNT(ec, sp) ((sp) - (ec)->vm_stack) -#ifdef MJIT_HEADER -#define THROW_EXCEPTION(exc) do { \ - ec->errinfo = (VALUE)(exc); \ - EC_JUMP_TAG(ec, ec->tag->state); \ -} while (0) -#else #if OPT_CALL_THREADED_CODE #define THROW_EXCEPTION(exc) do { \ ec->errinfo = (VALUE)(exc); \ @@ -183,15 +164,42 @@ default: \ #else #define THROW_EXCEPTION(exc) return (VALUE)(exc) #endif -#endif + +// Run the interpreter from the JIT +#define VM_EXEC(ec, val) do { \ + if (UNDEF_P(val)) { \ + VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_FINISH); \ + val = vm_exec(ec); \ + } \ +} while (0) + +// Run the JIT from the interpreter +#define JIT_EXEC(ec, val) do { \ + /* don't run tailcalls since that breaks FINISH */ \ + if (UNDEF_P(val) && GET_CFP() != ec->cfp) { \ + rb_zjit_func_t zjit_entry; \ + if (rb_yjit_enabled_p) { \ + rb_jit_func_t func = yjit_compile(ec); \ + if (func) { \ + val = func(ec, ec->cfp); \ + if (ec->tag->state) THROW_EXCEPTION(val); \ + } \ + } \ + else if ((zjit_entry = (rb_zjit_func_t)rb_zjit_entry)) { \ + rb_jit_func_t func = zjit_compile(ec); \ + if (func) { \ + val = zjit_entry(ec, ec->cfp, func); \ + } \ + } \ + } \ +} while (0) #define SCREG(r) (reg_##r) #define VM_DEBUG_STACKOVERFLOW 0 #if VM_DEBUG_STACKOVERFLOW -#define CHECK_VM_STACK_OVERFLOW_FOR_INSN(cfp, margin) \ - WHEN_VM_STACK_OVERFLOWED(cfp, (cfp)->sp, margin) vm_stack_overflow_for_insn() +#define CHECK_VM_STACK_OVERFLOW_FOR_INSN CHECK_VM_STACK_OVERFLOW #else #define CHECK_VM_STACK_OVERFLOW_FOR_INSN(cfp, margin) #endif |