diff --git a/src/machine.rs b/src/machine.rs index 5372e3d..1980cf0 100644 --- a/src/machine.rs +++ b/src/machine.rs @@ -157,6 +157,12 @@ impl Machine { self.branch_if_minus(addr); } + (instruction::BPL, instruction::UseRelative(rel)) => { + let addr = self.registers.program_counter + + AddressDiff(rel as i32); + self.branch_if_positive(addr); + } + (instruction::CLC, instruction::UseImplied) => { self.registers.status.and(!PS_CARRY); } @@ -583,6 +589,12 @@ impl Machine { } } + fn branch_if_positive(&mut self, addr: Address) { + if !self.registers.status.contains(PS_NEGATIVE) { + self.registers.program_counter = addr; + } + } + fn push_on_stack(&mut self, val: u8) { let addr = self.registers.stack_pointer.to_address(); self.memory.set_byte(addr, val); @@ -956,3 +968,16 @@ fn branch_if_minus_test() { assert_eq!(machine.registers.program_counter, Address(0xABCD)); } } + +#[test] +fn branch_if_positive_test() { + let mut machine = Machine::new(); + + machine.registers.status.insert(PS_NEGATIVE); + machine.branch_if_positive(Address(0xABCD)); + assert_eq!(machine.registers.program_counter, Address(0)); + + machine.registers.status.remove(PS_NEGATIVE); + machine.branch_if_positive(Address(0xABCD)); + assert_eq!(machine.registers.program_counter, Address(0xABCD)); +}