From 4d90ffb686b0f6b7029fe9aaae1744288023a596 Mon Sep 17 00:00:00 2001 From: Brendan Hansknecht Date: Mon, 28 Dec 2020 11:39:47 -0800 Subject: [PATCH] Fix typo --- compiler/gen_dev/src/generic64/mod.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/compiler/gen_dev/src/generic64/mod.rs b/compiler/gen_dev/src/generic64/mod.rs index fdc1519bb9..5053ef1673 100644 --- a/compiler/gen_dev/src/generic64/mod.rs +++ b/compiler/gen_dev/src/generic64/mod.rs @@ -58,9 +58,9 @@ pub trait Assembler { enum SymbolStorage { // These may need layout, but I am not sure. // I think whenever a symbol would be used, we specify layout anyways. - GPRegeg(GPReg), + GPReg(GPReg), Stack(i32), - StackAndGPRegeg(GPReg, i32), + StackAndGPReg(GPReg, i32), } pub trait GPRegTrait: Copy + Eq + std::hash::Hash + std::fmt::Debug + 'static {} @@ -221,8 +221,8 @@ impl<'a, GPReg: GPRegTrait, ASM: Assembler, CC: CallConv> Backend< fn return_symbol(&mut self, sym: &Symbol) -> Result<(), String> { let val = self.symbols_map.get(sym); match val { - Some(SymbolStorage::GPRegeg(reg)) if *reg == CC::GP_RETURN_REGS[0] => Ok(()), - Some(SymbolStorage::GPRegeg(reg)) => { + Some(SymbolStorage::GPReg(reg)) if *reg == CC::GP_RETURN_REGS[0] => Ok(()), + Some(SymbolStorage::GPReg(reg)) => { // 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. ASM::mov_reg64_reg64(&mut self.buf, CC::GP_RETURN_REGS[0], *reg); @@ -258,26 +258,26 @@ impl<'a, GPReg: GPRegTrait, ASM: Assembler, CC: CallConv> }?; 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) } fn load_to_reg(&mut self, sym: &Symbol) -> Result { let val = self.symbols_map.remove(sym); match val { - Some(SymbolStorage::GPRegeg(reg)) => { - self.symbols_map.insert(*sym, SymbolStorage::GPRegeg(reg)); + Some(SymbolStorage::GPReg(reg)) => { + self.symbols_map.insert(*sym, SymbolStorage::GPReg(reg)); Ok(reg) } - Some(SymbolStorage::StackAndGPRegeg(reg, offset)) => { + Some(SymbolStorage::StackAndGPReg(reg, offset)) => { self.symbols_map - .insert(*sym, SymbolStorage::StackAndGPRegeg(reg, offset)); + .insert(*sym, SymbolStorage::StackAndGPReg(reg, offset)); Ok(reg) } Some(SymbolStorage::Stack(offset)) => { let reg = self.claim_gp_reg(sym)?; 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); Ok(reg) } @@ -288,13 +288,13 @@ impl<'a, GPReg: GPRegTrait, ASM: Assembler, CC: CallConv> fn free_to_stack(&mut self, sym: &Symbol) -> Result<(), String> { let val = self.symbols_map.remove(sym); match val { - Some(SymbolStorage::GPRegeg(reg)) => { + Some(SymbolStorage::GPReg(reg)) => { let offset = self.increase_stack_size(8)?; ASM::mov_stack32_reg64(&mut self.buf, offset as i32, reg); self.symbols_map.insert(*sym, SymbolStorage::Stack(offset)); Ok(()) } - Some(SymbolStorage::StackAndGPRegeg(_, offset)) => { + Some(SymbolStorage::StackAndGPReg(_, offset)) => { self.symbols_map.insert(*sym, SymbolStorage::Stack(offset)); Ok(()) }