fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-13 06:15:33 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
losfair 2019-11-20 01:48:20 +08:00
parent 34bb321e66
commit c9aa37fc99
4 changed files with 51 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,8 +46,10 @@ use wasmer_runtime_core::{
};
#[cfg(target_arch = "aarch64")]
#[allow(dead_code)]
static ARCH: Architecture = Architecture::Aarch64;
#[cfg(target_arch = "x86_64")]
#[allow(dead_code)]
static ARCH: Architecture = Architecture::X64;
#[cfg(target_arch = "x86_64")]
@ -141,6 +143,7 @@ lazy_static! {
#[cfg(target_arch = "aarch64")]
#[repr(C)]
#[allow(dead_code)]
struct CallCtx {
ctx: *mut vm::Ctx,
stack: *mut u64,
@ -324,11 +327,12 @@ impl RunnableModule for X64ExecutionContext {
let args =
slice::from_raw_parts(args, num_params_plus_one.unwrap().as_ptr() as usize - 1);
let args_reverse: SmallVec<[u64; 8]> = args.iter().cloned().rev().collect();
let ret = match protect_unix::call_protected(
|| {
#[cfg(target_arch = "x86_64")]
{
let args_reverse: SmallVec<[u64; 8]> = args.iter().cloned().rev().collect();
CONSTRUCT_STACK_AND_CALL_WASM(
args_reverse.as_ptr(),
args_reverse.as_ptr().offset(args_reverse.len() as isize),
@ -430,16 +434,14 @@ impl RunnableModule for X64ExecutionContext {
PROT_WRITE,
};
const STACK_SIZE: usize = 1048576 * 1024; // 1GB of virtual address space for stack.
let stack_ptr = unsafe {
mmap(
::std::ptr::null_mut(),
STACK_SIZE,
PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
-1,
0,
)
};
let stack_ptr = mmap(
::std::ptr::null_mut(),
STACK_SIZE,
PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
-1,
0,
);
if stack_ptr as isize == -1 {
panic!("unable to allocate stack");
}
@ -529,7 +531,7 @@ impl ModuleCodeGenerator<X64FunctionCode, X64ExecutionContext, CodegenError>
for X64ModuleCodeGenerator
{
fn new() -> X64ModuleCodeGenerator {
let mut a = Assembler::new().unwrap();
let a = Assembler::new().unwrap();
X64ModuleCodeGenerator {
functions: vec![],
@ -612,7 +614,7 @@ impl ModuleCodeGenerator<X64FunctionCode, X64ExecutionContext, CodegenError>
mut self,
_: &ModuleInfo,
) -> Result<(X64ExecutionContext, Box<dyn CacheGen>), CodegenError> {
let (mut assembler, function_labels, breakpoints) = match self.functions.last_mut() {
let (assembler, function_labels, breakpoints) = match self.functions.last_mut() {
Some(x) => (
x.assembler.take().unwrap(),
x.function_labels.take().unwrap(),
@ -797,6 +799,7 @@ impl X64FunctionCode {
.insert(m.state.wasm_inst_offset, SuspendOffset::Trappable(offset));
}
#[allow(dead_code)]
fn mark_inline_breakpoint(
a: &mut Assembler,
m: &Machine,

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

@ -284,13 +284,6 @@ pub trait Emitter {
fn arch_emit_entry_trampoline(&mut self) {}
}
fn _dummy(a: &mut Assembler) {
dynasm!(
self
; .arch x64
);
}
macro_rules! unop_gpr {
($ins:ident, $assembler:tt, $sz:expr, $loc:expr, $otherwise:block) => {
match ($sz, $loc) {

5
lib/singlepass-backend/src/lib.rs
View File

@ -1,4 +1,4 @@
/*#![deny(
#![deny(
dead_code,
nonstandard_style,
unused_imports,
@ -6,7 +6,7 @@
unused_variables,
unused_unsafe,
unreachable_patterns
)]*/
)]
#![feature(proc_macro_hygiene)]
#![doc(html_favicon_url = "https://wasmer.io/static/icons/favicon.ico")]
#![doc(html_logo_url = "https://avatars3.githubusercontent.com/u/44205449?s=200&v=4")]
@ -34,6 +34,7 @@ mod codegen_x64;
mod emitter_x64;
mod machine;
pub mod protect_unix;
#[cfg(target_arch = "aarch64")]
mod translator_aarch64;
pub use codegen_x64::X64FunctionCode as FunctionCodeGenerator;

84
lib/singlepass-backend/src/translator_aarch64.rs
View File

@ -1,6 +1,5 @@
#![allow(dead_code)]
use crate::codegen_x64::*;
use crate::emitter_x64::*;
use dynasmrt::{aarch64::Assembler, AssemblyOffset, DynamicLabel, DynasmApi, DynasmLabelApi};
use wasmer_runtime_core::backend::InlineBreakpointType;
@ -106,7 +105,7 @@ pub fn map_xmm(xmm: XMM) -> AV {
}
pub fn get_aarch64_assembler() -> Assembler {
let mut a = Assembler::new().unwrap();
let a = Assembler::new().unwrap();
dynasm!(
a
; .arch aarch64
@ -201,24 +200,6 @@ macro_rules! binop_imm32_mem {
};
}
macro_rules! binop_imm64_gpr {
($ins:ident, $assembler:tt, $sz:expr, $src:expr, $dst:expr, $otherwise:block) => {
match ($sz, $src, $dst) {
(Size::S64, Location::Imm64(src), Location::GPR(dst)) => {
dynasm!($assembler
; b >after
; data:
; .qword src as i64
; after:
; ldr x_tmp1, <data
; $ins X(map_gpr(dst).x()), X(map_gpr(dst).x()), x_tmp1
);
},
_ => $otherwise
}
};
}
macro_rules! binop_gpr_gpr {
($ins:ident, $assembler:tt, $sz:expr, $src:expr, $dst:expr, $otherwise:block) => {
match ($sz, $src, $dst) {
@ -1185,10 +1166,10 @@ impl Emitter for Assembler {
fn emit_or(&mut self, sz: Size, src: Location, dst: Location) {
binop_all_nofp!(orr, self, sz, src, dst, { unreachable!("or") });
}
fn emit_bsr(&mut self, sz: Size, src: Location, dst: Location) {
fn emit_bsr(&mut self, _sz: Size, _src: Location, _dst: Location) {
unimplemented!("aarch64: bsr");
}
fn emit_bsf(&mut self, sz: Size, src: Location, dst: Location) {
fn emit_bsf(&mut self, _sz: Size, _src: Location, _dst: Location) {
unimplemented!("aarch64: bsf");
}
fn arch_has_xzcnt(&self) -> bool {
@ -1200,7 +1181,7 @@ impl Emitter for Assembler {
fn arch_emit_tzcnt(&mut self, sz: Size, src: Location, dst: Location) {
emit_clz_variant(self, sz, &src, &dst, true);
}
fn emit_neg(&mut self, sz: Size, value: Location) {
fn emit_neg(&mut self, _sz: Size, _value: Location) {
unimplemented!("aarch64: neg");
}
fn emit_popcnt(&mut self, sz: Size, src: Location, dst: Location) {
@ -1372,45 +1353,45 @@ impl Emitter for Assembler {
}
}
fn emit_xchg(&mut self, sz: Size, src: Location, dst: Location) {
fn emit_xchg(&mut self, _sz: Size, _src: Location, _dst: Location) {
unimplemented!("aarch64: xchg")
}
fn emit_lock_xadd(&mut self, sz: Size, src: Location, dst: Location) {
fn emit_lock_xadd(&mut self, _sz: Size, _src: Location, _dst: Location) {
unimplemented!("aarch64: xadd")
}
fn emit_lock_cmpxchg(&mut self, sz: Size, src: Location, dst: Location) {
fn emit_lock_cmpxchg(&mut self, _sz: Size, _src: Location, _dst: Location) {
unimplemented!("aarch64: cmpxchg")
}
fn emit_vmovaps(&mut self, src: XMMOrMemory, dst: XMMOrMemory) {
fn emit_vmovaps(&mut self, _src: XMMOrMemory, _dst: XMMOrMemory) {
unimplemented!("aarch64: vmovaps")
}
fn emit_vmovapd(&mut self, src: XMMOrMemory, dst: XMMOrMemory) {
fn emit_vmovapd(&mut self, _src: XMMOrMemory, _dst: XMMOrMemory) {
unimplemented!("aarch64: vmovapd")
}
fn emit_vxorps(&mut self, src1: XMM, src2: XMMOrMemory, dst: XMM) {
fn emit_vxorps(&mut self, _src1: XMM, _src2: XMMOrMemory, _dst: XMM) {
unimplemented!("aarch64: vxorps")
}
fn emit_vxorpd(&mut self, src1: XMM, src2: XMMOrMemory, dst: XMM) {
fn emit_vxorpd(&mut self, _src1: XMM, _src2: XMMOrMemory, _dst: XMM) {
unimplemented!("aarch64: vxorpd")
}
fn emit_vcmpunordss(&mut self, src1: XMM, src2: XMMOrMemory, dst: XMM) {
fn emit_vcmpunordss(&mut self, _src1: XMM, _src2: XMMOrMemory, _dst: XMM) {
unimplemented!("aarch64: vcmpunordss")
}
fn emit_vcmpunordsd(&mut self, src1: XMM, src2: XMMOrMemory, dst: XMM) {
fn emit_vcmpunordsd(&mut self, _src1: XMM, _src2: XMMOrMemory, _dst: XMM) {
unimplemented!("aarch64: vcmpunordsd")
}
fn emit_vcmpordss(&mut self, src1: XMM, src2: XMMOrMemory, dst: XMM) {
fn emit_vcmpordss(&mut self, _src1: XMM, _src2: XMMOrMemory, _dst: XMM) {
unimplemented!("aarch64: vcmpordss")
}
fn emit_vcmpordsd(&mut self, src1: XMM, src2: XMMOrMemory, dst: XMM) {
fn emit_vcmpordsd(&mut self, _src1: XMM, _src2: XMMOrMemory, _dst: XMM) {
unimplemented!("aarch64: vcmpordsd")
}
fn emit_vblendvps(&mut self, src1: XMM, src2: XMMOrMemory, mask: XMM, dst: XMM) {
fn emit_vblendvps(&mut self, _src1: XMM, _src2: XMMOrMemory, _mask: XMM, _dst: XMM) {
unimplemented!("aarch64: vblendvps")
}
fn emit_vblendvpd(&mut self, src1: XMM, src2: XMMOrMemory, mask: XMM, dst: XMM) {
fn emit_vblendvpd(&mut self, _src1: XMM, _src2: XMMOrMemory, _mask: XMM, _dst: XMM) {
unimplemented!("aarch64: vblendvpd")
}
@ -1518,50 +1499,49 @@ impl Emitter for Assembler {
dynasm!(self ; fneg D(map_xmm(dst).v()), D(map_xmm(src).v()));
}
// These instructions are only used in itruncf-type/fconverti-type opcodes.
fn emit_btc_gpr_imm8_32(&mut self, src: u8, dst: GPR) {
fn emit_btc_gpr_imm8_32(&mut self, _src: u8, _dst: GPR) {
unimplemented!();
}
fn emit_btc_gpr_imm8_64(&mut self, src: u8, dst: GPR) {
fn emit_btc_gpr_imm8_64(&mut self, _src: u8, _dst: GPR) {
unimplemented!();
}
fn emit_cmovae_gpr_32(&mut self, src: GPR, dst: GPR) {
fn emit_cmovae_gpr_32(&mut self, _src: GPR, _dst: GPR) {
unimplemented!();
}
fn emit_cmovae_gpr_64(&mut self, src: GPR, dst: GPR) {
fn emit_cmovae_gpr_64(&mut self, _src: GPR, _dst: GPR) {
unimplemented!();
}
fn emit_ucomiss(&mut self, src: XMMOrMemory, dst: XMM) {
fn emit_ucomiss(&mut self, _src: XMMOrMemory, _dst: XMM) {
unimplemented!();
}
fn emit_ucomisd(&mut self, src: XMMOrMemory, dst: XMM) {
fn emit_ucomisd(&mut self, _src: XMMOrMemory, _dst: XMM) {
unimplemented!();
}
fn emit_cvttss2si_32(&mut self, src: XMMOrMemory, dst: GPR) {
fn emit_cvttss2si_32(&mut self, _src: XMMOrMemory, _dst: GPR) {
unimplemented!();
}
fn emit_cvttss2si_64(&mut self, src: XMMOrMemory, dst: GPR) {
fn emit_cvttss2si_64(&mut self, _src: XMMOrMemory, _dst: GPR) {
unimplemented!();
}
fn emit_cvttsd2si_32(&mut self, src: XMMOrMemory, dst: GPR) {
fn emit_cvttsd2si_32(&mut self, _src: XMMOrMemory, _dst: GPR) {
unimplemented!();
}
fn emit_cvttsd2si_64(&mut self, src: XMMOrMemory, dst: GPR) {
fn emit_cvttsd2si_64(&mut self, _src: XMMOrMemory, _dst: GPR) {
unimplemented!();
}
fn emit_vcvtsi2ss_32(&mut self, src1: XMM, src2: GPROrMemory, dst: XMM) {
fn emit_vcvtsi2ss_32(&mut self, _src1: XMM, _src2: GPROrMemory, _dst: XMM) {
unimplemented!();
}
fn emit_vcvtsi2ss_64(&mut self, src1: XMM, src2: GPROrMemory, dst: XMM) {
fn emit_vcvtsi2ss_64(&mut self, _src1: XMM, _src2: GPROrMemory, _dst: XMM) {
unimplemented!();
}
fn emit_vcvtsi2sd_32(&mut self, src1: XMM, src2: GPROrMemory, dst: XMM) {
fn emit_vcvtsi2sd_32(&mut self, _src1: XMM, _src2: GPROrMemory, _dst: XMM) {
unimplemented!();
}
fn emit_vcvtsi2sd_64(&mut self, src1: XMM, src2: GPROrMemory, dst: XMM) {
fn emit_vcvtsi2sd_64(&mut self, _src1: XMM, _src2: GPROrMemory, _dst: XMM) {
unimplemented!();
}
fn emit_test_gpr_64(&mut self, reg: GPR) {
fn emit_test_gpr_64(&mut self, _reg: GPR) {
unimplemented!();
}