add pushdown points test

Author: kirjavascript

tests/src/pushdown.rs

@@ -1,5 +1,26 @@
+use crate::{labels, util};
+
+pub fn test() {
+    let mut emu = util::emulator(None);
+
+    for pushdown in 2..15 {
+        for score in 24500..25500 {
+            emu.registers.pc = labels::get(".addPushDownPoints");
+            emu.memory.iram_raw[labels::get(".holdDownPoints") as usize] = pushdown;
+
+            util::set_score(&mut emu, score);
+            util::run_to_return(&mut emu, false);
+
+            let reference = pushdown_impl(pushdown, score as u16) as u32;
+
+            assert_eq!(reference, util::get_score(&mut emu) - score);
+        }
+    }
+}
+
 // reference implementation - tested against the original game
-fn pushdown(pushdown: u8, score: u16) -> u16 {
+// may seem weird - designed to be translated to assembly
+fn pushdown_impl(pushdown: u8, score: u16) -> u16 {
     let ones = score % 10;
     let hundredths = score % 100;
     let mut newscore = ones as u8 + (pushdown - 1);
@@ -17,15 +38,5 @@ fn pushdown(pushdown: u8, score: u16) -> u16 {
         newscore = nextscore;
     }
 
-    newscore + (score-hundredths) - score
-}
-
-use crate::{ labels, util };
-
-pub fn test() {
-    let mut emu = util::emulator(None);
-
-    emu.registers.pc = labels::get(".addPushDownPoints");
-
-    util::run_to_return(&mut emu);
+    newscore + (score - hundredths) - score
 }

tests/src/util.rs

@@ -11,12 +11,16 @@ pub fn emulator(rom: Option<&[u8]>) -> NesState {
     emu
 }
 
-pub fn run_to_return(emu: &mut NesState) {
+pub fn run_to_return(emu: &mut NesState, print: bool) {
     opcodes::push(emu, 0);
     opcodes::push(emu, 0);
 
     loop {
-        print_step(emu);
+        if print {
+            print_step(emu);
+        } else {
+            emu.step();
+        }
 
         if emu.registers.pc < 3 {
             break;
@@ -35,3 +39,26 @@ pub fn print_step(emu: &mut NesState) {
 
     println!("{}", opcode_info::disassemble_instruction(emu.cpu.opcode, 0, 0).0);
 }
+
+pub fn set_score(emu: &mut NesState, score: u32) {
+    let score_addr = labels::get(".score");
+    let binscore_addr = labels::get(".binScore");
+    let bcd_str = format!("{:06}", score);
+    let bcd_a = i64::from_str_radix(&bcd_str[0..2], 16).unwrap();
+    let bcd_b = i64::from_str_radix(&bcd_str[2..4], 16).unwrap();
+    let bcd_c = i64::from_str_radix(&bcd_str[4..6], 16).unwrap();
+
+    emu.memory.iram_raw[(score_addr + 2) as usize] = bcd_a as u8;
+    emu.memory.iram_raw[(score_addr + 1) as usize] = bcd_b as u8;
+    emu.memory.iram_raw[score_addr as usize] = bcd_c as u8;
+    emu.memory.iram_raw[binscore_addr as usize] = score as u8;
+    emu.memory.iram_raw[(binscore_addr + 1) as usize] = (score >> 8) as u8;
+    emu.memory.iram_raw[(binscore_addr + 2) as usize] = (score >> 16) as u8;
+}
+
+pub fn get_score(emu: &mut NesState) -> u32 {
+    let binscore_addr = labels::get(".binScore");
+    emu.memory.iram_raw[binscore_addr as usize] as u32
+        + ((emu.memory.iram_raw[(binscore_addr + 1) as usize] as u32) << 8)
+        + ((emu.memory.iram_raw[(binscore_addr + 2) as usize] as u32) << 16)
+}