diff options
| -rw-r--r-- | mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c | 2 | ||||
| -rw-r--r-- | src/vm.c | 19 |
2 files changed, 3 insertions, 18 deletions
diff --git a/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c b/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c index 29f5a5c1d..31a4e6fa1 100644 --- a/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c +++ b/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c @@ -271,7 +271,7 @@ dump_file(mrb_state *mrb, FILE *wfp, const char *outfile, struct RProc *proc, st int main(int argc, char **argv) { - mrb_state *mrb = mrb_open(); + mrb_state *mrb = mrb_open_core(NULL, NULL); int n, result; struct mrbc_args args; FILE *wfp; @@ -39,14 +39,6 @@ void abort(void); #define STACK_INIT_SIZE 128 #define CALLINFO_INIT_SIZE 32 -#ifndef ENSURE_STACK_INIT_SIZE -#define ENSURE_STACK_INIT_SIZE 16 -#endif - -#ifndef RESCUE_STACK_INIT_SIZE -#define RESCUE_STACK_INIT_SIZE 16 -#endif - /* Define amount of linear stack growth. */ #ifndef MRB_STACK_GROWTH #define MRB_STACK_GROWTH 128 @@ -57,11 +49,6 @@ void abort(void); #define MRB_FUNCALL_DEPTH_MAX 512 #endif -/* Maximum depth of ecall() recursion. */ -#ifndef MRB_ECALL_DEPTH_MAX -#define MRB_ECALL_DEPTH_MAX 512 -#endif - /* Maximum stack depth. Should be set lower on memory constrained systems. The value below allows about 60000 recursive calls in the simplest case. */ #ifndef MRB_STACK_MAX @@ -1939,10 +1926,8 @@ RETRY_TRY_BLOCK: } if (mrb->exc) { - mrb_callinfo *ci0; - L_RAISE: - ci0 = ci = mrb->c->ci; + ci = mrb->c->ci; if (ci == mrb->c->cibase) { ch = catch_handler_find(mrb, ci, pc, MRB_CATCH_FILTER_ALL); if (ch == NULL) goto L_FTOP; @@ -1979,7 +1964,7 @@ RETRY_TRY_BLOCK: if (ch == NULL) goto L_STOP; if (FALSE) { L_CATCH_TAGGED_BREAK: /* from THROW_TAGGED_BREAK() or UNWIND_ENSURE() */ - ci = ci0 = mrb->c->ci; + ci = mrb->c->ci; } proc = ci->proc; irep = proc->body.irep; |