capi: use size_t for array sizes

Author: gumb0

include/fizzy/fizzy.h

@@ -47,7 +47,7 @@ typedef struct FizzyExecutionResult
 /// @param args_size   Size of the  argument array.
 /// @param depth        Call stack depth.
 typedef struct FizzyExecutionResult (*FizzyExternalFn)(void* context,
-    struct FizzyInstance* instance, const union FizzyValue* args, uint32_t args_size, int depth);
+    struct FizzyInstance* instance, const union FizzyValue* args, size_t args_size, int depth);
 
 /// External function.
 typedef struct FizzyExternalFunction
@@ -78,7 +78,7 @@ void fizzy_free_module(struct FizzyModule* module);
 /// @param imported_functions       Pointer to the imported function array.
 /// @param imported_functions_size  Size of the imported function array.
 struct FizzyInstance* fizzy_instantiate(struct FizzyModule* module,
-    const struct FizzyExternalFunction* imported_functions, uint32_t imported_functions_size);
+    const struct FizzyExternalFunction* imported_functions, size_t imported_functions_size);
 
 /// Free resources associated with the instance.
 void fizzy_free_instance(struct FizzyInstance* instance);
@@ -90,7 +90,7 @@ void fizzy_free_instance(struct FizzyInstance* instance);
 /// @param args_size    Size of the argument array.
 /// @param depth        Call stack depth.
 FizzyExecutionResult fizzy_execute(struct FizzyInstance* instance, uint32_t func_idx,
-    const union FizzyValue* args, uint32_t args_size, int depth);
+    const union FizzyValue* args, size_t args_size, int depth);
 
 #ifdef __cplusplus
 }

lib/fizzy/capi.cpp

@@ -67,7 +67,7 @@ void fizzy_free_module(FizzyModule* module)
 }
 
 FizzyInstance* fizzy_instantiate(FizzyModule* module,
-    const FizzyExternalFunction* imported_functions, uint32_t imported_functions_size)
+    const FizzyExternalFunction* imported_functions, size_t imported_functions_size)
 {
     try
     {
@@ -116,7 +116,7 @@ void fizzy_free_instance(FizzyInstance* instance)
 }
 
 FizzyExecutionResult fizzy_execute(FizzyInstance* instance, uint32_t func_idx,
-    const FizzyValue* cargs, uint32_t args_size, int depth)
+    const FizzyValue* cargs, size_t args_size, int depth)
 {
     const auto args = reinterpret_cast<const fizzy::Value*>(cargs);
 

test/compilation/compilation_test.c

@@ -8,7 +8,7 @@ bool validate(const uint8_t* binary, size_t size);
 bool parse(const uint8_t* binary, size_t size);
 bool instantiate(const uint8_t* binary, size_t size);
 struct FizzyExecutionResult dummy_host_func(void* context, struct FizzyInstance* instance,
-    const union FizzyValue* args, uint32_t args_size, int depth);
+    const union FizzyValue* args, size_t args_size, int depth);
 bool instantiate_with_host_func(const uint8_t* binary, size_t size);
 bool execute(const uint8_t* binary, size_t size);
 
@@ -42,7 +42,7 @@ bool instantiate(const uint8_t* binary, size_t size)
 }
 
 struct FizzyExecutionResult dummy_host_func(void* context, struct FizzyInstance* instance,
-    const union FizzyValue* args, uint32_t args_size, int depth)
+    const union FizzyValue* args, size_t args_size, int depth)
 {
     (void)context;
     (void)instance;

test/unittests/capi_test.cpp

@@ -54,7 +54,7 @@ TEST(capi, instantiate_imported_function)
     EXPECT_NE(module, nullptr);
 
     FizzyExternalFunction host_funcs[] = {
-        {[](void*, FizzyInstance*, const FizzyValue*, uint32_t, int) {
+        {[](void*, FizzyInstance*, const FizzyValue*, size_t, int) {
              return FizzyExecutionResult{false, true, {42}};
          },
             nullptr}};
@@ -107,11 +107,11 @@ TEST(capi, execute_with_host_function)
     EXPECT_NE(module, nullptr);
 
     FizzyExternalFunction host_funcs[] = {
-        {[](void*, FizzyInstance*, const FizzyValue*, uint32_t, int) {
+        {[](void*, FizzyInstance*, const FizzyValue*, size_t, int) {
              return FizzyExecutionResult{false, true, {42}};
          },
             nullptr},
-        {[](void*, FizzyInstance*, const FizzyValue* args, uint32_t, int) {
+        {[](void*, FizzyInstance*, const FizzyValue* args, size_t, int) {
              return FizzyExecutionResult{false, true, {args[0].i64 / args[1].i64}};
          },
             nullptr}};
@@ -141,7 +141,7 @@ TEST(capi, imported_function_traps)
     EXPECT_NE(module, nullptr);
 
     FizzyExternalFunction host_funcs[] = {
-        {[](void*, FizzyInstance*, const FizzyValue*, uint32_t, int) {
+        {[](void*, FizzyInstance*, const FizzyValue*, size_t, int) {
              return FizzyExecutionResult{true, false, {}};
          },
             nullptr}};
@@ -169,7 +169,7 @@ TEST(capi, imported_function_void)
 
     bool called = false;
     FizzyExternalFunction host_funcs[] = {
-        {[](void* context, FizzyInstance*, const FizzyValue*, uint32_t, int) {
+        {[](void* context, FizzyInstance*, const FizzyValue*, size_t, int) {
              *static_cast<bool*>(context) = true;
              return FizzyExecutionResult{false, false, {}};
          },
@@ -221,7 +221,7 @@ TEST(capi, imported_function_from_another_module)
 
     // TODO fizzy_find_exported_function
 
-    auto sub = [](void* context, FizzyInstance*, const FizzyValue* args, uint32_t args_size,
+    auto sub = [](void* context, FizzyInstance*, const FizzyValue* args, size_t args_size,
                    int depth) -> FizzyExecutionResult {
         auto* called_instance = static_cast<FizzyInstance*>(context);
         return fizzy_execute(called_instance, 0, args, args_size, depth + 1);