capi: Instantiate with resolving host functions

Author: gumb0

include/fizzy/fizzy.h

@@ -80,6 +80,17 @@ typedef struct FizzyExternalFunction
     void* context;
 } FizzyExternalFunction;
 
+/// Imported function.
+typedef struct FizzyImportedFunction
+{
+    /// Module name. NULL-terminated string. Cannot be NULL.
+    const char* module;
+    /// Function name. NULL-terminated string. Cannot be NULL.
+    const char* name;
+    /// External function, defining its type, pointer to function and context for calling it.
+    FizzyExternalFunction external_function;
+} FizzyImportedFunction;
+
 /// Validate binary module.
 bool fizzy_validate(const uint8_t* wasm_binary, size_t wasm_binary_size);
 
@@ -130,6 +141,22 @@ bool fizzy_find_exported_function(
 FizzyInstance* fizzy_instantiate(const FizzyModule* module,
     const FizzyExternalFunction* imported_functions, size_t imported_functions_size);
 
+/// Instantiate a module resolving imported functions.
+/// Takes ownership of module, i.e. @p module is invalidated after this call.
+///
+/// @param      module                   Pointer to module.
+/// @param      imported_functions       Pointer to the imported function array. Can be NULL iff
+///                                      imported_functions_size equals 0.
+/// @param      imported_functions_size  Size of the imported function array. Can be zero.
+/// @returns    non-NULL pointer to instance in case of success, NULL otherwise.
+///
+/// @note
+/// Functions in @a imported_functions are allowed to be in any order and allowed to include some
+/// functions not required by instantiated module.
+/// Functions are matched to module's imports based on their module and name strings.
+FizzyInstance* fizzy_resolve_instantiate(const FizzyModule* module,
+    const FizzyImportedFunction* imported_functions, size_t imported_functions_size);
+
 /// Free resources associated with the instance.
 /// If passed pointer is NULL, has no effect.
 void fizzy_free_instance(FizzyInstance* instance);

lib/fizzy/capi.cpp

@@ -115,6 +115,23 @@ inline fizzy::ExternalFunction unwrap(const FizzyExternalFunction& external_func
     return fizzy::ExternalFunction{
         unwrap(external_func.function, external_func.context), unwrap(external_func.type)};
 }
+
+inline fizzy::ImportedFunction unwrap(const FizzyImportedFunction& imported_func)
+{
+    fizzy::ImportedFunction result;
+    result.module = imported_func.module ? std::string{imported_func.module} : std::string{};
+    result.name = imported_func.name ? std::string{imported_func.name} : std::string{};
+
+    fizzy::FuncType type = unwrap(imported_func.external_function.type);
+    result.inputs = std::move(type.inputs);
+    result.output = type.outputs.empty() ? std::nullopt : std::make_optional(type.outputs[0]);
+
+    result.function =
+        unwrap(imported_func.external_function.function, imported_func.external_function.context);
+
+    return result;
+}
+
 }  // namespace
 
 extern "C" {
@@ -186,6 +203,29 @@ FizzyInstance* fizzy_instantiate(const FizzyModule* module,
     }
 }
 
+FizzyInstance* fizzy_resolve_instantiate(const FizzyModule* c_module,
+    const FizzyImportedFunction* c_imported_functions, size_t imported_functions_size)
+{
+    try
+    {
+        std::vector<fizzy::ImportedFunction> imported_functions(imported_functions_size);
+        fizzy::ImportedFunction (*unwrap_imported_func_fn)(const FizzyImportedFunction&) = &unwrap;
+        std::transform(c_imported_functions, c_imported_functions + imported_functions_size,
+            imported_functions.begin(), unwrap_imported_func_fn);
+
+        std::unique_ptr<const fizzy::Module> module{unwrap(c_module)};
+        auto resolved_imports = fizzy::resolve_imported_functions(*module, imported_functions);
+
+        auto instance = fizzy::instantiate(std::move(module), std::move(resolved_imports));
+
+        return wrap(instance.release());
+    }
+    catch (...)
+    {
+        return nullptr;
+    }
+}
+
 void fizzy_free_instance(FizzyInstance* instance)
 {
     delete unwrap(instance);