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 store and load memory

Browse source
This commit is contained in:
Denis-Cosmin Nutiu 2024-12-11 00:31:22 +02:00
parent a9432ce7ed
commit 5f4981e995
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/emulator.rs
View file

@ -408,13 +408,13 @@ where
self.memory[self.index_register as usize + 1] = (number / 10) % 10; self.memory[self.index_register as usize + 1] = (number / 10) % 10;
self.memory[self.index_register as usize + 2] = ((number) % 100) % 10; self.memory[self.index_register as usize + 2] = ((number) % 100) % 10;
} }
ProcessorInstruction::LoadMemory(vx) => { ProcessorInstruction::LoadMemory { vx } => {
for i in 0..=vx { for i in 0..=vx {
let memory_index = (self.index_register + (i as u16)) as usize; let memory_index = (self.index_register + (i as u16)) as usize;
self.registers[i as usize] = self.memory[memory_index]; self.registers[i as usize] = self.memory[memory_index];
} }
} }
ProcessorInstruction::StoreMemory(vx) => { ProcessorInstruction::StoreMemory { vx } => {
for i in 0..=vx { for i in 0..=vx {
let memory_index = (self.index_register + (i as u16)) as usize; let memory_index = (self.index_register + (i as u16)) as usize;
self.memory[memory_index] = self.registers[i as usize]; self.memory[memory_index] = self.registers[i as usize];

16
src/instruction.rs
View file

@ -75,9 +75,9 @@ pub enum ProcessorInstruction {
/// Converts the number in VX to 3 digits. /// Converts the number in VX to 3 digits.
BinaryCodedDecimalConversion { vx: u8 }, BinaryCodedDecimalConversion { vx: u8 },
/// Stores the general purpose registers in memory at index register address. /// Stores the general purpose registers in memory at index register address.
StoreMemory(u8), StoreMemory { vx: u8 },
/// Loads the general purpose registers from memory at index register address. /// Loads the general purpose registers from memory at index register address.
LoadMemory(u8), LoadMemory { vx: u8 },
/// Blocks execution and waits for input. If a key is pressed it will be put in VX. /// Blocks execution and waits for input. If a key is pressed it will be put in VX.
GetKeyBlocking(u8), GetKeyBlocking(u8),
/// Skips one instruction if a key value stored in VX is pressed. Doesn't block execution. /// Skips one instruction if a key value stored in VX is pressed. Doesn't block execution.
@ -239,8 +239,12 @@ impl Instruction {
(0xF, _, 0x3, 0x3) => ProcessorInstruction::BinaryCodedDecimalConversion { (0xF, _, 0x3, 0x3) => ProcessorInstruction::BinaryCodedDecimalConversion {
vx: Self::grab_first_nibble(data), vx: Self::grab_first_nibble(data),
}, },
(0xF, _, 0x5, 0x5) => ProcessorInstruction::StoreMemory(Self::grab_first_nibble(data)), (0xF, _, 0x5, 0x5) => ProcessorInstruction::StoreMemory {
(0xF, _, 0x6, 0x5) => ProcessorInstruction::LoadMemory(Self::grab_first_nibble(data)), vx: Self::grab_first_nibble(data),
},
(0xF, _, 0x6, 0x5) => ProcessorInstruction::LoadMemory {
vx: Self::grab_first_nibble(data),
},
(0xE, _, 0x9, 0xE) => { (0xE, _, 0x9, 0xE) => {
ProcessorInstruction::SkipIfKeyIsPressed(Self::grab_first_nibble(data)) ProcessorInstruction::SkipIfKeyIsPressed(Self::grab_first_nibble(data))
} }
@ -611,7 +615,7 @@ mod tests {
let instruction = Instruction::new([0xFA, 0x55]); let instruction = Instruction::new([0xFA, 0x55]);
assert_eq!( assert_eq!(
instruction.processor_instruction, instruction.processor_instruction,
ProcessorInstruction::StoreMemory(0xA) ProcessorInstruction::StoreMemory { vx: 0xA }
) )
} }
@ -620,7 +624,7 @@ mod tests {
let instruction = Instruction::new([0xFA, 0x65]); let instruction = Instruction::new([0xFA, 0x65]);
assert_eq!( assert_eq!(
instruction.processor_instruction, instruction.processor_instruction,
ProcessorInstruction::LoadMemory(0xA) ProcessorInstruction::LoadMemory { vx: 0xA }
) )
} }