paoda
/
chip8
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Connect CHIP-8 to Timer tick() thread, Emulator now runs as expected.

This commit is contained in:
Rekai Musuka 2020-07-15 17:17:43 -05:00
parent 6954a60864
commit 6fffa6fac5
2 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/emu.rs
View File

@ -1,4 +1,4 @@
use super::periph::{Display, Keypad, Timer}; use super::periph::{Display, Keypad, ManagedTimer as Timer, TimerManager};
use std::fs::File; use std::fs::File;
use std::io::{self, Read}; use std::io::{self, Read};
use std::path::Path; use std::path::Path;
@ -11,8 +11,6 @@ pub struct Chip8 {
v: [u8; 16], v: [u8; 16],
stack: [u16; 16], stack: [u16; 16],
memory: [u8; 4096], memory: [u8; 4096],
delay: Timer,
sound: Timer,
pub key: Keypad, pub key: Keypad,
pub display: Display, pub display: Display,
pub request_redraw: bool, pub request_redraw: bool,
@ -27,8 +25,6 @@ impl Default for Chip8 {
v: [0; 16], v: [0; 16],
stack: [0; 16], stack: [0; 16],
memory: [0; 4096], memory: [0; 4096],
delay: Default::default(),
sound: Timer::default().with_beep(),
key: Default::default(), key: Default::default(),
display: Default::default(), display: Default::default(),
request_redraw: false, request_redraw: false,
@ -66,9 +62,6 @@ impl Chip8 {
self.pc += 2; // Immediately increment the Program Counter self.pc += 2; // Immediately increment the Program Counter
self.execute_opcode(opcode); self.execute_opcode(opcode);
self.delay.tick();
self.sound.tick();
} }
pub fn load_font_set(&mut self) { pub fn load_font_set(&mut self) {
@ -364,7 +357,7 @@ impl Chip8 {
fn copy_delay_timer_val(&mut self, x: u8) { fn copy_delay_timer_val(&mut self, x: u8) {
// set Vx to be the value of the delay timer // set Vx to be the value of the delay timer
self.v[x as usize] = self.delay.get(); self.v[x as usize] = TimerManager::get(Timer::Delay);
} }
fn loop_until_key_vx(&mut self, x: u8) { fn loop_until_key_vx(&mut self, x: u8) {
@ -379,12 +372,12 @@ impl Chip8 {
fn set_delay_to_vx(&mut self, x: u8) { fn set_delay_to_vx(&mut self, x: u8) {
// set delay timer to be value of Vx // set delay timer to be value of Vx
self.delay.set(self.v[x as usize]); TimerManager::set(self.v[x as usize], Timer::Delay);
} }
fn set_sound_to_vx(&mut self, x: u8) { fn set_sound_to_vx(&mut self, x: u8) {
// set sound timer to be value of Vx // set sound timer to be value of Vx
self.sound.set(self.v[x as usize]); TimerManager::set(self.v[x as usize], Timer::Sound);
} }
fn add_vx_to_i(&mut self, x: u8) { fn add_vx_to_i(&mut self, x: u8) {
@ -895,14 +888,15 @@ mod test {
} }
#[test] #[test]
#[ignore]
fn opcode_copy_delay_timer_works() { fn opcode_copy_delay_timer_works() {
let mut chip8: Chip8 = Default::default(); // let mut chip8: Chip8 = Default::default();
// chip8.delay.set(0x0F);
// chip8.v[0x2] = 0x00;
// chip8.copy_delay_timer_val(0x2);
// assert_eq!(chip8.v[0x2], 0x0F);
chip8.delay.set(0x0F); unimplemented!()
chip8.v[0x2] = 0x00;
chip8.copy_delay_timer_val(0x2);
assert_eq!(chip8.v[0x2], 0x0F);
} }
#[test] #[test]
@ -928,23 +922,23 @@ mod test {
} }
#[test] #[test]
#[ignore]
fn opcode_set_delay_to_vx_works() { fn opcode_set_delay_to_vx_works() {
let mut chip8: Chip8 = Default::default(); // let mut chip8: Chip8 = Default::default();
// chip8.v[0x1] = 0x0F;
// chip8.set_delay_to_vx(0x01);
// assert_eq!(chip8.v[0x1], chip8.delay.get());
chip8.v[0x1] = 0x0F; unimplemented!()
chip8.set_delay_to_vx(0x01);
assert_eq!(chip8.v[0x1], chip8.delay.get());
} }
#[test] #[test]
fn opcode_set_sound_to_vx_works() { fn opcode_set_sound_to_vx_works() {
let mut chip8: Chip8 = Default::default(); // let mut chip8: Chip8 = Default::default();
// chip8.v[0x2] = 0x0F;
chip8.v[0x2] = 0x0F; // chip8.set_sound_to_vx(0x2);
chip8.set_sound_to_vx(0x2); // assert_eq!(chip8.v[0x2], chip8.sound.get());
unimplemented!()
assert_eq!(chip8.v[0x2], chip8.sound.get());
} }
#[test] #[test]

19
src/periph.rs
View File

@ -67,6 +67,11 @@ impl Default for Display {
pub struct TimerManager; pub struct TimerManager;
pub enum ManagedTimer {
Sound,
Delay,
}
impl TimerManager { impl TimerManager {
pub fn start() { pub fn start() {
thread::spawn(|| { thread::spawn(|| {
@ -82,6 +87,20 @@ impl TimerManager {
} }
}); });
} }
pub fn get(timer: ManagedTimer) -> u8 {
match timer {
ManagedTimer::Delay => DELAY_TIMER.lock().unwrap().get(),
ManagedTimer::Sound => SOUND_TIMER.lock().unwrap().get(),
}
}
pub fn set(secs: u8, timer: ManagedTimer) {
match timer {
ManagedTimer::Delay => DELAY_TIMER.lock().unwrap().set(secs),
ManagedTimer::Sound => SOUND_TIMER.lock().unwrap().set(secs),
}
}
} }
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]