clippy fix

.github/workflows/rust.yml

@@ -22,3 +22,5 @@ jobs:
       run: cargo build --verbose
     - name: Run tests
       run: cargo test --verbose
+    - name: Run Clippy
+      run: cargo clippy --all-targets --all-features

snes-core/src/common/flags.rs

@@ -18,4 +18,4 @@ pub enum Flags {
 pub enum ModeFlag {
     Carry,
     EmulationMode,
-}
+}

snes-core/src/cpu/bus.rs

@@ -34,7 +34,7 @@ impl Bus {
     }
 
     fn read_wram(&self, address: u32) -> u8 {
-        return self.wram[(address & 0xFFFF) as usize];
+        self.wram[(address & 0xFFFF) as usize]
     }
 
     fn write_wram(&mut self, address: u32, value: u8) {
@@ -110,6 +110,12 @@ impl Bus {
     }
 }
 
+impl Default for Bus {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 
 #[cfg(test)]
 mod bus_tests {

snes-core/src/cpu/cycles.rs

@@ -53,9 +53,8 @@ fn common_conditions(cpu_registers: &Registers, addressing_mode: AddressingMode,
             Condition::MemorySelectFlag => {
                 if cpu_registers.is_16bit_mode() {
                     cycles += 1;
-                    match addressing_mode {
+                    if let A::Immediate = addressing_mode {
-                        A::Immediate => bytes += 1,
+                        bytes += 1
-                        _ => {},
                     }
                 }
             },

snes-core/src/cpu/dma.rs

@@ -47,7 +47,7 @@ pub enum TransferFormat {
     FourBytesFourRegisters, // Write once
 }
 
-pub struct DMATransferProps {
+#[allow(dead_code)] pub struct DMATransferProps {
     channel: DMAChannel,
     channel_number: u8,
     direction: TransferDirection,
@@ -119,15 +119,15 @@ impl DMATransferProps {
             DMATransferProps::read_channel_register(registers, DASXL, channel_number) as u16;
 
         Self {
-            channel: channel,
+            channel,
-            channel_number: channel_number,
+            channel_number,
-            direction: direction,
+            direction,
-            addressing_mode: addressing_mode,
+            addressing_mode,
-            auto_update_a_address: auto_update_a_address,
+            auto_update_a_address,
-            transfer_format: transfer_format,
+            transfer_format,
-            a_bus_address: a_bus_address,
+            a_bus_address,
-            b_bus_address: b_bus_address,
+            b_bus_address,
-            number_of_bytes: number_of_bytes,
+            number_of_bytes,
         }
     }
 
@@ -245,8 +245,8 @@ impl DMA {
     pub fn prepare_dma_transfer(&mut self, dma_select: u8) {
         self.active_dma_transfers = Vec::new();
         let mut active_channels = [false; 8];
-        for i in 0..8 {
+        for (i, active_channel) in active_channels.iter_mut().enumerate() {
-            active_channels[i] = (dma_select & (1 << i)) != 0;
+            *active_channel = (dma_select & (1 << i)) != 0;
         }
 
         for (channel, is_active) in active_channels.iter().enumerate() {
@@ -284,4 +284,10 @@ impl DMA {
         }
         pending_bus_writes
     }
-}
+}
+
+impl Default for DMA {
+    fn default() -> Self {
+        Self::new()
+    }
+}

snes-core/src/cpu/instructions/adc.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, read_write_common::{read_8bit_from_address, read_16bit_from_address}};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "ADC";
+static INSTR_NAME: &str = "ADC";
 
 pub struct ADC {
     pub addressing_mode: AddressingMode,
@@ -51,7 +51,7 @@ impl CPUInstruction for ADC8BIN {
         );
         registers.set_low_a(result);
         registers.set_flags(&affected_flags);
-        let (bytes, cycles) = cycles::increment_cycles_arithmetic(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_arithmetic(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -73,7 +73,7 @@ impl CPUInstruction for ADC16BIN {
         );
         registers.a = result;
         registers.set_flags(&affected_flags);
-        let (bytes, cycles) = cycles::increment_cycles_arithmetic(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_arithmetic(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -95,7 +95,7 @@ impl CPUInstruction for ADC8BCD {
         );
         registers.set_low_a(result);
         registers.set_flags(&affected_flags);
-        let (bytes, cycles) = cycles::increment_cycles_arithmetic(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_arithmetic(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -117,7 +117,7 @@ impl CPUInstruction for ADC16BCD {
         );
         registers.a = result;
         registers.set_flags(&affected_flags);
-        let (bytes, cycles) = cycles::increment_cycles_arithmetic(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_arithmetic(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 

snes-core/src/cpu/instructions/and.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, read_write_common::{read_8bit_from_address, read_16bit_from_address}};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "AND";
+static INSTR_NAME: &str = "AND";
 
 pub struct AND {
     pub addressing_mode: AddressingMode,
@@ -43,7 +43,7 @@ impl CPUInstruction for AND8 {
         );
         registers.set_low_a(result);
         registers.set_flags(&affected_flags);
-        let (bytes, cycles) = cycles::increment_cycles_bitwise(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_bitwise(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -64,7 +64,7 @@ impl CPUInstruction for AND16 {
         );
         registers.a = result;
         registers.set_flags(&affected_flags);
-        let (bytes, cycles) = cycles::increment_cycles_bitwise(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_bitwise(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 

snes-core/src/cpu/instructions/asl.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "ASL";
+static INSTR_NAME: &str = "ASL";
 
 pub struct ASL {
     pub addressing_mode: AddressingMode,
@@ -42,7 +42,7 @@ impl CPUInstruction for ASL8 {
         );
         registers.set_low_a(result);
         registers.set_flags(&affected_flags);
-        let (bytes, cycles) = cycles::increment_cycles_bitwise(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_bitwise(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -62,7 +62,7 @@ impl CPUInstruction for ASL16 {
         );
         registers.a = result;
         registers.set_flags(&affected_flags);
-        let (bytes, cycles) = cycles::increment_cycles_bitwise(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_bitwise(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 

snes-core/src/cpu/instructions/bcc.rs

@@ -4,7 +4,7 @@ use super::CPUInstruction;
 use super::decoder_common;
 use super::branch_common;
 
-static INSTR_NAME: &'static str = "BCC";
+static INSTR_NAME: &str = "BCC";
 
 pub struct BCC {}
 

snes-core/src/cpu/instructions/bcs.rs

@@ -4,7 +4,7 @@ use super::CPUInstruction;
 use super::decoder_common;
 use super::branch_common;
 
-static INSTR_NAME: &'static str = "BCS";
+static INSTR_NAME: &str = "BCS";
 
 pub struct BCS {}
 

snes-core/src/cpu/instructions/beq.rs

@@ -4,7 +4,7 @@ use super::CPUInstruction;
 use super::decoder_common;
 use super::branch_common;
 
-static INSTR_NAME: &'static str = "BEQ";
+static INSTR_NAME: &str = "BEQ";
 
 pub struct BEQ {}
 

snes-core/src/cpu/instructions/bit.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, bit_common, read_write_common::{read_8bit_from_address, read_16bit_from_address}};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "BIT";
+static INSTR_NAME: &str = "BIT";
 
 pub struct BIT {
     pub addressing_mode: AddressingMode,
@@ -43,7 +43,7 @@ impl CPUInstruction for BIT8 {
             read_8bit_from_address(registers, bus, self.addressing_mode),
             self.addressing_mode,
         );
-        let (bytes, cycles) = cycles::increment_cycles_bit(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_bit(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -64,7 +64,7 @@ impl CPUInstruction for BIT16 {
             read_16bit_from_address(registers, bus, self.addressing_mode),
             self.addressing_mode,
         );
-        let (bytes, cycles) = cycles::increment_cycles_bit(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_bit(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 

snes-core/src/cpu/instructions/bmi.rs

@@ -4,7 +4,7 @@ use super::CPUInstruction;
 use super::decoder_common;
 use super::branch_common;
 
-static INSTR_NAME: &'static str = "BMI";
+static INSTR_NAME: &str = "BMI";
 
 pub struct BMI {}
 

snes-core/src/cpu/instructions/bne.rs

@@ -4,7 +4,7 @@ use super::CPUInstruction;
 use super::decoder_common;
 use super::branch_common;
 
-static INSTR_NAME: &'static str = "BNE";
+static INSTR_NAME: &str = "BNE";
 
 pub struct BNE {}
 

snes-core/src/cpu/instructions/bpl.rs

@@ -4,7 +4,7 @@ use super::CPUInstruction;
 use super::decoder_common;
 use super::branch_common;
 
-static INSTR_NAME: &'static str = "BPL";
+static INSTR_NAME: &str = "BPL";
 
 pub struct BPL {}
 

snes-core/src/cpu/instructions/bra.rs

@@ -5,7 +5,7 @@ use super::decoder_common;
 use super::branch_common;
 use crate::cpu::cycles;
 
-static INSTR_NAME: &'static str = "BRA";
+static INSTR_NAME: &str = "BRA";
 
 pub struct BRA {}
 

snes-core/src/cpu/instructions/branch_common.rs

@@ -22,6 +22,5 @@ pub fn do_branch(nearlabel: u8, registers: &mut Registers) -> bool {
         registers.increment_pc(nearlabel as u16);
     }
     let new_pc = registers.get_pc_address();
-    let page_boundary_crossed = (old_pc & 0xFF00) != (new_pc & 0xFF00);
+    (old_pc & 0xFF00) != (new_pc & 0xFF00)
-    return page_boundary_crossed
 }

snes-core/src/cpu/instructions/brk.rs

@@ -5,7 +5,7 @@ use super::decoder_common;
 use super::push_common;
 use crate::cpu::cycles;
 
-static INSTR_NAME: &'static str = "BRK";
+static INSTR_NAME: &str = "BRK";
 
 pub struct BRK {}
 
@@ -24,13 +24,3 @@ impl CPUInstruction for BRK {
         decoder_common::mnemonic_single_byte_instr(opcode, INSTR_NAME)
     }
 }
-
-
-#[cfg(test)]
-mod cpu_instructions_tests {
-    use super::*;
-
-    #[test]
-    fn test() {
-    }
-}

snes-core/src/cpu/instructions/brl.rs

@@ -4,7 +4,7 @@ use super::CPUInstruction;
 use super::decoder_common;
 use crate::cpu::cycles;
 
-static INSTR_NAME: &'static str = "BRL";
+static INSTR_NAME: &str = "BRL";
 
 pub struct BRL {}
 

snes-core/src/cpu/instructions/bvc.rs

@@ -4,7 +4,7 @@ use super::CPUInstruction;
 use super::decoder_common;
 use super::branch_common;
 
-static INSTR_NAME: &'static str = "BVC";
+static INSTR_NAME: &str = "BVC";
 
 pub struct BVC {}
 

snes-core/src/cpu/instructions/bvs.rs

@@ -4,7 +4,7 @@ use super::CPUInstruction;
 use super::decoder_common;
 use super::branch_common;
 
-static INSTR_NAME: &'static str = "BVS";
+static INSTR_NAME: &str = "BVS";
 
 pub struct BVS {}
 

snes-core/src/cpu/instructions/clc.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "CLC";
+static INSTR_NAME: &str = "CLC";
 
 pub struct CLC {}
 

snes-core/src/cpu/instructions/cld.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "CLD";
+static INSTR_NAME: &str = "CLD";
 
 pub struct CLD {}
 

snes-core/src/cpu/instructions/cli.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "CLI";
+static INSTR_NAME: &str = "CLI";
 
 pub struct CLI {}
 

snes-core/src/cpu/instructions/clv.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "CLV";
+static INSTR_NAME: &str = "CLV";
 
 pub struct CLV {}
 

snes-core/src/cpu/instructions/cmp.rs

@@ -5,7 +5,7 @@ use super::{CPUInstruction, read_write_common::{read_8bit_from_address, read_16b
 use super::decoder_common;
 use super::comp_common;
 
-static INSTR_NAME: &'static str = "CMP";
+static INSTR_NAME: &str = "CMP";
 
 pub struct CMP {
     pub addressing_mode: AddressingMode,
@@ -43,7 +43,7 @@ impl CPUInstruction for CMP8 {
             registers.a as u8,
             read_8bit_from_address(registers, bus, self.addressing_mode),
         );
-        let (bytes, cycles) = cycles::increment_cycles_arithmetic(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_arithmetic(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -63,7 +63,7 @@ impl CPUInstruction for CMP16 {
             registers.a,
             read_16bit_from_address(registers, bus, self.addressing_mode),
         );
-        let (bytes, cycles) = cycles::increment_cycles_arithmetic(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_arithmetic(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 

snes-core/src/cpu/instructions/cop.rs

@@ -5,7 +5,7 @@ use super::decoder_common;
 use super::push_common;
 use crate::cpu::cycles;
 
-static INSTR_NAME: &'static str = "COP";
+static INSTR_NAME: &str = "COP";
 
 pub struct COP {}
 
@@ -24,13 +24,3 @@ impl CPUInstruction for COP {
         decoder_common::mnemonic_single_byte_instr(opcode, INSTR_NAME)
     }
 }
-
-
-#[cfg(test)]
-mod cpu_instructions_tests {
-    use super::*;
-
-    #[test]
-    fn test() {
-    }
-}

snes-core/src/cpu/instructions/cpx.rs

@@ -5,7 +5,7 @@ use super::{CPUInstruction, read_write_common::{read_8bit_from_address, read_16b
 use super::decoder_common;
 use super::comp_common;
 
-static INSTR_NAME: &'static str = "CPX";
+static INSTR_NAME: &str = "CPX";
 
 pub struct CPX {
     pub addressing_mode: AddressingMode,
@@ -43,7 +43,7 @@ impl CPUInstruction for CPX8 {
             registers.x as u8,
             read_8bit_from_address(registers, bus, self.addressing_mode),
         );
-        let (bytes, cycles) = cycles::increment_cycles_comp_index(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_comp_index(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -63,7 +63,7 @@ impl CPUInstruction for CPX16 {
             registers.x,
             read_16bit_from_address(registers, bus, self.addressing_mode),
         );
-        let (bytes, cycles) = cycles::increment_cycles_comp_index(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_comp_index(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 

snes-core/src/cpu/instructions/cpy.rs

@@ -5,7 +5,7 @@ use super::{CPUInstruction, read_write_common::{read_8bit_from_address, read_16b
 use super::decoder_common;
 use super::comp_common;
 
-static INSTR_NAME: &'static str = "CPY";
+static INSTR_NAME: &str = "CPY";
 
 pub struct CPY {
     pub addressing_mode: AddressingMode,
@@ -43,7 +43,7 @@ impl CPUInstruction for CPY8 {
             registers.y as u8,
             read_8bit_from_address(registers, bus, self.addressing_mode),
         );
-        let (bytes, cycles) = cycles::increment_cycles_comp_index(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_comp_index(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -63,7 +63,7 @@ impl CPUInstruction for CPY16 {
             registers.y,
             read_16bit_from_address(registers, bus, self.addressing_mode),
         );
-        let (bytes, cycles) = cycles::increment_cycles_comp_index(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_comp_index(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 

snes-core/src/cpu/instructions/dec.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, dec_common, read_write_common::{read_8bit_from_address, write_8bit_to_address, read_16bit_from_address, write_16bit_to_address}};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "DEC";
+static INSTR_NAME: &str = "DEC";
 
 pub struct DEC {
     pub addressing_mode: AddressingMode,
@@ -42,7 +42,7 @@ impl CPUInstruction for DEC8 {
             read_8bit_from_address(registers, bus, self.addressing_mode),
         ) as u8;
         write_8bit_to_address(registers, bus, self.addressing_mode, result);
-        let (bytes, cycles) = cycles::increment_cycles_inc_dec(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_inc_dec(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -62,7 +62,7 @@ impl CPUInstruction for DEC16 {
             read_16bit_from_address(registers, bus, self.addressing_mode),
         ) as u16;
         write_16bit_to_address(registers, bus, self.addressing_mode, result);
-        let (bytes, cycles) = cycles::increment_cycles_inc_dec(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_inc_dec(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 

snes-core/src/cpu/instructions/dex.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, dec_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "DEX";
+static INSTR_NAME: &str = "DEX";
 
 pub struct DEX {}
 

snes-core/src/cpu/instructions/dey.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, dec_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "DEY";
+static INSTR_NAME: &str = "DEY";
 
 pub struct DEY {}
 

snes-core/src/cpu/instructions/eor.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, read_write_common::{read_8bit_from_address, read_16bit_from_address}};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "EOR";
+static INSTR_NAME: &str = "EOR";
 
 pub struct EOR {
     pub addressing_mode: AddressingMode,
@@ -41,7 +41,7 @@ impl CPUInstruction for EOR8 {
         let (result, affected_flags) = alu::eor(registers.a as u8, value);
         registers.set_low_a(result);
         registers.set_flags(&affected_flags);
-        let (bytes, cycles) = cycles::increment_cycles_bitwise(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_bitwise(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -60,7 +60,7 @@ impl CPUInstruction for EOR16 {
         let (result, affected_flags) = alu::eor(registers.a, value);
         registers.a = result;
         registers.set_flags(&affected_flags);
-        let (bytes, cycles) = cycles::increment_cycles_bitwise(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_bitwise(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 

snes-core/src/cpu/instructions/inc.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, dec_common, read_write_common::{read_8bit_from_address, write_8bit_to_address, read_16bit_from_address, write_16bit_to_address}};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "INC";
+static INSTR_NAME: &str = "INC";
 
 pub struct INC {
     pub addressing_mode: AddressingMode,
@@ -42,7 +42,7 @@ impl CPUInstruction for INC8 {
             read_8bit_from_address(registers, bus, self.addressing_mode),
         ) as u8;
         write_8bit_to_address(registers, bus, self.addressing_mode, result);
-        let (bytes, cycles) = cycles::increment_cycles_inc_dec(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_inc_dec(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -62,7 +62,7 @@ impl CPUInstruction for INC16 {
             read_16bit_from_address(registers, bus, self.addressing_mode),
         ) as u16;
         write_16bit_to_address(registers, bus, self.addressing_mode, result);
-        let (bytes, cycles) = cycles::increment_cycles_inc_dec(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_inc_dec(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 

snes-core/src/cpu/instructions/inx.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, dec_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "INX";
+static INSTR_NAME: &str = "INX";
 
 pub struct INX {}
 

snes-core/src/cpu/instructions/iny.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, dec_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "INY";
+static INSTR_NAME: &str = "INY";
 
 pub struct INY {}
 

snes-core/src/cpu/instructions/jmp.rs

@@ -6,7 +6,7 @@ use super::CPUInstruction;
 use super::decoder_common;
 use crate::cpu::cycles;
 
-static INSTR_NAME: &'static str = "JMP";
+static INSTR_NAME: &str = "JMP";
 
 pub struct JMP {
     pub addressing_mode: AddressingMode,
@@ -14,12 +14,8 @@ pub struct JMP {
 
 impl CPUInstruction for JMP {
     fn execute(&self, registers: &mut Registers, bus: &mut Bus) {
-        let effective_address = get_effective_address(&registers, bus, self.addressing_mode);
+        let effective_address = get_effective_address(registers, bus, self.addressing_mode);
-        let is_long = match self.addressing_mode {
+        let is_long = matches!(self.addressing_mode, AddressingMode::AbsoluteLong | AddressingMode::AbsoluteIndirectLong);
-            AddressingMode::AbsoluteLong |
-            AddressingMode::AbsoluteIndirectLong => true,
-            _  => false,
-        };
         registers.pc = effective_address as u16;
         if is_long {
             registers.pbr = (effective_address >> 16) as u8;

snes-core/src/cpu/instructions/jsr.rs

@@ -6,7 +6,7 @@ use super::{CPUInstruction, push_common};
 use super::decoder_common;
 use crate::cpu::cycles;
 
-static INSTR_NAME: &'static str = "JSR";
+static INSTR_NAME: &str = "JSR";
 
 pub struct JSR {
     pub addressing_mode: AddressingMode,
@@ -15,11 +15,7 @@ pub struct JSR {
 impl CPUInstruction for JSR {
     fn execute(&self, registers: &mut Registers, bus: &mut Bus) {
         let effective_address = get_effective_address(registers, bus, self.addressing_mode);
-        let is_long = match self.addressing_mode {
+        let is_long = matches!(self.addressing_mode, AddressingMode::AbsoluteLong | AddressingMode::AbsoluteIndirectLong);
-            AddressingMode::AbsoluteLong |
-            AddressingMode::AbsoluteIndirectLong => true,
-            _  => false,
-        };
         // We need to push the *next* instruction onto the stack
         let (bytes, cycles) = cycles::increment_cycles_jsr(self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;

snes-core/src/cpu/instructions/lda.rs

@@ -7,7 +7,7 @@ use super::read_write_common::{read_8bit_from_address, read_16bit_from_address};
 use super::{CPUInstruction, bit_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "LDA";
+static INSTR_NAME: &str = "LDA";
 
 pub struct LDA {
     pub addressing_mode: AddressingMode,
@@ -47,7 +47,7 @@ impl CPUInstruction for LDA8 {
         ]);
         registers.set_low_a(value);
         bit_common::do_bit(registers, registers.a as u8, value, self.addressing_mode);
-        let (bytes, cycles) = cycles::increment_cycles_lda(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_lda(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -68,7 +68,7 @@ impl CPUInstruction for LDA16 {
             Flags::Negative(value >> 15 == 1),
             Flags::Zero(value == 0),
         ]);
-        let (bytes, cycles) = cycles::increment_cycles_lda(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_lda(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 

snes-core/src/cpu/instructions/ldx.rs

@@ -7,7 +7,7 @@ use super::read_write_common::{read_8bit_from_address, read_16bit_from_address};
 use super::{CPUInstruction, bit_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "LDX";
+static INSTR_NAME: &str = "LDX";
 
 pub struct LDX {
     pub addressing_mode: AddressingMode,
@@ -47,7 +47,7 @@ impl CPUInstruction for LDX8 {
         ]);
         registers.set_low_x(value);
         bit_common::do_bit(registers, registers.x as u8, value, self.addressing_mode);
-        let (bytes, cycles) = cycles::increment_cycles_ld_index(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_ld_index(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -68,7 +68,7 @@ impl CPUInstruction for LDX16 {
             Flags::Negative(value >> 15 == 1),
             Flags::Zero(value == 0),
         ]);
-        let (bytes, cycles) = cycles::increment_cycles_ld_index(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_ld_index(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 

snes-core/src/cpu/instructions/ldy.rs

@@ -7,7 +7,7 @@ use super::read_write_common::{read_8bit_from_address, read_16bit_from_address};
 use super::{CPUInstruction, bit_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "LDY";
+static INSTR_NAME: &str = "LDY";
 
 pub struct LDY {
     pub addressing_mode: AddressingMode,
@@ -47,7 +47,7 @@ impl CPUInstruction for LDY8 {
         ]);
         registers.set_low_y(value);
         bit_common::do_bit(registers, registers.y as u8, value, self.addressing_mode);
-        let (bytes, cycles) = cycles::increment_cycles_ld_index(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_ld_index(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -68,7 +68,7 @@ impl CPUInstruction for LDY16 {
             Flags::Negative(value >> 15 == 1),
             Flags::Zero(value == 0),
         ]);
-        let (bytes, cycles) = cycles::increment_cycles_ld_index(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_ld_index(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 

snes-core/src/cpu/instructions/lsr.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, read_write_common::{write_8bit_to_address, read_8bit_from_address, read_16bit_from_address, write_16bit_to_address}};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "LSR";
+static INSTR_NAME: &str = "LSR";
 
 pub struct LSR {
     pub addressing_mode: AddressingMode,
@@ -40,7 +40,7 @@ impl CPUInstruction for LSR8 {
         let (result, affected_flags) = alu::lsr(read_8bit_from_address(registers, bus, self.addressing_mode));
         write_8bit_to_address(registers, bus, self.addressing_mode, result);
         registers.set_flags(&affected_flags);
-        let (bytes, cycles) = cycles::increment_cycles_shift(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_shift(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -58,7 +58,7 @@ impl CPUInstruction for LSR16 {
         let (result, affected_flags) = alu::lsr(read_16bit_from_address(registers, bus, self.addressing_mode));
         write_16bit_to_address(registers, bus, self.addressing_mode, result);
         registers.set_flags(&affected_flags);
-        let (bytes, cycles) = cycles::increment_cycles_shift(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_shift(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 

snes-core/src/cpu/instructions/mvn.rs

@@ -3,7 +3,7 @@ use crate::cpu::{bus::Bus, registers::Registers};
 use super::{CPUInstruction, move_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "MVN";
+static INSTR_NAME: &str = "MVN";
 
 pub struct MVN {}
 
@@ -16,13 +16,3 @@ impl CPUInstruction for MVN {
         decoder_common::mnemonic_move(opcode, INSTR_NAME, registers, bus)
     }
 }
-
-
-#[cfg(test)]
-mod cpu_instructions_tests {
-    use super::*;
-
-    #[test]
-    fn test() {
-    }
-}

snes-core/src/cpu/instructions/mvp.rs

@@ -3,7 +3,7 @@ use crate::cpu::{bus::Bus, registers::Registers};
 use super::{CPUInstruction, move_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "MVP";
+static INSTR_NAME: &str = "MVP";
 
 pub struct MVP {}
 
@@ -16,13 +16,3 @@ impl CPUInstruction for MVP {
         decoder_common::mnemonic_move(opcode, INSTR_NAME, registers, bus)
     }
 }
-
-
-#[cfg(test)]
-mod cpu_instructions_tests {
-    use super::*;
-
-    #[test]
-    fn test() {
-    }
-}

snes-core/src/cpu/instructions/nop.rs

@@ -4,7 +4,7 @@ use crate::cpu::{bus::Bus, registers::Registers};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "NOP";
+static INSTR_NAME: &str = "NOP";
 
 pub struct NOP {}
 

snes-core/src/cpu/instructions/ora.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, read_write_common::{read_8bit_from_address, read_16bit_from_address}};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "ORA";
+static INSTR_NAME: &str = "ORA";
 
 pub struct ORA {
     pub addressing_mode: AddressingMode,

snes-core/src/cpu/instructions/pea.rs

@@ -6,7 +6,7 @@ use super::read_write_common::get_effective_address;
 use super::{CPUInstruction, push_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "PEA";
+static INSTR_NAME: &str = "PEA";
 
 pub struct PEA {}
 

snes-core/src/cpu/instructions/pei.rs

@@ -6,7 +6,7 @@ use super::read_write_common::get_effective_address;
 use super::{CPUInstruction, push_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "PEI";
+static INSTR_NAME: &str = "PEI";
 
 pub struct PEI {}
 

snes-core/src/cpu/instructions/per.rs

@@ -6,7 +6,7 @@ use super::read_write_common::get_effective_address;
 use super::{CPUInstruction, push_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "PER";
+static INSTR_NAME: &str = "PER";
 
 pub struct PER {}
 

snes-core/src/cpu/instructions/pha.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, push_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "PHA";
+static INSTR_NAME: &str = "PHA";
 
 pub struct PHA {}
 

snes-core/src/cpu/instructions/phb.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, push_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "PHB";
+static INSTR_NAME: &str = "PHB";
 
 pub struct PHB {}
 

snes-core/src/cpu/instructions/phd.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, push_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "PHD";
+static INSTR_NAME: &str = "PHD";
 
 pub struct PHD {}
 

snes-core/src/cpu/instructions/phk.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, push_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "PHK";
+static INSTR_NAME: &str = "PHK";
 
 pub struct PHK {}
 

snes-core/src/cpu/instructions/php.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, push_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "PHP";
+static INSTR_NAME: &str = "PHP";
 
 pub struct PHP {}
 

snes-core/src/cpu/instructions/phx.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, push_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "PHX";
+static INSTR_NAME: &str = "PHX";
 
 pub struct PHX {}
 

snes-core/src/cpu/instructions/phy.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, push_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "PHY";
+static INSTR_NAME: &str = "PHY";
 
 pub struct PHY {}
 

snes-core/src/cpu/instructions/pla.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, pull_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "PLA";
+static INSTR_NAME: &str = "PLA";
 
 pub struct PLA {}
 
@@ -49,8 +49,8 @@ mod cpu_instructions_tests {
         assert_eq!(registers.a, 0x1234);
         assert_eq!(registers.sp, 0x1FC);
         assert_eq!(registers.pc, 0x0001);
-        assert_eq!(registers.get_negative_flag(), false);
+        assert!(!registers.get_negative_flag());
-        assert_eq!(registers.get_zero_flag(), false);
+        assert!(!registers.get_zero_flag());
         assert_eq!(registers.cycles, 5);
     }
 }

snes-core/src/cpu/instructions/plb.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, pull_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "PLB";
+static INSTR_NAME: &str = "PLB";
 
 pub struct PLB {}
 
@@ -40,8 +40,8 @@ mod cpu_instructions_tests {
         assert_eq!(registers.dbr, 0x12);
         assert_eq!(registers.sp, 0x1FC);
         assert_eq!(registers.pc, 0x0001);
-        assert_eq!(registers.get_negative_flag(), false);
+        assert!(!registers.get_negative_flag());
-        assert_eq!(registers.get_zero_flag(), false);
+        assert!(!registers.get_zero_flag());
         assert_eq!(registers.cycles, 4);
     }
 }

snes-core/src/cpu/instructions/pld.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, pull_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "PLD";
+static INSTR_NAME: &str = "PLD";
 
 pub struct PLD {}
 
@@ -42,8 +42,8 @@ mod cpu_instructions_tests {
         assert_eq!(registers.d, 0x1234);
         assert_eq!(registers.sp, 0x1FC);
         assert_eq!(registers.pc, 0x0001);
-        assert_eq!(registers.get_negative_flag(), false);
+        assert!(!registers.get_negative_flag());
-        assert_eq!(registers.get_zero_flag(), false);
+        assert!(!registers.get_zero_flag());
         assert_eq!(registers.cycles, 5);
     }
 }

snes-core/src/cpu/instructions/plp.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, pull_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "PLP";
+static INSTR_NAME: &str = "PLP";
 
 pub struct PLP {}
 

snes-core/src/cpu/instructions/plx.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, pull_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "PLX";
+static INSTR_NAME: &str = "PLX";
 
 pub struct PLX {}
 
@@ -49,8 +49,8 @@ mod cpu_instructions_tests {
         assert_eq!(registers.x, 0x1234);
         assert_eq!(registers.sp, 0x1FC);
         assert_eq!(registers.pc, 0x0001);
-        assert_eq!(registers.get_negative_flag(), false);
+        assert!(!registers.get_negative_flag());
-        assert_eq!(registers.get_zero_flag(), false);
+        assert!(!registers.get_zero_flag());
         assert_eq!(registers.cycles, 5);
     }
 }

snes-core/src/cpu/instructions/ply.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, pull_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "PLY";
+static INSTR_NAME: &str = "PLY";
 
 pub struct PLY {}
 
@@ -49,8 +49,8 @@ mod cpu_instructions_tests {
         assert_eq!(registers.y, 0x1234);
         assert_eq!(registers.sp, 0x1FC);
         assert_eq!(registers.pc, 0x0001);
-        assert_eq!(registers.get_negative_flag(), false);
+        assert!(!registers.get_negative_flag());
-        assert_eq!(registers.get_zero_flag(), false);
+        assert!(!registers.get_zero_flag());
         assert_eq!(registers.cycles, 5);
     }
 }

snes-core/src/cpu/instructions/pull_common.rs

@@ -13,7 +13,7 @@ pub fn do_pull(registers: &mut Registers, bus: &mut Bus, count: usize) -> Vec<u8
         bytes.push(byte);
     }
     registers.set_zero_flag(is_zero);
-    if bytes.len() > 0 {
+    if !bytes.is_empty() {
         // Low byte is pulled first, so we need to check
         // for the last byte that we pull
         registers.set_negative_flag((bytes[bytes.len() - 1] >> 7) == 1);

snes-core/src/cpu/instructions/read_write_common.rs

@@ -1,25 +1,28 @@
-use crate::{cpu::{registers::Registers, bus::Bus}, utils::addressing::AddressingMode};
+use crate::{cpu::{registers::Registers, bus::Bus}, utils::addressing::{AddressingMode, ResolveAddressParams}};
 
 pub fn get_effective_address(registers: &Registers, bus: &mut Bus, addressing_mode: AddressingMode) -> u32 {
     addressing_mode.effective_address(
         bus,
-        registers.get_pc_address(),
+        ResolveAddressParams {
-        registers.d,
+            pc_addr: registers.get_pc_address(),
-        registers.sp,
+            direct_page_register: registers.d,
-        registers.x, registers.y,
+            stack_pointer: registers.sp,
+            x: registers.x, y: registers.y,
+        }
     )
 }
 
 pub fn read_8bit_from_address(registers: &Registers, bus: &mut Bus, addressing_mode: AddressingMode) -> u8 {
     match addressing_mode {
         AddressingMode::Accumulator => registers.a as u8,
-        _ => addressing_mode.value_8bit(
+        _ => addressing_mode.read_8bit(
+            ResolveAddressParams {
+                pc_addr: registers.get_pc_address(),
+                direct_page_register: registers.d,
+                stack_pointer: registers.sp,
+                x: registers.x, y: registers.y,
+            },
             bus,
-            registers.get_pc_address(),
-            registers.d,
-            registers.sp,
-            registers.x,
-            registers.y,
         )
     }
 }
@@ -27,13 +30,14 @@ pub fn read_8bit_from_address(registers: &Registers, bus: &mut Bus, addressing_m
 pub fn read_16bit_from_address(registers: &Registers, bus: &mut Bus, addressing_mode: AddressingMode) -> u16 {
     match addressing_mode {
         AddressingMode::Accumulator => registers.a,
-        _ => addressing_mode.value_16bit(
+        _ => addressing_mode.read_16bit(
+            ResolveAddressParams {
+                pc_addr: registers.get_pc_address(),
+                direct_page_register: registers.d,
+                stack_pointer: registers.sp,
+                x: registers.x, y: registers.y,
+            },
             bus,
-            registers.get_pc_address(),
-            registers.d,
-            registers.sp,
-            registers.x,
-            registers.y,
         )
     }
 }
@@ -41,12 +45,14 @@ pub fn read_16bit_from_address(registers: &Registers, bus: &mut Bus, addressing_
 pub fn write_8bit_to_address(registers: &mut Registers, bus: &mut Bus, addressing_mode: AddressingMode, value: u8) {
     match addressing_mode {
         AddressingMode::Accumulator => registers.set_low_a(value),
-        _ => addressing_mode.store_8bit(
+        _ => addressing_mode.write_8bit(
+            ResolveAddressParams {
+                pc_addr: registers.get_pc_address(),
+                direct_page_register: registers.d,
+                stack_pointer: registers.sp,
+                x: registers.x, y: registers.y,
+            },
             bus,
-            registers.get_pc_address(),
-            registers.d,
-            registers.sp,
-            registers.x, registers.y,
             value,
         ),
     };
@@ -55,12 +61,14 @@ pub fn write_8bit_to_address(registers: &mut Registers, bus: &mut Bus, addressin
 pub fn write_16bit_to_address(registers: &mut Registers, bus: &mut Bus, addressing_mode: AddressingMode, value: u16) {
     match addressing_mode {
         AddressingMode::Accumulator => registers.a = value,
-        _ => addressing_mode.store_16bit(
+        _ => addressing_mode.write_16bit(
+            ResolveAddressParams {
+                pc_addr: registers.get_pc_address(),
+                direct_page_register: registers.d,
+                stack_pointer: registers.sp,
+                x: registers.x, y: registers.y,
+            },
             bus,
-            registers.get_pc_address(),
-            registers.d,
-            registers.sp,
-            registers.x, registers.y,
             value,
         ),
     };

snes-core/src/cpu/instructions/rep.rs

@@ -6,7 +6,7 @@ use super::read_write_common::read_8bit_from_address;
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "REP";
+static INSTR_NAME: &str = "REP";
 
 pub struct REP {}
 

snes-core/src/cpu/instructions/rol.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, read_write_common::{read_8bit_from_address, write_8bit_to_address, read_16bit_from_address, write_16bit_to_address}};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "ROL";
+static INSTR_NAME: &str = "ROL";
 
 pub struct ROL {
     pub addressing_mode: AddressingMode,
@@ -84,8 +84,8 @@ mod cpu_instructions_tests {
         registers.pc  = 0x0000;
         let instruction = ROL8{addressing_mode: AddressingMode::Accumulator};
         instruction.execute(&mut registers, &mut bus);
-        assert_eq!(registers.get_negative_flag(), true);
+        assert!(registers.get_negative_flag());
-        assert_eq!(registers.get_zero_flag(), false);
+        assert!(!registers.get_zero_flag());
         assert_eq!(registers.a, 0b1000_0000);
         assert_eq!(registers.pc, 0x0001);
         assert_eq!(registers.cycles, 2);
@@ -101,8 +101,8 @@ mod cpu_instructions_tests {
         registers.pc  = 0x0000;
         let instruction = ROL16{addressing_mode: AddressingMode::Accumulator};
         instruction.execute(&mut registers, &mut bus);
-        assert_eq!(registers.get_negative_flag(), true);
+        assert!(registers.get_negative_flag());
-        assert_eq!(registers.get_zero_flag(), false);
+        assert!(!registers.get_zero_flag());
         assert_eq!(registers.a, 0b10000000_00000000);
         assert_eq!(registers.pc, 0x0001);
         assert_eq!(registers.cycles, 4);

snes-core/src/cpu/instructions/ror.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, read_write_common::{read_8bit_from_address, write_8bit_to_address, read_16bit_from_address, write_16bit_to_address}};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "ROR";
+static INSTR_NAME: &str = "ROR";
 
 pub struct ROR {
     pub addressing_mode: AddressingMode,
@@ -85,8 +85,8 @@ mod cpu_instructions_tests {
         registers.pc  = 0x0000;
         let instruction = ROR8{addressing_mode: AddressingMode::Accumulator};
         instruction.execute(&mut registers, &mut bus);
-        assert_eq!(registers.get_carry_flag(), false);
+        assert!(!registers.get_carry_flag());
-        assert_eq!(registers.get_zero_flag(), false);
+        assert!(!registers.get_zero_flag());
         assert_eq!(registers.a, 0b1000_0000);
         assert_eq!(registers.pc, 0x0001);
         assert_eq!(registers.cycles, 2);
@@ -103,8 +103,8 @@ mod cpu_instructions_tests {
         registers.pc  = 0x0000;
         let instruction = ROR16{addressing_mode: AddressingMode::Accumulator};
         instruction.execute(&mut registers, &mut bus);
-        assert_eq!(registers.get_negative_flag(), true);
+        assert!(registers.get_negative_flag());
-        assert_eq!(registers.get_zero_flag(), false);
+        assert!(!registers.get_zero_flag());
         assert_eq!(registers.a, 0b10000000_00000000);
         assert_eq!(registers.pc, 0x0001);
         assert_eq!(registers.cycles, 4);

snes-core/src/cpu/instructions/rti.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, pull_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "RTI";
+static INSTR_NAME: &str = "RTI";
 
 pub struct RTI {}
 
@@ -24,13 +24,3 @@ impl CPUInstruction for RTI {
         decoder_common::mnemonic_single_byte_instr(opcode, INSTR_NAME)
     }
 }
-
-
-#[cfg(test)]
-mod cpu_instructions_tests {
-    use super::*;
-
-    #[test]
-    fn test() {
-    }
-}

snes-core/src/cpu/instructions/rtl.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, pull_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "RTL";
+static INSTR_NAME: &str = "RTL";
 
 pub struct RTL {}
 

snes-core/src/cpu/instructions/rts.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, pull_common};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "RTS";
+static INSTR_NAME: &str = "RTS";
 
 pub struct RTS {}
 

snes-core/src/cpu/instructions/sbc.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::{CPUInstruction, read_write_common::{read_8bit_from_address, read_16bit_from_address}};
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "SBC";
+static INSTR_NAME: &str = "SBC";
 
 pub struct SBC {
     pub addressing_mode: AddressingMode,
@@ -51,7 +51,7 @@ impl CPUInstruction for SBC8BIN {
         );
         registers.set_low_a(result);
         registers.set_flags(&affected_flags);
-        let (bytes, cycles) = cycles::increment_cycles_arithmetic(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_arithmetic(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -73,7 +73,7 @@ impl CPUInstruction for SBC16BIN {
         );
         registers.a = result;
         registers.set_flags(&affected_flags);
-        let (bytes, cycles) = cycles::increment_cycles_arithmetic(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_arithmetic(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -95,7 +95,7 @@ impl CPUInstruction for SBC8BCD {
         );
         registers.set_low_a(result);
         registers.set_flags(&affected_flags);
-        let (bytes, cycles) = cycles::increment_cycles_arithmetic(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_arithmetic(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 
@@ -117,7 +117,7 @@ impl CPUInstruction for SBC16BCD {
         );
         registers.a = result;
         registers.set_flags(&affected_flags);
-        let (bytes, cycles) = cycles::increment_cycles_arithmetic(&registers, self.addressing_mode);
+        let (bytes, cycles) = cycles::increment_cycles_arithmetic(registers, self.addressing_mode);
         registers.increment_pc(bytes); registers.cycles += cycles;
     }
 

snes-core/src/cpu/instructions/sec.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "SEC";
+static INSTR_NAME: &str = "SEC";
 
 pub struct SEC {}
 
@@ -33,7 +33,7 @@ mod cpu_instructions_tests {
         registers.set_carry_flag(false);
         let instruction = SEC{};
         instruction.execute(&mut registers, &mut bus);
-        assert_eq!(registers.get_carry_flag(), true);
+        assert!(registers.get_carry_flag());
         assert_eq!(registers.pc, 0x0001);
         assert_eq!(registers.cycles, 2);
     }

snes-core/src/cpu/instructions/sed.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "SED";
+static INSTR_NAME: &str = "SED";
 
 pub struct SED {}
 
@@ -33,7 +33,7 @@ mod cpu_instructions_tests {
         registers.set_decimal_mode_flag(false);
         let instruction = SED{};
         instruction.execute(&mut registers, &mut bus);
-        assert_eq!(registers.get_decimal_mode_flag(), true);
+        assert!(registers.get_decimal_mode_flag());
         assert_eq!(registers.pc, 0x0001);
         assert_eq!(registers.cycles, 2);
     }

snes-core/src/cpu/instructions/sei.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "SEI";
+static INSTR_NAME: &str = "SEI";
 
 pub struct SEI {}
 
@@ -33,7 +33,7 @@ mod cpu_instructions_tests {
         registers.set_irq_disable_flag(false);
         let instruction = SEI{};
         instruction.execute(&mut registers, &mut bus);
-        assert_eq!(registers.get_irq_disable_flag(), true);
+        assert!(registers.get_irq_disable_flag());
         assert_eq!(registers.pc, 0x0001);
         assert_eq!(registers.cycles, 2);
     }

snes-core/src/cpu/instructions/sep.rs

@@ -6,7 +6,7 @@ use super::read_write_common::read_8bit_from_address;
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "SEP";
+static INSTR_NAME: &str = "SEP";
 
 pub struct SEP {}
 

snes-core/src/cpu/instructions/sta.rs

@@ -6,7 +6,7 @@ use super::read_write_common::{write_8bit_to_address, write_16bit_to_address};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "STA";
+static INSTR_NAME: &str = "STA";
 
 pub struct STA {
     pub addressing_mode: AddressingMode,

snes-core/src/cpu/instructions/stp.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "STP";
+static INSTR_NAME: &str = "STP";
 
 pub struct STP {}
 
@@ -34,7 +34,7 @@ mod cpu_instructions_tests {
         let instruction = STP{};
         instruction.execute(&mut registers, &mut bus);
         assert_eq!(registers.pc, 0x0001);
-        assert_eq!(registers.is_cpu_stopped, true);
+        assert!(registers.is_cpu_stopped);
         assert_eq!(registers.cycles, 3);
     }
 }

snes-core/src/cpu/instructions/stx.rs

@@ -6,7 +6,7 @@ use super::read_write_common::{write_8bit_to_address, write_16bit_to_address};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "STX";
+static INSTR_NAME: &str = "STX";
 
 pub struct STX {
     pub addressing_mode: AddressingMode,

snes-core/src/cpu/instructions/sty.rs

@@ -6,7 +6,7 @@ use super::read_write_common::{write_8bit_to_address, write_16bit_to_address};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "STY";
+static INSTR_NAME: &str = "STY";
 
 pub struct STY {
     pub addressing_mode: AddressingMode,

snes-core/src/cpu/instructions/stz.rs

@@ -6,7 +6,7 @@ use super::read_write_common::{write_8bit_to_address, write_16bit_to_address};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "STZ";
+static INSTR_NAME: &str = "STZ";
 
 pub struct STZ {
     pub addressing_mode: AddressingMode,

snes-core/src/cpu/instructions/tax.rs

@@ -4,7 +4,7 @@ use crate::cpu::{bus::Bus, registers::Registers};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "TAX";
+static INSTR_NAME: &str = "TAX";
 
 pub struct TAX {}
 
@@ -78,8 +78,8 @@ mod cpu_instructions_tests {
         registers.set_16bit_index(false);
         let instruction = TAX8{};
         instruction.execute(&mut registers, &mut bus);
-        assert_eq!(registers.get_negative_flag(), true);
+        assert!(registers.get_negative_flag());
-        assert_eq!(registers.get_zero_flag(), false);
+        assert!(!registers.get_zero_flag());
         assert_eq!(registers.x, 0x00FF);
         assert_eq!(registers.pc, 0x0001);
         assert_eq!(registers.cycles, 2);
@@ -97,8 +97,8 @@ mod cpu_instructions_tests {
         registers.set_16bit_index(true);
         let instruction = TAX16{};
         instruction.execute(&mut registers, &mut bus);
-        assert_eq!(registers.get_negative_flag(), true);
+        assert!(registers.get_negative_flag());
-        assert_eq!(registers.get_zero_flag(), false);
+        assert!(!registers.get_zero_flag());
         assert_eq!(registers.x, 0xF0F0);
         assert_eq!(registers.pc, 0x0001);
         assert_eq!(registers.cycles, 2);

snes-core/src/cpu/instructions/tay.rs

@@ -4,7 +4,7 @@ use crate::cpu::{bus::Bus, registers::Registers};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "TAY";
+static INSTR_NAME: &str = "TAY";
 
 pub struct TAY {}
 
@@ -79,8 +79,8 @@ mod cpu_instructions_tests {
         registers.set_16bit_index(false);
         let instruction = TAY8{};
         instruction.execute(&mut registers, &mut bus);
-        assert_eq!(registers.get_negative_flag(), true);
+        assert!(registers.get_negative_flag());
-        assert_eq!(registers.get_zero_flag(), false);
+        assert!(!registers.get_zero_flag());
         assert_eq!(registers.y, 0x00FF);
         assert_eq!(registers.pc, 0x0001);
         assert_eq!(registers.cycles, 2);
@@ -98,8 +98,8 @@ mod cpu_instructions_tests {
         registers.set_16bit_index(true);
         let instruction = TAY16{};
         instruction.execute(&mut registers, &mut bus);
-        assert_eq!(registers.get_negative_flag(), true);
+        assert!(registers.get_negative_flag());
-        assert_eq!(registers.get_zero_flag(), false);
+        assert!(!registers.get_zero_flag());
         assert_eq!(registers.y, 0xF0F0);
         assert_eq!(registers.pc, 0x0001);
         assert_eq!(registers.cycles, 2);

snes-core/src/cpu/instructions/tcd.rs

@@ -4,7 +4,7 @@ use crate::cpu::{bus::Bus, registers::Registers};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "TCD";
+static INSTR_NAME: &str = "TCD";
 
 pub struct TCD {}
 

snes-core/src/cpu/instructions/tcs.rs

@@ -4,7 +4,7 @@ use crate::cpu::{bus::Bus, registers::Registers};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "TCS";
+static INSTR_NAME: &str = "TCS";
 
 pub struct TCS {}
 

snes-core/src/cpu/instructions/tdc.rs

@@ -4,7 +4,7 @@ use crate::cpu::{bus::Bus, registers::Registers};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "TDC";
+static INSTR_NAME: &str = "TDC";
 
 pub struct TDC {}
 

snes-core/src/cpu/instructions/trb.rs

@@ -6,7 +6,7 @@ use super::read_write_common::{read_8bit_from_address, write_8bit_to_address, re
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "TRB";
+static INSTR_NAME: &str = "TRB";
 
 pub struct TRB {
     pub addressing_mode: AddressingMode,
@@ -70,13 +70,3 @@ impl CPUInstruction for TRB16 {
         decoder_common::mnemonic_arithmetic(true, opcode, INSTR_NAME, self.addressing_mode, registers, bus)
     }
 }
-
-
-#[cfg(test)]
-mod cpu_instructions_tests {
-    use super::*;
-
-    #[test]
-    fn test() {
-    }
-}

snes-core/src/cpu/instructions/tsb.rs

@@ -6,7 +6,7 @@ use super::read_write_common::{read_8bit_from_address, write_8bit_to_address, re
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "TSB";
+static INSTR_NAME: &str = "TSB";
 
 pub struct TSB {
     pub addressing_mode: AddressingMode,
@@ -68,13 +68,3 @@ impl CPUInstruction for TSB16 {
         decoder_common::mnemonic_arithmetic(true, opcode, INSTR_NAME, self.addressing_mode, registers, bus)
     }
 }
-
-
-#[cfg(test)]
-mod cpu_instructions_tests {
-    use super::*;
-
-    #[test]
-    fn test() {
-    }
-}

snes-core/src/cpu/instructions/tsc.rs

@@ -4,7 +4,7 @@ use crate::cpu::{bus::Bus, registers::Registers};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "TSC";
+static INSTR_NAME: &str = "TSC";
 
 pub struct TSC {}
 

snes-core/src/cpu/instructions/tsx.rs

@@ -4,7 +4,7 @@ use crate::cpu::{bus::Bus, registers::Registers};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "TSX";
+static INSTR_NAME: &str = "TSX";
 
 pub struct TSX {}
 

snes-core/src/cpu/instructions/txa.rs

@@ -4,7 +4,7 @@ use crate::cpu::{bus::Bus, registers::Registers};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "TXA";
+static INSTR_NAME: &str = "TXA";
 
 pub struct TXA {}
 

snes-core/src/cpu/instructions/txs.rs

@@ -4,7 +4,7 @@ use crate::cpu::{bus::Bus, registers::Registers};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "TXS";
+static INSTR_NAME: &str = "TXS";
 
 pub struct TXS {}
 

snes-core/src/cpu/instructions/txy.rs

@@ -4,7 +4,7 @@ use crate::cpu::{bus::Bus, registers::Registers};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "TXY";
+static INSTR_NAME: &str = "TXY";
 
 pub struct TXY {}
 

snes-core/src/cpu/instructions/tya.rs

@@ -4,7 +4,7 @@ use crate::cpu::{bus::Bus, registers::Registers};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "TYA";
+static INSTR_NAME: &str = "TYA";
 
 pub struct TYA {}
 

snes-core/src/cpu/instructions/tyx.rs

@@ -4,7 +4,7 @@ use crate::cpu::{bus::Bus, registers::Registers};
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "TYX";
+static INSTR_NAME: &str = "TYX";
 
 pub struct TYX {}
 

snes-core/src/cpu/instructions/wai.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "WAI";
+static INSTR_NAME: &str = "WAI";
 
 pub struct WAI {}
 
@@ -34,7 +34,7 @@ mod cpu_instructions_tests {
         let instruction = WAI{};
         instruction.execute(&mut registers, &mut bus);
         assert_eq!(registers.pc, 0x0001);
-        assert_eq!(registers.is_cpu_waiting_interrupt, true);
+        assert!(registers.is_cpu_waiting_interrupt);
         assert_eq!(registers.cycles, 3);
     }
 }

snes-core/src/cpu/instructions/wdm.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "WDM";
+static INSTR_NAME: &str = "WDM";
 
 pub struct WDM {}
 

snes-core/src/cpu/instructions/xba.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "XBA";
+static INSTR_NAME: &str = "XBA";
 
 pub struct XBA {}
 

snes-core/src/cpu/instructions/xce.rs

@@ -4,7 +4,7 @@ use crate::cpu::cycles;
 use super::CPUInstruction;
 use super::decoder_common;
 
-static INSTR_NAME: &'static str = "XCE";
+static INSTR_NAME: &str = "XCE";
 
 pub struct XCE {}
 

snes-core/src/cpu/interface.rs

@@ -39,7 +39,7 @@ impl CPU {
             self.registers.increment_pc(bytes); self.registers.cycles += cycles;
             return false;
         }
-        return true;
+        true
     }
 
     pub fn tick(&mut self, bus: &mut Bus) {
@@ -51,3 +51,9 @@ impl CPU {
         instruction.execute(&mut self.registers, bus);
     }
 }
+
+impl Default for CPU {
+    fn default() -> Self {
+        Self::new()
+    }
+}

snes-core/src/cpu/internal_registers.rs

@@ -45,7 +45,7 @@ impl InternalRegisters {
 
     pub fn write(&mut self, address: u16, value: u8, dma: &mut dma::DMA) {
         self._write(address, value);
-        match address {
+        #[allow(clippy::single_match)] match address {
             dma::MDMAEN => dma.prepare_dma_transfer(value),
             _ => {},
         }
@@ -53,8 +53,7 @@ impl InternalRegisters {
 
     fn read_vblank_nmi(&self, ppu_registers: &PPURegisters) -> u8 {
         let byte = self._read(RDNMI);
-        let result = (byte & 0x7F) | ((ppu_registers.vblank_nmi as u8) << 7);
+        (byte & 0x7F) | ((ppu_registers.vblank_nmi as u8) << 7)
-        result
     }
 
     fn read_vblank_nmi_mut(&self, ppu_registers: &mut PPURegisters) -> u8 {
@@ -66,11 +65,17 @@ impl InternalRegisters {
     }
 }
 
+impl Default for InternalRegisters {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 
 #[cfg(test)]
 mod ppu_general_test {
     use super::*;
-    use crate::ppu::ppu::PPU;
+    use crate::ppu::interface::PPU;
 
     #[test]
     fn test_read_vblank_nmi() {
@@ -78,13 +83,13 @@ mod ppu_general_test {
         let mut ppu = PPU::new();
         ppu.registers.h_count = 20;
         ppu.dot_cycle();
-        assert_eq!(registers.read_vblank_nmi(&mut ppu.registers), 0x00);
+        assert_eq!(registers.read_vblank_nmi(&ppu.registers), 0x00);
         ppu.registers.h_count = 339;
         ppu.registers.v_count = 224;
         ppu.dot_cycle();
         assert_eq!(registers.read_vblank_nmi_mut(&mut ppu.registers), 0x80);
         // vblank bit is reset after read
         ppu.dot_cycle();
-        assert_eq!(registers.read_vblank_nmi(&mut ppu.registers), 0x00);
+        assert_eq!(registers.read_vblank_nmi(&ppu.registers), 0x00);
     }
 }