dnutiu/chip8-rust
dnutiu/chip8-rust
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use c-like struct for arithmetic instructions

Browse source
This commit is contained in:
Denis-Cosmin Nutiu 2024-12-11 00:03:21 +02:00
parent a4e2942eea
commit b8e3509086
2 changed files with 56 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/emulator.rs
View file

@ -274,19 +274,19 @@ where
trace!("Set VX={vx:04x} VY={vy:04x}"); trace!("Set VX={vx:04x} VY={vy:04x}");
self.registers[vx as usize] = self.registers[vy as usize]; self.registers[vx as usize] = self.registers[vy as usize];
} }
ProcessorInstruction::BinaryOr(vx, vy) => { ProcessorInstruction::BinaryOr { vx, vy } => {
trace!("BinaryOr VX={vx:04x} VY={vy:04x}"); trace!("BinaryOr VX={vx:04x} VY={vy:04x}");
self.registers[vx as usize] |= self.registers[vy as usize] self.registers[vx as usize] |= self.registers[vy as usize]
} }
ProcessorInstruction::BinaryAnd(vx, vy) => { ProcessorInstruction::BinaryAnd { vx, vy } => {
trace!("BinaryAnd VX={vx:04x} VY={vy:04x}"); trace!("BinaryAnd VX={vx:04x} VY={vy:04x}");
self.registers[vx as usize] &= self.registers[vy as usize] self.registers[vx as usize] &= self.registers[vy as usize]
} }
ProcessorInstruction::BinaryXor(vx, vy) => { ProcessorInstruction::BinaryXor { vx, vy } => {
trace!("BinaryXor VX={vx:04x} VY={vy:04x}"); trace!("BinaryXor VX={vx:04x} VY={vy:04x}");
self.registers[vx as usize] ^= self.registers[vy as usize] self.registers[vx as usize] ^= self.registers[vy as usize]
} }
ProcessorInstruction::Add(vx, vy) => { ProcessorInstruction::Add { vx, vy } => {
trace!("Add VX={vx:04x} VY={vy:04x}"); trace!("Add VX={vx:04x} VY={vy:04x}");
let (result, overflow) = let (result, overflow) =
self.registers[vx as usize].overflowing_add(self.registers[vy as usize]); self.registers[vx as usize].overflowing_add(self.registers[vy as usize]);
@ -298,7 +298,7 @@ where
self.registers[0xF] = 0; self.registers[0xF] = 0;
} }
} }
ProcessorInstruction::SubtractVX(vx, vy) => { ProcessorInstruction::SubtractVX { vx, vy } => {
trace!("SubtractVX VX={vx:04x} VY={vy:04x}"); trace!("SubtractVX VX={vx:04x} VY={vy:04x}");
if self.registers[vx as usize] > self.registers[vy as usize] { if self.registers[vx as usize] > self.registers[vy as usize] {
self.registers[0xF] = 1 self.registers[0xF] = 1
@ -310,7 +310,7 @@ where
self.registers[vx as usize].overflowing_sub(self.registers[vy as usize]); self.registers[vx as usize].overflowing_sub(self.registers[vy as usize]);
self.registers[vx as usize] = result; self.registers[vx as usize] = result;
} }
ProcessorInstruction::SubtractVY(vx, vy) => { ProcessorInstruction::SubtractVY { vx, vy } => {
trace!("SubtractVY VX={vx:04x} VY={vy:04x}"); trace!("SubtractVY VX={vx:04x} VY={vy:04x}");
if self.registers[vy as usize] > self.registers[vx as usize] { if self.registers[vy as usize] > self.registers[vx as usize] {
self.registers[0xF] = 1 self.registers[0xF] = 1
@ -322,12 +322,12 @@ where
self.registers[vy as usize].overflowing_sub(self.registers[vx as usize]); self.registers[vy as usize].overflowing_sub(self.registers[vx as usize]);
self.registers[vx as usize] = result; self.registers[vx as usize] = result;
} }
ProcessorInstruction::ShiftLeft(vx, vy) => { ProcessorInstruction::ShiftLeft { vx, vy } => {
trace!("ShiftLeft VX={vx:04x} VY={vy:04x}"); trace!("ShiftLeft VX={vx:04x} VY={vy:04x}");
self.registers[0xF] = (self.registers[vx as usize] >> 7) & 1; self.registers[0xF] = (self.registers[vx as usize] >> 7) & 1;
self.registers[vx as usize] <<= 1; self.registers[vx as usize] <<= 1;
} }
ProcessorInstruction::ShiftRight(vx, vy) => { ProcessorInstruction::ShiftRight { vx, vy } => {
trace!("ShiftRight VX={vx:04x} VY={vy:04x}"); trace!("ShiftRight VX={vx:04x} VY={vy:04x}");
self.registers[0xF] = self.registers[vx as usize] & 0x1; self.registers[0xF] = self.registers[vx as usize] & 0x1;
self.registers[vx as usize] >>= 1; self.registers[vx as usize] >>= 1;

96
src/instruction.rs
View file

@ -33,23 +33,23 @@ pub enum ProcessorInstruction {
/// Set VX to the value of VY /// Set VX to the value of VY
Set { vx: u8, vy: u8 }, Set { vx: u8, vy: u8 },
/// Or VX with VY and store in VX. /// Or VX with VY and store in VX.
BinaryOr(u8, u8), BinaryOr { vx: u8, vy: u8 },
/// And VX with VY and store in VX. /// And VX with VY and store in VX.
BinaryAnd(u8, u8), BinaryAnd { vx: u8, vy: u8 },
/// XOR VX with VY and store in VX. /// XOR VX with VY and store in VX.
BinaryXor(u8, u8), BinaryXor { vx: u8, vy: u8 },
/// Add VX with VY and store in VX, if addition overflows set the carry flag 0xVF /// Add VX with VY and store in VX, if addition overflows set the carry flag 0xVF
Add(u8, u8), Add { vx: u8, vy: u8 },
/// Subtract VX from VY and set to VX. VX = VX - VY. Affects the carry flag. /// Subtract VX from VY and set to VX. VX = VX - VY. Affects the carry flag.
SubtractVX(u8, u8), SubtractVX { vx: u8, vy: u8 },
/// Subtract VY from VX and set to VX. VX = VY - VX. Affects the carry flag. /// Subtract VY from VX and set to VX. VX = VY - VX. Affects the carry flag.
SubtractVY(u8, u8), SubtractVY { vx: u8, vy: u8 },
/// Set VX = VY >> 1. VF needs to be set to the bit that is shifted out. /// Set VX = VY >> 1. VF needs to be set to the bit that is shifted out.
/// This instruction has different behaviour on CHIP-48 and SUPER-CHIP. /// This instruction has different behaviour on CHIP-48 and SUPER-CHIP.
ShiftRight(u8, u8), ShiftRight { vx: u8, vy: u8 },
/// Set VX = VY << 1 VF needs to be set to the bit that is shifted out. /// Set VX = VY << 1 VF needs to be set to the bit that is shifted out.
/// This instruction has different behaviour on CHIP-48 and SUPER-CHIP. /// This instruction has different behaviour on CHIP-48 and SUPER-CHIP.
ShiftLeft(u8, u8), ShiftLeft { vx: u8, vy: u8 },
/// Jumps to the address and adds V0 offset. /// Jumps to the address and adds V0 offset.
JumpWithOffset(u16), JumpWithOffset(u16),
/// Generates a random number ANDed with the data and stores it in VX. /// Generates a random number ANDed with the data and stores it in VX.
@ -166,38 +166,38 @@ impl Instruction {
vx: Self::grab_first_nibble(data), vx: Self::grab_first_nibble(data),
vy: Self::grab_middle_nibble(data), vy: Self::grab_middle_nibble(data),
}, },
(0x8, _, _, 0x1) => ProcessorInstruction::BinaryOr( (0x8, _, _, 0x1) => ProcessorInstruction::BinaryOr {
Self::grab_first_nibble(data), vx: Self::grab_first_nibble(data),
Self::grab_middle_nibble(data), vy: Self::grab_middle_nibble(data),
), },
(0x8, _, _, 0x2) => ProcessorInstruction::BinaryAnd( (0x8, _, _, 0x2) => ProcessorInstruction::BinaryAnd {
Self::grab_first_nibble(data), vx: Self::grab_first_nibble(data),
Self::grab_middle_nibble(data), vy: Self::grab_middle_nibble(data),
), },
(0x8, _, _, 0x3) => ProcessorInstruction::BinaryXor( (0x8, _, _, 0x3) => ProcessorInstruction::BinaryXor {
Self::grab_first_nibble(data), vx: Self::grab_first_nibble(data),
Self::grab_middle_nibble(data), vy: Self::grab_middle_nibble(data),
), },
(0x8, _, _, 0x4) => ProcessorInstruction::Add( (0x8, _, _, 0x4) => ProcessorInstruction::Add {
Self::grab_first_nibble(data), vx: Self::grab_first_nibble(data),
Self::grab_middle_nibble(data), vy: Self::grab_middle_nibble(data),
), },
(0x8, _, _, 0x5) => ProcessorInstruction::SubtractVX( (0x8, _, _, 0x5) => ProcessorInstruction::SubtractVX {
Self::grab_first_nibble(data), vx: Self::grab_first_nibble(data),
Self::grab_middle_nibble(data), vy: Self::grab_middle_nibble(data),
), },
(0x8, _, _, 0x7) => ProcessorInstruction::SubtractVY( (0x8, _, _, 0x7) => ProcessorInstruction::SubtractVY {
Self::grab_first_nibble(data), vx: Self::grab_first_nibble(data),
Self::grab_middle_nibble(data), vy: Self::grab_middle_nibble(data),
), },
(0x8, _, _, 0x6) => ProcessorInstruction::ShiftRight( (0x8, _, _, 0x6) => ProcessorInstruction::ShiftRight {
Self::grab_first_nibble(data), vx: Self::grab_first_nibble(data),
Self::grab_middle_nibble(data), vy: Self::grab_middle_nibble(data),
), },
(0x8, _, _, 0xE) => ProcessorInstruction::ShiftLeft( (0x8, _, _, 0xE) => ProcessorInstruction::ShiftLeft {
Self::grab_first_nibble(data), vx: Self::grab_first_nibble(data),
Self::grab_middle_nibble(data), vy: Self::grab_middle_nibble(data),
), },
(0xB, _, _, _) => ProcessorInstruction::JumpWithOffset(Self::grab_inner_data(data)), (0xB, _, _, _) => ProcessorInstruction::JumpWithOffset(Self::grab_inner_data(data)),
(0xC, _, _, _) => ProcessorInstruction::GenerateRandomNumber( (0xC, _, _, _) => ProcessorInstruction::GenerateRandomNumber(
Self::grab_first_nibble(data), Self::grab_first_nibble(data),
@ -432,7 +432,7 @@ mod tests {
let instruction = Instruction::new([0x81, 0xF1]); let instruction = Instruction::new([0x81, 0xF1]);
assert_eq!( assert_eq!(
instruction.processor_instruction, instruction.processor_instruction,
ProcessorInstruction::BinaryOr(1, 0xF) ProcessorInstruction::BinaryOr { vx: 1, vy: 0xF }
) )
} }
@ -441,7 +441,7 @@ mod tests {
let instruction = Instruction::new([0x81, 0xF2]); let instruction = Instruction::new([0x81, 0xF2]);
assert_eq!( assert_eq!(
instruction.processor_instruction, instruction.processor_instruction,
ProcessorInstruction::BinaryAnd(1, 0xF) ProcessorInstruction::BinaryAnd { vx: 1, vy: 0xF }
) )
} }
@ -450,7 +450,7 @@ mod tests {
let instruction = Instruction::new([0x81, 0xF3]); let instruction = Instruction::new([0x81, 0xF3]);
assert_eq!( assert_eq!(
instruction.processor_instruction, instruction.processor_instruction,
ProcessorInstruction::BinaryXor(1, 0xF) ProcessorInstruction::BinaryXor { vx: 1, vy: 0xF }
) )
} }
@ -459,7 +459,7 @@ mod tests {
let instruction = Instruction::new([0x81, 0xF4]); let instruction = Instruction::new([0x81, 0xF4]);
assert_eq!( assert_eq!(
instruction.processor_instruction, instruction.processor_instruction,
ProcessorInstruction::Add(1, 0xF) ProcessorInstruction::Add { vx: 1, vy: 0xF }
) )
} }
@ -468,7 +468,7 @@ mod tests {
let instruction = Instruction::new([0x8E, 0xF5]); let instruction = Instruction::new([0x8E, 0xF5]);
assert_eq!( assert_eq!(
instruction.processor_instruction, instruction.processor_instruction,
ProcessorInstruction::SubtractVX(0xE, 0xF) ProcessorInstruction::SubtractVX { vx: 0xE, vy: 0xF }
) )
} }
@ -477,7 +477,7 @@ mod tests {
let instruction = Instruction::new([0x8E, 0xF7]); let instruction = Instruction::new([0x8E, 0xF7]);
assert_eq!( assert_eq!(
instruction.processor_instruction, instruction.processor_instruction,
ProcessorInstruction::SubtractVY(0xE, 0xF) ProcessorInstruction::SubtractVY { vx: 0xE, vy: 0xF }
) )
} }
@ -486,7 +486,7 @@ mod tests {
let instruction = Instruction::new([0x81, 0x1E]); let instruction = Instruction::new([0x81, 0x1E]);
assert_eq!( assert_eq!(
instruction.processor_instruction, instruction.processor_instruction,
ProcessorInstruction::ShiftLeft(1, 1) ProcessorInstruction::ShiftLeft { vx: 1, vy: 1 }
) )
} }
@ -495,7 +495,7 @@ mod tests {
let instruction = Instruction::new([0x81, 0x26]); let instruction = Instruction::new([0x81, 0x26]);
assert_eq!( assert_eq!(
instruction.processor_instruction, instruction.processor_instruction,
ProcessorInstruction::ShiftRight(1, 2) ProcessorInstruction::ShiftRight { vx: 1, vy: 2 }
) )
} }