6502/mre-mos6502
1
0
Fork 0
mirror of https://github.com/mre/mos6502.git synced 2024-06-25 22:29:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix clippy warnings

Browse Source
This commit is contained in:
Matthias 2022-06-07 19:52:00 +02:00
parent 363dc47755
commit d1b1c93fd4
1 changed files with 133 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

266
src/cpu.rs
View File

@ -801,24 +801,24 @@ mod tests {
cpu.add_with_carry(0x09); cpu.add_with_carry(0x09);
assert_eq!(cpu.registers.accumulator, 0x09); assert_eq!(cpu.registers.accumulator, 0x09);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.add_with_carry(0x43); cpu.add_with_carry(0x43);
assert_eq!(cpu.registers.accumulator, 0x52); assert_eq!(cpu.registers.accumulator, 0x52);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.add_with_carry(0x48); cpu.add_with_carry(0x48);
assert_eq!(cpu.registers.accumulator, 0x00); assert_eq!(cpu.registers.accumulator, 0x00);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), true); assert!(cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), true); assert!(cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), true); assert!(cpu.registers.status.contains(Status::PS_OVERFLOW));
} }
#[test] #[test]
@ -831,16 +831,16 @@ mod tests {
cpu.subtract_with_carry(0x48); cpu.subtract_with_carry(0x48);
assert_eq!(cpu.registers.accumulator as u8, 0x52); assert_eq!(cpu.registers.accumulator as u8, 0x52);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), true); assert!(cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.subtract_with_carry(0x43); cpu.subtract_with_carry(0x43);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
} }
#[test] #[test]
@ -849,77 +849,77 @@ mod tests {
cpu.add_with_carry(1); cpu.add_with_carry(1);
assert_eq!(cpu.registers.accumulator, 1); assert_eq!(cpu.registers.accumulator, 1);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.add_with_carry(-1); cpu.add_with_carry(-1);
assert_eq!(cpu.registers.accumulator, 0); assert_eq!(cpu.registers.accumulator, 0);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), true); assert!(cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), true); assert!(cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.add_with_carry(1); cpu.add_with_carry(1);
assert_eq!(cpu.registers.accumulator, 2); assert_eq!(cpu.registers.accumulator, 2);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
let mut cpu = CPU::new(); let mut cpu = CPU::new();
cpu.add_with_carry(127); cpu.add_with_carry(127);
assert_eq!(cpu.registers.accumulator, 127); assert_eq!(cpu.registers.accumulator, 127);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.add_with_carry(-127); cpu.add_with_carry(-127);
assert_eq!(cpu.registers.accumulator, 0); assert_eq!(cpu.registers.accumulator, 0);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), true); assert!(cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), true); assert!(cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.registers.status.remove(Status::PS_CARRY); cpu.registers.status.remove(Status::PS_CARRY);
cpu.add_with_carry(-128); cpu.add_with_carry(-128);
assert_eq!(cpu.registers.accumulator, -128); assert_eq!(cpu.registers.accumulator, -128);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), true); assert!(cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.add_with_carry(127); cpu.add_with_carry(127);
assert_eq!(cpu.registers.accumulator, -1); assert_eq!(cpu.registers.accumulator, -1);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), true); assert!(cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
let mut cpu = CPU::new(); let mut cpu = CPU::new();
cpu.add_with_carry(127); cpu.add_with_carry(127);
assert_eq!(cpu.registers.accumulator, 127); assert_eq!(cpu.registers.accumulator, 127);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.add_with_carry(1); cpu.add_with_carry(1);
assert_eq!(cpu.registers.accumulator, -128); assert_eq!(cpu.registers.accumulator, -128);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), true); assert!(cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), true); assert!(cpu.registers.status.contains(Status::PS_OVERFLOW));
let mut cpu = CPU::new(); let mut cpu = CPU::new();
cpu.registers.status.or(Status::PS_CARRY); cpu.registers.status.or(Status::PS_CARRY);
cpu.add_with_carry(-1); cpu.add_with_carry(-1);
assert_eq!(cpu.registers.accumulator, 0); assert_eq!(cpu.registers.accumulator, 0);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), true); assert!(cpu.registers.status.contains(Status::PS_CARRY));
} }
#[test] #[test]
@ -929,26 +929,26 @@ mod tests {
cpu.registers.accumulator = 0; cpu.registers.accumulator = 0;
cpu.and(-1); cpu.and(-1);
assert_eq!(cpu.registers.accumulator, 0); assert_eq!(cpu.registers.accumulator, 0);
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), true); assert!(cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
cpu.registers.accumulator = -1; cpu.registers.accumulator = -1;
cpu.and(0); cpu.and(0);
assert_eq!(cpu.registers.accumulator, 0); assert_eq!(cpu.registers.accumulator, 0);
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), true); assert!(cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
cpu.registers.accumulator = -1; cpu.registers.accumulator = -1;
cpu.and(0x0f); cpu.and(0x0f);
assert_eq!(cpu.registers.accumulator, 0x0f); assert_eq!(cpu.registers.accumulator, 0x0f);
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
cpu.registers.accumulator = -1; cpu.registers.accumulator = -1;
cpu.and(-128); cpu.and(-128);
assert_eq!(cpu.registers.accumulator, -128); assert_eq!(cpu.registers.accumulator, -128);
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), true); assert!(cpu.registers.status.contains(Status::PS_NEGATIVE));
} }
#[test] #[test]
@ -960,55 +960,55 @@ mod tests {
cpu.subtract_with_carry(1); cpu.subtract_with_carry(1);
assert_eq!(cpu.registers.accumulator, -1); assert_eq!(cpu.registers.accumulator, -1);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), true); assert!(cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), true); assert!(cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.execute_instruction((Instruction::SEC, OpInput::UseImplied)); cpu.execute_instruction((Instruction::SEC, OpInput::UseImplied));
cpu.registers.accumulator = -128; cpu.registers.accumulator = -128;
cpu.subtract_with_carry(1); cpu.subtract_with_carry(1);
assert_eq!(cpu.registers.accumulator, 127); assert_eq!(cpu.registers.accumulator, 127);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), true); assert!(cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.execute_instruction((Instruction::SEC, OpInput::UseImplied)); cpu.execute_instruction((Instruction::SEC, OpInput::UseImplied));
cpu.registers.accumulator = 127; cpu.registers.accumulator = 127;
cpu.subtract_with_carry(-1); cpu.subtract_with_carry(-1);
assert_eq!(cpu.registers.accumulator, -128); assert_eq!(cpu.registers.accumulator, -128);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), true); assert!(cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), true); assert!(cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), true); assert!(cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.execute_instruction((Instruction::CLC, OpInput::UseImplied)); cpu.execute_instruction((Instruction::CLC, OpInput::UseImplied));
cpu.registers.accumulator = -64; cpu.registers.accumulator = -64;
cpu.subtract_with_carry(64); cpu.subtract_with_carry(64);
assert_eq!(cpu.registers.accumulator, 127); assert_eq!(cpu.registers.accumulator, 127);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), true); assert!(cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.execute_instruction((Instruction::SEC, OpInput::UseImplied)); cpu.execute_instruction((Instruction::SEC, OpInput::UseImplied));
cpu.registers.accumulator = 0; cpu.registers.accumulator = 0;
cpu.subtract_with_carry(-128); cpu.subtract_with_carry(-128);
assert_eq!(cpu.registers.accumulator, -128); assert_eq!(cpu.registers.accumulator, -128);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), true); assert!(cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), true); assert!(cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), true); assert!(cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.execute_instruction((Instruction::CLC, OpInput::UseImplied)); cpu.execute_instruction((Instruction::CLC, OpInput::UseImplied));
cpu.registers.accumulator = 0; cpu.registers.accumulator = 0;
cpu.subtract_with_carry(127); cpu.subtract_with_carry(127);
assert_eq!(cpu.registers.accumulator, -128); assert_eq!(cpu.registers.accumulator, -128);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), true); assert!(cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), true); assert!(cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
} }
#[test] #[test]
@ -1020,25 +1020,25 @@ mod tests {
cpu.decrement_memory(addr); cpu.decrement_memory(addr);
assert_eq!(cpu.memory.get_byte(addr), 4); assert_eq!(cpu.memory.get_byte(addr), 4);
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
cpu.decrement_memory(addr); cpu.decrement_memory(addr);
assert_eq!(cpu.memory.get_byte(addr), 3); assert_eq!(cpu.memory.get_byte(addr), 3);
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
cpu.decrement_memory(addr); cpu.decrement_memory(addr);
cpu.decrement_memory(addr); cpu.decrement_memory(addr);
cpu.decrement_memory(addr); cpu.decrement_memory(addr);
assert_eq!(cpu.memory.get_byte(addr), 0); assert_eq!(cpu.memory.get_byte(addr), 0);
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), true); assert!(cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
cpu.decrement_memory(addr); cpu.decrement_memory(addr);
assert_eq!(cpu.memory.get_byte(addr) as i8, -1); assert_eq!(cpu.memory.get_byte(addr) as i8, -1);
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), true); assert!(cpu.registers.status.contains(Status::PS_NEGATIVE));
} }
#[test] #[test]
@ -1049,34 +1049,34 @@ mod tests {
cpu.execute_instruction((Instruction::LDA, OpInput::UseImmediate(0))); cpu.execute_instruction((Instruction::LDA, OpInput::UseImmediate(0)));
cpu.execute_instruction((Instruction::LSR, OpInput::UseImplied)); cpu.execute_instruction((Instruction::LSR, OpInput::UseImplied));
assert_eq!(cpu.registers.accumulator, 0); assert_eq!(cpu.registers.accumulator, 0);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), true); assert!(cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.execute_instruction((Instruction::LDA, OpInput::UseImmediate(1))); cpu.execute_instruction((Instruction::LDA, OpInput::UseImmediate(1)));
cpu.execute_instruction((Instruction::LSR, OpInput::UseImplied)); cpu.execute_instruction((Instruction::LSR, OpInput::UseImplied));
assert_eq!(cpu.registers.accumulator, 0); assert_eq!(cpu.registers.accumulator, 0);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), true); assert!(cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), true); assert!(cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.execute_instruction((Instruction::LDA, OpInput::UseImmediate(255))); cpu.execute_instruction((Instruction::LDA, OpInput::UseImmediate(255)));
cpu.execute_instruction((Instruction::LSR, OpInput::UseImplied)); cpu.execute_instruction((Instruction::LSR, OpInput::UseImplied));
assert_eq!(cpu.registers.accumulator, 0x7F); assert_eq!(cpu.registers.accumulator, 0x7F);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), true); assert!(cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.execute_instruction((Instruction::LDA, OpInput::UseImmediate(254))); cpu.execute_instruction((Instruction::LDA, OpInput::UseImmediate(254)));
cpu.execute_instruction((Instruction::LSR, OpInput::UseImplied)); cpu.execute_instruction((Instruction::LSR, OpInput::UseImplied));
assert_eq!(cpu.registers.accumulator, 0x7F); assert_eq!(cpu.registers.accumulator, 0x7F);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
} }
#[test] #[test]
@ -1085,25 +1085,25 @@ mod tests {
cpu.dec_x(); cpu.dec_x();
assert_eq!(cpu.registers.index_x, -1); assert_eq!(cpu.registers.index_x, -1);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), true); assert!(cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.dec_x(); cpu.dec_x();
assert_eq!(cpu.registers.index_x, -2); assert_eq!(cpu.registers.index_x, -2);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), true); assert!(cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.load_x_register(5); cpu.load_x_register(5);
cpu.dec_x(); cpu.dec_x();
assert_eq!(cpu.registers.index_x, 4); assert_eq!(cpu.registers.index_x, 4);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.dec_x(); cpu.dec_x();
cpu.dec_x(); cpu.dec_x();
@ -1111,17 +1111,17 @@ mod tests {
cpu.dec_x(); cpu.dec_x();
assert_eq!(cpu.registers.index_x, 0); assert_eq!(cpu.registers.index_x, 0);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), true); assert!(cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), false); assert!(!cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
cpu.dec_x(); cpu.dec_x();
assert_eq!(cpu.registers.index_x, -1); assert_eq!(cpu.registers.index_x, -1);
assert_eq!(cpu.registers.status.contains(Status::PS_CARRY), false); assert!(!cpu.registers.status.contains(Status::PS_CARRY));
assert_eq!(cpu.registers.status.contains(Status::PS_ZERO), false); assert!(!cpu.registers.status.contains(Status::PS_ZERO));
assert_eq!(cpu.registers.status.contains(Status::PS_NEGATIVE), true); assert!(cpu.registers.status.contains(Status::PS_NEGATIVE));
assert_eq!(cpu.registers.status.contains(Status::PS_OVERFLOW), false); assert!(!cpu.registers.status.contains(Status::PS_OVERFLOW));
} }
#[test] #[test]