From 4c7f9897c2fc1b180a7758130c8e6694d2361c96 Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Tue, 29 Apr 2014 20:45:12 +0900 Subject: Support local variables information dumping. --- src/load.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) (limited to 'src/load.c') diff --git a/src/load.c b/src/load.c index c6aff4f9c..27832af3c 100644 --- a/src/load.c +++ b/src/load.c @@ -401,6 +401,88 @@ debug_exit: return result; } +static int +read_lv_record(mrb_state *mrb, const uint8_t *start, mrb_irep *irep, size_t *record_len, mrb_sym const *syms, uint32_t syms_len) +{ + const uint8_t *bin = start; + size_t i; + ptrdiff_t diff; + + irep->lv_len = bin_to_uint16(bin); + bin += sizeof(uint16_t); + irep->lv = (struct mrb_locals*)mrb_malloc(mrb, sizeof(struct mrb_locals) * irep->lv_len); + + for (i = 0; i < irep->lv_len; ++i) { + uint16_t const sym_idx = bin_to_uint16(bin); + bin += sizeof(uint16_t); + if (sym_idx >= syms_len) { + return MRB_DUMP_GENERAL_FAILURE; + } + irep->lv[i].name = syms[sym_idx]; + + irep->lv[i].r = bin_to_uint32(bin); + bin += sizeof(uint32_t); + } + + for (i = 0; i < irep->rlen; ++i) { + size_t len; + int ret; + + ret = read_lv_record(mrb, bin, irep->reps[i], &len, syms, syms_len); + if (ret != MRB_DUMP_OK) return ret; + bin += len; + } + + diff = bin - start; + mrb_assert_int_fit(ptrdiff_t, diff, size_t, SIZE_MAX); + *record_len = (size_t)diff; + + return MRB_DUMP_OK; +} + +static int +read_section_lv(mrb_state *mrb, const uint8_t *start, mrb_irep *irep, mrb_bool alloc) +{ + const uint8_t *bin; + ptrdiff_t diff; + struct rite_section_lv_header const *header; + uint32_t i; + size_t len = 0; + int result; + uint32_t syms_len; + mrb_sym *syms; + mrb_sym (*intern_func)(mrb_state*, const char*, size_t) = alloc? mrb_intern : mrb_intern_static; + + bin = start; + header = (struct rite_section_lv_header const*)bin; + bin += sizeof(struct rite_section_lv_header); + + syms_len = bin_to_uint32(bin); + bin += sizeof(uint32_t); + syms = (mrb_sym*)mrb_malloc(mrb, sizeof(mrb_sym) * (size_t)syms_len); + for (i = 0; i < syms_len; ++i) { + uint16_t const str_len = bin_to_uint16(bin); + bin += sizeof(uint16_t); + + syms[i] = intern_func(mrb, (const char*)bin, str_len); + bin += str_len; + } + + result = read_lv_record(mrb, bin, irep, &len, syms, syms_len); + if (result != MRB_DUMP_OK) goto lv_exit; + + bin += len; + diff = bin - start; + mrb_assert_int_fit(ptrdiff_t, diff, size_t, SIZE_MAX); + if ((uint32_t)diff != bin_to_uint32(header->section_size)) { + result = MRB_DUMP_GENERAL_FAILURE; + } + +lv_exit: + mrb_free(mrb, syms); + return result; +} + static int read_binary_header(const uint8_t *bin, size_t *bin_size, uint16_t *crc) { @@ -467,6 +549,13 @@ mrb_read_irep(mrb_state *mrb, const uint8_t *bin) return NULL; } } + else if (memcmp(section_header->section_identify, RITE_SECTION_LV_IDENTIFIER, sizeof(section_header->section_identify)) == 0) { + if (!irep) return NULL; + result = read_section_lv(mrb, bin, irep, FALSE); + if (result < MRB_DUMP_OK) { + return NULL; + } + } bin += bin_to_uint32(section_header->section_size); } while (memcmp(section_header->section_identify, RITE_BINARY_EOF, sizeof(section_header->section_identify)) != 0); @@ -686,6 +775,21 @@ mrb_read_irep_file(mrb_state *mrb, FILE* fp) } if (result < MRB_DUMP_OK) return NULL; } + else if (memcmp(section_header.section_identify, RITE_SECTION_LV_IDENTIFIER, sizeof(section_header.section_identify)) == 0) { + if (!irep) return NULL; + else { + uint8_t* const bin = (uint8_t*)mrb_malloc(mrb, section_size); + + fseek(fp, fpos, SEEK_SET); + if (fread((char*)bin, section_size, 1, fp) != 1) { + mrb_free(mrb, bin); + return NULL; + } + result = read_section_lv(mrb, bin, irep, TRUE); + mrb_free(mrb, bin); + } + if (result < MRB_DUMP_OK) return NULL; + } fseek(fp, fpos + section_size, SEEK_SET); } while (memcmp(section_header.section_identify, RITE_BINARY_EOF, sizeof(section_header.section_identify)) != 0); -- cgit v1.2.3 From 5073d14e280a82e4cb4e41692154de825b07b5e9 Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Tue, 29 Apr 2014 22:06:59 +0900 Subject: Remove `lv_len` and use `nlocals - 1` instead. Check that `lv`'s length is always `nlocals - 1`. --- include/mruby/irep.h | 2 +- mrbgems/mruby-proc-ext/src/proc.c | 4 ++-- src/codegen.c | 8 ++------ src/dump.c | 12 +++++------- src/load.c | 6 ++---- 5 files changed, 12 insertions(+), 20 deletions(-) (limited to 'src/load.c') diff --git a/include/mruby/irep.h b/include/mruby/irep.h index a06483090..13298f17f 100644 --- a/include/mruby/irep.h +++ b/include/mruby/irep.h @@ -41,7 +41,7 @@ typedef struct mrb_irep { uint16_t *lines; struct mrb_irep_debug_info* debug_info; - size_t ilen, plen, slen, rlen, lv_len, refcnt; + size_t ilen, plen, slen, rlen, refcnt; } mrb_irep; #define MRB_ISEQ_NO_FREE 1 diff --git a/mrbgems/mruby-proc-ext/src/proc.c b/mrbgems/mruby-proc-ext/src/proc.c index 964a7c9bb..341001f05 100644 --- a/mrbgems/mruby-proc-ext/src/proc.c +++ b/mrbgems/mruby-proc-ext/src/proc.c @@ -137,8 +137,8 @@ mrb_local_variables(mrb_state *mrb, mrb_value self) } irep = proc->body.irep; - ret = mrb_ary_new_capa(mrb, irep->lv_len); - for (i = 0; i < irep->lv_len; ++i) { + ret = mrb_ary_new_capa(mrb, irep->nlocals - 1); + for (i = 0; i < (irep->nlocals - 1); ++i) { mrb_ary_push(mrb, ret, mrb_symbol_value(irep->lv[i].name)); } diff --git a/src/codegen.c b/src/codegen.c index 822dfef88..5e22e199f 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -2496,20 +2496,16 @@ scope_new(mrb_state *mrb, codegen_scope *prev, node *lv) p->lv = lv; p->sp += node_len(lv)+1; /* add self */ p->nlocals = p->sp; - p->irep->lv_len = 0; if (lv) { node *n = lv; size_t i = 0; - for (n=lv; n; n=n->cdr) { - p->irep->lv_len++; - } - - p->irep->lv = (struct mrb_locals*)mrb_malloc(mrb, sizeof(struct mrb_locals)*p->irep->lv_len); + p->irep->lv = (struct mrb_locals*)mrb_malloc(mrb, sizeof(struct mrb_locals) * (p->nlocals - 1)); for (i=0, n=lv; n; i++,n=n->cdr) { p->irep->lv[i].name = lv_name(n); p->irep->lv[i].r = lv_idx(p, lv_name(n)); } + mrb_assert(i == (p->nlocals - 1)); } p->ai = mrb_gc_arena_save(mrb); diff --git a/src/dump.c b/src/dump.c index c06c5a49e..854ddfe33 100644 --- a/src/dump.c +++ b/src/dump.c @@ -693,7 +693,7 @@ write_section_debug(mrb_state *mrb, mrb_irep *irep, uint8_t *cur) } static void -create_lv_sym_table(mrb_state *mrb, mrb_irep *irep, mrb_sym **syms, uint32_t *syms_len) +create_lv_sym_table(mrb_state *mrb, const mrb_irep *irep, mrb_sym **syms, uint32_t *syms_len) { size_t i; @@ -701,7 +701,7 @@ create_lv_sym_table(mrb_state *mrb, mrb_irep *irep, mrb_sym **syms, uint32_t *sy *syms = (mrb_sym*)mrb_malloc(mrb, sizeof(mrb_sym) * 1); } - for (i = 0; i < irep->lv_len; ++i) { + for (i = 0; i < (irep->nlocals - 1); ++i) { mrb_sym const name = irep->lv[i].name; if (find_filename_index(*syms, *syms_len, name) != -1) continue; @@ -738,13 +738,12 @@ write_lv_sym_table(mrb_state *mrb, uint8_t **start, mrb_sym const *syms, uint32_ } static int -write_lv_record(mrb_state *mrb, mrb_irep *irep, uint8_t **start, mrb_sym const *syms, uint32_t syms_len) +write_lv_record(mrb_state *mrb, const mrb_irep *irep, uint8_t **start, mrb_sym const *syms, uint32_t syms_len) { uint8_t *cur = *start; size_t i; - cur += uint16_to_bin(irep->lv_len, cur); - for (i = 0; i < irep->lv_len; ++i) { + for (i = 0; i < (irep->nlocals - 1); ++i) { int const sym_idx = find_filename_index(syms, syms_len, irep->lv[i].name); mrb_assert(sym_idx != -1); /* local variable name must be in syms */ @@ -766,8 +765,7 @@ get_lv_record_size(mrb_state *mrb, mrb_irep *irep) { size_t ret = 0, i; - ret += sizeof(uint16_t); /* lv_len */ - ret += (sizeof(uint16_t) + sizeof(uint32_t)) * irep->lv_len; + ret += (sizeof(uint16_t) + sizeof(uint32_t)) * (irep->nlocals - 1); for (i = 0; i < irep->rlen; ++i) { ret += get_lv_record_size(mrb, irep->reps[i]); diff --git a/src/load.c b/src/load.c index 27832af3c..912a28218 100644 --- a/src/load.c +++ b/src/load.c @@ -408,11 +408,9 @@ read_lv_record(mrb_state *mrb, const uint8_t *start, mrb_irep *irep, size_t *rec size_t i; ptrdiff_t diff; - irep->lv_len = bin_to_uint16(bin); - bin += sizeof(uint16_t); - irep->lv = (struct mrb_locals*)mrb_malloc(mrb, sizeof(struct mrb_locals) * irep->lv_len); + irep->lv = (struct mrb_locals*)mrb_malloc(mrb, sizeof(struct mrb_locals) * (irep->nlocals - 1)); - for (i = 0; i < irep->lv_len; ++i) { + for (i = 0; i < (irep->nlocals - 1); ++i) { uint16_t const sym_idx = bin_to_uint16(bin); bin += sizeof(uint16_t); if (sym_idx >= syms_len) { -- cgit v1.2.3 From 9184d254e23c14a67b5b1aa5dc5dbbbf747a9ff6 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Wed, 14 May 2014 17:32:30 +0900 Subject: resize register number in LVAR section from 32bits to 16bits --- include/mruby/irep.h | 2 +- src/codegen.c | 6 +++--- src/dump.c | 8 ++++---- src/load.c | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/load.c') diff --git a/include/mruby/irep.h b/include/mruby/irep.h index 13298f17f..3d6b5efc7 100644 --- a/include/mruby/irep.h +++ b/include/mruby/irep.h @@ -21,7 +21,7 @@ enum irep_pool_type { struct mrb_locals { mrb_sym name; - size_t r; + uint16_t r; }; /* Program data array struct */ diff --git a/src/codegen.c b/src/codegen.c index 226cd9bf8..6406c58b3 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -66,8 +66,8 @@ typedef struct scope { size_t scapa; size_t rcapa; - int nlocals; - int nregs; + uint16_t nlocals; + uint16_t nregs; int ai; int debug_start_pos; @@ -2505,7 +2505,7 @@ scope_new(mrb_state *mrb, codegen_scope *prev, node *lv) p->irep->lv[i].name = lv_name(n); p->irep->lv[i].r = lv_idx(p, lv_name(n)); } - mrb_assert(i == (p->nlocals - 1)); + mrb_assert(i + 1 == p->nlocals); } p->ai = mrb_gc_arena_save(mrb); diff --git a/src/dump.c b/src/dump.c index 7ad3d6985..d0e230f1f 100644 --- a/src/dump.c +++ b/src/dump.c @@ -701,7 +701,7 @@ create_lv_sym_table(mrb_state *mrb, const mrb_irep *irep, mrb_sym **syms, uint32 *syms = (mrb_sym*)mrb_malloc(mrb, sizeof(mrb_sym) * 1); } - for (i = 0; i < (irep->nlocals - 1); ++i) { + for (i = 0; i + 1 < irep->nlocals; ++i) { mrb_sym const name = irep->lv[i].name; if (find_filename_index(*syms, *syms_len, name) != -1) continue; @@ -743,12 +743,12 @@ write_lv_record(mrb_state *mrb, const mrb_irep *irep, uint8_t **start, mrb_sym c uint8_t *cur = *start; size_t i; - for (i = 0; i < (irep->nlocals - 1); ++i) { + for (i = 0; i + 1 < irep->nlocals; ++i) { int const sym_idx = find_filename_index(syms, syms_len, irep->lv[i].name); mrb_assert(sym_idx != -1); /* local variable name must be in syms */ cur += uint16_to_bin(sym_idx, cur); - cur += uint32_to_bin(irep->lv[i].r, cur); + cur += uint16_to_bin(irep->lv[i].r, cur); } for (i = 0; i < irep->rlen; ++i) { @@ -765,7 +765,7 @@ get_lv_record_size(mrb_state *mrb, mrb_irep *irep) { size_t ret = 0, i; - ret += (sizeof(uint16_t) + sizeof(uint32_t)) * (irep->nlocals - 1); + ret += (sizeof(uint16_t) + sizeof(uint16_t)) * (irep->nlocals - 1); for (i = 0; i < irep->rlen; ++i) { ret += get_lv_record_size(mrb, irep->reps[i]); diff --git a/src/load.c b/src/load.c index dc5a5bf06..89a5f7cd2 100644 --- a/src/load.c +++ b/src/load.c @@ -408,7 +408,7 @@ read_lv_record(mrb_state *mrb, const uint8_t *start, mrb_irep *irep, size_t *rec irep->lv = (struct mrb_locals*)mrb_malloc(mrb, sizeof(struct mrb_locals) * (irep->nlocals - 1)); - for (i = 0; i < (irep->nlocals - 1); ++i) { + for (i = 0; i + 1< irep->nlocals; ++i) { uint16_t const sym_idx = bin_to_uint16(bin); bin += sizeof(uint16_t); if (sym_idx >= syms_len) { @@ -416,8 +416,8 @@ read_lv_record(mrb_state *mrb, const uint8_t *start, mrb_irep *irep, size_t *rec } irep->lv[i].name = syms[sym_idx]; - irep->lv[i].r = bin_to_uint32(bin); - bin += sizeof(uint32_t); + irep->lv[i].r = bin_to_uint16(bin); + bin += sizeof(uint16_t); } for (i = 0; i < irep->rlen; ++i) { -- cgit v1.2.3