1 files changed, 13 insertions, 13 deletions

diff --git a/src/codedump.c b/src/codedump.c
index 94d4f24c0..576ff6ceb 100644
--- a/src/codedump.c
+++ b/src/codedump.c
@@ -86,9 +86,9 @@ codedump(mrb_state *mrb, const mrb_irep *irep)
     const struct mrb_irep_catch_handler *e = mrb_irep_catch_handler_table(irep);
 
     for (; i > 0; i --, e ++) {
-      int begin = bin_to_uint16(e->begin);
-      int end = bin_to_uint16(e->end);
-      int target = bin_to_uint16(e->target);
+      uint32_t begin = mrb_irep_catch_handler_unpack(e->begin);
+      uint32_t end = mrb_irep_catch_handler_unpack(e->end);
+      uint32_t target = mrb_irep_catch_handler_unpack(e->target);
       char buf[20];
       const char *type;
 
@@ -105,7 +105,7 @@ codedump(mrb_state *mrb, const mrb_irep *irep)
           type = buf;
           break;
       }
-      printf("catch type: %-8s begin: %04d end: %04d target: %04d\n", type, begin, end, target);
+      printf("catch type: %-8s begin: %04" PRIu32 " end: %04" PRIu32 " target: %04" PRIu32 "\n", type, begin, end, target);
     }
   }
 
@@ -387,37 +387,37 @@ codedump(mrb_state *mrb, const mrb_irep *irep)
       printf("OP_ALIAS\t:%s\t%s\n", mrb_sym_dump(mrb, irep->syms[a]), mrb_sym_dump(mrb, irep->syms[b]));
       break;
     CASE(OP_ADD, B);
-      printf("OP_ADD\tR%d\t\n", a);
+      printf("OP_ADD\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_ADDI, BB);
       printf("OP_ADDI\tR%d\t%d\n", a, b);
       break;
     CASE(OP_SUB, B);
-      printf("OP_SUB\tR%d\t\n", a);
+      printf("OP_SUB\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_SUBI, BB);
       printf("OP_SUBI\tR%d\t%d\n", a, b);
       break;
     CASE(OP_MUL, B);
-      printf("OP_MUL\tR%d\t\n", a);
+      printf("OP_MUL\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_DIV, B);
-      printf("OP_DIV\tR%d\t\n", a);
+      printf("OP_DIV\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_LT, B);
-      printf("OP_LT\t\tR%d\t\n", a);
+      printf("OP_LT\t\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_LE, B);
-      printf("OP_LE\t\tR%d\t\n", a);
+      printf("OP_LE\t\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_GT, B);
-      printf("OP_GT\t\tR%d\t\n", a);
+      printf("OP_GT\t\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_GE, B);
-      printf("OP_GE\t\tR%d\t\n", a);
+      printf("OP_GE\t\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_EQ, B);
-      printf("OP_EQ\t\tR%d\t\n", a);
+      printf("OP_EQ\t\tR%d\tR%d\n", a, a+1);
       break;
     CASE(OP_ARRAY, BB);
       printf("OP_ARRAY\tR%d\t%d\t", a, b);