WIP for Unification including global_mrb

Author: hasumikin

include/mrc_common.h

@@ -19,16 +19,6 @@
                             MRC_STRINGIZE(MRC_RELEASE_MONTH) "-" \
                             MRC_STRINGIZE(MRC_RELEASE_DAY)
 
-#ifdef MRC_CUSTOM_ALLOC
-  #include <prism_xallocator.h>
-#else
-  #include <stdlib.h>
-  #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
 #define MRC_USE_CXX_ABI
 #endif
@@ -48,13 +38,17 @@
   # define MRC_END_DECL
 #endif
 
-#ifdef MRC_DEBUG
-  #include <assert.h>
-  #define mrc_assert(p) assert(p)
-  #define mrc_assert_int_fit(t1,n,t2,max) assert((n)>=0 && ((sizeof(n)<=sizeof(t2))||(n<=(t1)(max))))
+/** Declare a public mruby API function. */
+#ifndef MRC_API
+#if defined(MRC_BUILD_AS_DLL)
+#if defined(MRC_CORE) || defined(MRC_LIB)
+# define MRC_API __declspec(dllexport)
 #else
-  #define mrc_assert(p) ((void)0)
-  #define mrc_assert_int_fit(t1,n,t2,max) ((void)0)
+# define MRC_API __declspec(dllimport)
+#endif
+#else
+# define MRC_API extern
+#endif
 #endif
 
 #if defined(__cplusplus) || (defined(__bool_true_false_are_defined) && __bool_true_false_are_defined)
@@ -128,17 +122,21 @@ typedef uint8_t mrc_code;
  */
 typedef uint32_t mrc_aspec;
 
-/** Declare a public mruby API function. */
-#ifndef MRC_API
-#if defined(MRC_BUILD_AS_DLL)
-#if defined(MRC_CORE) || defined(MRC_LIB)
-# define MRC_API __declspec(dllexport)
-#else
-# define MRC_API __declspec(dllimport)
+#ifndef MRC_CUSTOM_ALLOC
+  #include <stdlib.h>
+//  #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 MRC_DEBUG
+  #include <assert.h>
+  #define mrc_assert(p) assert(p)
+  #define mrc_assert_int_fit(t1,n,t2,max) assert((n)>=0 && ((sizeof(n)<=sizeof(t2))||(n<=(t1)(max))))
 #else
-# define MRC_API extern
-#endif
+  #define mrc_assert(p) ((void)0)
+  #define mrc_assert_int_fit(t1,n,t2,max) ((void)0)
 #endif
 
 #endif  /* MRC_COMMON_H */

include/prism_xallocator.h

@@ -1,20 +1,24 @@
 #ifndef PRISM_CUSTOM_ALLOCATOR_H
 #define PRISM_CUSTOM_ALLOCATOR_H
 
-void *picorb_alloc(unsigned int size);
-void *picorb_calloc(unsigned int nmemb, unsigned int size);
-void *picorb_realloc(void *ptr, unsigned int size);
-void  picorb_free(void *ptr);
+#if defined(MRC_TARGET_MRUBY)
+  #include <mruby.h>
 
-#define xmalloc      picorb_alloc
-#define xcalloc      picorb_calloc
-#define xrealloc     picorb_realloc
-#define xfree        picorb_free
+  extern mrb_state *global_mrb;
 
-#define mrc_malloc   picorb_alloc
-#define mrc_calloc   picorb_calloc
-#define mrc_realloc  picorb_realloc
-#define mrc_free     picorb_free
+  #define xmalloc(size)             mrb_malloc(global_mrb, size)
+  #define xcalloc(nmemb,size)       mrb_calloc(global_mrb, nmemb, size)
+  #define xrealloc(ptr,size)        mrb_realloc(global_mrb, ptr, size)
+  #define xfree(ptr)                mrb_free(global_mrb, ptr)
+
+  #define mrc_malloc(c,size)        mrb_malloc(c->mrb, size)
+  #define mrc_calloc(c,nmemb,size)  mrb_calloc(c->mrb, nmemb, size)
+  #define mrc_realloc(c,ptr,size)   mrb_realloc(c->mrb, ptr, size)
+  #define mrc_free(c,ptr)           mrb_free(c->mrb, ptr)
+#else
+  #include <mrubyc.h>
+  // TODO
+#endif
 
 #endif
 

mrbgem.rake

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

src/ccontext.c

@@ -8,8 +8,8 @@ mrc_ccontext_new(mrb_state *mrb)
 {
   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));
+  mrc_ccontext *c = (mrc_ccontext *)mrc_calloc((&temp_c), 1, sizeof(mrc_ccontext));
+  c->p = (mrc_parser_state *)mrc_malloc((&temp_c), sizeof(mrc_parser_state));
   c->options = NULL;
   c->mrb = temp_c.mrb;
   return c;

src/codegen.c

@@ -538,6 +538,11 @@ scope_new(mrc_ccontext *c, mrc_codegen_scope *prev, mrc_constant_id_list *nlv)
     return NULL;
   }
   *s = codegen_scope_zero;
+  if (prev) {
+    s->c = prev->c;
+  } else {
+    s->c = c;
+  }
   s->mpool = pool;
   if (!prev) return s;
   s->prev = prev;

src/compile.c

@@ -186,7 +186,7 @@ mrc_pm_parse(mrc_ccontext *c)
   // save top-level locals for IRB
   pm_program_node_t *program = (pm_program_node_t *)node;
   uint32_t nlocals = program->locals.size;
-  pm_options_t *options = (pm_options_t *)mrc_malloc(c->mrb, sizeof(pm_options_t));
+  pm_options_t *options = (pm_options_t *)mrc_malloc(c, sizeof(pm_options_t));
   memset(options, 0, sizeof(pm_options_t));
   pm_string_t *encoding = &options->encoding;
   pm_string_constant_init(encoding, "UTF-8", 5);
@@ -201,7 +201,7 @@ mrc_pm_parse(mrc_ccontext *c)
     scope_local = &options_scope->locals[i];
     id = program->locals.ids[i];
     local = pm_constant_pool_id_to_constant(&c->p->constant_pool, id);
-    allocated = (char *)mrc_malloc(c->mrb, local->length);
+    allocated = (char *)mrc_malloc(c, local->length);
     memcpy(allocated, local->start, local->length);
     pm_string_constant_init(scope_local, (const char *)allocated, local->length);
   }
@@ -224,7 +224,7 @@ mrc_parse_file_cxt(mrc_ccontext *c, const char **filenames, uint8_t **source)
   while (filenames[filecount]) {
     filecount++;
   }
-  c->filename_table = (mrc_filename_table *)mrc_malloc(c->mrb, sizeof(mrc_filename_table) * filecount);
+  c->filename_table = (mrc_filename_table *)mrc_malloc(c, sizeof(mrc_filename_table) * filecount);
   c->filename_table_length = filecount;
   c->current_filename_index = 0;
   ssize_t length = read_input_files(c, filenames, source, c->filename_table);
@@ -258,7 +258,7 @@ mrc_parse_string_cxt(mrc_ccontext *c, const uint8_t **source, size_t length)
 {
   pm_string_t string;
   pm_string_owned_init(&string, (uint8_t *)source, length);
-  c->filename_table = (mrc_filename_table *)mrc_malloc(c->mrb, sizeof(mrc_filename_table));
+  c->filename_table = (mrc_filename_table *)mrc_malloc(c, sizeof(mrc_filename_table));
   c->filename_table[0].filename = "-e";
   c->filename_table[0].start = 0;
   c->filename_table_length = 1;

src/custom_allocator.c

@@ -1,17 +1,17 @@
 #ifdef MRC_CUSTOM_ALLOC
 
+#include <prism_xallocator.h>
 #include <string.h>
-#include "../include/mrc_ccontext.h"
 
 #ifdef MRC_TARGET_MRUBY
 
 #include <mruby.h>
-#define picorb_alloc(c, size)           mrb_malloc(c->mrb, size)
-#define picorb_calloc(c, nmemb, size)   mrb_calloc(c->mrb, nmemb, size)
-#define picorb_realloc(c, ptr, size)    mrb_realloc(c->mrb, ptr, size)
-#define picorb_free(c, ptr)             mrb_free(c->mrb, ptr)
+#define picorb_alloc(c, size)           mrb_malloc(c, size)
+#define picorb_calloc(c, nmemb, size)   mrb_calloc(c, nmemb, size)
+#define picorb_realloc(c, ptr, size)    mrb_realloc(c, ptr, size)
+#define picorb_free(c, ptr)             mrb_free(c, ptr)
 
-#else /* MRC_TARGET_MRUBY */
+#else /* MRC_TARGET_MRUBYC */
 
 #include <mrubyc.h>
 #define picorb_alloc    mrbc_raw_alloc
@@ -31,6 +31,6 @@ picorb_realloc(void *ptr, unsigned int size)
   }
 }
 
-#endif /* MRC_TARGET_MRUBY */
+#endif /* MRC_TARGET_MRUBYC */
 
 #endif // MRC_CUSTOM_ALLOC

src/diagnostic.c

@@ -61,7 +61,7 @@ mrc_diagnostic_code_to_string(mrc_diagnostic_code code)
 void
 mrc_diagnostic_list_append(mrc_ccontext *c, const uint8_t * location_start, const char *message, mrc_diagnostic_code code)
 {
-  mrc_diagnostic_list *list = mrc_calloc(c->mrb, 1, sizeof(mrc_diagnostic_list));
+  mrc_diagnostic_list *list = mrc_calloc(c, 1, sizeof(mrc_diagnostic_list));
   line_and_column_by_start_and_offset(c->p->start, location_start, &list->line, &list->column);
   char buf[256];
   const char *diagnostic_code_str = mrc_diagnostic_code_to_string(code);