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

Merge remote-tracking branch 'origin/master' into feature/llvm-osr

Browse Source
This commit is contained in:
losfair
2019-08-14 16:33:26 -07:00
parent 44f71759f6 804e586196
commit 0e0573c73c
289 changed files with 35513 additions and 7333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/singlepass-backend/src/codegen_x64.rs
View File

@ -5,7 +5,7 @@ use crate::emitter_x64::*;
use crate::machine::*;
use crate::protect_unix;
use dynasmrt::{
x64::Assembler, AssemblyOffset, DynamicLabel, DynasmApi, DynasmLabelApi, ExecutableBuffer,
x64::Assembler, AssemblyOffset, DynamicLabel, DynasmApi, DynasmLabelApi,
};
use smallvec::SmallVec;
use std::ptr::NonNull;
@ -149,7 +149,7 @@ pub struct X64FunctionCode {
breakpoints: Option<
HashMap<
AssemblyOffset,
Box<Fn(BreakpointInfo) -> Result<(), Box<dyn Any>> + Send + Sync + 'static>,
Box<dyn Fn(BreakpointInfo) -> Result<(), Box<dyn Any>> + Send + Sync + 'static>,
>,
>,
returns: SmallVec<[WpType; 1]>,
@ -319,7 +319,7 @@ impl RunnableModule for X64ExecutionContext {
})
}
unsafe fn do_early_trap(&self, data: Box<Any>) -> ! {
unsafe fn do_early_trap(&self, data: Box<dyn Any>) -> ! {
protect_unix::TRAP_EARLY_DATA.with(|x| x.set(Some(data)));
protect_unix::trigger_trap();
}
@ -4969,6 +4969,7 @@ fn type_to_wp_type(ty: Type) -> WpType {
Type::I64 => WpType::I64,
Type::F32 => WpType::F32,
Type::F64 => WpType::F64,
Type::V128 => WpType::V128,
}
}