summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-06 14:27:15 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-06 14:27:15 +0000
commitd409017bc6e7d5521111e607afcdc5e2dc25bbef (patch)
tree4578abd6a8f91d9231b345db891978951d368719
parent3cb196f404efdb391dd3020a1df0518b12338802 (diff)
mjit_compile.c: fix inconsistent indentation
and style of generated code. I've used 2-space indentation at first but at some moment I started to use insns.def contents for generated code. So the 4-space indentation was introduced. But it does no longer make sense. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62255 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--mjit_compile.c20
-rw-r--r--tool/ruby_vm/views/mjit_compile.inc.erb2
2 files changed, 11 insertions, 11 deletions
diff --git a/mjit_compile.c b/mjit_compile.c
index fc864c6187..3155ef2c84 100644
--- a/mjit_compile.c
+++ b/mjit_compile.c
@@ -137,29 +137,29 @@ mjit_compile(FILE *f, const struct rb_iseq_constant_body *body, const char *func
status.success = TRUE;
status.compiled_for_pos = ZALLOC_N(int, body->iseq_size);
- fprintf(f, "VALUE %s(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp) {\n", funcname);
- fprintf(f, " VALUE *stack = reg_cfp->sp;\n");
+ fprintf(f, "VALUE\n%s(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp)\n{\n", funcname);
+ fprintf(f, " VALUE *stack = reg_cfp->sp;\n");
/* Simulate `opt_pc` in setup_parameters_complex */
if (body->param.flags.has_opt) {
int i;
fprintf(f, "\n");
- fprintf(f, " switch (reg_cfp->pc - reg_cfp->iseq->body->iseq_encoded) {\n");
+ fprintf(f, " switch (reg_cfp->pc - reg_cfp->iseq->body->iseq_encoded) {\n");
for (i = 0; i <= body->param.opt_num; i++) {
VALUE pc_offset = body->param.opt_table[i];
- fprintf(f, " case %"PRIdVALUE":\n", pc_offset);
- fprintf(f, " goto label_%"PRIdVALUE";\n", pc_offset);
+ fprintf(f, " case %"PRIdVALUE":\n", pc_offset);
+ fprintf(f, " goto label_%"PRIdVALUE";\n", pc_offset);
}
- fprintf(f, " }\n");
+ fprintf(f, " }\n");
}
/* ISeq might be used for catch table too. For that usage, this code cancels JIT execution. */
- fprintf(f, " if (reg_cfp->pc != 0x%"PRIxVALUE") {\n", (VALUE)body->iseq_encoded);
- fprintf(f, " return Qundef;\n");
- fprintf(f, " }\n");
+ fprintf(f, " if (reg_cfp->pc != 0x%"PRIxVALUE") {\n", (VALUE)body->iseq_encoded);
+ fprintf(f, " return Qundef;\n");
+ fprintf(f, " }\n");
compile_insns(f, body, 0, 0, &status);
- fprintf(f, "}\n");
+ fprintf(f, "\n} /* end of %s */\n", funcname);
xfree(status.compiled_for_pos);
return status.success;
diff --git a/tool/ruby_vm/views/mjit_compile.inc.erb b/tool/ruby_vm/views/mjit_compile.inc.erb
index 7437a44855..47492a0ed8 100644
--- a/tool/ruby_vm/views/mjit_compile.inc.erb
+++ b/tool/ruby_vm/views/mjit_compile.inc.erb
@@ -63,4 +63,4 @@ switch (insn) {
/* if next_pos is already compiled, next instruction won't be compiled in C code and needs `goto`. */
if ((next_pos < body->iseq_size && status->compiled_for_pos[next_pos]))
- fprintf(f, " goto label_%d;\n", next_pos);
+ fprintf(f, "goto label_%d;\n", next_pos);