language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 06:44:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix naming clippy warning

Browse source
This commit is contained in:
Brendan Hansknecht 2022-02-16 23:37:28 -08:00
parent b76052c91e
commit d7cac1a224
2 changed files with 60 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

88
compiler/gen_dev/src/generic64/mod.rs
View file

@ -614,7 +614,7 @@ impl<
// The basic plan is to make jumps to nowhere and then correct them once we know the correct address. // The basic plan is to make jumps to nowhere and then correct them once we know the correct address.
let cond_reg = self let cond_reg = self
.storage_manager .storage_manager
.to_general_reg(&mut self.buf, cond_symbol); .load_to_general_reg(&mut self.buf, cond_symbol);
let mut ret_jumps = bumpalo::vec![in self.env.arena]; let mut ret_jumps = bumpalo::vec![in self.env.arena];
let mut tmp = bumpalo::vec![in self.env.arena]; let mut tmp = bumpalo::vec![in self.env.arena];
@ -796,12 +796,12 @@ impl<
match layout { match layout {
Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => { Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => {
let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst); let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst);
let src_reg = self.storage_manager.to_general_reg(&mut self.buf, src); let src_reg = self.storage_manager.load_to_general_reg(&mut self.buf, src);
ASM::abs_reg64_reg64(&mut self.buf, dst_reg, src_reg); ASM::abs_reg64_reg64(&mut self.buf, dst_reg, src_reg);
} }
Layout::Builtin(Builtin::Float(FloatWidth::F64)) => { Layout::Builtin(Builtin::Float(FloatWidth::F64)) => {
let dst_reg = self.storage_manager.claim_float_reg(&mut self.buf, dst); let dst_reg = self.storage_manager.claim_float_reg(&mut self.buf, dst);
let src_reg = self.storage_manager.to_float_reg(&mut self.buf, src); let src_reg = self.storage_manager.load_to_float_reg(&mut self.buf, src);
ASM::abs_freg64_freg64(&mut self.buf, &mut self.relocs, dst_reg, src_reg); ASM::abs_freg64_freg64(&mut self.buf, &mut self.relocs, dst_reg, src_reg);
} }
x => todo!("NumAbs: layout, {:?}", x), x => todo!("NumAbs: layout, {:?}", x),
@ -812,14 +812,18 @@ impl<
match layout { match layout {
Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => { Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => {
let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst); let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst);
let src1_reg = self.storage_manager.to_general_reg(&mut self.buf, src1); let src1_reg = self
let src2_reg = self.storage_manager.to_general_reg(&mut self.buf, src2); .storage_manager
.load_to_general_reg(&mut self.buf, src1);
let src2_reg = self
.storage_manager
.load_to_general_reg(&mut self.buf, src2);
ASM::add_reg64_reg64_reg64(&mut self.buf, dst_reg, src1_reg, src2_reg); ASM::add_reg64_reg64_reg64(&mut self.buf, dst_reg, src1_reg, src2_reg);
} }
Layout::Builtin(Builtin::Float(FloatWidth::F64)) => { Layout::Builtin(Builtin::Float(FloatWidth::F64)) => {
let dst_reg = self.storage_manager.claim_float_reg(&mut self.buf, dst); let dst_reg = self.storage_manager.claim_float_reg(&mut self.buf, dst);
let src1_reg = self.storage_manager.to_float_reg(&mut self.buf, src1); let src1_reg = self.storage_manager.load_to_float_reg(&mut self.buf, src1);
let src2_reg = self.storage_manager.to_float_reg(&mut self.buf, src2); let src2_reg = self.storage_manager.load_to_float_reg(&mut self.buf, src2);
ASM::add_freg64_freg64_freg64(&mut self.buf, dst_reg, src1_reg, src2_reg); ASM::add_freg64_freg64_freg64(&mut self.buf, dst_reg, src1_reg, src2_reg);
} }
x => todo!("NumAdd: layout, {:?}", x), x => todo!("NumAdd: layout, {:?}", x),
@ -830,8 +834,12 @@ impl<
match layout { match layout {
Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => { Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => {
let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst); let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst);
let src1_reg = self.storage_manager.to_general_reg(&mut self.buf, src1); let src1_reg = self
let src2_reg = self.storage_manager.to_general_reg(&mut self.buf, src2); .storage_manager
.load_to_general_reg(&mut self.buf, src1);
let src2_reg = self
.storage_manager
.load_to_general_reg(&mut self.buf, src2);
ASM::imul_reg64_reg64_reg64(&mut self.buf, dst_reg, src1_reg, src2_reg); ASM::imul_reg64_reg64_reg64(&mut self.buf, dst_reg, src1_reg, src2_reg);
} }
x => todo!("NumMul: layout, {:?}", x), x => todo!("NumMul: layout, {:?}", x),
@ -842,7 +850,7 @@ impl<
match layout { match layout {
Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => { Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => {
let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst); let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst);
let src_reg = self.storage_manager.to_general_reg(&mut self.buf, src); let src_reg = self.storage_manager.load_to_general_reg(&mut self.buf, src);
ASM::neg_reg64_reg64(&mut self.buf, dst_reg, src_reg); ASM::neg_reg64_reg64(&mut self.buf, dst_reg, src_reg);
} }
x => todo!("NumNeg: layout, {:?}", x), x => todo!("NumNeg: layout, {:?}", x),
@ -853,8 +861,12 @@ impl<
match layout { match layout {
Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => { Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => {
let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst); let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst);
let src1_reg = self.storage_manager.to_general_reg(&mut self.buf, src1); let src1_reg = self
let src2_reg = self.storage_manager.to_general_reg(&mut self.buf, src2); .storage_manager
.load_to_general_reg(&mut self.buf, src1);
let src2_reg = self
.storage_manager
.load_to_general_reg(&mut self.buf, src2);
ASM::sub_reg64_reg64_reg64(&mut self.buf, dst_reg, src1_reg, src2_reg); ASM::sub_reg64_reg64_reg64(&mut self.buf, dst_reg, src1_reg, src2_reg);
} }
x => todo!("NumSub: layout, {:?}", x), x => todo!("NumSub: layout, {:?}", x),
@ -865,8 +877,12 @@ impl<
match arg_layout { match arg_layout {
Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => { Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => {
let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst); let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst);
let src1_reg = self.storage_manager.to_general_reg(&mut self.buf, src1); let src1_reg = self
let src2_reg = self.storage_manager.to_general_reg(&mut self.buf, src2); .storage_manager
.load_to_general_reg(&mut self.buf, src1);
let src2_reg = self
.storage_manager
.load_to_general_reg(&mut self.buf, src2);
ASM::eq_reg64_reg64_reg64(&mut self.buf, dst_reg, src1_reg, src2_reg); ASM::eq_reg64_reg64_reg64(&mut self.buf, dst_reg, src1_reg, src2_reg);
} }
x => todo!("NumEq: layout, {:?}", x), x => todo!("NumEq: layout, {:?}", x),
@ -877,8 +893,12 @@ impl<
match arg_layout { match arg_layout {
Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => { Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => {
let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst); let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst);
let src1_reg = self.storage_manager.to_general_reg(&mut self.buf, src1); let src1_reg = self
let src2_reg = self.storage_manager.to_general_reg(&mut self.buf, src2); .storage_manager
.load_to_general_reg(&mut self.buf, src1);
let src2_reg = self
.storage_manager
.load_to_general_reg(&mut self.buf, src2);
ASM::neq_reg64_reg64_reg64(&mut self.buf, dst_reg, src1_reg, src2_reg); ASM::neq_reg64_reg64_reg64(&mut self.buf, dst_reg, src1_reg, src2_reg);
} }
x => todo!("NumNeq: layout, {:?}", x), x => todo!("NumNeq: layout, {:?}", x),
@ -895,8 +915,12 @@ impl<
match arg_layout { match arg_layout {
Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => { Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => {
let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst); let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst);
let src1_reg = self.storage_manager.to_general_reg(&mut self.buf, src1); let src1_reg = self
let src2_reg = self.storage_manager.to_general_reg(&mut self.buf, src2); .storage_manager
.load_to_general_reg(&mut self.buf, src1);
let src2_reg = self
.storage_manager
.load_to_general_reg(&mut self.buf, src2);
ASM::lt_reg64_reg64_reg64(&mut self.buf, dst_reg, src1_reg, src2_reg); ASM::lt_reg64_reg64_reg64(&mut self.buf, dst_reg, src1_reg, src2_reg);
} }
x => todo!("NumLt: layout, {:?}", x), x => todo!("NumLt: layout, {:?}", x),
@ -916,42 +940,42 @@ impl<
Layout::Builtin(Builtin::Int(IntWidth::I32 | IntWidth::I64)), Layout::Builtin(Builtin::Int(IntWidth::I32 | IntWidth::I64)),
Layout::Builtin(Builtin::Float(FloatWidth::F64)), Layout::Builtin(Builtin::Float(FloatWidth::F64)),
) => { ) => {
let src_reg = self.storage_manager.to_general_reg(&mut self.buf, src); let src_reg = self.storage_manager.load_to_general_reg(&mut self.buf, src);
ASM::to_float_freg64_reg64(&mut self.buf, dst_reg, src_reg); ASM::to_float_freg64_reg64(&mut self.buf, dst_reg, src_reg);
} }
( (
Layout::Builtin(Builtin::Int(IntWidth::I32 | IntWidth::I64)), Layout::Builtin(Builtin::Int(IntWidth::I32 | IntWidth::I64)),
Layout::Builtin(Builtin::Float(FloatWidth::F32)), Layout::Builtin(Builtin::Float(FloatWidth::F32)),
) => { ) => {
let src_reg = self.storage_manager.to_general_reg(&mut self.buf, src); let src_reg = self.storage_manager.load_to_general_reg(&mut self.buf, src);
ASM::to_float_freg32_reg64(&mut self.buf, dst_reg, src_reg); ASM::to_float_freg32_reg64(&mut self.buf, dst_reg, src_reg);
} }
( (
Layout::Builtin(Builtin::Float(FloatWidth::F64)), Layout::Builtin(Builtin::Float(FloatWidth::F64)),
Layout::Builtin(Builtin::Float(FloatWidth::F32)), Layout::Builtin(Builtin::Float(FloatWidth::F32)),
) => { ) => {
let src_reg = self.storage_manager.to_float_reg(&mut self.buf, src); let src_reg = self.storage_manager.load_to_float_reg(&mut self.buf, src);
ASM::to_float_freg32_freg64(&mut self.buf, dst_reg, src_reg); ASM::to_float_freg32_freg64(&mut self.buf, dst_reg, src_reg);
} }
( (
Layout::Builtin(Builtin::Float(FloatWidth::F32)), Layout::Builtin(Builtin::Float(FloatWidth::F32)),
Layout::Builtin(Builtin::Float(FloatWidth::F64)), Layout::Builtin(Builtin::Float(FloatWidth::F64)),
) => { ) => {
let src_reg = self.storage_manager.to_float_reg(&mut self.buf, src); let src_reg = self.storage_manager.load_to_float_reg(&mut self.buf, src);
ASM::to_float_freg64_freg32(&mut self.buf, dst_reg, src_reg); ASM::to_float_freg64_freg32(&mut self.buf, dst_reg, src_reg);
} }
( (
Layout::Builtin(Builtin::Float(FloatWidth::F64)), Layout::Builtin(Builtin::Float(FloatWidth::F64)),
Layout::Builtin(Builtin::Float(FloatWidth::F64)), Layout::Builtin(Builtin::Float(FloatWidth::F64)),
) => { ) => {
let src_reg = self.storage_manager.to_float_reg(&mut self.buf, src); let src_reg = self.storage_manager.load_to_float_reg(&mut self.buf, src);
ASM::mov_freg64_freg64(&mut self.buf, dst_reg, src_reg); ASM::mov_freg64_freg64(&mut self.buf, dst_reg, src_reg);
} }
( (
Layout::Builtin(Builtin::Float(FloatWidth::F32)), Layout::Builtin(Builtin::Float(FloatWidth::F32)),
Layout::Builtin(Builtin::Float(FloatWidth::F32)), Layout::Builtin(Builtin::Float(FloatWidth::F32)),
) => { ) => {
let src_reg = self.storage_manager.to_float_reg(&mut self.buf, src); let src_reg = self.storage_manager.load_to_float_reg(&mut self.buf, src);
ASM::mov_freg64_freg64(&mut self.buf, dst_reg, src_reg); ASM::mov_freg64_freg64(&mut self.buf, dst_reg, src_reg);
} }
(a, r) => todo!("NumToFloat: layout, arg {:?}, ret {:?}", a, r), (a, r) => todo!("NumToFloat: layout, arg {:?}, ret {:?}", a, r),
@ -968,8 +992,12 @@ impl<
match arg_layout { match arg_layout {
Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => { Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => {
let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst); let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst);
let src1_reg = self.storage_manager.to_general_reg(&mut self.buf, src1); let src1_reg = self
let src2_reg = self.storage_manager.to_general_reg(&mut self.buf, src2); .storage_manager
.load_to_general_reg(&mut self.buf, src1);
let src2_reg = self
.storage_manager
.load_to_general_reg(&mut self.buf, src2);
ASM::gte_reg64_reg64_reg64(&mut self.buf, dst_reg, src1_reg, src2_reg); ASM::gte_reg64_reg64_reg64(&mut self.buf, dst_reg, src1_reg, src2_reg);
} }
x => todo!("NumGte: layout, {:?}", x), x => todo!("NumGte: layout, {:?}", x),
@ -981,7 +1009,7 @@ impl<
// What's important is to load the value, and for src and dest to have different Layouts. // What's important is to load the value, and for src and dest to have different Layouts.
// This is used for pointer math in refcounting and for pointer equality // This is used for pointer math in refcounting and for pointer equality
let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst); let dst_reg = self.storage_manager.claim_general_reg(&mut self.buf, dst);
let src_reg = self.storage_manager.to_general_reg(&mut self.buf, src); let src_reg = self.storage_manager.load_to_general_reg(&mut self.buf, src);
ASM::mov_reg64_reg64(&mut self.buf, dst_reg, src_reg); ASM::mov_reg64_reg64(&mut self.buf, dst_reg, src_reg);
} }
@ -1253,7 +1281,7 @@ impl<
{ {
Some( Some(
self.storage_manager self.storage_manager
.to_general_reg(&mut self.buf, &Symbol::RET_POINTER), .load_to_general_reg(&mut self.buf, &Symbol::RET_POINTER),
) )
} else { } else {
None None
@ -1329,11 +1357,11 @@ impl<
fn copy_symbol_to_stack_offset(&mut self, to_offset: i32, sym: &Symbol, layout: &Layout<'a>) { fn copy_symbol_to_stack_offset(&mut self, to_offset: i32, sym: &Symbol, layout: &Layout<'a>) {
match layout { match layout {
Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => { Layout::Builtin(Builtin::Int(IntWidth::I64 | IntWidth::U64)) => {
let reg = self.storage_manager.to_general_reg(&mut self.buf, sym); let reg = self.storage_manager.load_to_general_reg(&mut self.buf, sym);
ASM::mov_base32_reg64(&mut self.buf, to_offset, reg); ASM::mov_base32_reg64(&mut self.buf, to_offset, reg);
} }
Layout::Builtin(Builtin::Float(FloatWidth::F64)) => { Layout::Builtin(Builtin::Float(FloatWidth::F64)) => {
let reg = self.storage_manager.to_float_reg(&mut self.buf, sym); let reg = self.storage_manager.load_to_float_reg(&mut self.buf, sym);
ASM::mov_base32_freg64(&mut self.buf, to_offset, reg); ASM::mov_base32_freg64(&mut self.buf, to_offset, reg);
} }
// Layout::Struct(_) if layout.safe_to_memcpy() => { // Layout::Struct(_) if layout.safe_to_memcpy() => {

4
compiler/gen_dev/src/generic64/storage.rs
View file

@ -217,7 +217,7 @@ impl<
// The symbol must already be stored somewhere. // The symbol must already be stored somewhere.
// Will fail on values stored in float regs. // Will fail on values stored in float regs.
// Will fail for values that don't fit in a single register. // Will fail for values that don't fit in a single register.
pub fn to_general_reg(&mut self, buf: &mut Vec<'a, u8>, sym: &Symbol) -> GeneralReg { pub fn load_to_general_reg(&mut self, buf: &mut Vec<'a, u8>, sym: &Symbol) -> GeneralReg {
let storage = if let Some(storage) = self.symbol_storage_map.remove(sym) { let storage = if let Some(storage) = self.symbol_storage_map.remove(sym) {
storage storage
} else { } else {
@ -266,7 +266,7 @@ impl<
// The symbol must already be stored somewhere. // The symbol must already be stored somewhere.
// Will fail on values stored in general regs. // Will fail on values stored in general regs.
// Will fail for values that don't fit in a single register. // Will fail for values that don't fit in a single register.
pub fn to_float_reg(&mut self, buf: &mut Vec<'a, u8>, sym: &Symbol) -> FloatReg { pub fn load_to_float_reg(&mut self, buf: &mut Vec<'a, u8>, sym: &Symbol) -> FloatReg {
let storage = if let Some(storage) = self.symbol_storage_map.remove(sym) { let storage = if let Some(storage) = self.symbol_storage_map.remove(sym) {
storage storage
} else { } else {