Changeset 374 for asp3_tinet_ecnl_rx/trunk/asp3_dcre/tecsgen/tecs/mruby

Timestamp:

Apr 5, 2019, 9:26:53 PM (5 years ago)

Author:

coas-nagasima

Message:

mbed関連を更新
シリアルドライバをmbedのHALを使うよう変更
ファイルディスクリプタの処理を更新

Location:

asp3_tinet_ecnl_rx/trunk/asp3_dcre/tecsgen/tecs/mruby

Files:

• README-mruby.txt (added)
• TECSPointer.h (modified) (2 diffs)
• mrubyBridge.txt (added)
• mrubyTECSPointer.txt (added)
• mrubyTECSStruct.txt (added)
• mrubyVMs.cdl (modified) (1 diff)
• nMruby_tMrubyCyclicTaskBody.c (added)
• nMruby_tMrubyProc.c (added)
• nMruby_tMrubyProc_1_0.c (added)
• nMruby_tMrubyTaskBody.c (added)
• nMruby_tMrubyVM.c (added)
• sMruby.cdl (added)
• tecs_mruby.h (modified) (3 diffs)

asp3_tinet_ecnl_rx/trunk/asp3_dcre/tecsgen/tecs/mruby/TECSPointer.h

@@ -102 +102 @@
         {                                                                                                                                       \
                 if( sizeof( type ) > sizeof( mrb_int ) ){                                               \
-                        if( val >= (((type)1) << (sizeof(mrb_int)*8-1))                         \
-                                || val < -(((type)1) << (sizeof(mrb_int)*8-1)) )                \
+                        if( val > TYPE ## _MAX                          \
+                                || val < TYPE ## _MIN )         \
                                 /* '=' unecessary for negative value    */                              \
                                 /* ignore warning on int32_t */                                                 \
@@ -126 +126 @@
         {                                                                                                                                       \
                 if( sizeof( type ) > sizeof( mrb_int ) ){                                               \
-                        if( val >= (((type)1) << (sizeof(mrb_int)*8)))                          \
+      if( val > TYPE ## _MAX )                        \
                                 /* '=' unecessary for negative value    */                              \
                                 /* ignore warning on int32_t */                                                 \

asp3_tinet_ecnl_rx/trunk/asp3_dcre/tecsgen/tecs/mruby/mrubyVMs.cdl

@@ -37 +37 @@
 
 /*
- * tools/mruby/mruby.c から cInit_initializeBridge( mrb ) を呼び出すように変更したもの
+ * POSIX 環境用の VM
+ * mrbgems の mrbgems/mruby-bin-mruby/tools/mruby/mruby.c を参考に作成したもの
  */
 namespace nMruby{

asp3_tinet_ecnl_rx/trunk/asp3_dcre/tecsgen/tecs/mruby/tecs_mruby.h

@@ -1 +1 @@
 /*
- *  Copyright (C) 2008-2017 by TOPPERS Project
+ *  Copyright (C) 2008-2019 by TOPPERS Project
  *
  *  上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
@@ -46 +46 @@
 #include "mruby/irep.h"
 #include "mruby/dump.h"
+#include "mruby/proc.h"
 
 #include "TECSPointer.h"
 #include "TECSStruct.h"
 
-#if  ! defined( MRUBY_RELEASE_MAJOR ) || MRUBY_RELEASE_MAJOR == 1 && MRUBY_RELEASE_MINOR < 2
-#ifndef MRB_ARGS_REQ
-#define MRB_ARGS_REQ(n)     ARGS_REQ(n)
-#define MRB_ARGS_OPT(n)     ARGS_OPT(n)
-#define MRB_ARGS_ARG(n1,n2) ARGS_ARG(n1,n2)
-#define MRB_ARGS_REST()     ARGS_REST()
-#define MRB_ARGS_POST(n)    ARGS_POST(n)
-#define MRB_ARGS_KEY(n1,n2) ARGS_KEY(n1,n2)
-#define MRB_ARGS_BLOCK()    ARGS_BLOCK()
-#define MRB_ARGS_ANY()      ARGS_ANY()
-#define MRB_ARGS_NONE()     ARGS_NONE()
-#endif /* MRB_ARGS_REQ */
-#endif
 
-#if  ! defined( MRUBY_RELEASE_MAJOR )
-#define mrb_float_value( mrb, val )  mrb_float_value( val )
-#endif
-
-#else
+#else /* TECSGEN */
 
 /*
- * fake tecsgen because tecsgen cannot accept actual mruby.h in case of below.
+ * fake definition because tecsgen cannot accept actual mruby.h in case of below.
  *   types:   long long, long long int
  *   special keyword __attribute__(x), __extension__
@@ -78 +62 @@
 typedef int mrb_irep;
 typedef int mrb_context;
-struct  RClass {int dummy;};
-struct  RProc  {int dummy;};
+struct  RClass {uint32_t gcnext;};  // actual definition: struct RBasic *gcnext
+struct  RProc  {uint32_t gcnext;};  // actual definition: struct RBasic *gcnext
 
 typedef int CELLCB;
+
+#define GET_SET_BOOL( Type, type )
+#define GET_SET_CHAR( Type, type )
+#define GET_SET_INT( Type, type )
+#define GET_SET_FLOAT( Type, type )
+#define POINTER_CLASS( Type, type )
+#define CHECK_AND_GET_POINTER( Type, type )
 
 #endif /* TECSGEN */