Unify the Ruby runtime initialization process in ruby_init

Author: kateinoigakukun

packages/gems/js/ext/js/bindgen/ext.c

@@ -78,9 +78,6 @@ extern void __wasm_import_ruby_js_js_runtime_throw_prohibit_rewind_exception(uin
 
 
 
-
-
-
 __attribute__((__weak__, __export_name__("cabi_post_ruby:js/ruby-runtime#rstring-ptr")))
 void __wasm_export_exports_ruby_js_ruby_runtime_rstring_ptr_post_return(uint8_t * arg0) {
   if ((*((size_t*) (arg0 + 4))) > 0) {
@@ -437,27 +434,9 @@ void __wasm_export_exports_ruby_js_ruby_runtime_ruby_show_version(void) {
 }
 
 __attribute__((__export_name__("ruby:js/ruby-runtime#ruby-init")))
-void __wasm_export_exports_ruby_js_ruby_runtime_ruby_init(void) {
-  exports_ruby_js_ruby_runtime_ruby_init();
-}
-
-__attribute__((__export_name__("ruby:js/ruby-runtime#ruby-sysinit")))
-void __wasm_export_exports_ruby_js_ruby_runtime_ruby_sysinit(uint8_t * arg, size_t arg0) {
-  ext_list_string_t arg1 = (ext_list_string_t) { (ext_string_t*)(arg), (arg0) };
-  exports_ruby_js_ruby_runtime_ruby_sysinit(&arg1);
-}
-
-__attribute__((__export_name__("ruby:js/ruby-runtime#ruby-options")))
-int32_t __wasm_export_exports_ruby_js_ruby_runtime_ruby_options(uint8_t * arg, size_t arg0) {
+void __wasm_export_exports_ruby_js_ruby_runtime_ruby_init(uint8_t * arg, size_t arg0) {
   ext_list_string_t arg1 = (ext_list_string_t) { (ext_string_t*)(arg), (arg0) };
-  exports_ruby_js_ruby_runtime_own_rb_iseq_t ret = exports_ruby_js_ruby_runtime_ruby_options(&arg1);
-  return (ret).__handle;
-}
-
-__attribute__((__export_name__("ruby:js/ruby-runtime#ruby-script")))
-void __wasm_export_exports_ruby_js_ruby_runtime_ruby_script(uint8_t * arg, size_t arg0) {
-  ext_string_t arg1 = (ext_string_t) { (uint8_t*)(arg), (arg0) };
-  exports_ruby_js_ruby_runtime_ruby_script(&arg1);
+  exports_ruby_js_ruby_runtime_ruby_init(&arg1);
 }
 
 __attribute__((__export_name__("ruby:js/ruby-runtime#ruby-init-loadpath")))

packages/gems/js/ext/js/bindgen/ext.h

@@ -108,10 +108,7 @@ extern void ruby_js_js_runtime_throw_prohibit_rewind_exception(ext_string_t *mes
 
 // Exported Functions from `ruby:js/ruby-runtime`
 void exports_ruby_js_ruby_runtime_ruby_show_version(void);
-void exports_ruby_js_ruby_runtime_ruby_init(void);
-void exports_ruby_js_ruby_runtime_ruby_sysinit(ext_list_string_t *args);
-exports_ruby_js_ruby_runtime_own_rb_iseq_t exports_ruby_js_ruby_runtime_ruby_options(ext_list_string_t *args);
-void exports_ruby_js_ruby_runtime_ruby_script(ext_string_t *name);
+void exports_ruby_js_ruby_runtime_ruby_init(ext_list_string_t *args);
 void exports_ruby_js_ruby_runtime_ruby_init_loadpath(void);
 void exports_ruby_js_ruby_runtime_rb_eval_string_protect(ext_string_t *str, exports_ruby_js_ruby_runtime_tuple2_own_rb_abi_value_s32_t *ret);
 void exports_ruby_js_ruby_runtime_rb_funcallv_protect(exports_ruby_js_ruby_runtime_borrow_rb_abi_value_t recv, exports_ruby_js_ruby_runtime_rb_id_t mid, exports_ruby_js_ruby_runtime_list_borrow_rb_abi_value_t *args, exports_ruby_js_ruby_runtime_tuple2_own_rb_abi_value_s32_t *ret);

packages/gems/js/ext/js/bindgen/ext_component_type.o

@@ -127,25 +127,10 @@ __attribute__((export_name("ruby-show-version: func() -> ()")))
 void __wasm_export_rb_abi_guest_ruby_show_version(void) {
   rb_abi_guest_ruby_show_version();
 }
-__attribute__((export_name("ruby-init: func() -> ()")))
-void __wasm_export_rb_abi_guest_ruby_init(void) {
-  rb_abi_guest_ruby_init();
-}
-__attribute__((export_name("ruby-sysinit: func(args: list<string>) -> ()")))
-void __wasm_export_rb_abi_guest_ruby_sysinit(int32_t arg, int32_t arg0) {
-  rb_abi_guest_list_string_t arg1 = (rb_abi_guest_list_string_t) { (rb_abi_guest_string_t*)(arg), (size_t)(arg0) };
-  rb_abi_guest_ruby_sysinit(&arg1);
-}
-__attribute__((export_name("ruby-options: func(args: list<string>) -> handle<rb-iseq>")))
-int32_t __wasm_export_rb_abi_guest_ruby_options(int32_t arg, int32_t arg0) {
+__attribute__((export_name("ruby-init: func(args: list<string>) -> ()")))
+void __wasm_export_rb_abi_guest_ruby_init(int32_t arg, int32_t arg0) {
   rb_abi_guest_list_string_t arg1 = (rb_abi_guest_list_string_t) { (rb_abi_guest_string_t*)(arg), (size_t)(arg0) };
-  rb_abi_guest_rb_iseq_t ret = rb_abi_guest_ruby_options(&arg1);
-  return (ret).idx;
-}
-__attribute__((export_name("ruby-script: func(name: string) -> ()")))
-void __wasm_export_rb_abi_guest_ruby_script(int32_t arg, int32_t arg0) {
-  rb_abi_guest_string_t arg1 = (rb_abi_guest_string_t) { (char*)(arg), (size_t)(arg0) };
-  rb_abi_guest_ruby_script(&arg1);
+  rb_abi_guest_ruby_init(&arg1);
 }
 __attribute__((export_name("ruby-init-loadpath: func() -> ()")))
 void __wasm_export_rb_abi_guest_ruby_init_loadpath(void) {

packages/gems/js/ext/js/bindgen/legacy/rb-abi-guest.c

@@ -56,10 +56,7 @@ extern "C"
   } rb_abi_guest_list_rb_abi_value_t;
   void rb_abi_guest_list_rb_abi_value_free(rb_abi_guest_list_rb_abi_value_t *ptr);
   void rb_abi_guest_ruby_show_version(void);
-  void rb_abi_guest_ruby_init(void);
-  void rb_abi_guest_ruby_sysinit(rb_abi_guest_list_string_t *args);
-  rb_abi_guest_rb_iseq_t rb_abi_guest_ruby_options(rb_abi_guest_list_string_t *args);
-  void rb_abi_guest_ruby_script(rb_abi_guest_string_t *name);
+  void rb_abi_guest_ruby_init(rb_abi_guest_list_string_t *args);
   void rb_abi_guest_ruby_init_loadpath(void);
   void rb_abi_guest_rb_eval_string_protect(rb_abi_guest_string_t *str, rb_abi_guest_tuple2_rb_abi_value_s32_t *ret0);
   void rb_abi_guest_rb_funcallv_protect(rb_abi_guest_rb_abi_value_t recv, rb_abi_guest_rb_id_t mid, rb_abi_guest_list_rb_abi_value_t *args, rb_abi_guest_tuple2_rb_abi_value_s32_t *ret0);

packages/gems/js/ext/js/bindgen/legacy/rb-abi-guest.h

@@ -4,10 +4,7 @@ type rb-errno = s32
 type rb-id = u32
 
 ruby-show-version: func()
-ruby-init: func()
-ruby-sysinit: func(args: list<string>)
-ruby-options: func(args: list<string>) -> rb-iseq
-ruby-script: func(name: string)
+ruby-init: func(args: list<string>)
 ruby-init-loadpath: func()
 rb-eval-string-protect: func(str: string) -> tuple<rb-abi-value, s32>
 rb-funcallv-protect: func(recv: rb-abi-value, mid: rb-id, args: list<rb-abi-value>) -> tuple<rb-abi-value, s32>

packages/gems/js/ext/js/bindgen/legacy/rb-abi-guest.wit

@@ -203,36 +203,22 @@ void exports_ruby_js_ruby_runtime_rb_abi_value_destructor(
 
 void rb_abi_guest_ruby_show_version(void) { ruby_show_version(); }
 
-__attribute__((noinline)) static void rb_abi_guest_ruby_init_thunk(void) {
+__attribute__((noinline)) static void rb_abi_guest_ruby_init_thunk(int argc, char **c_args) {
   ruby_init();
   rb_abi_guest_arena_hash = rb_hash_new();
   rb_abi_guest_refcount_hash = rb_hash_new();
 
   rb_gc_register_mark_object(rb_abi_guest_arena_hash);
   rb_gc_register_mark_object(rb_abi_guest_refcount_hash);
+  ruby_sysinit(&argc, &c_args);
+  ruby_options(argc, c_args);
 }
-void rb_abi_guest_ruby_init(void) {
-  RB_WASM_LIB_RT(rb_abi_guest_ruby_init_thunk())
-}
-
-void rb_abi_guest_ruby_sysinit(rb_abi_guest_list_string_t *args) {
-  char **c_args;
-  int argc = args->len;
-  c_strings_from_abi(args, c_args);
-  RB_WASM_LIB_RT(ruby_sysinit(&argc, &c_args))
-}
-
-rb_abi_guest_rb_iseq_t
-rb_abi_guest_ruby_options(rb_abi_guest_list_string_t *args) {
+void rb_abi_guest_ruby_init(rb_abi_guest_list_string_t *args) {
   void *result;
+  int argc = args->len;
   char **c_args;
   c_strings_from_abi(args, c_args);
-  RB_WASM_LIB_RT(result = ruby_options(args->len, c_args))
-  return rb_abi_guest_rb_iseq_new(result);
-}
-
-void rb_abi_guest_ruby_script(rb_abi_guest_string_t *name) {
-  RB_WASM_LIB_RT(ruby_script((const char *)name->ptr))
+  RB_WASM_LIB_RT(rb_abi_guest_ruby_init_thunk(argc, c_args))
 }
 
 void rb_abi_guest_ruby_init_loadpath(void) {
@@ -398,22 +384,9 @@ void exports_ruby_js_ruby_runtime_ruby_show_version(void) {
   __wasm_call_ctors_if_needed();
   rb_abi_guest_ruby_show_version();
 }
-void exports_ruby_js_ruby_runtime_ruby_init(void) {
-  __wasm_call_ctors_if_needed();
-  rb_abi_guest_ruby_init();
-}
-void exports_ruby_js_ruby_runtime_ruby_sysinit(ext_list_string_t *args) {
-  __wasm_call_ctors_if_needed();
-  rb_abi_guest_ruby_sysinit(args);
-}
-exports_ruby_js_ruby_runtime_own_rb_iseq_t
-exports_ruby_js_ruby_runtime_ruby_options(ext_list_string_t *args) {
-  __wasm_call_ctors_if_needed();
-  return rb_abi_guest_ruby_options(args);
-}
-void exports_ruby_js_ruby_runtime_ruby_script(ext_string_t *name) {
+void exports_ruby_js_ruby_runtime_ruby_init(ext_list_string_t *args) {
   __wasm_call_ctors_if_needed();
-  rb_abi_guest_ruby_script(name);
+  rb_abi_guest_ruby_init(args);
 }
 void exports_ruby_js_ruby_runtime_ruby_init_loadpath(void) {
   __wasm_call_ctors_if_needed();

packages/gems/js/ext/js/witapi-core.c

@@ -10,10 +10,7 @@ interface ruby-runtime {
     type rb-id = u32;
 
     ruby-show-version: func();
-    ruby-init: func();
-    ruby-sysinit: func(args: list<string>);
-    ruby-options: func(args: list<string>) -> rb-iseq;
-    ruby-script: func(name: string);
+    ruby-init: func(args: list<string>);
     ruby-init-loadpath: func();
     rb-eval-string-protect: func(str: string) -> tuple<rb-abi-value, s32>;
     rb-funcallv-protect: func(recv: borrow<rb-abi-value>, mid: rb-id, args: list<borrow<rb-abi-value>>) -> tuple<rb-abi-value, s32>;

packages/gems/js/wit/ruby-runtime.wit

@@ -16,7 +16,7 @@ export namespace RubyJsJsRuntime {
   export function jsValueTypeof(value: JsAbiValue): string;
   export function jsValueEqual(lhs: JsAbiValue, rhs: JsAbiValue): boolean;
   export function jsValueStrictlyEqual(lhs: JsAbiValue, rhs: JsAbiValue): boolean;
-  export function reflectApply(target: JsAbiValue, thisArgument: JsAbiValue, arguments: JsAbiValue[]): JsAbiResult;
+  export function reflectApply(target: JsAbiValue, thisArgument: JsAbiValue, arguments: Array<JsAbiValue>): JsAbiResult;
   export function reflectGet(target: JsAbiValue, propertyKey: string): JsAbiResult;
   export function reflectSet(target: JsAbiValue, propertyKey: string, value: JsAbiValue): JsAbiResult;
   export function throwProhibitRewindException(message: string): void;

packages/npm-packages/ruby-wasm-wasi/src/bindgen/interfaces/ruby-js-js-runtime.d.ts

@@ -1,12 +1,9 @@
 export namespace RubyJsRubyRuntime {
   export function rubyShowVersion(): void;
-  export function rubyInit(): void;
-  export function rubySysinit(args: string[]): void;
-  export function rubyOptions(args: string[]): RbIseq;
-  export function rubyScript(name: string): void;
+  export function rubyInit(args: Array<string>): void;
   export function rubyInitLoadpath(): void;
   export function rbEvalStringProtect(str: string): [RbAbiValue, number];
-  export function rbFuncallvProtect(recv: RbAbiValue, mid: RbId, args: RbAbiValue[]): [RbAbiValue, number];
+  export function rbFuncallvProtect(recv: RbAbiValue, mid: RbId, args: Array<RbAbiValue>): [RbAbiValue, number];
   export function rbIntern(name: string): RbId;
   export function rbErrinfo(): RbAbiValue;
   export function rbClearErrinfo(): void;