codedump.c: adjust output format for ireps and literals

- I(%d:%p) -> I[%d]
- L(%d) -> L[%d]

The irep address is not useful, so just print index in reps table.
And use `[]` instead of `()` to clarify they are index.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2023-02-06 11:13:48 +09:00
parent 1e122f7887
commit 7e607c67f2
+11 -11
View File
@@ -173,19 +173,19 @@ codedump(mrb_state *mrb, const mrb_irep *irep, FILE *out)
switch (irep->pool[b].tt) {
#ifndef MRB_NO_FLOAT
case IREP_TT_FLOAT:
fprintf(out, "LOADL\t\tR%d\tL(%d)\t; %f", a, b, (double)irep->pool[b].u.f);
fprintf(out, "LOADL\t\tR%d\tL[%d]\t; %f", a, b, (double)irep->pool[b].u.f);
break;
#endif
case IREP_TT_INT32:
fprintf(out, "LOADL\t\tR%d\tL(%d)\t; %" PRId32, a, b, irep->pool[b].u.i32);
fprintf(out, "LOADL\t\tR%d\tL[%d]\t; %" PRId32, a, b, irep->pool[b].u.i32);
break;
#ifdef MRB_64BIT
case IREP_TT_INT64:
fprintf(out, "LOADL\t\tR%d\tL(%d)\t; %" PRId64, a, b, irep->pool[b].u.i64);
fprintf(out, "LOADL\t\tR%d\tL[%d]\t; %" PRId64, a, b, irep->pool[b].u.i64);
break;
#endif
default:
fprintf(out, "LOADL\t\tR%d\tL(%d)\t", a, b);
fprintf(out, "LOADL\t\tR%d\tL[%d]\t", a, b);
break;
}
print_lv_a(mrb, irep, a, out);
@@ -403,13 +403,13 @@ codedump(mrb_state *mrb, const mrb_irep *irep, FILE *out)
print_lv_a(mrb, irep, a, out);
break;
CASE(OP_LAMBDA, BB):
fprintf(out, "LAMBDA\tR%d\tI(%d:%p)\n", a, b, (void*)irep->reps[b]);
fprintf(out, "LAMBDA\tR%d\tI[%d]\n", a, b);
break;
CASE(OP_BLOCK, BB):
fprintf(out, "BLOCK\t\tR%d\tI(%d:%p)\n", a, b, (void*)irep->reps[b]);
fprintf(out, "BLOCK\t\tR%d\tI[%d]\n", a, b);
break;
CASE(OP_METHOD, BB):
fprintf(out, "METHOD\tR%d\tI(%d:%p)\n", a, b, (void*)irep->reps[b]);
fprintf(out, "METHOD\tR%d\tI[%d]\n", a, b);
break;
CASE(OP_RANGE_INC, B):
fprintf(out, "RANGE_INC\tR%d\n", a);
@@ -499,12 +499,12 @@ codedump(mrb_state *mrb, const mrb_irep *irep, FILE *out)
break;
CASE(OP_SYMBOL, BB):
mrb_assert((irep->pool[b].tt&IREP_TT_NFLAG)==0);
fprintf(out, "SYMBOL\tR%d\tL(%d)\t; %s", a, b, irep->pool[b].u.str);
fprintf(out, "SYMBOL\tR%d\tL[%d]\t; %s", a, b, irep->pool[b].u.str);
print_lv_a(mrb, irep, a, out);
break;
CASE(OP_STRING, BB):
mrb_assert((irep->pool[b].tt&IREP_TT_NFLAG)==0);
fprintf(out, "STRING\tR%d\tL(%d)\t; %s", a, b, irep->pool[b].u.str);
fprintf(out, "STRING\tR%d\tL[%d]\t; %s", a, b, irep->pool[b].u.str);
print_lv_a(mrb, irep, a, out);
break;
CASE(OP_STRCAT, B):
@@ -537,7 +537,7 @@ codedump(mrb_state *mrb, const mrb_irep *irep, FILE *out)
print_lv_a(mrb, irep, a, out);
break;
CASE(OP_EXEC, BB):
fprintf(out, "EXEC\t\tR%d\tI(%d:%p)", a, b, (void*)irep->reps[b]);
fprintf(out, "EXEC\t\tR%d\tI[%d]", a, b);
print_lv_a(mrb, irep, a, out);
break;
CASE(OP_SCLASS, B):
@@ -553,7 +553,7 @@ codedump(mrb_state *mrb, const mrb_irep *irep, FILE *out)
fprintf(out, "ERR\t\t%s\n", irep->pool[a].u.str);
}
else {
fprintf(out, "ERR\tL(%d)\n", a);
fprintf(out, "ERR\tL[%d]\n", a);
}
break;
CASE(OP_EXCEPT, B):