From 80534b6d14f1392ab1c199f0906880d61f55ae84 Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Tue, 1 Apr 2014 01:13:39 +0900 Subject: Use MRB_ENV_STACK_LEN instead of accessing `flags` directly to get REnv's stack length. --- include/mruby/proc.h | 2 ++ mrbgems/mruby-proc-ext/src/proc.c | 6 +++--- src/gc.c | 2 +- src/proc.c | 2 +- src/vm.c | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/mruby/proc.h b/include/mruby/proc.h index bb924447e..6d2cf516a 100644 --- a/include/mruby/proc.h +++ b/include/mruby/proc.h @@ -20,6 +20,8 @@ struct REnv { int cioff; }; +#define MRB_ENV_STACK_LEN(e) ((e)->flags) + struct RProc { MRB_OBJECT_HEADER; union { diff --git a/mrbgems/mruby-proc-ext/src/proc.c b/mrbgems/mruby-proc-ext/src/proc.c index 507f91d7d..b4744fa1b 100644 --- a/mrbgems/mruby-proc-ext/src/proc.c +++ b/mrbgems/mruby-proc-ext/src/proc.c @@ -18,7 +18,7 @@ mrb_proc_new_cfunc_with_env(mrb_state *mrb, mrb_func_t f, mrb_int argc, const mr mrb_gc_arena_restore(mrb, ai); e->cioff = -1; - e->flags = argc; + MRB_ENV_STACK_LEN(e) = argc; e->stack = (mrb_value*)mrb_malloc(mrb, sizeof(mrb_value) * argc); for (i = 0; i < argc; ++i) { e->stack[i] = argv[i]; @@ -39,9 +39,9 @@ mrb_cfunc_env_get(mrb_state *mrb, mrb_int idx) if (!e) { mrb_raise(mrb, E_TYPE_ERROR, "Can't get cfunc env from cfunc Proc without REnv."); } - if (idx < 0 || e->flags <= idx) { + if (idx < 0 || MRB_ENV_STACK_LEN(e) <= idx) { mrb_raisef(mrb, E_INDEX_ERROR, "Env index out of range: %S (expected: 0 <= index < %S)", - mrb_fixnum_value(idx), mrb_fixnum_value(e->flags)); + mrb_fixnum_value(idx), mrb_fixnum_value(MRB_ENV_STACK_LEN(e))); } return e->stack[idx]; diff --git a/src/gc.c b/src/gc.c index 81b234d6f..426a84514 100644 --- a/src/gc.c +++ b/src/gc.c @@ -518,7 +518,7 @@ gc_mark_children(mrb_state *mrb, struct RBasic *obj) if (e->cioff < 0) { int i, len; - len = (int)e->flags; + len = (int)MRB_ENV_STACK_LEN(e); for (i=0; istack[i]); } diff --git a/src/proc.c b/src/proc.c index 4e6e2b95f..0dfc3f818 100644 --- a/src/proc.c +++ b/src/proc.c @@ -41,7 +41,7 @@ closure_setup(mrb_state *mrb, struct RProc *p, int nlocals) if (!mrb->c->ci->env) { e = (struct REnv*)mrb_obj_alloc(mrb, MRB_TT_ENV, (struct RClass*)mrb->c->ci->proc->env); - e->flags= (unsigned int)nlocals; + MRB_ENV_STACK_LEN(e)= (unsigned int)nlocals; e->mid = mrb->c->ci->mid; e->cioff = mrb->c->ci - mrb->c->cibase; e->stack = mrb->c->stack; diff --git a/src/vm.c b/src/vm.c index ad26d9b8c..e2b02a4ce 100644 --- a/src/vm.c +++ b/src/vm.c @@ -245,7 +245,7 @@ cipop(mrb_state *mrb) if (c->ci->env) { struct REnv *e = c->ci->env; - size_t len = (size_t)e->flags; + size_t len = (size_t)MRB_ENV_STACK_LEN(e); mrb_value *p = (mrb_value *)mrb_malloc(mrb, sizeof(mrb_value)*len); e->cioff = -1; -- cgit v1.2.3 From b38eb72d829edc94c6a9f5d34bb6e5c102039cb5 Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Tue, 1 Apr 2014 01:35:40 +0900 Subject: Add macro MRB_ENV_UNSHARE_STACK instead of assigning -1 directly. --- include/mruby/proc.h | 1 + mrbgems/mruby-proc-ext/src/proc.c | 2 +- src/vm.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/mruby/proc.h b/include/mruby/proc.h index 6d2cf516a..e72e8f7e4 100644 --- a/include/mruby/proc.h +++ b/include/mruby/proc.h @@ -21,6 +21,7 @@ struct REnv { }; #define MRB_ENV_STACK_LEN(e) ((e)->flags) +#define MRB_ENV_UNSHARE_STACK(e) ((e)->cioff = -1) struct RProc { MRB_OBJECT_HEADER; diff --git a/mrbgems/mruby-proc-ext/src/proc.c b/mrbgems/mruby-proc-ext/src/proc.c index b4744fa1b..8b6ee4740 100644 --- a/mrbgems/mruby-proc-ext/src/proc.c +++ b/mrbgems/mruby-proc-ext/src/proc.c @@ -17,7 +17,7 @@ mrb_proc_new_cfunc_with_env(mrb_state *mrb, mrb_func_t f, mrb_int argc, const mr p->env = e; mrb_gc_arena_restore(mrb, ai); - e->cioff = -1; + MRB_ENV_UNSHARE_STACK(e); MRB_ENV_STACK_LEN(e) = argc; e->stack = (mrb_value*)mrb_malloc(mrb, sizeof(mrb_value) * argc); for (i = 0; i < argc; ++i) { diff --git a/src/vm.c b/src/vm.c index e2b02a4ce..4aa9b9460 100644 --- a/src/vm.c +++ b/src/vm.c @@ -248,7 +248,7 @@ cipop(mrb_state *mrb) size_t len = (size_t)MRB_ENV_STACK_LEN(e); mrb_value *p = (mrb_value *)mrb_malloc(mrb, sizeof(mrb_value)*len); - e->cioff = -1; + MRB_ENV_UNSHARE_STACK(e); stack_copy(p, e->stack, len); e->stack = p; } -- cgit v1.2.3 From 755ded2ef087bc29c8223919a3e8ab95a0692de4 Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Tue, 1 Apr 2014 01:53:28 +0900 Subject: Use MRB_ENV_STACK_SHARED_P to check `cioff` field of REnv. --- include/mruby/proc.h | 1 + src/gc.c | 4 ++-- src/vm.c | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/mruby/proc.h b/include/mruby/proc.h index e72e8f7e4..870e9f748 100644 --- a/include/mruby/proc.h +++ b/include/mruby/proc.h @@ -22,6 +22,7 @@ struct REnv { #define MRB_ENV_STACK_LEN(e) ((e)->flags) #define MRB_ENV_UNSHARE_STACK(e) ((e)->cioff = -1) +#define MRB_ENV_STACK_SHARED_P(e) ((e)->cioff >= 0) struct RProc { MRB_OBJECT_HEADER; diff --git a/src/gc.c b/src/gc.c index 426a84514..4db640ff4 100644 --- a/src/gc.c +++ b/src/gc.c @@ -515,7 +515,7 @@ gc_mark_children(mrb_state *mrb, struct RBasic *obj) { struct REnv *e = (struct REnv*)obj; - if (e->cioff < 0) { + if (!MRB_ENV_STACK_SHARED_P(e)) { int i, len; len = (int)MRB_ENV_STACK_LEN(e); @@ -612,7 +612,7 @@ obj_free(mrb_state *mrb, struct RBasic *obj) { struct REnv *e = (struct REnv*)obj; - if (e->cioff < 0) { + if (!MRB_ENV_STACK_SHARED_P(e)) { mrb_free(mrb, e->stack); e->stack = NULL; } diff --git a/src/vm.c b/src/vm.c index 4aa9b9460..09988a996 100644 --- a/src/vm.c +++ b/src/vm.c @@ -121,7 +121,7 @@ envadjust(mrb_state *mrb, mrb_value *oldbase, mrb_value *newbase) if (newbase == oldbase) return; while (ci <= mrb->c->ci) { struct REnv *e = ci->env; - if (e && e->cioff >= 0) { + if (e && MRB_ENV_STACK_SHARED_P(e)) { ptrdiff_t off = e->stack - oldbase; e->stack = newbase + off; @@ -188,7 +188,7 @@ is_strict(mrb_state *mrb, struct REnv *e) { int cioff = e->cioff; - if (cioff >= 0 && mrb->c->cibase[cioff].proc && + if (MRB_ENV_STACK_SHARED_P(e) && mrb->c->cibase[cioff].proc && MRB_PROC_STRICT_P(mrb->c->cibase[cioff].proc)) { return TRUE; } @@ -1406,7 +1406,7 @@ RETRY_TRY_BLOCK: if (proc->env && !MRB_PROC_STRICT_P(proc)) { struct REnv *e = top_env(mrb, proc); - if (e->cioff < 0) { + if (!MRB_ENV_STACK_SHARED_P(e)) { localjump_error(mrb, LOCALJUMP_ERROR_RETURN); goto L_RAISE; } @@ -1437,7 +1437,7 @@ RETRY_TRY_BLOCK: ci = mrb->c->ci; break; case OP_R_BREAK: - if (!proc->env || proc->env->cioff < 0) { + if (!proc->env || !MRB_ENV_STACK_SHARED_P(proc->env)) { localjump_error(mrb, LOCALJUMP_ERROR_BREAK); goto L_RAISE; } -- cgit v1.2.3