T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Run rustfmt 1.48

Browse Source 
Run rustfmt over wasmtime with the new stable release which looks like
it wants to reformat a few lines.
This commit is contained in:
Alex Crichton
2020-11-19 11:12:30 -08:00
parent bf971efa42
commit 4d64c68b05
2 changed files with 137 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

196
cranelift/codegen/src/isa/aarch64/inst/mod.rs
View File

@@ -3045,41 +3045,13 @@ impl Inst {
let rn = show_ireg_sized(rn, mb_rru, size); let rn = show_ireg_sized(rn, mb_rru, size);
format!("{} {}, {}", op, rd, rn) format!("{} {}, {}", op, rd, rn)
} }
&Inst::ULoad8 { &Inst::ULoad8 { rd, ref mem, .. }
rd, | &Inst::SLoad8 { rd, ref mem, .. }
ref mem, | &Inst::ULoad16 { rd, ref mem, .. }
.. | &Inst::SLoad16 { rd, ref mem, .. }
} | &Inst::ULoad32 { rd, ref mem, .. }
| &Inst::SLoad8 { | &Inst::SLoad32 { rd, ref mem, .. }
rd, | &Inst::ULoad64 { rd, ref mem, .. } => {
ref mem,
..
}
| &Inst::ULoad16 {
rd,
ref mem,
..
}
| &Inst::SLoad16 {
rd,
ref mem,
..
}
| &Inst::ULoad32 {
rd,
ref mem,
..
}
| &Inst::SLoad32 {
rd,
ref mem,
..
}
| &Inst::ULoad64 {
rd,
ref mem,
..
} => {
let (mem_str, mem) = mem_finalize_for_show(mem, mb_rru, state); let (mem_str, mem) = mem_finalize_for_show(mem, mb_rru, state);
let is_unscaled = match &mem { let is_unscaled = match &mem {
@@ -3107,26 +3079,10 @@ impl Inst {
let mem = mem.show_rru(mb_rru); let mem = mem.show_rru(mb_rru);
format!("{}{} {}, {}", mem_str, op, rd, mem) format!("{}{} {}, {}", mem_str, op, rd, mem)
} }
&Inst::Store8 { &Inst::Store8 { rd, ref mem, .. }
rd, | &Inst::Store16 { rd, ref mem, .. }
ref mem, | &Inst::Store32 { rd, ref mem, .. }
.. | &Inst::Store64 { rd, ref mem, .. } => {
}
| &Inst::Store16 {
rd,
ref mem,
..
}
| &Inst::Store32 {
rd,
ref mem,
..
}
| &Inst::Store64 {
rd,
ref mem,
..
} => {
let (mem_str, mem) = mem_finalize_for_show(mem, mb_rru, state); let (mem_str, mem) = mem_finalize_for_show(mem, mb_rru, state);
let is_unscaled = match &mem { let is_unscaled = match &mem {
@@ -3148,13 +3104,17 @@ impl Inst {
let mem = mem.show_rru(mb_rru); let mem = mem.show_rru(mb_rru);
format!("{}{} {}, {}", mem_str, op, rd, mem) format!("{}{} {}, {}", mem_str, op, rd, mem)
} }
&Inst::StoreP64 { rt, rt2, ref mem, .. } => { &Inst::StoreP64 {
rt, rt2, ref mem, ..
} => {
let rt = rt.show_rru(mb_rru); let rt = rt.show_rru(mb_rru);
let rt2 = rt2.show_rru(mb_rru); let rt2 = rt2.show_rru(mb_rru);
let mem = mem.show_rru(mb_rru); let mem = mem.show_rru(mb_rru);
format!("stp {}, {}, {}", rt, rt2, mem) format!("stp {}, {}, {}", rt, rt2, mem)
} }
&Inst::LoadP64 { rt, rt2, ref mem, .. } => { &Inst::LoadP64 {
rt, rt2, ref mem, ..
} => {
let rt = rt.to_reg().show_rru(mb_rru); let rt = rt.to_reg().show_rru(mb_rru);
let rt2 = rt2.to_reg().show_rru(mb_rru); let rt2 = rt2.to_reg().show_rru(mb_rru);
let mem = mem.show_rru(mb_rru); let mem = mem.show_rru(mb_rru);
@@ -3220,14 +3180,25 @@ impl Inst {
"atomically {{ compare-and-swap({}_bits_at_[x25], x26 -> x28), x27 = old_value_at_[x25]; x24 = trash }}", "atomically {{ compare-and-swap({}_bits_at_[x25], x26 -> x28), x27 = old_value_at_[x25]; x24 = trash }}",
ty.bits()) ty.bits())
} }
&Inst::AtomicLoad { ty, r_data, r_addr, .. } => { &Inst::AtomicLoad {
ty, r_data, r_addr, ..
} => {
format!( format!(
"atomically {{ {} = zero_extend_{}_bits_at[{}] }}", "atomically {{ {} = zero_extend_{}_bits_at[{}] }}",
r_data.show_rru(mb_rru), ty.bits(), r_addr.show_rru(mb_rru)) r_data.show_rru(mb_rru),
ty.bits(),
r_addr.show_rru(mb_rru)
)
} }
&Inst::AtomicStore { ty, r_data, r_addr, .. } => { &Inst::AtomicStore {
ty, r_data, r_addr, ..
} => {
format!( format!(
"atomically {{ {}_bits_at[{}] = {} }}", ty.bits(), r_addr.show_rru(mb_rru), r_data.show_rru(mb_rru)) "atomically {{ {}_bits_at[{}] = {} }}",
ty.bits(),
r_addr.show_rru(mb_rru),
r_data.show_rru(mb_rru)
)
} }
&Inst::Fence {} => { &Inst::Fence {} => {
format!("dmb ish") format!("dmb ish")
@@ -3370,7 +3341,11 @@ impl Inst {
} }
&Inst::LoadFpuConst64 { rd, const_data } => { &Inst::LoadFpuConst64 { rd, const_data } => {
let rd = show_vreg_scalar(rd.to_reg(), mb_rru, ScalarSize::Size64); let rd = show_vreg_scalar(rd.to_reg(), mb_rru, ScalarSize::Size64);
format!("ldr {}, pc+8 ; b 12 ; data.f64 {}", rd, f64::from_bits(const_data)) format!(
"ldr {}, pc+8 ; b 12 ; data.f64 {}",
rd,
f64::from_bits(const_data)
)
} }
&Inst::LoadFpuConst128 { rd, const_data } => { &Inst::LoadFpuConst128 { rd, const_data } => {
let rd = show_vreg_scalar(rd.to_reg(), mb_rru, ScalarSize::Size128); let rd = show_vreg_scalar(rd.to_reg(), mb_rru, ScalarSize::Size128);
@@ -3479,31 +3454,61 @@ impl Inst {
let rn = show_vreg_element(rn, mb_rru, 0, size); let rn = show_vreg_element(rn, mb_rru, 0, size);
format!("dup {}, {}", rd, rn) format!("dup {}, {}", rd, rn)
} }
&Inst::VecDupImm { rd, imm, invert, size } => { &Inst::VecDupImm {
rd,
imm,
invert,
size,
} => {
let imm = imm.show_rru(mb_rru); let imm = imm.show_rru(mb_rru);
let op = if invert { let op = if invert { "mvni" } else { "movi" };
"mvni"
} else {
"movi"
};
let rd = show_vreg_vector(rd.to_reg(), mb_rru, size); let rd = show_vreg_vector(rd.to_reg(), mb_rru, size);
format!("{} {}, {}", op, rd, imm) format!("{} {}, {}", op, rd, imm)
} }
&Inst::VecExtend { t, rd, rn, high_half } => { &Inst::VecExtend {
t,
rd,
rn,
high_half,
} => {
let (op, dest, src) = match (t, high_half) { let (op, dest, src) = match (t, high_half) {
(VecExtendOp::Sxtl8, false) => ("sxtl", VectorSize::Size16x8, VectorSize::Size8x8), (VecExtendOp::Sxtl8, false) => {
(VecExtendOp::Sxtl8, true) => ("sxtl2", VectorSize::Size16x8, VectorSize::Size8x16), ("sxtl", VectorSize::Size16x8, VectorSize::Size8x8)
(VecExtendOp::Sxtl16, false) => ("sxtl", VectorSize::Size32x4, VectorSize::Size16x4), }
(VecExtendOp::Sxtl16, true) => ("sxtl2", VectorSize::Size32x4, VectorSize::Size16x8), (VecExtendOp::Sxtl8, true) => {
(VecExtendOp::Sxtl32, false) => ("sxtl", VectorSize::Size64x2, VectorSize::Size32x2), ("sxtl2", VectorSize::Size16x8, VectorSize::Size8x16)
(VecExtendOp::Sxtl32, true) => ("sxtl2", VectorSize::Size64x2, VectorSize::Size32x4), }
(VecExtendOp::Uxtl8, false) => ("uxtl", VectorSize::Size16x8, VectorSize::Size8x8), (VecExtendOp::Sxtl16, false) => {
(VecExtendOp::Uxtl8, true) => ("uxtl2", VectorSize::Size16x8, VectorSize::Size8x16), ("sxtl", VectorSize::Size32x4, VectorSize::Size16x4)
(VecExtendOp::Uxtl16, false) => ("uxtl", VectorSize::Size32x4, VectorSize::Size16x4), }
(VecExtendOp::Uxtl16, true) => ("uxtl2", VectorSize::Size32x4, VectorSize::Size16x8), (VecExtendOp::Sxtl16, true) => {
(VecExtendOp::Uxtl32, false) => ("uxtl", VectorSize::Size64x2, VectorSize::Size32x2), ("sxtl2", VectorSize::Size32x4, VectorSize::Size16x8)
(VecExtendOp::Uxtl32, true) => ("uxtl2", VectorSize::Size64x2, VectorSize::Size32x4), }
(VecExtendOp::Sxtl32, false) => {
("sxtl", VectorSize::Size64x2, VectorSize::Size32x2)
}
(VecExtendOp::Sxtl32, true) => {
("sxtl2", VectorSize::Size64x2, VectorSize::Size32x4)
}
(VecExtendOp::Uxtl8, false) => {
("uxtl", VectorSize::Size16x8, VectorSize::Size8x8)
}
(VecExtendOp::Uxtl8, true) => {
("uxtl2", VectorSize::Size16x8, VectorSize::Size8x16)
}
(VecExtendOp::Uxtl16, false) => {
("uxtl", VectorSize::Size32x4, VectorSize::Size16x4)
}
(VecExtendOp::Uxtl16, true) => {
("uxtl2", VectorSize::Size32x4, VectorSize::Size16x8)
}
(VecExtendOp::Uxtl32, false) => {
("uxtl", VectorSize::Size64x2, VectorSize::Size32x2)
}
(VecExtendOp::Uxtl32, true) => {
("uxtl2", VectorSize::Size64x2, VectorSize::Size32x4)
}
}; };
let rd = show_vreg_vector(rd.to_reg(), mb_rru, dest); let rd = show_vreg_vector(rd.to_reg(), mb_rru, dest);
let rn = show_vreg_vector(rn, mb_rru, src); let rn = show_vreg_vector(rn, mb_rru, src);
@@ -3520,7 +3525,13 @@ impl Inst {
let rn = show_vreg_element(rn, mb_rru, src_idx, size); let rn = show_vreg_element(rn, mb_rru, src_idx, size);
format!("mov {}, {}", rd, rn) format!("mov {}, {}", rd, rn)
} }
&Inst::VecMiscNarrow { op, rd, rn, size, high_half } => { &Inst::VecMiscNarrow {
op,
rd,
rn,
size,
high_half,
} => {
let dest_size = if high_half { let dest_size = if high_half {
assert!(size.is_128bits()); assert!(size.is_128bits());
size size
@@ -3589,11 +3600,11 @@ impl Inst {
}; };
let rd_size = match alu_op { let rd_size = match alu_op {
VecALUOp::Umlal | VecALUOp::Smull | VecALUOp::Smull2 => size.widen(), VecALUOp::Umlal | VecALUOp::Smull | VecALUOp::Smull2 => size.widen(),
_ => size _ => size,
}; };
let rn_size = match alu_op { let rn_size = match alu_op {
VecALUOp::Smull => size.halve(), VecALUOp::Smull => size.halve(),
_ => size _ => size,
}; };
let rm_size = rn_size; let rm_size = rn_size;
let rd = show_vreg_vector(rd.to_reg(), mb_rru, rd_size); let rd = show_vreg_vector(rd.to_reg(), mb_rru, rd_size);
@@ -3651,7 +3662,13 @@ impl Inst {
let rn = show_vreg_vector(rn, mb_rru, size); let rn = show_vreg_vector(rn, mb_rru, size);
format!("{} {}, {}", op, rd, rn) format!("{} {}, {}", op, rd, rn)
} }
&Inst::VecShiftImm { op, rd, rn, size, imm } => { &Inst::VecShiftImm {
op,
rd,
rn,
size,
imm,
} => {
let op = match op { let op = match op {
VecShiftImmOp::Shl => "shl", VecShiftImmOp::Shl => "shl",
VecShiftImmOp::Ushr => "ushr", VecShiftImmOp::Ushr => "ushr",
@@ -3704,7 +3721,10 @@ impl Inst {
let rn = show_vreg_vector(rn, mb_rru, VectorSize::Size8x16); let rn = show_vreg_vector(rn, mb_rru, VectorSize::Size8x16);
let rm = show_vreg_vector(rm, mb_rru, VectorSize::Size8x16); let rm = show_vreg_vector(rm, mb_rru, VectorSize::Size8x16);
let cond = cond.show_rru(mb_rru); let cond = cond.show_rru(mb_rru);
format!("vcsel {}, {}, {}, {} (if-then-else diamond)", rd, rn, rm, cond) format!(
"vcsel {}, {}, {}, {} (if-then-else diamond)",
rd, rn, rm, cond
)
} }
&Inst::MovToNZCV { rn } => { &Inst::MovToNZCV { rn } => {
let rn = rn.show_rru(mb_rru); let rn = rn.show_rru(mb_rru);
@@ -3887,7 +3907,9 @@ impl Inst {
let (reg, index_reg, offset) = match mem { let (reg, index_reg, offset) = match mem {
AMode::RegExtended(r, idx, extendop) => (r, Some((idx, extendop)), 0), AMode::RegExtended(r, idx, extendop) => (r, Some((idx, extendop)), 0),
AMode::Unscaled(r, simm9) => (r, None, simm9.value()), AMode::Unscaled(r, simm9) => (r, None, simm9.value()),
AMode::UnsignedOffset(r, uimm12scaled) => (r, None, uimm12scaled.value() as i32), AMode::UnsignedOffset(r, uimm12scaled) => {
(r, None, uimm12scaled.value() as i32)
}
_ => panic!("Unsupported case for LoadAddr: {:?}", mem), _ => panic!("Unsupported case for LoadAddr: {:?}", mem),
}; };
let abs_offset = if offset < 0 { let abs_offset = if offset < 0 {

39
cranelift/codegen/src/isa/x64/inst/mod.rs
View File

@@ -1365,19 +1365,28 @@ impl PrettyPrint for Inst {
show_ireg_sized(rhs_dst.to_reg(), mb_rru, 8), show_ireg_sized(rhs_dst.to_reg(), mb_rru, 8),
), ),
Inst::XmmRmRImm { op, src, dst, imm, is64, .. } => format!( Inst::XmmRmRImm {
op,
src,
dst,
imm,
is64,
..
} => format!(
"{} ${}, {}, {}", "{} ${}, {}, {}",
ljustify(format!("{}{}", op.to_string(), if *is64 { ".w" } else { "" })), ljustify(format!(
"{}{}",
op.to_string(),
if *is64 { ".w" } else { "" }
)),
imm, imm,
src.show_rru(mb_rru), src.show_rru(mb_rru),
dst.show_rru(mb_rru), dst.show_rru(mb_rru),
), ),
Inst::XmmUninitializedValue { dst } => format!( Inst::XmmUninitializedValue { dst } => {
"{} {}", format!("{} {}", ljustify("uninit".into()), dst.show_rru(mb_rru),)
ljustify("uninit".into()), }
dst.show_rru(mb_rru),
),
Inst::XmmLoadConst { src, dst, .. } => { Inst::XmmLoadConst { src, dst, .. } => {
format!("load_const {:?}, {}", src, dst.show_rru(mb_rru),) format!("load_const {:?}, {}", src, dst.show_rru(mb_rru),)
@@ -1691,23 +1700,25 @@ impl PrettyPrint for Inst {
Inst::LockCmpxchg { ty, src, dst, .. } => { Inst::LockCmpxchg { ty, src, dst, .. } => {
let size = ty.bytes() as u8; let size = ty.bytes() as u8;
format!("lock cmpxchg{} {}, {}", format!(
suffix_bwlq(size), show_ireg_sized(*src, mb_rru, size), dst.show_rru(mb_rru)) "lock cmpxchg{} {}, {}",
suffix_bwlq(size),
show_ireg_sized(*src, mb_rru, size),
dst.show_rru(mb_rru)
)
} }
Inst::AtomicRmwSeq { ty, op, .. } => { Inst::AtomicRmwSeq { ty, op, .. } => {
format!( format!(
"atomically {{ {}_bits_at_[%r9]) {:?}= %r10; %rax = old_value_at_[%r9]; %r11, %rflags = trash }}", "atomically {{ {}_bits_at_[%r9]) {:?}= %r10; %rax = old_value_at_[%r9]; %r11, %rflags = trash }}",
ty.bits(), op) ty.bits(), op)
}, }
Inst::Fence { kind } => { Inst::Fence { kind } => match kind {
match kind {
FenceKind::MFence => "mfence".to_string(), FenceKind::MFence => "mfence".to_string(),
FenceKind::LFence => "lfence".to_string(), FenceKind::LFence => "lfence".to_string(),
FenceKind::SFence => "sfence".to_string(), FenceKind::SFence => "sfence".to_string(),
} },
}
Inst::VirtualSPOffsetAdj { offset } => format!("virtual_sp_offset_adjust {}", offset), Inst::VirtualSPOffsetAdj { offset } => format!("virtual_sp_offset_adjust {}", offset),