From c07f24cd18ab41117f6ec3b9a1246786e4d0d8bf Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 23 Jun 2020 09:14:59 +0900 Subject: Change flag names in preparation of `REnv` refactoring. --- src/gc.c | 10 +++++----- src/kernel.c | 2 +- src/proc.c | 12 ++++++------ src/vm.c | 24 ++++++++++++------------ 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/gc.c b/src/gc.c index b2d782073..03c561d35 100644 --- a/src/gc.c +++ b/src/gc.c @@ -716,10 +716,10 @@ gc_mark_children(mrb_state *mrb, mrb_gc *gc, struct RBasic *obj) struct REnv *e = (struct REnv*)obj; mrb_int i, len; - if (MRB_ENV_STACK_SHARED_P(e) && e->cxt && e->cxt->fib) { + if (MRB_ENV_ONSTACK_P(e) && e->cxt && e->cxt->fib) { mrb_gc_mark(mrb, (struct RBasic*)e->cxt->fib); } - len = MRB_ENV_STACK_LEN(e); + len = MRB_ENV_LEN(e); for (i=0; istack[i]); } @@ -820,7 +820,7 @@ obj_free(mrb_state *mrb, struct RBasic *obj, int end) { struct REnv *e = (struct REnv*)obj; - if (MRB_ENV_STACK_SHARED_P(e)) { + if (MRB_ENV_ONSTACK_P(e)) { /* cannot be freed */ e->stack = NULL; break; @@ -842,7 +842,7 @@ obj_free(mrb_state *mrb, struct RBasic *obj, int end) while (ce <= ci) { struct REnv *e = ci->env; if (e && !mrb_object_dead_p(mrb, (struct RBasic*)e) && - e->tt == MRB_TT_ENV && MRB_ENV_STACK_SHARED_P(e)) { + e->tt == MRB_TT_ENV && MRB_ENV_ONSTACK_P(e)) { mrb_env_unshare(mrb, e); } ci--; @@ -990,7 +990,7 @@ gc_gray_counts(mrb_state *mrb, mrb_gc *gc, struct RBasic *obj) break; case MRB_TT_ENV: - children += MRB_ENV_STACK_LEN(obj); + children += MRB_ENV_LEN(obj); break; case MRB_TT_FIBER: diff --git a/src/kernel.c b/src/kernel.c index 8a78de67d..8f0c9c7b5 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -160,7 +160,7 @@ mrb_f_block_given_p_m(mrb_state *mrb, mrb_value self) /* use saved block arg position */ bidx = MRB_ENV_BIDX(e); /* bidx may be useless (e.g. define_method) */ - if (bidx >= MRB_ENV_STACK_LEN(e)) + if (bidx >= MRB_ENV_LEN(e)) return mrb_false_value(); bp = &e->stack[bidx]; } diff --git a/src/proc.c b/src/proc.c index df80682a2..c00b09acf 100644 --- a/src/proc.c +++ b/src/proc.c @@ -47,7 +47,7 @@ env_new(mrb_state *mrb, mrb_int nlocals) int bidx; e = (struct REnv*)mrb_obj_alloc(mrb, MRB_TT_ENV, NULL); - MRB_ENV_SET_STACK_LEN(e, nlocals); + MRB_ENV_SET_LEN(e, nlocals); bidx = ci->argc; if (ci->argc < 0) bidx = 2; else bidx += 1; @@ -122,14 +122,14 @@ mrb_proc_new_cfunc_with_env(mrb_state *mrb, mrb_func_t func, mrb_int argc, const p->e.env = e = env_new(mrb, argc); p->flags |= MRB_PROC_ENVSET; mrb_field_write_barrier(mrb, (struct RBasic*)p, (struct RBasic*)e); - MRB_ENV_UNSHARE_STACK(e); + MRB_ENV_CLOSE(e); /* NOTE: Prevents keeping invalid addresses when NoMemoryError is raised from `mrb_malloc()`. */ e->stack = NULL; - MRB_ENV_SET_STACK_LEN(e, 0); + MRB_ENV_SET_LEN(e, 0); e->stack = (mrb_value*)mrb_malloc(mrb, sizeof(mrb_value) * argc); - MRB_ENV_SET_STACK_LEN(e, argc); + MRB_ENV_SET_LEN(e, argc); if (argv) { for (i = 0; i < argc; ++i) { @@ -163,9 +163,9 @@ mrb_proc_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 || MRB_ENV_STACK_LEN(e) <= idx) { + if (idx < 0 || MRB_ENV_LEN(e) <= idx) { mrb_raisef(mrb, E_INDEX_ERROR, "Env index out of range: %i (expected: 0 <= index < %i)", - idx, MRB_ENV_STACK_LEN(e)); + idx, MRB_ENV_LEN(e)); } return e->stack[idx]; diff --git a/src/vm.c b/src/vm.c index a280026f8..eff5b7e3c 100644 --- a/src/vm.c +++ b/src/vm.c @@ -152,7 +152,7 @@ envadjust(mrb_state *mrb, mrb_value *oldbase, mrb_value *newbase, size_t oldsize struct REnv *e = ci->env; mrb_value *st; - if (e && MRB_ENV_STACK_SHARED_P(e) && + if (e && MRB_ENV_ONSTACK_P(e) && (st = e->stack) && oldbase <= st && st < oldbase+oldsize) { ptrdiff_t off = e->stack - oldbase; @@ -162,7 +162,7 @@ envadjust(mrb_state *mrb, mrb_value *oldbase, mrb_value *newbase, size_t oldsize if (ci->proc && MRB_PROC_ENV_P(ci->proc) && ci->env != MRB_PROC_ENV(ci->proc)) { e = MRB_PROC_ENV(ci->proc); - if (e && MRB_ENV_STACK_SHARED_P(e) && + if (e && MRB_ENV_ONSTACK_P(e) && (st = e->stack) && oldbase <= st && st < oldbase+oldsize) { ptrdiff_t off = e->stack - oldbase; @@ -297,10 +297,10 @@ mrb_env_unshare(mrb_state *mrb, struct REnv *e) { if (e == NULL) return; else { - size_t len = (size_t)MRB_ENV_STACK_LEN(e); + size_t len = (size_t)MRB_ENV_LEN(e); mrb_value *p; - if (!MRB_ENV_STACK_SHARED_P(e)) return; + if (!MRB_ENV_ONSTACK_P(e)) return; if (e->cxt != mrb->c) return; if (e == mrb->c->cibase->env) return; /* for mirb */ p = (mrb_value *)mrb_malloc(mrb, sizeof(mrb_value)*len); @@ -308,7 +308,7 @@ mrb_env_unshare(mrb_state *mrb, struct REnv *e) stack_copy(p, e->stack, len); } e->stack = p; - MRB_ENV_UNSHARE_STACK(e); + MRB_ENV_CLOSE(e); mrb_write_barrier(mrb, (struct RBasic *)e); } } @@ -1160,7 +1160,7 @@ RETRY_TRY_BLOCK: mrb_value *regs_a = regs + a; struct REnv *e = uvenv(mrb, c); - if (e && b < MRB_ENV_STACK_LEN(e)) { + if (e && b < MRB_ENV_LEN(e)) { *regs_a = e->stack[b]; } else { @@ -1175,7 +1175,7 @@ RETRY_TRY_BLOCK: if (e) { mrb_value *regs_a = regs + a; - if (b < MRB_ENV_STACK_LEN(e)) { + if (b < MRB_ENV_LEN(e)) { e->stack[b] = *regs_a; mrb_write_barrier(mrb, (struct RBasic*)e); } @@ -1689,7 +1689,7 @@ RETRY_TRY_BLOCK: else { struct REnv *e = uvenv(mrb, lv-1); if (!e) goto L_NOSUPER; - if (MRB_ENV_STACK_LEN(e) <= m1+r+m2+kd+1) + if (MRB_ENV_LEN(e) <= m1+r+m2+kd+1) goto L_NOSUPER; stack = e->stack + 1; } @@ -2015,7 +2015,7 @@ RETRY_TRY_BLOCK: if (MRB_PROC_ENV_P(dst)) { struct REnv *e = MRB_PROC_ENV(dst); - if (!MRB_ENV_STACK_SHARED_P(e) || (e->cxt && e->cxt != mrb->c)) { + if (!MRB_ENV_ONSTACK_P(e) || (e->cxt && e->cxt != mrb->c)) { localjump_error(mrb, LOCALJUMP_ERROR_RETURN); goto L_RAISE; } @@ -2070,7 +2070,7 @@ RETRY_TRY_BLOCK: mrb_exc_set(mrb, exc); goto L_RAISE; } - if (!MRB_PROC_ENV_P(proc) || !MRB_ENV_STACK_SHARED_P(MRB_PROC_ENV(proc))) { + if (!MRB_PROC_ENV_P(proc) || !MRB_ENV_ONSTACK_P(MRB_PROC_ENV(proc))) { goto L_BREAK_ERROR; } else { @@ -2170,8 +2170,8 @@ RETRY_TRY_BLOCK: if (lv == 0) stack = regs + 1; else { struct REnv *e = uvenv(mrb, lv-1); - if (!e || (!MRB_ENV_STACK_SHARED_P(e) && e->mid == 0) || - MRB_ENV_STACK_LEN(e) <= m1+r+m2+1) { + if (!e || (!MRB_ENV_ONSTACK_P(e) && e->mid == 0) || + MRB_ENV_LEN(e) <= m1+r+m2+1) { localjump_error(mrb, LOCALJUMP_ERROR_YIELD); goto L_RAISE; } -- cgit v1.2.3