Unification

Fix:
- mrc_malloc
- mrc_realloc
- mrc_calloc
- mrc_free
- mrc_gc_arena_save
- mrc_gc_arena_restore

Author: hasumikin

include/mrc_ccontext.h

@@ -64,6 +64,22 @@ typedef struct mrc_ccontext {
 #endif
 } mrc_ccontext;                 /* compiler context */
 
+#ifdef MRC_TARGET_MRUBY
+static inline int mrc_gc_arena_save(mrc_ccontext *c)
+{
+  if (!c->mrb) return 0;
+  return mrb_gc_arena_save(c->mrb);
+}
+static inline void mrc_gc_arena_restore(mrc_ccontext *c, int ai)
+{
+  if (!c->mrb) return;
+  mrb_gc_arena_restore(c->mrb, ai);
+}
+#else
+# define mrc_gc_arena_save(c)        0;(void)ai
+# define mrc_gc_arena_restore(c,ai)
+#endif
+
 mrc_ccontext *mrc_ccontext_new(mrb_state *mrb);
 void mrc_ccontext_cleanup_local_variables(mrc_ccontext *c);
 const char *mrc_ccontext_filename(mrc_ccontext *c, const char *s);

include/mrc_common.h

@@ -8,20 +8,8 @@
 
 #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
@@ -35,10 +23,10 @@ static inline void mrc_gc_arena_restore(mrb_state *mrb, int ai)
   #include <prism_xallocator.h>
 #else
   #include <stdlib.h>
-  #define mrc_malloc   malloc
-  #define mrc_realloc  realloc
-  #define mrc_calloc   calloc
-  #define mrc_free     free
+  #define mrc_malloc(c, size)         malloc(size)
+  #define mrc_realloc(c, ptr, size)   realloc(ptr, size)
+  #define mrc_calloc(c, nmemb, size)  calloc(nmemb, size)
+  #define mrc_free(c, ptr)            free(ptr)
 #endif
 
 #ifdef MRB_USE_CXX_ABI

src/ccontext.c

@@ -6,8 +6,10 @@
 MRC_API mrc_ccontext *
 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));
+  mrc_ccontext temp_c = {0};
+  temp_c.mrb = mrb;
+  mrc_ccontext *c = (mrc_ccontext*)mrc_calloc(&temp_c, 1, sizeof(mrc_ccontext));
+  c->p = (mrc_parser_state *)mrc_malloc(c, sizeof(mrc_parser_state));
   c->options = NULL;
   c->mrb = mrb;
   return c;
@@ -18,7 +20,7 @@ MRC_API void
 mrc_ccontext_cleanup_local_variables(mrc_ccontext *c)
 {
   if (c->syms) {
-    mrc_free(c->syms);
+    mrc_free(c, c->syms);
     c->syms = NULL;
     c->slen = 0;
   }
@@ -30,12 +32,12 @@ mrc_ccontext_filename(mrc_ccontext *c, const char *s)
 {
   if (s) {
     size_t len = strlen(s);
-    char *p = (char*)mrc_malloc(len + 1);
+    char *p = (char*)mrc_malloc(c, len + 1);
 
     if (p == NULL) return NULL;
     memcpy(p, s, len + 1);
     if (c->filename) {
-      mrc_free(c->filename);
+      mrc_free(c, c->filename);
     }
     c->filename = p;
   }
@@ -44,14 +46,14 @@ mrc_ccontext_filename(mrc_ccontext *c, const char *s)
 
 MRC_API void mrc_ccontext_free(mrc_ccontext *c)
 {
-  mrc_free(c->filename_table);
-  mrc_free(c->filename);
-  mrc_free(c->syms);
+  mrc_free(c, c->filename_table);
+  mrc_free(c, c->filename);
+  mrc_free(c, c->syms);
   pm_parser_free(c->p);
   mrc_diagnostic_list_free(c);
   if (c->p->lex_callback) {
-    mrc_free(c->p->lex_callback);
+    mrc_free(c, c->p->lex_callback);
   }
-  mrc_free(c->p);
-  mrc_free(c);
+  mrc_free(c, c->p);
+  mrc_free(c, c);
 }

src/cdump.c

@@ -32,15 +32,15 @@ typedef struct mrc_string {
 static mrc_string*
 mrc_str_new_capa(mrc_ccontext *c, size_t capa)
 {
-  mrc_string *s = (mrc_string *)mrc_malloc(sizeof(mrc_string));
+  mrc_string *s = (mrc_string *)mrc_malloc(c, sizeof(mrc_string));
   if (s) {
-    s->ptr = (char *)mrc_calloc(1, capa);
+    s->ptr = (char *)mrc_calloc(c, 1, capa);
     if (s->ptr) {
       s->len = 0;
       s->capa = capa;
       return s;
     }
-    mrc_free(s);
+    mrc_free(c, s);
   }
   return NULL;
 }
@@ -64,42 +64,42 @@ mrc_str_new_cstr(mrc_ccontext *c, const char *cstr)
 }
 
 static void
-mrc_str_cat_lit(mrc_string *s, const char *lit)
+mrc_str_cat_lit(mrc_ccontext *c, mrc_string *s, const char *lit)
 {
   size_t len = strlen(lit);
   if (s->len+len+1 > s->capa) {
     s->capa = s->len+len+1;
-    s->ptr = (char *)mrc_realloc(s->ptr, s->capa);
+    s->ptr = (char *)mrc_realloc(c, s->ptr, s->capa);
   }
   memcpy(s->ptr+s->len, lit, len);
   s->len += len;
   s->ptr[s->len] = '\0';
 }
 
 static void
-mrc_str_cat_cstr(mrc_string *s, const char *cstr)
+mrc_str_cat_cstr(mrc_ccontext *c, mrc_string *s, const char *cstr)
 {
   if (!cstr) return;
-  mrc_str_cat_lit(s, cstr);
+  mrc_str_cat_lit(c, s, cstr);
 }
 
 static void
-mrc_str_cat_str(mrc_string *s, mrc_string *s2)
+mrc_str_cat_str(mrc_ccontext *c, mrc_string *s, mrc_string *s2)
 {
   if (s->len+s2->len+1 > s->capa) {
     s->capa = s->len+s2->len+1;
-    s->ptr = (char *)mrc_realloc(s->ptr, s->capa);
+    s->ptr = (char *)mrc_realloc(c, s->ptr, s->capa);
   }
   memcpy(s->ptr+s->len, s2->ptr, s2->len);
   s->len += s2->len;
   s->ptr[s->len] = '\0';
 }
 
 static void
-mrc_str_free(mrc_string *s)
+mrc_str_free(mrc_ccontext *c, mrc_string *s)
 {
-  mrc_free(s->ptr);
-  mrc_free(s);
+  mrc_free(c, s->ptr);
+  mrc_free(c, s);
 }
 
 static mrc_string*
@@ -108,11 +108,11 @@ mrc_str_escape(mrc_ccontext *c, mrc_string *s)
   mrc_string *s2 = mrc_str_new_capa(c, s->len*2+1);
   if (s2) {
     for (size_t i=0; i<s->len; i++) {
-      char c = s->ptr[i];
-      if (c == '"' || c == '\\') {
-        mrc_str_cat_lit(s2, "\\");
+      char ch = s->ptr[i];
+      if (ch == '"' || ch == '\\') {
+        mrc_str_cat_lit(c, s2, "\\");
       }
-      mrc_str_cat_lit(s2, &c);
+      mrc_str_cat_lit(c, s2, &ch);
     }
   }
   return s2;
@@ -276,11 +276,11 @@ sym_var_name_str(mrc_ccontext *c, const char *initname, const char *key, int n)
 {
   char buf[32];
   mrc_string *s = mrc_str_new_cstr(c, initname);
-  mrc_str_cat_lit(s, "_");
-  mrc_str_cat_cstr(s, key);
-  mrc_str_cat_lit(s, "_");
+  mrc_str_cat_lit(c, s, "_");
+  mrc_str_cat_cstr(c, s, key);
+  mrc_str_cat_lit(c, s, "_");
   snprintf(buf, sizeof(buf), "%d", n);
-  mrc_str_cat_cstr(s, buf);
+  mrc_str_cat_cstr(c, s, buf);
   return s;
 }
 
@@ -299,7 +299,7 @@ cdump_sym(mrc_ccontext *c, mrc_sym sym, const char *var_name, int idx, mrc_strin
   mrc_int len = constant->length;
 
   if (*name == '\0') {
-    mrc_str_free(name_obj);
+    mrc_str_free(c, name_obj);
     return MRC_DUMP_INVALID_ARGUMENT;
   }
   if (sym_name_word_p(name, len)) {
@@ -326,39 +326,39 @@ cdump_sym(mrc_ccontext *c, mrc_sym sym, const char *var_name, int idx, mrc_strin
   else {
     char buf[32];
     mrc_string *name_obj = mrc_str_new(c, name, len);
-    mrc_str_cat_lit(init_syms_code, "  ");
-    mrc_str_cat_cstr(init_syms_code, var_name);
+    mrc_str_cat_lit(c, init_syms_code, "  ");
+    mrc_str_cat_cstr(c, init_syms_code, var_name);
     snprintf(buf, sizeof(buf), "[%d] = ", idx);
-    mrc_str_cat_cstr(init_syms_code, buf);
-    mrc_str_cat_lit(init_syms_code, "mrb_intern_lit(mrb, ");
+    mrc_str_cat_cstr(c, init_syms_code, buf);
+    mrc_str_cat_lit(c, init_syms_code, "mrb_intern_lit(mrb, ");
     mrc_string *escaped = mrc_str_escape(c, name_obj);
-    mrc_str_free(name_obj);
-    mrc_str_cat_str(init_syms_code, escaped);
-    mrc_str_free(escaped);
-    mrc_str_cat_lit(init_syms_code, ");\n");
+    mrc_str_free(c, name_obj);
+    mrc_str_cat_str(c, init_syms_code, escaped);
+    mrc_str_free(c, escaped);
+    mrc_str_cat_lit(c, init_syms_code, ");\n");
     fputs("0", fp);
   }
   fputs(", ", fp);
-  mrc_str_free(name_obj);
+  mrc_str_free(c, name_obj);
   return MRC_DUMP_OK;
 }
 
 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)
 {
-  int ai = mrc_gc_arena_save(c->mrb);
+  int ai = mrc_gc_arena_save(c);
   mrc_int code_len = MRC_STRING_LEN(init_syms_code);
   mrc_string *var_name = sym_var_name_str(c, name, key, n);
 
   fprintf(fp, "mrb_DEFINE_SYMS_VAR(%s, %d, (", MRC_STRING_PTR(var_name), syms_len);
   for (int i=0; i<syms_len; i++) {
     cdump_sym(c, syms[i], MRC_STRING_PTR(var_name), i, init_syms_code, fp);
   }
-  mrc_str_free(var_name);
+  mrc_str_free(c, var_name);
   fputs("), ", fp);
   if (code_len == MRC_STRING_LEN(init_syms_code)) fputs("const", fp);
   fputs(");\n", fp);
-  mrc_gc_arena_restore(c->mrb, ai);
+  mrc_gc_arena_restore(c, ai);
   return MRC_DUMP_OK;
 }
 
@@ -380,7 +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)
 {
-  int ai = mrc_gc_arena_save(c->mrb);
+  int ai = mrc_gc_arena_save(c);
   char buffer[256];
   const char *line_type = "mrb_debug_line_ary";
 
@@ -392,13 +392,13 @@ cdump_debug(mrc_ccontext *c, const char *name, int n, mrc_irep_debug_info *info,
   const pm_constant_t *fn_constant = pm_constant_pool_id_to_constant(&c->p->constant_pool, info->files[0]->filename_sym);
   const char *filename = (const char *)fn_constant->start;
   snprintf(buffer, sizeof(buffer), "  %s_debug_file_%d.filename_sym = mrb_intern_lit(mrb,", name, n);
-  mrc_str_cat_cstr(init_syms_code, buffer);
+  mrc_str_cat_cstr(c, init_syms_code, buffer);
   mrc_string *filename_str = mrc_str_new_cstr(c, filename);
   mrc_string *escaped = mrc_str_escape(c, filename_str);
-  mrc_str_free(filename_str);
-  mrc_str_cat_str(init_syms_code, escaped);
-  mrc_str_free(escaped);
-  mrc_str_cat_cstr(init_syms_code, ");\n");
+  mrc_str_free(c, filename_str);
+  mrc_str_cat_str(c, init_syms_code, escaped);
+  mrc_str_free(c, escaped);
+  mrc_str_cat_cstr(c, init_syms_code, ");\n");
 
   switch (info->files[0]->line_type) {
   case mrc_debug_line_ary:
@@ -442,7 +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);
 
-  mrc_gc_arena_restore(c->mrb, ai);
+  mrc_gc_arena_restore(c, ai);
   return MRC_DUMP_OK;
 }
 
@@ -575,7 +575,7 @@ mrc_dump_irep_cstruct(mrc_ccontext *c, const mrc_irep *irep, uint8_t flags, FILE
   fputs("{\n", fp);
   fputs(MRC_STRING_PTR(init_syms_code), fp);
   fputs("}\n", fp);
-  mrc_str_free(init_syms_code);
+  mrc_str_free(c, init_syms_code);
   return MRC_DUMP_OK;
 }
 #endif /* MRC_NO_STDIO */

src/codedump.c

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