admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

should have adjusted stack address kept in closures; close #222

Browse Source
This commit is contained in:
Yukihiro Matsumoto
2012-06-03 14:44:46 +09:00
parent 27c2416d20
commit e88e30524e
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+19
View File
@@ -41,12 +41,30 @@ stack_init(mrb_state *mrb)
mrb->ci->target_class = mrb->object_class;
}
static void
envadjust(mrb_state *mrb, mrb_value *oldbase, mrb_value *newbase)
{
mrb_callinfo *ci = mrb->cibase;
while (ci <= mrb->ci) {
struct REnv *e = ci->env;
if (e && e->cioff >= 0) {
int off = e->stack - oldbase;
e->stack = newbase + off;
}
ci++;
}
}
static void
stack_extend(mrb_state *mrb, int room, int keep)
{
int size, off;
if (mrb->stack + room >= mrb->stend) {
mrb_value *oldbase = mrb->stbase;
size = mrb->stend - mrb->stbase;
off = mrb->stack - mrb->stbase;
@@ -57,6 +75,7 @@ stack_extend(mrb_state *mrb, int room, int keep)
mrb->stbase = mrb_realloc(mrb, mrb->stbase, sizeof(mrb_value) * size);
mrb->stack = mrb->stbase + off;
mrb->stend = mrb->stbase + size;
envadjust(mrb, oldbase, mrb->stbase);
}
if (room > keep) {
memset(mrb->stack+keep, 0, sizeof(mrb_value) * (room-keep));