From 826ff5480a00b23812845991f253a9ad1990cd4d Mon Sep 17 00:00:00 2001 From: Franco Colmenarez Date: Tue, 26 Dec 2023 19:41:28 -0500 Subject: [PATCH] and --- snes-core/src/cpu/instructionstemp/and.rs | 105 ++++++++++++++++++++++ snes-core/src/cpu/instructionstemp/mod.rs | 1 + 2 files changed, 106 insertions(+) create mode 100644 snes-core/src/cpu/instructionstemp/and.rs diff --git a/snes-core/src/cpu/instructionstemp/and.rs b/snes-core/src/cpu/instructionstemp/and.rs new file mode 100644 index 0000000..3296790 --- /dev/null +++ b/snes-core/src/cpu/instructionstemp/and.rs @@ -0,0 +1,105 @@ +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}; + +pub const OPCODE: u8 = 0x29; + +fn mnemonic_8bit(registers: &Registers, bus: &Bus) -> String { + let next_byte = bus.read_external(registers.get_pc_address() + 1); + format!("{:02X} {:02X} __ __ | AND #${:02X}", OPCODE, next_byte, next_byte) +} + +fn mnemonic_16bit(registers: &Registers, bus: &Bus) -> String { + let next_byte = bus.read_external(registers.get_pc_address() + 1); + let next_second_byte = bus.read_external(registers.get_pc_address() + 2); + let word = (next_byte as u16) | ((next_byte as u16) << 8); + format!("{:02X} {:02X} {:02X} __ | AND #${:04X}", OPCODE, next_byte, next_second_byte, word) +} + +pub struct AND8 {} + +impl CPUInstruction for AND8 { + fn execute(&self, registers: &mut Registers, bus: &mut Bus, addressing_mode: AddressingMode) { + let (result, affected_flags) = alu::and( + registers.a as u8, + read_8bit_from_address(registers, bus, addressing_mode), + ); + registers.set_low_a(result); + registers.set_flags(&affected_flags); + let (bytes, cycles) = cycles::increment_cycles_bitwise(®isters, addressing_mode); + registers.increment_pc(bytes); registers.cycles += cycles; + } +} + +impl Decode for AND8 { + fn mnemonic(&self, registers: &Registers, bus: &Bus) -> String { + mnemonic_8bit(registers, bus) + } +} + +pub struct AND16 {} + +impl CPUInstruction for AND16 { + fn execute(&self, registers: &mut Registers, bus: &mut Bus, addressing_mode: AddressingMode) { + let (result, affected_flags) = alu::and( + registers.a, + read_16bit_from_address(registers, bus, addressing_mode), + ); + registers.a = result; + registers.set_flags(&affected_flags); + let (bytes, cycles) = cycles::increment_cycles_bitwise(®isters, addressing_mode); + registers.increment_pc(bytes); registers.cycles += cycles; + } +} + +impl Decode for AND16 { + fn mnemonic(&self, registers: &Registers, bus: &Bus) -> String { + mnemonic_16bit(registers, bus) + } +} + + +#[cfg(test)] +mod cpu_instructions_tests { + use super::*; + + #[test] + fn test_and_8bit() { + let mut registers = Registers::new(); + let mut bus = Bus::new(); + registers.emulation_mode = false; + registers.a = 0x0101; + registers.pbr = 0x00; + registers.pc = 0x0000; + registers.set_memory_select_flag(true); + bus.write(0x000001, 0x00); + let instruction = AND8{}; + instruction.execute(&mut registers, &mut bus, AddressingMode::Immediate); + assert_eq!(registers.a, 0x0100); + assert_eq!(registers.pc, 0x02); + assert_eq!(registers.cycles, 2); + assert!(!registers.get_carry_flag()); + assert!(registers.get_zero_flag()); + } + + #[test] + fn test_and_16bit() { + let mut registers = Registers::new(); + let mut bus = Bus::new(); + registers.emulation_mode = false; + registers.a = 0x0101; + registers.pbr = 0x00; + registers.pc = 0x0000; + registers.set_memory_select_flag(false); + bus.write(0x000001, 0x01); + bus.write(0x000002, 0x01); + let instruction = AND16{}; + instruction.execute(&mut registers, &mut bus, AddressingMode::Immediate); + assert_eq!(registers.a, 0x0101); + assert_eq!(registers.pc, 0x03); + assert_eq!(registers.cycles, 3); + assert!(!registers.get_carry_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 7b8d80f..7dc353d 100644 --- a/snes-core/src/cpu/instructionstemp/mod.rs +++ b/snes-core/src/cpu/instructionstemp/mod.rs @@ -3,6 +3,7 @@ use crate::cpu::registers::Registers; use crate::utils::addressing::AddressingMode; pub mod adc; +pub mod and; pub trait CPUInstruction { fn execute(&self, registers: &mut Registers, bus: &mut Bus, addressing_mode: AddressingMode);