Revert trampoline related functionality

lib/runtime-c-api/src/lib.rs

@@ -95,8 +95,6 @@ pub mod instance;
 pub mod memory;
 pub mod module;
 pub mod table;
-#[cfg(all(unix, target_arch = "x86_64"))]
-pub mod trampoline;
 pub mod value;
 
 #[allow(non_camel_case_types)]

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

@@ -14,15 +14,8 @@ typedef struct {
   int value;
 } context_data;
 
-struct print_str_context {
-    int call_count;
-};
-
 void print_str(wasmer_instance_context_t *ctx, int32_t ptr, int32_t len)
 {
-    struct print_str_context *local_context = wasmer_trampoline_get_context();
-    local_context->call_count++;
-
     const wasmer_memory_t *memory = wasmer_instance_context_memory(ctx, 0);
     uint32_t mem_len = wasmer_memory_length(memory);
     uint8_t *mem_bytes = wasmer_memory_data(memory);
@@ -43,22 +36,9 @@ int main()
 {
     wasmer_value_tag params_sig[] = {WASM_I32, WASM_I32};
     wasmer_value_tag returns_sig[] = {};
-    struct print_str_context local_context = {
-        .call_count = 0
-    };
-
-    printf("Creating trampoline buffer\n");
-    wasmer_trampoline_buffer_builder_t *tbb = wasmer_trampoline_buffer_builder_new();
-    unsigned long print_str_idx = wasmer_trampoline_buffer_builder_add_function(
-        tbb,
-        (wasmer_trampoline_callable_t *) print_str,
-        (void *) &local_context
-    );
-    wasmer_trampoline_buffer_t *tb = wasmer_trampoline_buffer_builder_build(tbb);
-    const wasmer_trampoline_callable_t *print_str_callable = wasmer_trampoline_buffer_get_trampoline(tb, print_str_idx);
 
     printf("Creating new func\n");
-    wasmer_import_func_t *func = wasmer_import_func_new((void (*)(void *)) print_str_callable, params_sig, 2, returns_sig, 0);
+    wasmer_import_func_t *func = wasmer_import_func_new((void (*)(void *)) print_str, params_sig, 2, returns_sig, 0);
     wasmer_import_t import;
 
     char *module_name = "env";
@@ -115,10 +95,7 @@ int main()
     assert(ptr_len == 13);
     assert(0 == strcmp(actual_str, "Hello, World!"));
     assert(context_data_value == actual_context_data_value);
-    assert(local_context.call_count == 1);
 
-    printf("Destroying trampoline buffer\n");
-    wasmer_trampoline_buffer_destroy(tb);
     printf("Destroying func\n");
     wasmer_import_func_destroy(func);
     printf("Destroy instance\n");

lib/runtime-c-api/wasmer.h

@@ -133,18 +133,6 @@ typedef struct {
 
 } wasmer_serialized_module_t;
 
-typedef struct {
-
-} wasmer_trampoline_buffer_builder_t;
-
-typedef struct {
-
-} wasmer_trampoline_callable_t;
-
-typedef struct {
-
-} wasmer_trampoline_buffer_t;
-
 /**
  * Creates a new Module from the given wasm bytes.
  * Returns `wasmer_result_t::WASMER_OK` upon success.
@@ -596,21 +584,6 @@ uint32_t wasmer_table_length(wasmer_table_t *table);
  */
 wasmer_result_t wasmer_table_new(wasmer_table_t **table, wasmer_limits_t limits);
 
-uintptr_t wasmer_trampoline_buffer_builder_add_function(wasmer_trampoline_buffer_builder_t *b,
-                                                        const wasmer_trampoline_callable_t *f,
-                                                        const void *ctx);
-
-wasmer_trampoline_buffer_t *wasmer_trampoline_buffer_builder_build(wasmer_trampoline_buffer_builder_t *b);
-
-wasmer_trampoline_buffer_builder_t *wasmer_trampoline_buffer_builder_new(void);
-
-void wasmer_trampoline_buffer_destroy(wasmer_trampoline_buffer_t *b);
-
-const wasmer_trampoline_callable_t *wasmer_trampoline_buffer_get_trampoline(const wasmer_trampoline_buffer_t *b,
-                                                                            uintptr_t idx);
-
-void *wasmer_trampoline_get_context(void);
-
 /**
  * Returns true for valid wasm bytes and false for invalid bytes
  */

lib/runtime-c-api/wasmer.hh

@@ -131,18 +131,6 @@ struct wasmer_serialized_module_t {
 
 };
 
-struct wasmer_trampoline_buffer_builder_t {
-
-};
-
-struct wasmer_trampoline_callable_t {
-
-};
-
-struct wasmer_trampoline_buffer_t {
-
-};
-
 extern "C" {
 
 /// Creates a new Module from the given wasm bytes.
@@ -470,21 +458,6 @@ uint32_t wasmer_table_length(wasmer_table_t *table);
 /// and `wasmer_last_error_message` to get an error message.
 wasmer_result_t wasmer_table_new(wasmer_table_t **table, wasmer_limits_t limits);
 
-uintptr_t wasmer_trampoline_buffer_builder_add_function(wasmer_trampoline_buffer_builder_t *b,
-                                                        const wasmer_trampoline_callable_t *f,
-                                                        const void *ctx);
-
-wasmer_trampoline_buffer_t *wasmer_trampoline_buffer_builder_build(wasmer_trampoline_buffer_builder_t *b);
-
-wasmer_trampoline_buffer_builder_t *wasmer_trampoline_buffer_builder_new();
-
-void wasmer_trampoline_buffer_destroy(wasmer_trampoline_buffer_t *b);
-
-const wasmer_trampoline_callable_t *wasmer_trampoline_buffer_get_trampoline(const wasmer_trampoline_buffer_t *b,
-                                                                            uintptr_t idx);
-
-void *wasmer_trampoline_get_context();
-
 /// Returns true for valid wasm bytes and false for invalid bytes
 bool wasmer_validate(const uint8_t *wasm_bytes, uint32_t wasm_bytes_len);
 

lib/runtime-core/src/lib.rs

@@ -8,10 +8,6 @@ extern crate field_offset;
 #[macro_use]
 extern crate serde_derive;
 
-#[allow(unused_imports)]
-#[macro_use]
-extern crate lazy_static;
-
 #[macro_use]
 mod macros;
 #[doc(hidden)]
@@ -33,16 +29,12 @@ mod sig_registry;
 pub mod structures;
 mod sys;
 pub mod table;
-#[cfg(all(unix, target_arch = "x86_64"))]
-pub mod trampoline_x64;
 pub mod typed_func;
 pub mod types;
 pub mod units;
 pub mod vm;
 #[doc(hidden)]
 pub mod vmcalls;
-#[cfg(all(unix, target_arch = "x86_64"))]
-pub use trampoline_x64 as trampoline;
 
 use self::error::CompileResult;
 #[doc(inline)]