Changeset 439 for EcnlProtoTool/trunk/prototool/src/cmdrun.c

Timestamp:

Jul 9, 2020, 8:51:43 AM (4 years ago)

Author:

coas-nagasima

Message:

mrubyを2.1.1に更新

File:

• EcnlProtoTool/trunk/prototool/src/cmdrun.c (modified) (5 diffs)

EcnlProtoTool/trunk/prototool/src/cmdrun.c

@@ -4 +4 @@
 */
 
-#include <stdlib.h>
-
-#include "mruby/opcode.h"
+#include <mruby/opcode.h>
 #include "mrdb.h"
 
@@ -12 +10 @@
 dbgcmd_run(mrb_state *mrb, mrdb_state *mrdb)
 {
-        mrb_debug_context *dbg = mrdb->dbg;
+  mrb_debug_context *dbg = mrdb->dbg;
 
-        if (dbg->xm == DBG_INIT) {
-                InterlockedExchange(&dbg->xm, DBG_RUN);
-        }
-        else {
-                InterlockedExchange(&dbg->xm, DBG_QUIT);
-                if (dbg->xphase == DBG_PHASE_RUNNING) {
-                        struct RClass *exc;
-                        puts("Start it from the beginning.");
-                        exc = mrb_define_class(mrb, "DebuggerRestart", mrb_class_get(mrb, "Exception"));
-                        mrb_raise(mrb, exc, "Restart mrdb.");
-                }
-        }
+  if (dbg->xm == DBG_INIT){
+    dbg->xm = DBG_RUN;
+  }
+  else {
+    dbg->xm = DBG_QUIT;
+    if (dbg->xphase == DBG_PHASE_RUNNING){
+      struct RClass *exc;
+      puts("Start it from the beginning.");
+      exc = mrb_define_class(mrb, "DebuggerRestart", mrb->eException_class);
+      mrb_raise(mrb, exc, "Restart mrdb.");
+    }
+  }
 
-        return DBGST_RESTART;
+  return DBGST_RESTART;
 }
 
@@ -33 +31 @@
 dbgcmd_continue(mrb_state *mrb, mrdb_state *mrdb)
 {
-        mrb_debug_context *dbg = mrdb->dbg;
-        int ccnt = 1;
+  mrb_debug_context *dbg = mrdb->dbg;
+  int ccnt = 1;
 
-        if (mrdb->wcnt > 1) {
-                sscanf(mrdb->words[1], "%d", &ccnt);
-        }
-        dbg->ccnt = (uint16_t)(ccnt > 0 ? ccnt : 1);  /* count of continue */
+  if (mrdb->wcnt > 1){
+    sscanf(mrdb->words[1], "%d", &ccnt);
+  }
+  dbg->ccnt = (uint16_t)(ccnt > 0 ? ccnt : 1);  /* count of continue */
 
-        if (dbg->xphase == DBG_PHASE_AFTER_RUN) {
-                puts("The program is not running.");
-                InterlockedExchange(&dbg->xm, DBG_QUIT);
-        }
-        else {
-                InterlockedExchange(&dbg->xm, DBG_RUN);
-        }
-        return DBGST_CONTINUE;
+  if (dbg->xphase == DBG_PHASE_AFTER_RUN){
+    puts("The program is not running.");
+    dbg->xm = DBG_QUIT;
+  }
+  else {
+    dbg->xm = DBG_RUN;
+  }
+  return DBGST_CONTINUE;
 }
 
@@ -54 +52 @@
 dbgcmd_step(mrb_state *mrb, mrdb_state *mrdb)
 {
-        InterlockedExchange(&mrdb->dbg->xm, DBG_STEP);
-        return DBGST_CONTINUE;
+  mrdb->dbg->xm = DBG_STEP;
+  return DBGST_CONTINUE;
 }
 
@@ -61 +59 @@
 dbgcmd_next(mrb_state *mrb, mrdb_state *mrdb)
 {
-        InterlockedExchange(&mrdb->dbg->xm, DBG_NEXT);
-        mrdb->dbg->prvci = mrb->c->ci;
-        return DBGST_CONTINUE;
+  mrdb->dbg->xm = DBG_NEXT;
+  mrdb->dbg->prvci = mrb->c->ci;
+  return DBGST_CONTINUE;
 }