Changeset 440

Timestamp:

Jul 9, 2020, 12:35:25 PM (4 years ago)

Author:

coas-nagasima

Message:

mrubyが不安なので、MRB_METHOD_T_STRUCTを指定

Location:

EcnlProtoTool/trunk

Files:

• mruby-2.1.1/build_config.rb (modified) (1 diff)
• mruby-2.1.1/include/mruby.h (modified) (3 diffs)
• mruby-2.1.1/include/mruby/proc.h (modified) (1 diff)
• mruby-2.1.1/src/symbol.c (modified) (1 diff)
• prototool/.cproject (modified) (1 diff)

EcnlProtoTool/trunk/mruby-2.1.1/build_config.rb

@@ -164 +164 @@
   conf.cc.include_paths  << "../musl-1.1.18/include"
 
-  conf.cc.defines << %w(MRB_USE_CUSTOM_RO_DATA_P MRB_ENABLE_DEBUG_HOOK MRB_CONSTRAINED_BASELINE_PROFILE)
+  conf.cc.defines << %w(MRB_METHOD_T_STRUCT MRB_USE_CUSTOM_RO_DATA_P MRB_ENABLE_DEBUG_HOOK MRB_CONSTRAINED_BASELINE_PROFILE)
 
   #conf.build_mrbtest_lib_only

EcnlProtoTool/trunk/mruby-2.1.1/include/mruby.h

@@ -43 +43 @@
 #include <stddef.h>
 #include <limits.h>
+#include <float.h>
 
 #ifdef __cplusplus
@@ -75 +76 @@
 #include <mruby/gc.h>
 #include <mruby/version.h>
-
-#ifdef _MSC_VER
-#include <float.h>
-#endif
 
 #ifndef MRB_WITHOUT_FLOAT
@@ -169 +166 @@
   uint16_t esize, eidx;
 
-  enum mrb_fiber_state status;
-  mrb_bool vmexec;
+  enum mrb_fiber_state status : 4;
+  mrb_bool vmexec : 1;
   struct RFiber *fib;
 };

EcnlProtoTool/trunk/mruby-2.1.1/include/mruby/proc.h

@@ -105 +105 @@
 #define MRB_METHOD_NOARG_P(m) (((uintptr_t)(m))&MRB_METHOD_NOARG_FL)
 #define MRB_METHOD_NOARG_SET(m) ((m)=(mrb_method_t)(((uintptr_t)(m))|MRB_METHOD_NOARG_FL))
-#define MRB_METHOD_FUNC(m) ((mrb_func_t)((uintptr_t)(m)&(~(MRB_METHOD_NOARG_FL|MRB_METHOD_FUNC_FL))))
-#define MRB_METHOD_FROM_FUNC(m,fn) ((m)=(mrb_method_t)((((uintptr_t)(fn))|MRB_METHOD_FUNC_FL)))
+#define MRB_METHOD_FUNC(m) ((mrb_func_t)((uintptr_t)(m)>>2))
+#define MRB_METHOD_FROM_FUNC(m,fn) ((m)=(mrb_method_t)((((uintptr_t)(fn))<<2)|MRB_METHOD_FUNC_FL))
 #define MRB_METHOD_FROM_PROC(m,pr) ((m)=(mrb_method_t)(pr))
 #define MRB_METHOD_PROC_P(m) (!MRB_METHOD_FUNC_P(m))

EcnlProtoTool/trunk/mruby-2.1.1/src/symbol.c

@@ -16 +16 @@
 typedef struct symbol_name {
   mrb_bool lit : 1;
+  uint16_t len : 15;
   uint8_t prev;
-  uint16_t len;
   const char *name;
 } symbol_name;

EcnlProtoTool/trunk/prototool/.cproject

@@ -88 +88 @@
                                                                 </option>
                                                                 <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.165293534" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
+                                                                        <listOptionValue builtIn="false" value="MRB_METHOD_T_STRUCT"/>
                                                                         <listOptionValue builtIn="false" value="MRB_USE_CUSTOM_RO_DATA_P"/>
                                                                         <listOptionValue builtIn="false" value="MRB_ENABLE_DEBUG_HOOK"/>