From b65300792e0ed9c8f40ee463fbb8f547263ae81c Mon Sep 17 00:00:00 2001 From: Franco Colmenarez Date: Thu, 28 Dec 2023 21:01:33 -0500 Subject: [PATCH] eor --- snes-core/src/cpu/instructionstemp/eor.rs | 92 +++++++++++++++++++++++ snes-core/src/cpu/instructionstemp/mod.rs | 1 + 2 files changed, 93 insertions(+) create mode 100644 snes-core/src/cpu/instructionstemp/eor.rs diff --git a/snes-core/src/cpu/instructionstemp/eor.rs b/snes-core/src/cpu/instructionstemp/eor.rs new file mode 100644 index 0000000..b2d00ac --- /dev/null +++ b/snes-core/src/cpu/instructionstemp/eor.rs @@ -0,0 +1,92 @@ +use crate::{cpu::{bus::Bus, registers::Registers}, utils::{alu, addressing::AddressingMode}}; + +use crate::cpu::cycles; +use super::{CPUInstruction, Decode, read_8bit_from_address, read_16bit_from_address}; +use super::decoder_common; + +static INSTR_NAME: &'static str = "EOR"; + +pub struct EOR8 { + addressing_mode: AddressingMode, +} + +impl CPUInstruction for EOR8 { + fn execute(&self, registers: &mut Registers, bus: &mut Bus) { + let value = read_8bit_from_address(registers, bus, self.addressing_mode); + 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(®isters, self.addressing_mode); + registers.increment_pc(bytes); registers.cycles += cycles; + } +} + +impl Decode for EOR8 { + fn mnemonic(&self, registers: &Registers, bus: &Bus, opcode: u8) -> String { + decoder_common::mnemonic_arithmetic(false, opcode, INSTR_NAME, self.addressing_mode, registers, bus) + } +} + +pub struct EOR16 { + addressing_mode: AddressingMode, +} + +impl CPUInstruction for EOR16 { + fn execute(&self, registers: &mut Registers, bus: &mut Bus) { + let value = read_16bit_from_address(registers, bus, self.addressing_mode); + let (result, affected_flags) = alu::eor(registers.a, value); + registers.a = result; + registers.set_flags(&affected_flags); + let (bytes, cycles) = cycles::increment_cycles_bitwise(®isters, self.addressing_mode); + registers.increment_pc(bytes); registers.cycles += cycles; + } +} + +impl Decode for EOR16 { + fn mnemonic(&self, registers: &Registers, bus: &Bus, opcode: u8) -> String { + decoder_common::mnemonic_arithmetic(true, opcode, INSTR_NAME, self.addressing_mode, registers, bus) + } +} + + +#[cfg(test)] +mod cpu_instructions_tests { + use super::*; + + #[test] + fn test_8bit() { + let mut registers = Registers::new(); + let mut bus = Bus::new(); + registers.a = 0x0F; + registers.pbr = 0x00; + registers.pc = 0x0000; + registers.set_16bit_mode(false); + bus.write(0x000001, 0xF0); + let instruction = EOR8{addressing_mode: AddressingMode::Immediate}; + instruction.execute(&mut registers, &mut bus); + assert_eq!(registers.a, 0xFF); + assert_eq!(registers.pc, 0x02); + assert_eq!(registers.cycles, 2); + assert!(registers.get_negative_flag()); + assert!(!registers.get_zero_flag()); + } + + #[test] + fn test_and_16bit() { + let mut registers = Registers::new(); + let mut bus = Bus::new(); + registers.a = 0x0FFF; + registers.pbr = 0x00; + registers.pc = 0x0000; + registers.set_16bit_mode(false); + bus.write(0x000002, 0xF0); + bus.write(0x000001, 0x00); + let instruction = EOR16{addressing_mode: AddressingMode::Immediate}; + instruction.execute(&mut registers, &mut bus); + assert_eq!(registers.a, 0xFFFF); + assert_eq!(registers.pc, 0x02); + assert_eq!(registers.cycles, 2); + assert!(registers.get_negative_flag()); + assert!(!registers.get_zero_flag()); + } +} diff --git a/snes-core/src/cpu/instructionstemp/mod.rs b/snes-core/src/cpu/instructionstemp/mod.rs index 588e090..da9c903 100644 --- a/snes-core/src/cpu/instructionstemp/mod.rs +++ b/snes-core/src/cpu/instructionstemp/mod.rs @@ -28,6 +28,7 @@ pub mod cpy; pub mod dec; pub mod dex; pub mod dey; +pub mod eor; pub mod bit_common; pub mod dec_common; pub mod decoder_common;