From 2143de251d668a33b09c12f2df863d205f034316 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 11 Oct 2021 22:24:28 +0900 Subject: Extract precompile_inlinable_child_iseq to separate alloca for each iseq --- mjit_compile.c | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) (limited to 'mjit_compile.c') diff --git a/mjit_compile.c b/mjit_compile.c index a336ca5d03..946edc0ec6 100644 --- a/mjit_compile.c +++ b/mjit_compile.c @@ -508,6 +508,33 @@ init_ivar_compile_status(const struct rb_iseq_constant_body *body, struct compil memset(status.compile_info, 0, sizeof(struct rb_mjit_compile_info)); \ } while (0) +static bool +precompile_inlinable_child_iseq(FILE *f, const rb_iseq_t *child_iseq, struct compile_status *status, + const struct rb_callinfo *ci, const struct rb_callcache *cc, unsigned int pos) +{ + struct compile_status child_status = { .compiled_iseq = status->compiled_iseq, .compiled_id = status->compiled_id }; + INIT_COMPILE_STATUS(child_status, child_iseq->body, false); + child_status.inline_context = (struct inlined_call_context){ + .orig_argc = vm_ci_argc(ci), + .me = (VALUE)vm_cc_cme(cc), + .param_size = child_iseq->body->param.size, + .local_size = child_iseq->body->local_table_size + }; + if (child_iseq->body->ci_size > 0 && child_status.cc_entries_index == -1) { + return false; + } + init_ivar_compile_status(child_iseq->body, &child_status); + + fprintf(f, "ALWAYS_INLINE(static VALUE _mjit%d_inlined_%d(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, const VALUE orig_self, const rb_iseq_t *original_iseq));\n", status->compiled_id, pos); + fprintf(f, "static inline VALUE\n_mjit%d_inlined_%d(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, const VALUE orig_self, const rb_iseq_t *original_iseq)\n{\n", status->compiled_id, pos); + fprintf(f, " const VALUE *orig_pc = reg_cfp->pc;\n"); + fprintf(f, " VALUE *orig_sp = reg_cfp->sp;\n"); + bool success = mjit_compile_body(f, child_iseq, &child_status); + fprintf(f, "\n} /* end of _mjit%d_inlined_%d */\n\n", status->compiled_id, pos); + + return success; +} + // Compile inlinable ISeqs to C code in `f`. It returns true if it succeeds to compile them. static bool precompile_inlinable_iseqs(FILE *f, const rb_iseq_t *iseq, struct compile_status *status) @@ -532,28 +559,7 @@ precompile_inlinable_iseqs(FILE *f, const rb_iseq_t *iseq, struct compile_status RSTRING_PTR(rb_iseq_path(child_iseq)), FIX2INT(child_iseq->body->location.first_lineno), RSTRING_PTR(iseq->body->location.label), RSTRING_PTR(rb_iseq_path(iseq)), FIX2INT(iseq->body->location.first_lineno)); - - struct compile_status child_status = { .compiled_iseq = status->compiled_iseq, .compiled_id = status->compiled_id }; - INIT_COMPILE_STATUS(child_status, child_iseq->body, false); - child_status.inline_context = (struct inlined_call_context){ - .orig_argc = vm_ci_argc(ci), - .me = (VALUE)vm_cc_cme(cc), - .param_size = child_iseq->body->param.size, - .local_size = child_iseq->body->local_table_size - }; - if (child_iseq->body->ci_size > 0 && child_status.cc_entries_index == -1) { - return false; - } - init_ivar_compile_status(child_iseq->body, &child_status); - - fprintf(f, "ALWAYS_INLINE(static VALUE _mjit%d_inlined_%d(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, const VALUE orig_self, const rb_iseq_t *original_iseq));\n", status->compiled_id, pos); - fprintf(f, "static inline VALUE\n_mjit%d_inlined_%d(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, const VALUE orig_self, const rb_iseq_t *original_iseq)\n{\n", status->compiled_id, pos); - fprintf(f, " const VALUE *orig_pc = reg_cfp->pc;\n"); - fprintf(f, " VALUE *orig_sp = reg_cfp->sp;\n"); - bool success = mjit_compile_body(f, child_iseq, &child_status); - fprintf(f, "\n} /* end of _mjit%d_inlined_%d */\n\n", status->compiled_id, pos); - - if (!success) + if (!precompile_inlinable_child_iseq(f, child_iseq, status, ci, cc, pos)) return false; } } -- cgit v1.2.3