WIP merging microruby

Author: hasumikin

lib/picoruby/build.rb

@@ -66,6 +66,7 @@ def picoruby(alloc_libc: true)
             .gsub('@PICORUBY_COMMIT_HASH@', commit_hash)
       )
 
+      cc.include_paths << "#{gems['picoruby-mrubyc'].dir}/include"
       cc.include_paths << "#{gems['mruby-compiler2'].dir}/include"
       cc.include_paths << "#{gems['mruby-compiler2'].dir}/lib/prism/include"
       cc.include_paths << "#{MRUBY_ROOT}/include/picoruby"

mrbgems/picoruby-crc/src/mrubyc/crc.c

@@ -10,12 +10,13 @@ c_crc_crc32(mrbc_vm *vm, mrbc_value v[], int argc)
   mrbc_value string = GET_ARG(1);
   mrbc_int_t crc = GET_INT_ARG(2);
   if (string.tt == MRBC_TT_NIL) {
-    return mrb_fixnum_value(0);
+    SET_INT_RETURN(0);
+    return;
   } else if (string.tt != MRBC_TT_STRING) {
     mrbc_raise(vm, MRBC_CLASS(TypeError), "string expected");
     return;
   }
-  uint32_t crc_value = generate_crc32((uint8_t *)string.string->data, string.string->len, crc);
+  uint32_t crc_value = generate_crc32((uint8_t *)string.string->data, string.string->size, crc);
   SET_INT_RETURN(crc_value);
 }
 

mrbgems/picoruby-machine/include/hal.h

@@ -9,14 +9,8 @@ extern "C" {
 #include "mruby.h"
 void mrb_tick(mrb_state *mrb);
 void hal_init(mrb_state *mrb);
-//#elif defined(PICORB_VM_MRUBYC)
-//#include "mrubyc.h"
-//typedef void mrb_state;
-//void mrbc_tick();
-//void hal_init(mrb_state *mrb);
-//#define mrb_tick(mrb) mrbc_tick()
-//#define MRB_TICK_UNIT MRBC_TICK_UNIT
 #elif defined(PICORB_VM_MRUBYC)
+void mrbc_tick();
 void hal_init(void);
 #endif
 

mrbgems/picoruby-machine/ports/rp2040/machine.c

@@ -42,7 +42,9 @@ static volatile uint32_t interrupt_nesting = 0;
 
 static volatile bool in_tick_processing = false;
 
+#if defined(PICORB_VM_MRUBY)
 static mrb_state *mrb_;
+#endif
 
 static void
 alarm_handler(void)

mrbgems/picoruby-mrubyc/include/mruby.h

@@ -0,0 +1,8 @@
+#ifndef _MRUBY_H_FOR_MRUBYC
+#define _MRUBY_H_FOR_MRUBYC
+
+#define mrb_state void
+
+void mrb_init_mrblib(mrb_state *mrb);
+
+#endif

mrbgems/picoruby-mrubyc/include/mruby/irep.h

@@ -0,0 +1,9 @@
+#ifndef _MRUBY_IREP_H_FOR_MRUBYC
+#define _MRUBY_IREP_H_FOR_MRUBYC
+
+#include <stdint.h>
+
+inline void mrb_load_irep(mrb_state *mrb, const uint8_t *mrblib_irep) { }
+
+#endif
+

mrbgems/picoruby-shell/src/mrubyc/shell.c

@@ -44,3 +44,10 @@ mrbc_shell_init(mrbc_vm *vm)
   mrbc_class *mrbc_class_Shell = mrbc_define_class(vm, "Shell", mrbc_class_object);
   mrbc_define_method(vm, mrbc_class_Shell, "next_executable", c_next_executable);
 }
+
+void
+picoruby_init_executables(mrbc_vm *vm)
+{
+  mrbc_class *mrbc_class_Shell = mrbc_define_class(vm, "Shell", mrbc_class_object);
+  mrbc_define_method(vm, mrbc_class_Shell, "next_executable", c_next_executable);
+}