summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cdump.c3
-rw-r--r--src/codegen.c12
-rw-r--r--src/dump.c82
-rw-r--r--src/load.c61
-rw-r--r--src/mruby_core.rake2
5 files changed, 108 insertions, 52 deletions
diff --git a/src/cdump.c b/src/cdump.c
index 89ae0bbff..7cb159046 100644
--- a/src/cdump.c
+++ b/src/cdump.c
@@ -167,8 +167,7 @@ make_cdump_irep(mrb_state *mrb, int irep_no, FILE *f)
else
SOURCE_CODE0("");
- if (buf)
- mrb_free(mrb, buf);
+ mrb_free(mrb, buf);
return MRB_CDUMP_OK;
}
diff --git a/src/codegen.c b/src/codegen.c
index c1a62320d..246101f24 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -1106,18 +1106,24 @@ codegen(codegen_scope *s, node *tree, int val)
if (e) {
if (val) pop();
pos2 = new_label(s);
- genop(s, MKOP_sBx(OP_JMP, 0));
- dispatch(s, pos1);
+ genop(s, MKOP_sBx(OP_JMP, 0));
+ dispatch(s, pos1);
codegen(s, e, val);
dispatch(s, pos2);
}
else {
if (val) {
pop();
+ pos2 = new_label(s);
+ genop(s, MKOP_sBx(OP_JMP, 0));
+ dispatch(s, pos1);
genop(s, MKOP_A(OP_LOADNIL, cursp()));
+ dispatch(s, pos2);
push();
}
- dispatch(s, pos1);
+ else {
+ dispatch(s, pos1);
+ }
}
}
break;
diff --git a/src/dump.c b/src/dump.c
index c32703a17..2885c225a 100644
--- a/src/dump.c
+++ b/src/dump.c
@@ -351,10 +351,14 @@ write_pool_block(mrb_state *mrb, mrb_irep *irep, char *buf, int type)
char *char_buf;
uint16_t buf_size =0;
uint16_t len =0;
+ int result;
buf_size = MRB_DUMP_DEFAULT_STR_LEN;
- if ((char_buf = (char *)mrb_malloc(mrb, buf_size)) == NULL)
+ char_buf = (char *)mrb_malloc(mrb, buf_size);
+ if (char_buf == NULL) {
+ result = MRB_DUMP_GENERAL_FAILURE;
goto error_exit;
+ }
buf += uint32_dump((uint32_t)irep->plen, buf, type); /* number of pool */
@@ -376,8 +380,11 @@ write_pool_block(mrb_state *mrb, mrb_irep *irep, char *buf, int type)
len = str_dump_len(RSTRING_PTR(str), RSTRING_LEN(str), type);
if (len > buf_size - 1) {
buf_size = len + 1;
- if ((char_buf = (char *)mrb_realloc(mrb, char_buf, buf_size)) == NULL)
+ char_buf = (char *)mrb_realloc(mrb, char_buf, buf_size);
+ if (char_buf == NULL) {
+ result = MRB_DUMP_GENERAL_FAILURE;
goto error_exit;
+ }
memset(char_buf, 0, buf_size);
}
str_dump(RSTRING_PTR(str), char_buf, RSTRING_LEN(str), type);
@@ -389,8 +396,11 @@ write_pool_block(mrb_state *mrb, mrb_irep *irep, char *buf, int type)
len = str_dump_len(RSTRING_PTR(str), RSTRING_LEN(str), type);
if ( len > buf_size - 1) {
buf_size = len + 1;
- if ((char_buf = mrb_realloc(mrb, char_buf, buf_size)) == NULL)
+ char_buf = mrb_realloc(mrb, char_buf, buf_size);
+ if (char_buf == NULL) {
+ result = MRB_DUMP_GENERAL_FAILURE;
goto error_exit;
+ }
memset(char_buf, 0, buf_size);
}
str_dump(RSTRING_PTR(str), char_buf, RSTRING_LEN(str), type);
@@ -408,10 +418,10 @@ write_pool_block(mrb_state *mrb, mrb_irep *irep, char *buf, int type)
buf += len;
}
+ result = (int)(buf - buf_top);
error_exit:
- if (char_buf)
- mrb_free(mrb, char_buf);
- return (int)(buf - buf_top);
+ mrb_free(mrb, char_buf);
+ return result;
}
static int
@@ -423,7 +433,8 @@ write_syms_block(mrb_state *mrb, mrb_irep *irep, char *buf, int type)
uint16_t buf_size =0;
buf_size = MRB_DUMP_DEFAULT_STR_LEN;
- if ((char_buf = (char *)mrb_malloc(mrb, buf_size)) == NULL)
+ char_buf = (char *)mrb_malloc(mrb, buf_size);
+ if (char_buf == NULL)
goto error_exit;
buf += uint32_dump((uint32_t)irep->slen, buf, type); /* number of symbol */
@@ -439,7 +450,8 @@ write_syms_block(mrb_state *mrb, mrb_irep *irep, char *buf, int type)
nlen = str_dump_len((char*)name, len, type);
if ( nlen > buf_size - 1) {
buf_size = nlen + 1;
- if ((char_buf = (char *)mrb_realloc(mrb, char_buf, buf_size)) == NULL)
+ char_buf = (char *)mrb_realloc(mrb, char_buf, buf_size);
+ if (char_buf == NULL)
goto error_exit;
}
memset(char_buf, 0, buf_size);
@@ -455,8 +467,7 @@ write_syms_block(mrb_state *mrb, mrb_irep *irep, char *buf, int type)
}
error_exit:
- if (char_buf)
- mrb_free(mrb, char_buf);
+ mrb_free(mrb, char_buf);
return (int)(buf - buf_top);
}
@@ -466,6 +477,7 @@ calc_crc_section(mrb_state *mrb, mrb_irep *irep, uint16_t *crc, int section)
char *buf, *buf_top;
uint32_t buf_size;
int type = DUMP_TYPE_BIN;
+ int result;
switch (section) {
case DUMP_IREP_HEADER: buf_size = get_irep_header_size(mrb, irep, type); break;
@@ -475,24 +487,40 @@ calc_crc_section(mrb_state *mrb, mrb_irep *irep, uint16_t *crc, int section)
default: return MRB_DUMP_GENERAL_FAILURE;
}
- if ((buf = (char *)mrb_calloc(mrb, 1, buf_size)) == NULL)
+ buf = (char *)mrb_calloc(mrb, 1, buf_size);
+ if (buf == NULL)
return MRB_DUMP_GENERAL_FAILURE;
buf_top = buf;
switch (section) {
- case DUMP_IREP_HEADER: buf += write_irep_header(mrb, irep, buf, type); break;
- case DUMP_ISEQ_BLOCK: buf += write_iseq_block(mrb, irep, buf, type); break;
- case DUMP_POOL_BLOCK: buf += write_pool_block(mrb, irep, buf, type); break;
- case DUMP_SYMS_BLOCK: buf += write_syms_block(mrb, irep, buf, type); break;
- default: break;
+ case DUMP_IREP_HEADER:
+ result = write_irep_header(mrb, irep, buf, type);
+ break;
+ case DUMP_ISEQ_BLOCK:
+ result = write_iseq_block(mrb, irep, buf, type);
+ break;
+ case DUMP_POOL_BLOCK:
+ result = write_pool_block(mrb, irep, buf, type);
+ break;
+ case DUMP_SYMS_BLOCK:
+ result = write_syms_block(mrb, irep, buf, type);
+ break;
+ default:
+ break; /* Already checked above. */
}
+ if (result < 0) {
+ goto error_exit;
+ }
+ buf += result;
*crc = calc_crc_16_ccitt((unsigned char*)buf_top, (int)(buf - buf_top));
mrb_free(mrb, buf_top);
- return MRB_DUMP_OK;
+ result = MRB_DUMP_OK;
+ error_exit:
+ return result;
}
static uint16_t
@@ -599,7 +627,8 @@ write_irep_record(mrb_state *mrb, int irep_no, char* bin, uint32_t *rlen, int ty
default: break;
}
- if ((rc = calc_crc_section(mrb, irep, &crc, section)) != 0)
+ rc = calc_crc_section(mrb, irep, &crc, section);
+ if (rc != MRB_DUMP_OK)
return rc;
bin += uint16_dump(crc, bin, type); /* crc */
@@ -624,10 +653,12 @@ dump_irep_record(mrb_state *mrb, int irep_no, FILE* fp, uint32_t *rlen)
if (irep_record_size == 0)
return MRB_DUMP_GENERAL_FAILURE;
- if ((buf = (char *)mrb_calloc(mrb, 1, irep_record_size)) == NULL)
+ buf = (char *)mrb_calloc(mrb, 1, irep_record_size);
+ if (buf == NULL)
return MRB_DUMP_GENERAL_FAILURE;
- if ((rc = write_irep_record(mrb, irep_no, buf, rlen, DUMP_TYPE_HEX)) != MRB_DUMP_OK) {
+ rc = write_irep_record(mrb, irep_no, buf, rlen, DUMP_TYPE_HEX);
+ if (rc != MRB_DUMP_OK) {
rc = MRB_DUMP_GENERAL_FAILURE;
goto error_exit;
}
@@ -657,7 +688,8 @@ mrb_write_irep(mrb_state *mrb, int top, char *bin)
bin += sizeof(rite_binary_header) + MRB_DUMP_SIZE_OF_SHORT/* crc */;
for (irep_no=top; irep_no<mrb->irep_len; irep_no++) {
- if ((rc = write_irep_record(mrb, irep_no, bin, &rlen, DUMP_TYPE_BIN)) != 0)
+ rc = write_irep_record(mrb, irep_no, bin, &rlen, DUMP_TYPE_BIN);
+ if (rc != 0)
return rc;
bin += (rlen + DUMP_SIZE(MRB_DUMP_SIZE_OF_LONG, DUMP_TYPE_BIN));
@@ -685,7 +717,8 @@ mrb_dump_irep(mrb_state *mrb, int top, FILE* fp)
return MRB_DUMP_WRITE_FAULT;
for (irep_no=top; irep_no<mrb->irep_len; irep_no++) {
- if ((rc = dump_irep_record(mrb, irep_no, fp, &rlen)) != 0)
+ rc = dump_irep_record(mrb, irep_no, fp, &rlen);
+ if (rc != 0)
return rc;
rbds += rlen;
@@ -709,14 +742,15 @@ mrb_bdump_irep(mrb_state *mrb, int n, FILE *f,const char *initname)
int buf_idx = 0;
if (mrb == NULL || n < 0 || n >= mrb->irep_len || f == NULL || initname == NULL)
- return -1;
+ return MRB_DUMP_INVALID_ARGUMENT;
buf_size = sizeof(rite_binary_header) + MRB_DUMP_SIZE_OF_SHORT/* crc */;
for (irep_no=n; irep_no<mrb->irep_len; irep_no++)
buf_size += get_irep_record_size(mrb, irep_no, DUMP_TYPE_BIN);
buf_size += MRB_DUMP_SIZE_OF_LONG; /* end of file */
- if ((buf = (char *)mrb_malloc(mrb, buf_size)) == NULL)
+ buf = (char *)mrb_malloc(mrb, buf_size);
+ if (buf == NULL)
return MRB_DUMP_GENERAL_FAILURE;
rc = mrb_write_irep(mrb, n, buf);
diff --git a/src/load.c b/src/load.c
index 2b5f58001..504246799 100644
--- a/src/load.c
+++ b/src/load.c
@@ -142,10 +142,14 @@ load_rite_irep_record(mrb_state *mrb, RiteFILE* rfp, unsigned char* dst, uint32_
unsigned char *pStart;
char *char_buf;
uint16_t buf_size =0;
+ int result;
buf_size = MRB_DUMP_DEFAULT_STR_LEN;
- if ((char_buf = (char *)mrb_malloc(mrb, buf_size)) == NULL)
+ char_buf = (char *)mrb_malloc(mrb, buf_size);
+ if (char_buf == NULL) {
+ result = MRB_DUMP_GENERAL_FAILURE;
goto error_exit;
+ }
pStart = dst;
@@ -193,8 +197,11 @@ load_rite_irep_record(mrb_state *mrb, RiteFILE* rfp, unsigned char* dst, uint32_
if ( pdl > buf_size - 1) {
buf_size = pdl + 1;
- if ((char_buf = (char *)mrb_realloc(mrb, char_buf, buf_size)) == NULL)
+ char_buf = (char *)mrb_realloc(mrb, char_buf, buf_size);
+ if (char_buf == NULL) {
+ result = MRB_DUMP_GENERAL_FAILURE;
goto error_exit;
+ }
}
memset(char_buf, '\0', buf_size);
rite_fgets(rfp, (unsigned char*)char_buf, pdl, FALSE); //pool
@@ -220,8 +227,11 @@ load_rite_irep_record(mrb_state *mrb, RiteFILE* rfp, unsigned char* dst, uint32_
if ( snl > buf_size - 1) {
buf_size = snl + 1;
- if ((char_buf = (char *)mrb_realloc(mrb, char_buf, buf_size)) == NULL)
+ char_buf = (char *)mrb_realloc(mrb, char_buf, buf_size);
+ if (char_buf == NULL) {
+ result = MRB_DUMP_GENERAL_FAILURE;
goto error_exit;
+ }
}
memset(char_buf, '\0', buf_size);
rite_fgets(rfp, (unsigned char*)char_buf, snl, FALSE); //symbol name
@@ -234,11 +244,11 @@ load_rite_irep_record(mrb_state *mrb, RiteFILE* rfp, unsigned char* dst, uint32_
*len = dst - pStart;
+ result = MRB_DUMP_OK;
error_exit:
- if (char_buf)
- mrb_free(mrb, char_buf);
+ mrb_free(mrb, char_buf);
- return MRB_DUMP_OK;
+ return result;
}
int
@@ -259,11 +269,13 @@ mrb_read_irep_file(mrb_state *mrb, FILE* fp)
rfp = &ritefp;
//Read File Header Section
- if ((ret = load_rite_header(fp, &bin_header, hcrc)) != MRB_DUMP_OK)
+ ret = load_rite_header(fp, &bin_header, hcrc);
+ if (ret != MRB_DUMP_OK)
return ret;
len = sizeof(rite_binary_header) + bin_to_uint32(bin_header.rbds);
- if ((rite_dst = (unsigned char *)mrb_malloc(mrb, len)) == NULL)
+ rite_dst = (unsigned char *)mrb_malloc(mrb, len);
+ if (rite_dst == NULL)
return MRB_DUMP_GENERAL_FAILURE;
dst = rite_dst;
@@ -277,7 +289,8 @@ mrb_read_irep_file(mrb_state *mrb, FILE* fp)
for (i=0; i<len; i++) {
rite_fgets(rfp, hex8, sizeof(hex8), TRUE); //record len
dst += hex_to_bin32(dst, hex8);
- if ((ret = load_rite_irep_record(mrb, rfp, dst, &rlen)) != MRB_DUMP_OK) //irep info
+ ret = load_rite_irep_record(mrb, rfp, dst, &rlen);
+ if (ret != MRB_DUMP_OK) //irep info
goto error_exit;
dst += rlen;
}
@@ -292,8 +305,7 @@ mrb_read_irep_file(mrb_state *mrb, FILE* fp)
ret = mrb_read_irep(mrb, (char*)rite_dst);
error_exit:
- if (rite_dst)
- mrb_free(mrb, rite_dst);
+ mrb_free(mrb, rite_dst);
return ret;
}
@@ -336,7 +348,7 @@ read_rite_irep_record(mrb_state *mrb, unsigned char *src, uint32_t* len)
recordStart = src;
buf = (char *)mrb_malloc(mrb, bufsize);
if (buf == NULL) {
- ret = MRB_DUMP_INVALID_IREP;
+ ret = MRB_DUMP_GENERAL_FAILURE;
goto error_exit;
}
@@ -362,7 +374,8 @@ read_rite_irep_record(mrb_state *mrb, unsigned char *src, uint32_t* len)
irep->ilen = bin_to_uint32(src); //iseq length
src += MRB_DUMP_SIZE_OF_LONG;
if (irep->ilen > 0) {
- if ((irep->iseq = (mrb_code *)mrb_malloc(mrb, sizeof(mrb_code) * irep->ilen)) == NULL) {
+ irep->iseq = (mrb_code *)mrb_malloc(mrb, sizeof(mrb_code) * irep->ilen);
+ if (irep->iseq == NULL) {
ret = MRB_DUMP_GENERAL_FAILURE;
goto error_exit;
}
@@ -385,7 +398,7 @@ read_rite_irep_record(mrb_state *mrb, unsigned char *src, uint32_t* len)
if (plen > 0) {
irep->pool = (mrb_value *)mrb_malloc(mrb, sizeof(mrb_value) * plen);
if (irep->pool == NULL) {
- ret = MRB_DUMP_INVALID_IREP;
+ ret = MRB_DUMP_GENERAL_FAILURE;
goto error_exit;
}
@@ -397,7 +410,8 @@ read_rite_irep_record(mrb_state *mrb, unsigned char *src, uint32_t* len)
if (pdl > bufsize - 1) {
mrb_free(mrb, buf);
bufsize = pdl + 1;
- if ((buf = (char *)mrb_malloc(mrb, bufsize)) == NULL) {
+ buf = (char *)mrb_malloc(mrb, bufsize);
+ if (buf == NULL) {
ret = MRB_DUMP_GENERAL_FAILURE;
goto error_exit;
}
@@ -448,8 +462,9 @@ read_rite_irep_record(mrb_state *mrb, unsigned char *src, uint32_t* len)
irep->slen = bin_to_uint32(src); //syms length
src += MRB_DUMP_SIZE_OF_LONG;
if (irep->slen > 0) {
- if ((irep->syms = (mrb_sym *)mrb_malloc(mrb, sizeof(mrb_sym) * irep->slen)) == NULL) {
- ret = MRB_DUMP_INVALID_IREP;
+ irep->syms = (mrb_sym *)mrb_malloc(mrb, sizeof(mrb_sym) * irep->slen);
+ if (irep->syms == NULL) {
+ ret = MRB_DUMP_GENERAL_FAILURE;
goto error_exit;
}
@@ -469,7 +484,8 @@ read_rite_irep_record(mrb_state *mrb, unsigned char *src, uint32_t* len)
if (snl > bufsize - 1) {
mrb_free(mrb, buf);
bufsize = snl + 1;
- if ((buf = (char *)mrb_malloc(mrb, bufsize)) == NULL) {
+ buf = (char *)mrb_malloc(mrb, bufsize);
+ if (buf == NULL) {
ret = MRB_DUMP_GENERAL_FAILURE;
goto error_exit;
}
@@ -489,8 +505,7 @@ read_rite_irep_record(mrb_state *mrb, unsigned char *src, uint32_t* len)
*len = src - recordStart;
error_exit:
- if (buf)
- mrb_free(mrb, buf);
+ mrb_free(mrb, buf);
return ret;
}
@@ -510,7 +525,8 @@ mrb_read_irep(mrb_state *mrb, const char *bin)
sirep = mrb->irep_len;
//Read File Header Section
- if ((nirep = read_rite_header(mrb, src, &bin_header)) < 0)
+ nirep = read_rite_header(mrb, src, &bin_header);
+ if (nirep < 0)
return nirep;
src += sizeof(bin_header) + MRB_DUMP_SIZE_OF_SHORT; //header + crc
@@ -518,7 +534,8 @@ mrb_read_irep(mrb_state *mrb, const char *bin)
//Read Binary Data Section
for (n=0,i=sirep; n<nirep; n++,i++) {
src += MRB_DUMP_SIZE_OF_LONG; //record ren
- if ((ret = read_rite_irep_record(mrb, src, &len)) != MRB_DUMP_OK)
+ ret = read_rite_irep_record(mrb, src, &len);
+ if (ret != MRB_DUMP_OK)
goto error_exit;
src += len;
}
diff --git a/src/mruby_core.rake b/src/mruby_core.rake
index bc84ed6d9..7db1dbf77 100644
--- a/src/mruby_core.rake
+++ b/src/mruby_core.rake
@@ -6,7 +6,7 @@ MRuby.each_target do
self.libmruby << objs
file "#{build_dir}/lib/libmruby_core.a" => objs do |t|
- archive t.name, 'r', t.prerequisites
+ archive t.name, 'rs', t.prerequisites
end
# Parser
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-15 15:25:15 +0000