Merge branch 'master' into feature/add-c-api-module-import-descriptors

lib/runtime-c-api/tests/.gitignore

@@ -16,6 +16,7 @@ test-import-function
 test-memory
 test-module-imports
 test-module
+test-module-exports
 test-tables
 test-validate
 rust-build

lib/runtime-c-api/tests/CMakeLists.txt

@@ -8,6 +8,7 @@ add_executable(test-import-function test-import-function.c)
 add_executable(test-memory test-memory.c)
 add_executable(test-module-imports test-module-imports.c)
 add_executable(test-module test-module.c)
+add_executable(test-module-exports test-module-exports.c)
 add_executable(test-validate test-validate.c)
 add_executable(test-tables test-tables.c)
 
@@ -34,6 +35,8 @@ target_link_libraries(test-module-imports
         general ${WASMER_LIB})
 target_link_libraries(test-module
         general ${WASMER_LIB})
+target_link_libraries(test-module-exports
+        general ${WASMER_LIB})
 target_link_libraries(test-validate
         general ${WASMER_LIB})
 target_link_libraries(test-tables
@@ -47,6 +50,7 @@ add_test(test-import-function test-import-function)
 add_test(test-memory test-memory)
 add_test(test-module-imports test-module-imports)
 add_test(test-module test-module)
+add_test(test-module-exports test-module-exports)
 add_test(test-validate test-validate)
 add_test(test-tables test-tables)
 

lib/runtime-c-api/tests/test-exports.c

@@ -31,7 +31,7 @@ int main()
 
     wasmer_import_export_kind kind = wasmer_export_kind(export);
     assert(kind == WASM_FUNCTION);
-    wasmer_func_t *func = wasmer_export_to_func(export);
+    wasmer_export_func_t *func = wasmer_export_to_func(export);
 
     wasmer_byte_array name_bytes = wasmer_export_name(export);
     assert(name_bytes.bytes_len == 3);
@@ -42,40 +42,40 @@ int main()
     }
 
     uint32_t params_arity;
-    wasmer_func_params_arity(func, &params_arity);
+    wasmer_export_func_params_arity(func, &params_arity);
     assert(params_arity == 2);
 
     wasmer_value_tag *params_sig = malloc(sizeof(wasmer_value_tag) * params_arity);
-    wasmer_func_params(func, params_sig , params_arity);
+    wasmer_export_func_params(func, params_sig , params_arity);
     assert(params_sig[0] == WASM_I32);
     assert(params_sig[1] == WASM_I32);
     free(params_sig);
 
     uint32_t returns_arity;
-    wasmer_func_returns_arity(func, &returns_arity);
+    wasmer_export_func_returns_arity(func, &returns_arity);
     assert(returns_arity == 1);
 
     wasmer_value_tag *returns_sig = malloc(sizeof(wasmer_value_tag) * returns_arity);
-    wasmer_func_returns(func, returns_sig , returns_arity);
+    wasmer_export_func_returns(func, returns_sig , returns_arity);
     assert(returns_sig[0] == WASM_I32);
     free(returns_sig);
 
 
-//    wasmer_value_t param_one;
-//    param_one.tag = WASM_I32;
-//    param_one.value.I32 = 7;
-//    wasmer_value_t param_two;
-//    param_two.tag = WASM_I32;
-//    param_two.value.I32 = 8;
-//    wasmer_value_t params[] = {param_one, param_two};
-//    wasmer_value_t result_one;
-//    wasmer_value_t results[] = {result_one};
-//
-//    wasmer_result_t call_result = wasmer_func_call(func, params, 2, results, 1);
-//    printf("Call result:  %d\n", call_result);
-//    printf("Result: %d\n", results[0].value.I32);
-//    assert(results[0].value.I32 == 15);
-//    assert(call_result == WASMER_OK);
+    wasmer_value_t param_one;
+    param_one.tag = WASM_I32;
+    param_one.value.I32 = 7;
+    wasmer_value_t param_two;
+    param_two.tag = WASM_I32;
+    param_two.value.I32 = 8;
+    wasmer_value_t params[] = {param_one, param_two};
+    wasmer_value_t result_one;
+    wasmer_value_t results[] = {result_one};
+
+    wasmer_result_t call_result = wasmer_export_func_call(func, params, 2, results, 1);
+    printf("Call result:  %d\n", call_result);
+    printf("Result: %d\n", results[0].value.I32);
+    assert(results[0].value.I32 == 15);
+    assert(call_result == WASMER_OK);
 
 
     printf("Destroy instance\n");

lib/runtime-c-api/tests/test-import-function.c

@@ -31,7 +31,7 @@ int main()
     wasmer_value_tag returns_sig[] = {};
 
     printf("Creating new func\n");
-    wasmer_func_t *func = wasmer_func_new(print_str, params_sig, 2, returns_sig, 0);
+    wasmer_import_func_t *func = wasmer_import_func_new(print_str, params_sig, 2, returns_sig, 0);
     wasmer_import_t import;
 
     char *module_name = "env";
@@ -84,7 +84,7 @@ int main()
     assert(0 == strcmp(actual_str, "Hello, World!"));
 
     printf("Destroying func\n");
-    wasmer_func_destroy(func);
+    wasmer_import_func_destroy(func);
     printf("Destroy instance\n");
     wasmer_instance_destroy(instance);
     return 0;

lib/runtime-c-api/tests/test-module-exports.c

@@ -0,0 +1,53 @@
+#include <stdio.h>
+#include "../wasmer.h"
+#include <assert.h>
+#include <stdint.h>
+
+int main()
+{
+    // Read the wasm file bytes
+    FILE *file = fopen("sum.wasm", "r");
+    fseek(file, 0, SEEK_END);
+    long len = ftell(file);
+    uint8_t *bytes = malloc(len);
+    fseek(file, 0, SEEK_SET);
+    fread(bytes, 1, len, file);
+    fclose(file);
+
+    wasmer_module_t *module = NULL;
+    wasmer_result_t compile_result = wasmer_compile(&module, bytes, len);
+    printf("Compile result:  %d\n", compile_result);
+    assert(compile_result == WASMER_OK);
+
+    wasmer_import_t imports[] = {};
+    wasmer_instance_t *instance = NULL;
+    wasmer_result_t instantiate_result = wasmer_module_instantiate(module, &instance, imports, 0);
+    printf("Instantiate result:  %d\n", compile_result);
+    assert(instantiate_result == WASMER_OK);
+
+    wasmer_export_descriptors_t *exports = NULL;
+    wasmer_export_descriptors(module, &exports);
+
+    int exports_len = wasmer_export_descriptors_len(exports);
+    printf("exports_len:  %d\n", exports_len);
+    assert(exports_len == 1);
+
+    wasmer_export_descriptor_t *export = wasmer_export_descriptors_get(exports, 0);
+
+    wasmer_import_export_kind kind = wasmer_export_descriptor_kind(export);
+    assert(kind == WASM_FUNCTION);
+
+    wasmer_byte_array name_bytes = wasmer_export_descriptor_name(export);
+    assert(name_bytes.bytes_len == 3);
+    char expected[] = {'s', 'u', 'm'};
+    for(int idx = 0; idx < 3; idx++){
+        printf("%c\n", name_bytes.bytes[idx]);
+        assert(name_bytes.bytes[idx] == expected[idx]);
+    }
+
+    printf("Destroy module\n");
+    wasmer_module_destroy(module);
+    printf("Destroy exports\n");
+    wasmer_export_descriptors_destroy(exports);
+    return 0;
+}