Solve bugs in wasm loader and tests.

Author: viferga

source/loaders/wasm_loader/source/wasm_loader_function.c

@@ -161,7 +161,7 @@ static function_return function_wasm_interface_invoke(function func, function_im
 
 	if (args_size != signature_count(sig))
 	{
-		log_write("metacall", LOG_LEVEL_ERROR, "WebAssembly loader: Invalid number of arguments (%d expected, %d given)", args_size, signature_count(sig));
+		log_write("metacall", LOG_LEVEL_ERROR, "WebAssembly loader: Invalid number of arguments (%d expected, %d given) in call to function %s", args_size, signature_count(sig), function_name(func));
 		return NULL;
 	}
 
@@ -183,13 +183,13 @@ static function_return function_wasm_interface_invoke(function func, function_im
 
 			if (param_type_id != arg_type_id)
 			{
-				log_write("metacall", LOG_LEVEL_ERROR, "WebAssembly loader: Invalid type for argument %d (expected %d, was %d)", idx, param_type_id, arg_type_id);
+				log_write("metacall", LOG_LEVEL_ERROR, "WebAssembly loader: Invalid type for argument %d (expected %s, was %s) in call to function %s", idx, type_id_name(param_type_id), type_id_name(arg_type_id), function_name(func));
 				return NULL;
 			}
 
 			if (reflect_to_wasm_type(args[idx], &wasm_args[idx]) != 0)
 			{
-				log_write("metacall", LOG_LEVEL_ERROR, "WebAssembly loader: Unsupported type for argument %d", idx);
+				log_write("metacall", LOG_LEVEL_ERROR, "WebAssembly loader: Unsupported type for argument %d in call to function %s", idx, function_name(func));
 				return NULL;
 			}
 		}

source/loaders/wasm_loader/source/wasm_loader_handle.c

@@ -77,7 +77,7 @@ int wasm_loader_handle_add_module(loader_impl_wasm_handle handle, const loader_n
 		goto error_initialize_imports;
 	}
 
-	strncpy(module.name, name, sizeof(module.name));
+	strncpy(module.name, name, LOADER_NAME_SIZE - 1);
 
 	// There is no way to check whether `wasm_module_exports` or
 	// `wasm_instance_new` fail, so just hope for the best.

source/scripts/python/wasm/source/wasm.py.in

@@ -13,14 +13,14 @@ def test():
 
     # We can't import both functions.wasm and functions.wat here because their
     # definitions would collide.
-    from functions.wasm import none_ret_none, i32_ret_none, i32_f32_i64_f64_ret_none, none_ret_i32, none_ret_i32_f32_i64_f64, i32_f32_i64_f64_ret_i32_f32_i64_f64, trap
+    from functions.wasm import none_ret_none, i64_ret_none, i64_f64_i64_f64_ret_none, none_ret_i64, none_ret_i64_f64_i64_f64, i64_f64_i64_f64_ret_i64_f64_i64_f64, trap
 
     assert none_ret_none() is None
-    assert i32_ret_none(0) is None
-    assert i32_f32_i64_f64_ret_none(0) is None
-    assert none_ret_i32() == 1
-    assert none_ret_i32_f32_i64_f64() == [1, 2, 3, 4]
-    assert i32_f32_i64_f64_ret_i32_f32_i64_f64(0, 0, 0, 0) == [1, 2, 3, 4]
+    assert i64_ret_none(0) is None
+    assert i64_f64_i64_f64_ret_none(0) is None
+    assert none_ret_i64() == 1
+    assert none_ret_i64_f64_i64_f64() == [1, 2, 3, 4]
+    assert i64_f64_i64_f64_ret_i64_f64_i64_f64(0, 0.0, 0, 0.0) == [1, 2, 3, 4]
     assert trap() is None
 
     # We test an invalid load file attempt first to avoid polluting the global

source/scripts/wasm/tests/source/functions.wasm

@@ -1,6 +1,6 @@
 (module
   (func (export "none_ret_none"))
-  (func (export "i32_ret_none") (param i32))
+  (func (export "i64_ret_none") (param i64))
   (func (export "i32_f32_i64_f64_ret_none") (param i32) (param f32) (param i64) (param f64))
   (func (export "none_ret_i32") (result i32)
         i32.const 1)

source/scripts/wasm/tests/source/functions.wat

@@ -120,7 +120,7 @@ TEST_F(metacall_wasm_test, DiscoverFunctions)
 	ASSERT_EQ(NULL, metacall_handle_function(handle, "does_not_exist"));
 
 	TestFunction(handle, "none_ret_none", {}, METACALL_INVALID);
-	TestFunction(handle, "i32_ret_none", { METACALL_INT }, METACALL_INVALID);
+	TestFunction(handle, "i64_ret_none", { METACALL_LONG }, METACALL_INVALID);
 	TestFunction(handle, "i32_f32_i64_f64_ret_none", { METACALL_INT, METACALL_FLOAT, METACALL_LONG, METACALL_DOUBLE }, METACALL_INVALID);
 	TestFunction(handle, "none_ret_i32", {}, METACALL_INT);
 
@@ -137,10 +137,10 @@ TEST_F(metacall_wasm_test, CallFunctions)
 	void *ret = metacall("none_ret_none");
 	ASSERT_EQ(NULL, ret);
 
-	ret = metacall("i32_ret_none", 0);
+	ret = metacall("i64_ret_none", 0L);
 	ASSERT_EQ(NULL, ret);
 
-	ret = metacall("i32_f32_i64_f64_ret_none", 0, 0, 0, 0);
+	ret = metacall("i32_f32_i64_f64_ret_none", 0, 0.0f, 0L, 0.0);
 	ASSERT_EQ(NULL, ret);
 
 	ret = metacall("none_ret_i32");