language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 22:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix typo

Browse source
This commit is contained in:
Brendan Hansknecht 2020-12-28 11:39:47 -08:00
parent f6dc256cad
commit 4d90ffb686
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,9 +58,9 @@ pub trait Assembler<GPReg: GPRegTrait> {
enum SymbolStorage<GPReg: GPRegTrait> { enum SymbolStorage<GPReg: GPRegTrait> {
// These may need layout, but I am not sure. // These may need layout, but I am not sure.
// I think whenever a symbol would be used, we specify layout anyways. // I think whenever a symbol would be used, we specify layout anyways.
GPRegeg(GPReg), GPReg(GPReg),
Stack(i32), Stack(i32),
StackAndGPRegeg(GPReg, i32), StackAndGPReg(GPReg, i32),
} }
pub trait GPRegTrait: Copy + Eq + std::hash::Hash + std::fmt::Debug + 'static {} pub trait GPRegTrait: Copy + Eq + std::hash::Hash + std::fmt::Debug + 'static {}
@ -221,8 +221,8 @@ impl<'a, GPReg: GPRegTrait, ASM: Assembler<GPReg>, CC: CallConv<GPReg>> Backend<
fn return_symbol(&mut self, sym: &Symbol) -> Result<(), String> { fn return_symbol(&mut self, sym: &Symbol) -> Result<(), String> {
let val = self.symbols_map.get(sym); let val = self.symbols_map.get(sym);
match val { match val {
Some(SymbolStorage::GPRegeg(reg)) if *reg == CC::GP_RETURN_REGS[0] => Ok(()), Some(SymbolStorage::GPReg(reg)) if *reg == CC::GP_RETURN_REGS[0] => Ok(()),
Some(SymbolStorage::GPRegeg(reg)) => { Some(SymbolStorage::GPReg(reg)) => {
// If it fits in a general purpose register, just copy it over to. // If it fits in a general purpose register, just copy it over to.
// Technically this can be optimized to produce shorter instructions if less than 64bits. // Technically this can be optimized to produce shorter instructions if less than 64bits.
ASM::mov_reg64_reg64(&mut self.buf, CC::GP_RETURN_REGS[0], *reg); ASM::mov_reg64_reg64(&mut self.buf, CC::GP_RETURN_REGS[0], *reg);
@ -258,26 +258,26 @@ impl<'a, GPReg: GPRegTrait, ASM: Assembler<GPReg>, CC: CallConv<GPReg>>
}?; }?;
self.gp_used_regs.push((reg, *sym)); self.gp_used_regs.push((reg, *sym));
self.symbols_map.insert(*sym, SymbolStorage::GPRegeg(reg)); self.symbols_map.insert(*sym, SymbolStorage::GPReg(reg));
Ok(reg) Ok(reg)
} }
fn load_to_reg(&mut self, sym: &Symbol) -> Result<GPReg, String> { fn load_to_reg(&mut self, sym: &Symbol) -> Result<GPReg, String> {
let val = self.symbols_map.remove(sym); let val = self.symbols_map.remove(sym);
match val { match val {
Some(SymbolStorage::GPRegeg(reg)) => { Some(SymbolStorage::GPReg(reg)) => {
self.symbols_map.insert(*sym, SymbolStorage::GPRegeg(reg)); self.symbols_map.insert(*sym, SymbolStorage::GPReg(reg));
Ok(reg) Ok(reg)
} }
Some(SymbolStorage::StackAndGPRegeg(reg, offset)) => { Some(SymbolStorage::StackAndGPReg(reg, offset)) => {
self.symbols_map self.symbols_map
.insert(*sym, SymbolStorage::StackAndGPRegeg(reg, offset)); .insert(*sym, SymbolStorage::StackAndGPReg(reg, offset));
Ok(reg) Ok(reg)
} }
Some(SymbolStorage::Stack(offset)) => { Some(SymbolStorage::Stack(offset)) => {
let reg = self.claim_gp_reg(sym)?; let reg = self.claim_gp_reg(sym)?;
self.symbols_map self.symbols_map
.insert(*sym, SymbolStorage::StackAndGPRegeg(reg, offset)); .insert(*sym, SymbolStorage::StackAndGPReg(reg, offset));
ASM::mov_reg64_stack32(&mut self.buf, reg, offset as i32); ASM::mov_reg64_stack32(&mut self.buf, reg, offset as i32);
Ok(reg) Ok(reg)
} }
@ -288,13 +288,13 @@ impl<'a, GPReg: GPRegTrait, ASM: Assembler<GPReg>, CC: CallConv<GPReg>>
fn free_to_stack(&mut self, sym: &Symbol) -> Result<(), String> { fn free_to_stack(&mut self, sym: &Symbol) -> Result<(), String> {
let val = self.symbols_map.remove(sym); let val = self.symbols_map.remove(sym);
match val { match val {
Some(SymbolStorage::GPRegeg(reg)) => { Some(SymbolStorage::GPReg(reg)) => {
let offset = self.increase_stack_size(8)?; let offset = self.increase_stack_size(8)?;
ASM::mov_stack32_reg64(&mut self.buf, offset as i32, reg); ASM::mov_stack32_reg64(&mut self.buf, offset as i32, reg);
self.symbols_map.insert(*sym, SymbolStorage::Stack(offset)); self.symbols_map.insert(*sym, SymbolStorage::Stack(offset));
Ok(()) Ok(())
} }
Some(SymbolStorage::StackAndGPRegeg(_, offset)) => { Some(SymbolStorage::StackAndGPReg(_, offset)) => {
self.symbols_map.insert(*sym, SymbolStorage::Stack(offset)); self.symbols_map.insert(*sym, SymbolStorage::Stack(offset));
Ok(()) Ok(())
} }