1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

catch up recent changes for call threaded code VM.

Browse Source 
Fix compile errors for OPT_CALL_THREADED_CODE (in vm_opts.h).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2017-10-27 19:16:51 +00:00
parent baa849443f
commit 7e9aca4071
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
insns.def
View File

@ -998,7 +998,7 @@ leave
if (vm_pop_frame(ec, GET_CFP(), GET_EP())) { if (vm_pop_frame(ec, GET_CFP(), GET_EP())) {
#if OPT_CALL_THREADED_CODE #if OPT_CALL_THREADED_CODE
th->retval = val; rb_ec_thread_ptr(ec)->retval = val;
return 0; return 0;
#else #else
return val; return val;

3
vm_exec.c
View File

@ -140,9 +140,10 @@ rb_vm_get_insns_address_table(void)
} }
static VALUE static VALUE
vm_exec_core(rb_execution_cntext_t *ec, VALUE initial) vm_exec_core(rb_execution_context_t *ec, VALUE initial)
{ {
register rb_control_frame_t *reg_cfp = ec->cfp; register rb_control_frame_t *reg_cfp = ec->cfp;
rb_thread_t *th = rb_ec_thread_ptr(ec);
while (1) { while (1) {
reg_cfp = ((rb_insn_func_t) (*GET_PC()))(ec, reg_cfp); reg_cfp = ((rb_insn_func_t) (*GET_PC()))(ec, reg_cfp);

4
vm_exec.h
View File

@ -60,7 +60,7 @@ error !
#define INSN_ENTRY(insn) \ #define INSN_ENTRY(insn) \
static rb_control_frame_t * \ static rb_control_frame_t * \
FUNC_FASTCALL(LABEL(insn))(rb_thread_t *th, rb_control_frame_t *reg_cfp) { FUNC_FASTCALL(LABEL(insn))(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp) {
#define END_INSN(insn) return reg_cfp;} #define END_INSN(insn) return reg_cfp;}
@ -161,7 +161,7 @@ default: \
#if OPT_CALL_THREADED_CODE #if OPT_CALL_THREADED_CODE
#define THROW_EXCEPTION(exc) do { \ #define THROW_EXCEPTION(exc) do { \
th->ec->errinfo = (VALUE)(exc); \ ec->errinfo = (VALUE)(exc); \
return 0; \ return 0; \
} while (0) } while (0)
#else #else