j/Chirp
1
1
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

cpu: Change ST and DT back to u8

Browse Source
This commit is contained in:
John
2023-04-29 18:37:29 -05:00
parent 57c2ac681c
commit cb69af048f
3 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpu/behavior.rs
View File

@@ -520,7 +520,7 @@ impl CPU {
/// ```
#[inline(always)]
pub(super) fn load_delay_timer(&mut self, x: Reg) {
self.v[x] = self.delay as u8;
self.v[x] = self.delay;
}
/// |`Fx0A`| Wait for key, then vX = K
#[inline(always)]
@@ -539,7 +539,7 @@ impl CPU {
/// ```
#[inline(always)]
pub(super) fn store_delay_timer(&mut self, x: Reg) {
self.delay = self.v[x] as f64;
self.delay = self.v[x];
}
/// |`Fx18`| Load vX into ST
/// ```py
@@ -547,7 +547,7 @@ impl CPU {
/// ```
#[inline(always)]
pub(super) fn store_sound_timer(&mut self, x: Reg) {
self.sound = self.v[x] as f64;
self.sound = self.v[x];
}
/// |`Fx1e`| Add vX to I,
/// ```py

15
src/cpu/tests.rs
View File

@@ -875,8 +875,7 @@ mod io {
for word in 0..=0xff {
for x in 0..=0xf {
// set the register under test to `word`
cpu.delay = word as f64;
cpu.delay = word;
cpu.load_delay_timer(x);
assert_eq!(cpu.v[x], word);
@@ -895,7 +894,7 @@ mod io {
cpu.store_delay_timer(x);
assert_eq!(cpu.delay, word as f64);
assert_eq!(cpu.delay, word);
}
}
}
@@ -911,7 +910,7 @@ mod io {
cpu.store_sound_timer(x);
assert_eq!(cpu.sound, word as f64);
assert_eq!(cpu.sound, word);
}
}
}
@@ -1072,28 +1071,28 @@ mod behavior {
#[test]
fn delay() {
let (mut cpu, mut bus) = setup_environment();
cpu.delay = 10.0;
cpu.flags.monotonic = false;
cpu.delay = 10;
for _ in 0..2 {
cpu.multistep(&mut bus, 8)
.expect("Running valid instructions should always succeed");
std::thread::sleep(Duration::from_secs_f64(1.0 / 60.0));
}
// time is within 1 frame deviance over a theoretical 2 frame pause
assert!(7.0 <= cpu.delay && cpu.delay <= 9.0);
assert_eq!(cpu.delay, 8);
}
#[test]
fn sound() {
let (mut cpu, mut bus) = setup_environment();
cpu.sound = 10.0;
cpu.flags.monotonic = false; // disable monotonic timing
cpu.sound = 10;
for _ in 0..2 {
cpu.multistep(&mut bus, 8)
.expect("Running valid instructions should always succeed");
std::thread::sleep(Duration::from_secs_f64(1.0 / 60.0));
}
// time is within 1 frame deviance over a theoretical 2 frame pause
assert!(7.0 <= cpu.sound && cpu.sound <= 9.0);
assert_eq!(cpu.sound, 8);
}
#[test]
fn vbi_wait() {