Unification

Author: hasumikin

include/mrc_ccontext.h

@@ -28,9 +28,7 @@ typedef struct mrc_filename_table {
 } mrc_filename_table;
 
 typedef struct mrc_ccontext {
-#if defined(MRC_TARGET_MRUBY)
   mrb_state *mrb;
-#endif
   struct mrc_jmpbuf *jmp;
   mrc_parser_state *p;
   mrc_sym *syms;

include/mrc_common.h

@@ -6,6 +6,24 @@
 #define MRC_STRINGIZE0(expr) #expr
 #define MRC_STRINGIZE(expr) MRC_STRINGIZE0(expr)
 
+#ifdef MRC_TARGET_MRUBY
+# include <mruby.h>
+static inline int mrc_gc_arena_save(mrb_state *mrb)
+{
+  if (!mrb) return 0;
+  return mrb_gc_arena_save(mrb);
+}
+static inline void mrc_gc_arena_restore(mrb_state *mrb, int ai)
+{
+  if (!mrb) return;
+  mrb_gc_arena_restore(mrb, ai);
+}
+#else
+# define mrb_state void
+# define mrc_gc_arena_save(mrb)        0;(void)ai
+# define mrc_gc_arena_restore(mrb,ai)
+#endif
+
 #define MRC_RELEASE_YEAR    2024
 #define MRC_RELEASE_MONTH   9
 #define MRC_RELEASE_DAY     9
@@ -23,9 +41,6 @@
   #define mrc_free     free
 #endif
 
-//typedef void mrb_state;
-#define mrb_state void
-
 #ifdef MRB_USE_CXX_ABI
 #define MRC_USE_CXX_ABI
 #endif

mrbgem.rake

@@ -11,6 +11,11 @@ MRuby::Gem::Specification.new('mruby-compiler2') do |spec|
 
   cc.defines.flatten!
 
+  if cc.defines.include? "PICORB_VM_MRUBY"
+    cc.defines << "MRC_TARGET_MRUBY"
+    cc.include_paths << "#{build.gems['picoruby-mruby']}/lib/mruby/include"
+  end
+
   if cc.defines.any? { _1.match? /\A(PICORUBY|MRB)_NO_FLOAT(=|\z)/ }
     cc.defines << "MRC_NO_FLOAT"
   end

src/ccontext.c

@@ -9,11 +9,7 @@ mrc_ccontext_new(mrb_state *mrb)
   mrc_ccontext *c = (mrc_ccontext*)mrc_calloc(1, sizeof(mrc_ccontext));
   c->p = (mrc_parser_state *)mrc_malloc(sizeof(mrc_parser_state));
   c->options = NULL;
-#if defined(MRC_TARGET_MRUBY)
   c->mrb = mrb;
-#else
-  (void)mrb;
-#endif
   return c;
 }
 

src/cdump.c

@@ -346,9 +346,7 @@ cdump_sym(mrc_ccontext *c, mrc_sym sym, const char *var_name, int idx, mrc_strin
 static int
 cdump_syms(mrc_ccontext *c, const char *name, const char *key, int n, int syms_len, const mrc_sym *syms, mrc_string *init_syms_code, FILE *fp)
 {
-#if defined(MRC_TARGET_MRUBY)
-  int ai = mrb_gc_arena_save(c->mrb);
-#endif
+  int ai = mrc_gc_arena_save(c->mrb);
   mrc_int code_len = MRC_STRING_LEN(init_syms_code);
   mrc_string *var_name = sym_var_name_str(c, name, key, n);
 
@@ -360,9 +358,7 @@ cdump_syms(mrc_ccontext *c, const char *name, const char *key, int n, int syms_l
   fputs("), ", fp);
   if (code_len == MRC_STRING_LEN(init_syms_code)) fputs("const", fp);
   fputs(");\n", fp);
-#if defined(MRC_TARGET_MRUBY)
-  mrb_gc_arena_restore(c->mrb, ai);
-#endif
+  mrc_gc_arena_restore(c->mrb, ai);
   return MRC_DUMP_OK;
 }
 
@@ -384,9 +380,7 @@ static int
 cdump_debug(mrc_ccontext *c, const char *name, int n, mrc_irep_debug_info *info,
             mrc_string *init_syms_code, FILE *fp)
 {
-#if defined(MRC_TARGET_MRUBY)
-  int ai = mrb_gc_arena_save(c->mrb);
-#endif
+  int ai = mrc_gc_arena_save(c->mrb);
   char buffer[256];
   const char *line_type = "mrb_debug_line_ary";
 
@@ -448,9 +442,7 @@ cdump_debug(mrc_ccontext *c, const char *name, int n, mrc_irep_debug_info *info,
   fprintf(fp, "static mrb_irep_debug_info %s_debug_%d = {\n", name, n);
   fprintf(fp, "%d, %d, &%s_debug_file_%d_};\n", info->pc_count, info->flen, name, n);
 
-#if defined(MRC_TARGET_MRUBY)
-  mrb_gc_arena_restore(c->mrb, ai);
-#endif
+  mrc_gc_arena_restore(c->mrb, ai);
   return MRC_DUMP_OK;
 }
 

src/codedump.c

@@ -180,9 +180,7 @@ codedump(mrc_ccontext *c, const mrc_irep *irep, FILE *out)
     uint16_t b;
     uint16_t cc;
 
-#if defined(MRC_TARGET_MRUBY)
-    ai = mrc_gc_arena_save(c->mrb);
-#endif
+    int ai = mrc_gc_arena_save(c->mrb);
 
     i = pc - irep->iseq;
     next_file = mrc_debug_get_filename(c, irep, (uint32_t)i);
@@ -644,9 +642,7 @@ codedump(mrc_ccontext *c, const mrc_irep *irep, FILE *out)
       fprintf(out, "unknown_op (0x%x)\n", ins);
       break;
     }
-#if defined(MRC_TARGET_MRUBY)
     mrc_gc_arena_restore(c->mrb, ai);
-#endif
   }
   fprintf(out, "\n");
 }

src/codegen.c

@@ -234,9 +234,7 @@ typedef struct scope {
 
   uint16_t nlocals;
   uint16_t nregs;
-#if defined(MRC_TARGET_MRUBY)
   int ai;
-#endif
 
   int debug_start_pos;
   uint16_t filename_index;
@@ -577,9 +575,8 @@ scope_new(mrc_ccontext *c, mrc_codegen_scope *prev, mrc_constant_id_list *nlv)
     mrc_assert(nlv->size < UINT16_MAX);
   }
 
-#if defined(MRC_TARGET_MRUBY)
-  s->ai = gc_arena_save(c->mrb);
-#endif
+  int ai = mrc_gc_arena_save(c->mrb);
+  s->ai = ai;
   s->filename = prev->filename;
   if (s->filename) {
     s->lines = (uint16_t *)mrc_malloc(sizeof(uint16_t)*s->icapa);
@@ -1210,9 +1207,7 @@ scope_finish(mrc_codegen_scope *s)
   irep->nlocals = s->nlocals;
   irep->nregs = s->nregs;
 
-#if defined(MRC_TARGET_MRUBY)
-  mrb_gc_arena_restore(s->c->mrb, s->ai);
-#endif
+  mrc_gc_arena_restore(s->c->mrb, s->ai);
   mrc_pool_close(s->mpool);
 }
 

src/dump.c

@@ -124,9 +124,7 @@ get_pool_block_size(mrc_ccontext *c, const mrc_irep *irep)
   size += irep->plen * sizeof(uint8_t); /* len(n) */
 
   for (pool_no = 0; pool_no < irep->plen; pool_no++) {
-#if defined(MRC_TARGET_MRUBY)
-    int ai = mrb_gc_arena_save(c->mrb);
-#endif
+    int ai = mrc_gc_arena_save(c->mrb);
 
     switch (irep->pool[pool_no].tt) {
     case IREP_TT_INT64:
@@ -172,9 +170,7 @@ get_pool_block_size(mrc_ccontext *c, const mrc_irep *irep)
       }
       break;
     }
-#if defined(MRC_TARGET_MRUBY)
-    mrb_gc_arena_restore(c->mrb, ai);
-#endif
+    mrc_gc_arena_restore(c->mrb, ai);
   }
 
   return size;
@@ -191,9 +187,7 @@ write_pool_block(mrc_ccontext *c, const mrc_irep *irep, uint8_t *buf)
   cur += mrc_uint16_to_bin(irep->plen, cur); /* number of pool */
 
   for (pool_no = 0; pool_no < irep->plen; pool_no++) {
-#if defined(MRC_TARGET_MRUBY)
-    int ai = mrb_gc_arena_save(c->mrb);
-#endif
+    int ai = mrc_gc_arena_save(c->mrb);
 
     switch (irep->pool[pool_no].tt) {
     case IREP_TT_INT64:
@@ -247,9 +241,7 @@ write_pool_block(mrc_ccontext *c, const mrc_irep *irep, uint8_t *buf)
       *cur++ = '\0';
       break;
     }
-#if defined(MRC_TARGET_MRUBY)
-    mrb_gc_arena_restore(c->mrb, ai);
-#endif
+    mrc_gc_arena_restore(c->mrb, ai);
   }
 
   return cur - buf;