From 1d0fd6aad0d73d4791658e2145fe9f9e76a56741 Mon Sep 17 00:00:00 2001 From: Sam M W Date: Fri, 21 Oct 2022 06:37:41 +0100 Subject: [PATCH] remove unused function `dec_x` --- src/cpu.rs | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/cpu.rs b/src/cpu.rs index 751fcf9..d73a735 100644 --- a/src/cpu.rs +++ b/src/cpu.rs @@ -707,12 +707,6 @@ impl CPU { ); } - fn dec_x(&mut self) { - let mut r = self.registers.index_x; - CPU::decrement(&mut r, &mut self.registers.status); - self.load_x_register(r); - } - fn jump(&mut self, addr: Address) { self.registers.program_counter = addr; } @@ -1160,14 +1154,14 @@ mod tests { fn dec_x_test() { let mut cpu = CPU::new(); - cpu.dec_x(); + cpu.execute_instruction((Instruction::DEX, OpInput::UseImplied)); assert_eq!(cpu.registers.index_x, 0xff); assert!(!cpu.registers.status.contains(Status::PS_CARRY)); assert!(!cpu.registers.status.contains(Status::PS_ZERO)); assert!(cpu.registers.status.contains(Status::PS_NEGATIVE)); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW)); - cpu.dec_x(); + cpu.execute_instruction((Instruction::DEX, OpInput::UseImplied)); assert_eq!(cpu.registers.index_x, 0xfe); assert!(!cpu.registers.status.contains(Status::PS_CARRY)); assert!(!cpu.registers.status.contains(Status::PS_ZERO)); @@ -1175,17 +1169,17 @@ mod tests { assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW)); cpu.load_x_register(5); - cpu.dec_x(); + cpu.execute_instruction((Instruction::DEX, OpInput::UseImplied)); assert_eq!(cpu.registers.index_x, 4); assert!(!cpu.registers.status.contains(Status::PS_CARRY)); assert!(!cpu.registers.status.contains(Status::PS_ZERO)); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE)); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW)); - cpu.dec_x(); - cpu.dec_x(); - cpu.dec_x(); - cpu.dec_x(); + cpu.execute_instruction((Instruction::DEX, OpInput::UseImplied)); + cpu.execute_instruction((Instruction::DEX, OpInput::UseImplied)); + cpu.execute_instruction((Instruction::DEX, OpInput::UseImplied)); + cpu.execute_instruction((Instruction::DEX, OpInput::UseImplied)); assert_eq!(cpu.registers.index_x, 0); assert!(!cpu.registers.status.contains(Status::PS_CARRY)); @@ -1193,7 +1187,7 @@ mod tests { assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE)); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW)); - cpu.dec_x(); + cpu.execute_instruction((Instruction::DEX, OpInput::UseImplied)); assert_eq!(cpu.registers.index_x, 0xff); assert!(!cpu.registers.status.contains(Status::PS_CARRY)); assert!(!cpu.registers.status.contains(Status::PS_ZERO));