feat(runtime-c-api) Implement wasmer_trap

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

@@ -456,6 +456,7 @@ pub unsafe extern "C" fn wasmer_export_func_call(
 
     let instance = &*named_export.instance;
     let result = instance.call(&named_export.name, &params[..]);
+
     match result {
         Ok(results_vec) => {
             if !results_vec.is_empty() {

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

@@ -4,13 +4,20 @@
 use crate::{
     error::{update_last_error, CApiError},
     export::{wasmer_import_export_kind, wasmer_import_export_value},
+    instance::wasmer_instance_context_t,
     module::wasmer_module_t,
     value::wasmer_value_tag,
     wasmer_byte_array, wasmer_result_t,
 };
 use libc::c_uint;
-use std::{convert::TryFrom, ffi::c_void, ptr, slice, sync::Arc};
-use wasmer_runtime::{Global, Memory, Module, Table};
+use std::{
+    convert::TryFrom,
+    ffi::{c_void, CStr},
+    os::raw::c_char,
+    ptr, slice,
+    sync::Arc,
+};
+use wasmer_runtime::{Ctx, Global, Memory, Module, Table};
 use wasmer_runtime_core::{
     export::{Context, Export, FuncPointer},
     import::{ImportObject, ImportObjectIterator},
@@ -661,6 +668,24 @@ pub unsafe extern "C" fn wasmer_import_func_new(
     Box::into_raw(export) as *mut wasmer_import_func_t
 }
 
+/// Hello
+#[no_mangle]
+#[allow(clippy::cast_ptr_alignment)]
+pub unsafe extern "C" fn wasmer_import_trap(
+    ctx: *const wasmer_instance_context_t,
+    error_message: *const c_char,
+) -> c_uint {
+    let ctx = &*(ctx as *const Ctx);
+    let error_message = CStr::from_ptr(error_message).to_str().unwrap();
+
+    (&*ctx.module)
+        .runnable_module
+        .do_early_trap(Box::new(error_message)); // never returns
+
+    #[allow(unreachable_code)]
+    0
+}
+
 /// Sets the params buffer to the parameter types of the given wasmer_import_func_t
 ///
 /// Returns `wasmer_result_t::WASMER_OK` upon success.

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

@@ -9,6 +9,7 @@ static int memory_len = 0;
 static int ptr_len = 0;
 static char actual_str[14] = {};
 static int actual_context_data_value = 0;
+static const char *trap_error_message = "hello";
 
 typedef struct {
   int value;
@@ -31,12 +32,14 @@ void print_str(wasmer_instance_context_t *ctx, int32_t ptr, int32_t len)
         actual_str[idx] = mem_bytes[ptr + idx];
     }
     actual_str[13] = '\0';
-    printf("In print_str, memory len: %d, ptr_len: %d\n, str %s", mem_len, len, actual_str);
+    printf("In print_str, memory len: %d, ptr_len: %d, str %s\n", mem_len, len, actual_str);
     print_str_called = true;
     memory_len = mem_len;
     ptr_len = len;
 
     actual_context_data_value = ((context_data *) wasmer_instance_context_data_get(ctx))->value;
+
+    wasmer_import_trap(ctx, trap_error_message);
 }
 
 int main()

lib/runtime-c-api/wasmer.h

@@ -47,7 +47,7 @@ enum Version {
   Unknown = 0,
   /**
    * Latest version. See `wasmer_wasi::WasiVersion::Latest` to
-   * leran more.
+   * learn more.
    */
   Latest = 1,
   /**
@@ -661,6 +661,11 @@ wasmer_import_object_iter_t *wasmer_import_object_iterate_functions(const wasmer
  */
 wasmer_import_object_t *wasmer_import_object_new(void);
 
+/**
+ * Hello
+ */
+unsigned int wasmer_import_trap(const wasmer_instance_context_t *ctx, const char *error_message);
+
 /**
  * Calls an instances exported function by `name` with the provided parameters.
  * Results are set using the provided `results` pointer.

lib/runtime-c-api/wasmer.hh

@@ -44,7 +44,7 @@ enum class Version : uint8_t {
   /// Version cannot be detected or is unknown.
   Unknown = 0,
   /// Latest version. See `wasmer_wasi::WasiVersion::Latest` to
-  /// leran more.
+  /// learn more.
   Latest = 1,
   /// `wasi_unstable`.
   Snapshot0 = 2,
@@ -528,6 +528,9 @@ wasmer_import_object_iter_t *wasmer_import_object_iterate_functions(const wasmer
 /// See also `wasmer_import_object_append`
 wasmer_import_object_t *wasmer_import_object_new();
 
+/// Hello
+unsigned int wasmer_import_trap(const wasmer_instance_context_t *ctx, const char *error_message);
+
 /// Calls an instances exported function by `name` with the provided parameters.
 /// Results are set using the provided `results` pointer.
 ///

lib/runtime-core/src/backend.rs

@@ -219,10 +219,11 @@ pub trait RunnableModule: Send + Sync {
     }
 
     /// A wasm trampoline contains the necessary data to dynamically call an exported wasm function.
-    /// Given a particular signature index, we are returned a trampoline that is matched with that
+    /// Given a particular signature index, we are returning a trampoline that is matched with that
     /// signature and an invoke function that can call the trampoline.
     fn get_trampoline(&self, info: &ModuleInfo, sig_index: SigIndex) -> Option<Wasm>;
 
+    /// Trap an error.
     unsafe fn do_early_trap(&self, data: Box<dyn Any + Send>) -> !;
 
     /// Returns the machine code associated with this module.