mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-08 13:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed lint

Browse Source
This commit is contained in:
ptitSeb
2021-11-03 10:33:06 +01:00
parent 235b30930b
commit 9710ab8b84
6 changed files with 145 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
lib/compiler-singlepass/src/codegen_x64.rs
View File

@@ -1,5 +1,7 @@
use crate::address_map::get_function_address_map; use crate::address_map::get_function_address_map;
use crate::{common_decl::*, config::Singlepass, emitter_x64::*, machine_x64::Machine, x64_decl::*}; use crate::{
common_decl::*, config::Singlepass, emitter_x64::*, machine_x64::Machine, x64_decl::*,
};
use dynasmrt::{x64::Assembler, DynamicLabel}; use dynasmrt::{x64::Assembler, DynamicLabel};
use smallvec::{smallvec, SmallVec}; use smallvec::{smallvec, SmallVec};
use std::collections::BTreeMap; use std::collections::BTreeMap;
@@ -639,7 +641,8 @@ impl<'a> FuncGen<'a> {
} }
Location::Memory(_, _) | Location::GPR(_) => { Location::Memory(_, _) | Location::GPR(_) => {
op(self, src1, src2, tmp3); op(self, src1, src2, tmp3);
self.assembler.emit_mov(Size::S64, Location::SIMD(tmp3), dst); self.assembler
.emit_mov(Size::S64, Location::SIMD(tmp3), dst);
} }
_ => { _ => {
return Err(CodegenError { return Err(CodegenError {
@@ -2852,7 +2855,8 @@ impl<'a> FuncGen<'a> {
.emit_vmovaps(XMMOrMemory::XMM(src1), XMMOrMemory::XMM(x)); .emit_vmovaps(XMMOrMemory::XMM(src1), XMMOrMemory::XMM(x));
} }
Location::Memory(_, _) | Location::GPR(_) => { Location::Memory(_, _) | Location::GPR(_) => {
self.assembler.emit_mov(Size::S64, Location::SIMD(src1), ret); self.assembler
.emit_mov(Size::S64, Location::SIMD(src1), ret);
} }
_ => { _ => {
return Err(CodegenError { return Err(CodegenError {
@@ -3005,7 +3009,8 @@ impl<'a> FuncGen<'a> {
.emit_vmovaps(XMMOrMemory::XMM(src1), XMMOrMemory::XMM(x)); .emit_vmovaps(XMMOrMemory::XMM(src1), XMMOrMemory::XMM(x));
} }
Location::Memory(_, _) | Location::GPR(_) => { Location::Memory(_, _) | Location::GPR(_) => {
self.assembler.emit_mov(Size::S64, Location::SIMD(src1), ret); self.assembler
.emit_mov(Size::S64, Location::SIMD(src1), ret);
} }
_ => { _ => {
return Err(CodegenError { return Err(CodegenError {
@@ -3342,7 +3347,8 @@ impl<'a> FuncGen<'a> {
.emit_vmovapd(XMMOrMemory::XMM(src1), XMMOrMemory::XMM(x)); .emit_vmovapd(XMMOrMemory::XMM(src1), XMMOrMemory::XMM(x));
} }
Location::Memory(_, _) | Location::GPR(_) => { Location::Memory(_, _) | Location::GPR(_) => {
self.assembler.emit_mov(Size::S64, Location::SIMD(src1), ret); self.assembler
.emit_mov(Size::S64, Location::SIMD(src1), ret);
} }
_ => { _ => {
return Err(CodegenError { return Err(CodegenError {
@@ -3496,7 +3502,8 @@ impl<'a> FuncGen<'a> {
.emit_vmovaps(XMMOrMemory::XMM(src1), XMMOrMemory::XMM(x)); .emit_vmovaps(XMMOrMemory::XMM(src1), XMMOrMemory::XMM(x));
} }
Location::Memory(_, _) | Location::GPR(_) => { Location::Memory(_, _) | Location::GPR(_) => {
self.assembler.emit_mov(Size::S64, Location::SIMD(src1), ret); self.assembler
.emit_mov(Size::S64, Location::SIMD(src1), ret);
} }
_ => { _ => {
return Err(CodegenError { return Err(CodegenError {
@@ -3833,7 +3840,12 @@ impl<'a> FuncGen<'a> {
let tmp_out = self.machine.acquire_temp_gpr().unwrap(); let tmp_out = self.machine.acquire_temp_gpr().unwrap();
let tmp_in = self.machine.acquire_temp_xmm().unwrap(); let tmp_in = self.machine.acquire_temp_xmm().unwrap();
self.emit_relaxed_binop(Assembler::emit_mov, Size::S32, loc, Location::SIMD(tmp_in)); self.emit_relaxed_binop(
Assembler::emit_mov,
Size::S32,
loc,
Location::SIMD(tmp_in),
);
self.emit_f32_int_conv_check_sat( self.emit_f32_int_conv_check_sat(
tmp_in, tmp_in,
GEF32_LT_U32_MIN, GEF32_LT_U32_MIN,
@@ -3931,7 +3943,12 @@ impl<'a> FuncGen<'a> {
let tmp_out = self.machine.acquire_temp_gpr().unwrap(); let tmp_out = self.machine.acquire_temp_gpr().unwrap();
let tmp_in = self.machine.acquire_temp_xmm().unwrap(); let tmp_in = self.machine.acquire_temp_xmm().unwrap();
self.emit_relaxed_binop(Assembler::emit_mov, Size::S32, loc, Location::SIMD(tmp_in)); self.emit_relaxed_binop(
Assembler::emit_mov,
Size::S32,
loc,
Location::SIMD(tmp_in),
);
self.emit_f32_int_conv_check_sat( self.emit_f32_int_conv_check_sat(
tmp_in, tmp_in,
GEF32_LT_I32_MIN, GEF32_LT_I32_MIN,
@@ -4035,7 +4052,12 @@ impl<'a> FuncGen<'a> {
let tmp_out = self.machine.acquire_temp_gpr().unwrap(); let tmp_out = self.machine.acquire_temp_gpr().unwrap();
let tmp_in = self.machine.acquire_temp_xmm().unwrap(); let tmp_in = self.machine.acquire_temp_xmm().unwrap();
self.emit_relaxed_binop(Assembler::emit_mov, Size::S32, loc, Location::SIMD(tmp_in)); self.emit_relaxed_binop(
Assembler::emit_mov,
Size::S32,
loc,
Location::SIMD(tmp_in),
);
self.emit_f32_int_conv_check_sat( self.emit_f32_int_conv_check_sat(
tmp_in, tmp_in,
GEF32_LT_I64_MIN, GEF32_LT_I64_MIN,
@@ -4172,7 +4194,12 @@ impl<'a> FuncGen<'a> {
let tmp_out = self.machine.acquire_temp_gpr().unwrap(); let tmp_out = self.machine.acquire_temp_gpr().unwrap();
let tmp_in = self.machine.acquire_temp_xmm().unwrap(); let tmp_in = self.machine.acquire_temp_xmm().unwrap();
self.emit_relaxed_binop(Assembler::emit_mov, Size::S32, loc, Location::SIMD(tmp_in)); self.emit_relaxed_binop(
Assembler::emit_mov,
Size::S32,
loc,
Location::SIMD(tmp_in),
);
self.emit_f32_int_conv_check_sat( self.emit_f32_int_conv_check_sat(
tmp_in, tmp_in,
GEF32_LT_U64_MIN, GEF32_LT_U64_MIN,
@@ -4311,7 +4338,12 @@ impl<'a> FuncGen<'a> {
let tmp_out = self.machine.acquire_temp_gpr().unwrap(); let tmp_out = self.machine.acquire_temp_gpr().unwrap();
let tmp_in = self.machine.acquire_temp_xmm().unwrap(); let tmp_in = self.machine.acquire_temp_xmm().unwrap();
self.emit_relaxed_binop(Assembler::emit_mov, Size::S64, loc, Location::SIMD(tmp_in)); self.emit_relaxed_binop(
Assembler::emit_mov,
Size::S64,
loc,
Location::SIMD(tmp_in),
);
self.emit_f64_int_conv_check_sat( self.emit_f64_int_conv_check_sat(
tmp_in, tmp_in,
GEF64_LT_U32_MIN, GEF64_LT_U32_MIN,
@@ -4546,7 +4578,12 @@ impl<'a> FuncGen<'a> {
let tmp_out = self.machine.acquire_temp_gpr().unwrap(); let tmp_out = self.machine.acquire_temp_gpr().unwrap();
let tmp_in = self.machine.acquire_temp_xmm().unwrap(); let tmp_in = self.machine.acquire_temp_xmm().unwrap();
self.emit_relaxed_binop(Assembler::emit_mov, Size::S64, loc, Location::SIMD(tmp_in)); self.emit_relaxed_binop(
Assembler::emit_mov,
Size::S64,
loc,
Location::SIMD(tmp_in),
);
self.emit_f64_int_conv_check_sat( self.emit_f64_int_conv_check_sat(
tmp_in, tmp_in,
GEF64_LT_I64_MIN, GEF64_LT_I64_MIN,
@@ -4684,7 +4721,12 @@ impl<'a> FuncGen<'a> {
let tmp_out = self.machine.acquire_temp_gpr().unwrap(); let tmp_out = self.machine.acquire_temp_gpr().unwrap();
let tmp_in = self.machine.acquire_temp_xmm().unwrap(); let tmp_in = self.machine.acquire_temp_xmm().unwrap();
self.emit_relaxed_binop(Assembler::emit_mov, Size::S64, loc, Location::SIMD(tmp_in)); self.emit_relaxed_binop(
Assembler::emit_mov,
Size::S64,
loc,
Location::SIMD(tmp_in),
);
self.emit_f64_int_conv_check_sat( self.emit_f64_int_conv_check_sat(
tmp_in, tmp_in,
GEF64_LT_U64_MIN, GEF64_LT_U64_MIN,

37
lib/compiler-singlepass/src/emitter_x64.rs
View File

@@ -1,6 +1,6 @@
pub use crate::x64_decl::{GPR, XMM};
pub use crate::location::Multiplier;
use crate::location::Location as AbstractLocation; use crate::location::Location as AbstractLocation;
pub use crate::location::Multiplier;
pub use crate::x64_decl::{GPR, XMM};
use dynasm::dynasm; use dynasm::dynasm;
use dynasmrt::{ use dynasmrt::{
x64::X64Relocation, AssemblyOffset, DynamicLabel, DynasmApi, DynasmLabelApi, VecAssembler, x64::X64Relocation, AssemblyOffset, DynamicLabel, DynasmApi, DynasmLabelApi, VecAssembler,
@@ -34,7 +34,6 @@ macro_rules! dynasm {
// MemoryAddTriple(GPR, GPR, i32), // MemoryAddTriple(GPR, GPR, i32),
//} //}
pub type Location = AbstractLocation<GPR, XMM>; pub type Location = AbstractLocation<GPR, XMM>;
#[derive(Copy, Clone, Debug, Eq, PartialEq)] #[derive(Copy, Clone, Debug, Eq, PartialEq)]
@@ -814,19 +813,35 @@ impl Emitter for Assembler {
(Size::S32, Location::Memory2(src1, src2, mult, disp), Location::GPR(dst)) => { (Size::S32, Location::Memory2(src1, src2, mult, disp), Location::GPR(dst)) => {
match mult { match mult {
Multiplier::Zero => dynasm!(self ; lea Rd(dst as u8), [Rq(src1 as u8) + disp]), Multiplier::Zero => dynasm!(self ; lea Rd(dst as u8), [Rq(src1 as u8) + disp]),
Multiplier::One => dynasm!(self ; lea Rd(dst as u8), [Rq(src1 as u8) + Rq(src2 as u8) + disp]), Multiplier::One => {
Multiplier::Two => dynasm!(self ; lea Rd(dst as u8), [Rq(src1 as u8) + Rq(src2 as u8) * 2 + disp]), dynasm!(self ; lea Rd(dst as u8), [Rq(src1 as u8) + Rq(src2 as u8) + disp])
Multiplier::Four => dynasm!(self ; lea Rd(dst as u8), [Rq(src1 as u8) + Rq(src2 as u8) * 4 + disp]), }
Multiplier::Height => dynasm!(self ; lea Rd(dst as u8), [Rq(src1 as u8) + Rq(src2 as u8) * 8 + disp]), Multiplier::Two => {
dynasm!(self ; lea Rd(dst as u8), [Rq(src1 as u8) + Rq(src2 as u8) * 2 + disp])
}
Multiplier::Four => {
dynasm!(self ; lea Rd(dst as u8), [Rq(src1 as u8) + Rq(src2 as u8) * 4 + disp])
}
Multiplier::Height => {
dynasm!(self ; lea Rd(dst as u8), [Rq(src1 as u8) + Rq(src2 as u8) * 8 + disp])
}
}; };
} }
(Size::S64, Location::Memory2(src1, src2, mult, disp), Location::GPR(dst)) => { (Size::S64, Location::Memory2(src1, src2, mult, disp), Location::GPR(dst)) => {
match mult { match mult {
Multiplier::Zero => dynasm!(self ; lea Rq(dst as u8), [Rq(src1 as u8) + disp]), Multiplier::Zero => dynasm!(self ; lea Rq(dst as u8), [Rq(src1 as u8) + disp]),
Multiplier::One => dynasm!(self ; lea Rq(dst as u8), [Rq(src1 as u8) + Rq(src2 as u8) + disp]), Multiplier::One => {
Multiplier::Two => dynasm!(self ; lea Rq(dst as u8), [Rq(src1 as u8) + Rq(src2 as u8) * 2 + disp]), dynasm!(self ; lea Rq(dst as u8), [Rq(src1 as u8) + Rq(src2 as u8) + disp])
Multiplier::Four => dynasm!(self ; lea Rq(dst as u8), [Rq(src1 as u8) + Rq(src2 as u8) * 4 + disp]), }
Multiplier::Height => dynasm!(self ; lea Rq(dst as u8), [Rq(src1 as u8) + Rq(src2 as u8) * 8 + disp]), Multiplier::Two => {
dynasm!(self ; lea Rq(dst as u8), [Rq(src1 as u8) + Rq(src2 as u8) * 2 + disp])
}
Multiplier::Four => {
dynasm!(self ; lea Rq(dst as u8), [Rq(src1 as u8) + Rq(src2 as u8) * 4 + disp])
}
Multiplier::Height => {
dynasm!(self ; lea Rq(dst as u8), [Rq(src1 as u8) + Rq(src2 as u8) * 8 + disp])
}
}; };
} }
_ => panic!("singlepass can't emit LEA {:?} {:?} {:?}", sz, src, dst), _ => panic!("singlepass can't emit LEA {:?} {:?} {:?}", sz, src, dst),

2
lib/compiler-singlepass/src/lib.rs
View File

@@ -14,10 +14,10 @@ mod common_decl;
mod compiler; mod compiler;
mod config; mod config;
mod emitter_x64; mod emitter_x64;
mod location;
mod machine; mod machine;
mod machine_x64; mod machine_x64;
mod x64_decl; mod x64_decl;
mod location;
pub use crate::compiler::SinglepassCompiler; pub use crate::compiler::SinglepassCompiler;
pub use crate::config::Singlepass; pub use crate::config::Singlepass;

10
lib/compiler-singlepass/src/location.rs
View File

@@ -4,11 +4,11 @@ use std::fmt::Debug;
#[allow(dead_code)] #[allow(dead_code)]
#[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)] #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
pub enum Multiplier { pub enum Multiplier {
Zero = 0, Zero = 0,
One = 1, One = 1,
Two = 2, Two = 2,
Four = 4, Four = 4,
Height = 8, Height = 8,
} }
#[allow(dead_code)] #[allow(dead_code)]

3
lib/compiler-singlepass/src/machine.rs
View File

@@ -1,6 +1,4 @@
#[allow(dead_code)] #[allow(dead_code)]
#[derive(Clone, PartialEq)] #[derive(Clone, PartialEq)]
pub enum Value { pub enum Value {
I8(i8), I8(i8),
@@ -16,4 +14,3 @@ pub trait MaybeImmediate {
self.imm_value().is_some() self.imm_value().is_some()
} }
} }

4
lib/compiler-singlepass/src/x64_decl.rs
View File

@@ -94,8 +94,8 @@ impl AbstractReg for GPR {
impl AbstractReg for XMM { impl AbstractReg for XMM {
fn is_callee_save(self) -> bool { fn is_callee_save(self) -> bool {
const IS_CALLEE_SAVE: [bool; 16] = [ const IS_CALLEE_SAVE: [bool; 16] = [
false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, true, true, true, true,
true, true, true, true, true, true, true, true, true, true, true,
]; ];
IS_CALLEE_SAVE[self as usize] IS_CALLEE_SAVE[self as usize]
} }