mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-16 17:18:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wire up llvm code generated traps to the new runtime trap handler function.

Browse Source
This commit is contained in:
Nick Lewycky
2020-05-05 13:41:44 -07:00
parent e43b50a810
commit fbeedbd3ac
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/compiler-llvm/src/translator/code.rs
View File

@@ -213,6 +213,7 @@ impl FuncTranslator {
// TODO: use phf? // TODO: use phf?
let mut libcalls = HashMap::new(); let mut libcalls = HashMap::new();
libcalls.insert("vm.exception.trap".to_string(), LibCall::RaiseTrap);
libcalls.insert("truncf".to_string(), LibCall::TruncF32); libcalls.insert("truncf".to_string(), LibCall::TruncF32);
libcalls.insert("trunc".to_string(), LibCall::TruncF64); libcalls.insert("trunc".to_string(), LibCall::TruncF64);
libcalls.insert("ceilf".to_string(), LibCall::CeilF32); libcalls.insert("ceilf".to_string(), LibCall::CeilF32);

28
lib/compiler-llvm/src/translator/intrinsics.rs
View File

@@ -38,7 +38,7 @@ use wasm_common::{
SignatureIndex, TableIndex, Type, SignatureIndex, TableIndex, Type,
}; };
use wasmer_runtime::Module as WasmerCompilerModule; use wasmer_runtime::Module as WasmerCompilerModule;
use wasmer_runtime::{MemoryPlan, MemoryStyle, VMOffsets}; use wasmer_runtime::{MemoryPlan, MemoryStyle, TrapCode, VMOffsets};
fn type_to_llvm_ptr<'ctx>(intrinsics: &Intrinsics<'ctx>, ty: Type) -> PointerType<'ctx> { fn type_to_llvm_ptr<'ctx>(intrinsics: &Intrinsics<'ctx>, ty: Type) -> PointerType<'ctx> {
match ty { match ty {
@@ -462,12 +462,26 @@ impl<'ctx> Intrinsics<'ctx> {
f32x4_zero, f32x4_zero,
f64x2_zero, f64x2_zero,
trap_unreachable: i32_zero.as_basic_value_enum(), trap_unreachable: i32_ty
trap_call_indirect_sig: i32_ty.const_int(1, false).as_basic_value_enum(), .const_int(TrapCode::UnreachableCodeReached as _, false)
trap_call_indirect_oob: i32_ty.const_int(3, false).as_basic_value_enum(), .as_basic_value_enum(),
trap_memory_oob: i32_ty.const_int(2, false).as_basic_value_enum(), trap_call_indirect_sig: i32_ty
trap_illegal_arithmetic: i32_ty.const_int(4, false).as_basic_value_enum(), .const_int(TrapCode::BadSignature as _, false)
trap_misaligned_atomic: i32_ty.const_int(5, false).as_basic_value_enum(), .as_basic_value_enum(),
trap_call_indirect_oob: i32_ty
.const_int(TrapCode::OutOfBounds as _, false)
.as_basic_value_enum(),
trap_memory_oob: i32_ty
.const_int(TrapCode::OutOfBounds as _, false)
.as_basic_value_enum(),
// TODO: split out div-by-zero and float-to-int
trap_illegal_arithmetic: i32_ty
.const_int(TrapCode::IntegerOverflow as _, false)
.as_basic_value_enum(),
// TODO: add misaligned atomic traps to wasmer runtime
trap_misaligned_atomic: i32_ty
.const_int(TrapCode::Interrupt as _, false)
.as_basic_value_enum(),
// VM intrinsics. // VM intrinsics.
memory_grow_dynamic_local: module.add_function( memory_grow_dynamic_local: module.add_function(