fixed warnings

Author: derzz

src/cpu/branch_test.rs

@@ -25,9 +25,9 @@ mod branch_test {
 
     // Literally same as above but just testing if branch can branch negative
     fn jump_neg(cpu: &mut CPU, op: u8, clear: bool, flag: CpuFlags){
-        cpu.load_and_reset(vec![op, 0xFE, 0x00]);
-        cpu.memory[cpu.mem_read(0xFFFC).wrapping_sub(2) as usize] = op::INX;
-        cpu.memory[cpu.mem_read(0xFFFC).wrapping_sub(1) as usize] = 0x00;
+        cpu.load_and_reset(vec![op, 0xFC, 0x00]);
+        cpu.memory[0x7FFE] = op::INX;
+        cpu.memory[0x7FFF] = 0x00;
         if clear {
             println!("branch_test: Allocating flags to clear!");
             cpu.flags = CpuFlags::from_bits_truncate(0b1111_1111);
@@ -51,7 +51,7 @@ mod branch_test {
             cpu.x
         );
 
-        jump(&mut cpu, op, clear, flag);
+        jump_neg(&mut cpu, op, clear, flag);
         assert!(
             cpu.x == 1,
             "jump neg Helper_test positive failed on {:#x}, cpu.x is {}",
@@ -68,9 +68,9 @@ mod branch_test {
             cpu.x
         );
 
-        jump(&mut cpu, op, clear, flag);
+        jump_neg(&mut cpu, op, !clear, flag);
         assert!(
-            cpu.x == 1,
+            cpu.x == 0,
             "jump neg Helper_test negative failed on {:#x}, cpu.x is {}",
             op,
             cpu.x

src/cpu/group1_test.rs

@@ -57,7 +57,7 @@ mod group1_test {
 
         // Zero Page Testing
         print_title!("Zero Page Test");
-        cpu.load_and_reset((vec![first_half + g1_op::ZP, 0xFF]));
+        cpu.load_and_reset(vec![first_half + g1_op::ZP, 0xFF]);
         gen_test_flag(cpu, carry);
         cpu.memory[0xFF] = load_mem;
         cpu.a = load_a;
@@ -87,7 +87,7 @@ mod group1_test {
 
         // Absolute testing
         // Note 0xFE is first due to little endian
-        cpu.load_and_reset((vec![first_half + g1_op::ABSOLUTE_X, 0xFE, 0x01]));
+        cpu.load_and_reset(vec![first_half + g1_op::ABSOLUTE_X, 0xFE, 0x01]);
         gen_test_flag(cpu, carry);
         cpu.memory[0x01FE] = load_mem;
         cpu.a = load_a;
@@ -374,7 +374,7 @@ mod group1_test {
 
         // Zero Page Testing
         print_title!("Zero Page Test");
-        cpu.load_and_reset((vec![first_half + g1_op::ZP, 0xA1]));
+        cpu.load_and_reset(vec![first_half + g1_op::ZP, 0xA1]);
         cpu.a = load_a;
         cpu.run();
         assert!(
@@ -384,7 +384,7 @@ mod group1_test {
 
         // Absolute testing
         // Note 0xFE is first due to little endian
-        cpu.load_and_reset((vec![first_half + g1_op::ABSOLUTE_X, 0xFE, 0x01]));
+        cpu.load_and_reset(vec![first_half + g1_op::ABSOLUTE_X, 0xFE, 0x01]);
         cpu.a = load_a;
         cpu.run();
         assert!(

src/cpu/group3_test.rs

@@ -143,7 +143,7 @@ mod group3_test {
 
         // Zero Page Testing
         print_title!("Zero Page Test");
-        cpu.load_and_reset((vec![first_half + zp_end, 0xFF]));
+        cpu.load_and_reset(vec![first_half + zp_end, 0xFF]);
         cpu.memory[0xFF] = load_mem;
         reg_loader(cpu, x, load_reg);
         cpu.run();
@@ -171,7 +171,7 @@ mod group3_test {
 
         // Absolute testing
         // Note 0xFE is first due to little endian
-        cpu.load_and_reset((vec![first_half + abs_end, 0xFE, 0x01]));
+        cpu.load_and_reset(vec![first_half + abs_end, 0xFE, 0x01]);
         cpu.memory[0x01FE] = load_mem;
         reg_loader(cpu, x, load_reg);
         cpu.run();
@@ -218,7 +218,7 @@ mod group3_test {
         // Set x to be true for cpx, false for cpy
         for i in 0..2 {
             let mut cpu = CPU::new();
-            let mut x = i == 1;
+            let x = i == 1;
             gen_test(&mut cpu, x, 0, 0x05, 0x05);
             assert!(!cpu.flags.contains(CpuFlags::NEGATIVE) && !cpu.flags.contains(CpuFlags::ZERO));
 
@@ -250,7 +250,7 @@ mod group3_test {
                 second_half_zp = g2_op::ZP;
                 second_half_abs = g2_op::ABS;
             }
-            cpu.load_and_reset((vec![first_half + second_half_zp, 0xA1]));
+            cpu.load_and_reset(vec![first_half + second_half_zp, 0xA1]);
             reg_loader(&mut cpu, x, load_reg);
             cpu.run();
             assert!(
@@ -260,7 +260,7 @@ mod group3_test {
 
             // Absolute testing
             // Note 0xFE is first due to little endian
-            cpu.load_and_reset((vec![first_half + second_half_abs, 0xFE, 0x01]));
+            cpu.load_and_reset(vec![first_half + second_half_abs, 0xFE, 0x01]);
             reg_loader(&mut cpu, x, load_reg);
             cpu.run();
             assert!(

src/cpu/op.rs

@@ -118,6 +118,6 @@ pub mod branch_op {
 #[cfg(test)]
 pub mod other_op{
     pub const JSR:u8 = 0x20;
-    pub const RTI: u8 = 0x40;
+    // pub const RTI: u8 = 0x40;
     pub const RTS: u8 = 0x60;
 }

src/cpu/other_test.rs

@@ -2,7 +2,6 @@
 #[cfg(test)]
 mod branch_test {
     use crate::cpu::op::*;
-    use crate::cpu::CpuFlags;
     use crate::cpu::CPU;
 
     // BRK is not tested as every other test hinges on BRK working...