fix bug that doesn't stop program when execute next command.

mruby · Dec 23, 2015 · 887a56b · 887a56b
1 parent a08439a
commit 887a56b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/cmdrun.c b/mrbgems/mruby-bin-debugger/tools/mrdb/cmdrun.c
@@ -57,5 +57,6 @@ dbgcmd_state
 dbgcmd_next(mrb_state *mrb, mrdb_state *mrdb)
 {
   mrdb->dbg->xm = DBG_NEXT;
+  mrdb->dbg->prvci = mrb->c->ci;
   return DBGST_CONTINUE;
 }
diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c
@@ -585,6 +585,7 @@ mrb_code_fetch_hook(mrb_state *mrb, mrb_irep *irep, mrb_code *pc, mrb_value *reg
     if((uint32_t)(dbg->prvci) < (uint32_t)(mrb->c->ci)) {
       return;
     }
+    dbg->prvci = NULL;
     dbg->method_bpno = 0;
     dbg->bm = BRK_NEXT;
     break;
@@ -606,7 +607,6 @@ mrb_code_fetch_hook(mrb_state *mrb, mrb_irep *irep, mrb_code *pc, mrb_value *reg
     }
     dbg->prvfile = file;
     dbg->prvline = line;
-    dbg->prvci = mrb->c->ci;
     return;
   case DBG_INIT:
     dbg->root_irep = irep;