fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-20 12:16:30 +00:00
Code Issues Projects Releases Wiki Activity

Address feedback; improve emscripten fn names in C API

Browse Source
This commit is contained in:
Mark McCaskey
2019-12-16 19:43:57 -05:00
parent cd0b4a3d7f
commit bb90cffac9
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/runtime-c-api/src/import/emscripten.rs
View File

@ -13,7 +13,7 @@ pub struct wasmer_emscripten_globals_t;
/// Create a `wasmer_emscripten_globals_t` from a Wasm module. /// Create a `wasmer_emscripten_globals_t` from a Wasm module.
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn wasmer_emscripten_get_emscripten_globals( pub unsafe extern "C" fn wasmer_emscripten_get_globals(
module: *const wasmer_module_t, module: *const wasmer_module_t,
) -> *mut wasmer_emscripten_globals_t { ) -> *mut wasmer_emscripten_globals_t {
if module.is_null() { if module.is_null() {
@ -32,7 +32,7 @@ pub unsafe extern "C" fn wasmer_emscripten_get_emscripten_globals(
/// Destroy `wasmer_emscrpten_globals_t` created by /// Destroy `wasmer_emscrpten_globals_t` created by
/// `wasmer_emscripten_get_emscripten_globals`. /// `wasmer_emscripten_get_emscripten_globals`.
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn wasmer_emscripten_destroy_emscripten_globals( pub unsafe extern "C" fn wasmer_emscripten_destroy_globals(
globals: *mut wasmer_emscripten_globals_t, globals: *mut wasmer_emscripten_globals_t,
) { ) {
if globals.is_null() { if globals.is_null() {
@ -47,7 +47,7 @@ pub unsafe extern "C" fn wasmer_emscripten_destroy_emscripten_globals(
/// This function sets the data pointer in the same way that /// This function sets the data pointer in the same way that
/// [`wasmer_instance_context_data_set`] does. /// [`wasmer_instance_context_data_set`] does.
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn wasmer_emscripten_set_up_emscripten( pub unsafe extern "C" fn wasmer_emscripten_set_up(
instance: *mut wasmer_instance_t, instance: *mut wasmer_instance_t,
globals: *mut wasmer_emscripten_globals_t, globals: *mut wasmer_emscripten_globals_t,
) -> wasmer_result_t { ) -> wasmer_result_t {

6
lib/runtime-c-api/tests/test-emscripten-import-object.c
View File

@ -58,7 +58,7 @@ int main()
assert(compile_result == WASMER_OK); assert(compile_result == WASMER_OK);
// Set up data for Emscripten // Set up data for Emscripten
wasmer_emscripten_globals_t *emscripten_globals = wasmer_emscripten_get_emscripten_globals(module); wasmer_emscripten_globals_t *emscripten_globals = wasmer_emscripten_get_globals(module);
if (!emscripten_globals) if (!emscripten_globals)
{ {
@ -83,7 +83,7 @@ int main()
assert(instantiate_result == WASMER_OK); assert(instantiate_result == WASMER_OK);
// Set up emscripten to be called // Set up emscripten to be called
wasmer_result_t setup_result = wasmer_emscripten_set_up_emscripten(instance, emscripten_globals); wasmer_result_t setup_result = wasmer_emscripten_set_up(instance, emscripten_globals);
printf("Set up result: %d\n", setup_result); printf("Set up result: %d\n", setup_result);
if (setup_result != WASMER_OK) if (setup_result != WASMER_OK)
@ -128,7 +128,7 @@ int main()
wasmer_import_object_iter_destroy(func_iter); wasmer_import_object_iter_destroy(func_iter);
// Use *_destroy methods to cleanup as specified in the header documentation // Use *_destroy methods to cleanup as specified in the header documentation
wasmer_emscripten_destroy_emscripten_globals(emscripten_globals); wasmer_emscripten_destroy_globals(emscripten_globals);
wasmer_instance_destroy(instance); wasmer_instance_destroy(instance);
wasmer_import_object_destroy(import_object); wasmer_import_object_destroy(import_object);
wasmer_module_destroy(module); wasmer_module_destroy(module);

8
lib/runtime-c-api/wasmer.h
View File

@ -279,7 +279,7 @@ wasmer_result_t wasmer_emscripten_call_main(wasmer_instance_t *instance,
* Destroy `wasmer_emscrpten_globals_t` created by * Destroy `wasmer_emscrpten_globals_t` created by
* `wasmer_emscripten_get_emscripten_globals`. * `wasmer_emscripten_get_emscripten_globals`.
*/ */
void wasmer_emscripten_destroy_emscripten_globals(wasmer_emscripten_globals_t *globals); void wasmer_emscripten_destroy_globals(wasmer_emscripten_globals_t *globals);
#endif #endif
#if defined(WASMER_EMSCRIPTEN_ENABLED) #if defined(WASMER_EMSCRIPTEN_ENABLED)
@ -300,7 +300,7 @@ wasmer_import_object_t *wasmer_emscripten_generate_import_object(wasmer_emscript
/** /**
* Create a `wasmer_emscripten_globals_t` from a Wasm module. * Create a `wasmer_emscripten_globals_t` from a Wasm module.
*/ */
wasmer_emscripten_globals_t *wasmer_emscripten_get_emscripten_globals(const wasmer_module_t *module); wasmer_emscripten_globals_t *wasmer_emscripten_get_globals(const wasmer_module_t *module);
#endif #endif
#if defined(WASMER_EMSCRIPTEN_ENABLED) #if defined(WASMER_EMSCRIPTEN_ENABLED)
@ -311,8 +311,8 @@ wasmer_emscripten_globals_t *wasmer_emscripten_get_emscripten_globals(const wasm
* This function sets the data pointer in the same way that * This function sets the data pointer in the same way that
* [`wasmer_instance_context_data_set`] does. * [`wasmer_instance_context_data_set`] does.
*/ */
wasmer_result_t wasmer_emscripten_set_up_emscripten(wasmer_instance_t *instance, wasmer_result_t wasmer_emscripten_set_up(wasmer_instance_t *instance,
wasmer_emscripten_globals_t *globals); wasmer_emscripten_globals_t *globals);
#endif #endif
/** /**

8
lib/runtime-c-api/wasmer.hh
View File

@ -242,7 +242,7 @@ wasmer_result_t wasmer_emscripten_call_main(wasmer_instance_t *instance,
#if defined(WASMER_EMSCRIPTEN_ENABLED) #if defined(WASMER_EMSCRIPTEN_ENABLED)
/// Destroy `wasmer_emscrpten_globals_t` created by /// Destroy `wasmer_emscrpten_globals_t` created by
/// `wasmer_emscripten_get_emscripten_globals`. /// `wasmer_emscripten_get_emscripten_globals`.
void wasmer_emscripten_destroy_emscripten_globals(wasmer_emscripten_globals_t *globals); void wasmer_emscripten_destroy_globals(wasmer_emscripten_globals_t *globals);
#endif #endif
#if defined(WASMER_EMSCRIPTEN_ENABLED) #if defined(WASMER_EMSCRIPTEN_ENABLED)
@ -259,7 +259,7 @@ wasmer_import_object_t *wasmer_emscripten_generate_import_object(wasmer_emscript
#if defined(WASMER_EMSCRIPTEN_ENABLED) #if defined(WASMER_EMSCRIPTEN_ENABLED)
/// Create a `wasmer_emscripten_globals_t` from a Wasm module. /// Create a `wasmer_emscripten_globals_t` from a Wasm module.
wasmer_emscripten_globals_t *wasmer_emscripten_get_emscripten_globals(const wasmer_module_t *module); wasmer_emscripten_globals_t *wasmer_emscripten_get_globals(const wasmer_module_t *module);
#endif #endif
#if defined(WASMER_EMSCRIPTEN_ENABLED) #if defined(WASMER_EMSCRIPTEN_ENABLED)
@ -268,8 +268,8 @@ wasmer_emscripten_globals_t *wasmer_emscripten_get_emscripten_globals(const wasm
/// ///
/// This function sets the data pointer in the same way that /// This function sets the data pointer in the same way that
/// [`wasmer_instance_context_data_set`] does. /// [`wasmer_instance_context_data_set`] does.
wasmer_result_t wasmer_emscripten_set_up_emscripten(wasmer_instance_t *instance, wasmer_result_t wasmer_emscripten_set_up(wasmer_instance_t *instance,
wasmer_emscripten_globals_t *globals); wasmer_emscripten_globals_t *globals);
#endif #endif
/// Gets export descriptor kind /// Gets export descriptor kind