Changeset 439 for EcnlProtoTool/trunk/prototool/src/mrdb.h

Timestamp:

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

Author:

coas-nagasima

Message:

mrubyを2.1.1に更新

File:

• EcnlProtoTool/trunk/prototool/src/mrdb.h (modified) (7 diffs)

EcnlProtoTool/trunk/prototool/src/mrdb.h

@@ -7 +7 @@
 #define MRDB_H
 
-#include "mruby.h"
+#include <mruby.h>
 
 #include "mrdbconf.h"
+
+#ifdef _MSC_VER
+# define __func__ __FUNCTION__
+#endif
 
 #define MAX_COMMAND_WORD (16)
@@ -20 +24 @@
   DBGCMD_BREAK,
   DBGCMD_INFO_BREAK,
+  DBGCMD_INFO_LOCAL,
   DBGCMD_WATCH,
   DBGCMD_INFO_WATCH,
@@ -52 +57 @@
   DBG_QUIT,
 } mrdb_exemode;
-
-#ifdef _MSC_VER
-# define __func__ __FUNCTION__
-extern long __stdcall InterlockedExchange(long *dst, long src);
-extern long __stdcall InterlockedCompareExchange(long *dst, long src, long cmp);
-#else
-#define InterlockedExchange(dst, src) do { *(dst) = src; } while(0)
-__inline__ static enum mrdb_exemode InterlockedCompareExchange(enum mrdb_exemode *dst, enum mrdb_exemode src, enum mrdb_exemode cmp) { long prev = *(dst); if (*(dst) == cmp) *(dst) = src; return prev; }
-#endif
 
 typedef enum mrdb_exephase {
@@ -110 +106 @@
   struct mrb_irep *root_irep;
   struct mrb_irep *irep;
-  mrb_code *pc;
+  const mrb_code *pc;
   mrb_value *regs;
 
@@ -117 +113 @@
   mrb_callinfo *prvci;
 
-#ifdef _MSC_VER
-  long xm;
-#else
   mrdb_exemode xm;
-#endif
   mrdb_exephase xphase;
   mrdb_brkmode bm;
@@ -161 +153 @@
 dbgcmd_state dbgcmd_break(mrb_state*, mrdb_state*);
 dbgcmd_state dbgcmd_info_break(mrb_state*, mrdb_state*);
+dbgcmd_state dbgcmd_info_local(mrb_state*, mrdb_state*);
 dbgcmd_state dbgcmd_delete(mrb_state*, mrdb_state*);
 dbgcmd_state dbgcmd_enable(mrb_state*, mrdb_state*);
@@ -168 +161 @@
 dbgcmd_state dbgcmd_eval(mrb_state*, mrdb_state*);
 /* cmdmisc.c */
+dbgcmd_state dbgcmd_list(mrb_state*, mrdb_state*);
 dbgcmd_state dbgcmd_help(mrb_state*, mrdb_state*);
 dbgcmd_state dbgcmd_quit(mrb_state*, mrdb_state*);