read addresses from debug info

Author: kirjavascript

tests/Cargo.lock

@@ -4,4 +4,5 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+gumdrop = "0.8.1"
 rusticnes-core = { git = "https://github.com/zeta0134/rusticnes-core.git", version = "0.2.0" }

tests/Cargo.toml

@@ -1,18 +1,44 @@
 use std::collections::HashMap;
 use std::sync::OnceLock;
 
+fn parse_debug_line(line: &str) -> (String, u16) {
+    let pairs: Vec<&str> = line.split(',').collect();
+
+    let mut name = String::new();
+    let mut val = 0;
+
+    for pair in pairs {
+        let key_val: Vec<&str> = pair.split('=').collect();
+        if key_val.len() == 2 {
+            let key = key_val[0].trim();
+            let value = key_val[1].trim();
+
+            match key {
+                "name" => name = value.trim_matches('"').to_string(),
+                "val" => {
+                    if let Ok(hex_value) = u16::from_str_radix(value.trim_start_matches("0x"), 16) {
+                        val = hex_value;
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+
+    (name, val)
+}
+
 fn labels() -> &'static HashMap<String, u16> {
     static LABELS: OnceLock<HashMap<String, u16>> = OnceLock::new();
     LABELS.get_or_init(|| {
-        let text = include_str!("../../tetris.lbl");
+        let text = include_str!("../../tetris.dbg");
         let mut labels: HashMap<String, u16> = HashMap::new();
 
         for line in text.lines() {
-            let parts: Vec<&str> = line.split_whitespace().collect();
-            if parts.len() >= 2 {
-                if let Ok(hex_value) = u16::from_str_radix(parts[1], 16) {
-                    labels.insert(parts[2].to_string(), hex_value);
-                }
+            let (name, val) = parse_debug_line(line);
+
+            if !name.is_empty() {
+                labels.insert(name, val);
             }
         }
 
@@ -23,15 +49,14 @@ fn labels() -> &'static HashMap<String, u16> {
 fn addrs() -> &'static HashMap<u16, String> {
     static LABELS: OnceLock<HashMap<u16, String>> = OnceLock::new();
     LABELS.get_or_init(|| {
-        let text = include_str!("../../tetris.lbl");
+        let text = include_str!("../../tetris.dbg");
         let mut labels: HashMap<u16, String> = HashMap::new();
 
         for line in text.lines() {
-            let parts: Vec<&str> = line.split_whitespace().collect();
-            if parts.len() >= 2 {
-                if let Ok(hex_value) = u16::from_str_radix(parts[1], 16) {
-                    labels.insert(hex_value, parts[2].to_string());
-                }
+            let (name, val) = parse_debug_line(line);
+
+            if !name.is_empty() {
+                labels.insert(val, name);
             }
         }
 

tests/src/labels.rs

@@ -1,9 +1,26 @@
 mod labels;
 mod util;
-
-// tests
 mod pushdown;
 
+use gumdrop::Options;
+
+#[derive(Debug, Options)]
+struct TestOptions {
+    help: bool,
+    #[options(help="run tests")]
+    test: bool,
+}
+
 fn main() {
-    pushdown::test();
+    let options = TestOptions::parse_args_default_or_exit();
+
+    if options.test {
+        pushdown::test();
+        println!("pushdown works!");
+    }
+
+    let mut emu = util::emulator(None);
+
+    emu.memory.iram_raw[labels::get("practiseType") as usize] = labels::get("MODE_SEED") as u8;
+
 }

tests/src/main.rs

@@ -4,17 +4,20 @@ 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;
+        [0..1000, 24500..25500].into_iter().for_each(|range| {
+            for score in range {
+                util::set_score(&mut emu, score);
 
-            util::set_score(&mut emu, score);
-            util::run_to_return(&mut emu, false);
+                emu.registers.pc = labels::get("addPushDownPoints");
+                emu.memory.iram_raw[labels::get("holdDownPoints") as usize] = pushdown;
 
-            let reference = pushdown_impl(pushdown, score as u16) as u32;
+                util::run_to_return(&mut emu, false);
 
-            assert_eq!(reference, util::get_score(&mut emu) - score);
-        }
+                let reference = pushdown_impl(pushdown, score as u16) as u32;
+
+                assert_eq!(reference, util::get_score(&mut emu) - score);
+            }
+        });
     }
 }
 

tests/src/pushdown.rs

@@ -41,8 +41,8 @@ pub fn print_step(emu: &mut NesState) {
 }
 
 pub fn set_score(emu: &mut NesState, score: u32) {
-    let score_addr = labels::get(".score");
-    let binscore_addr = labels::get(".binScore");
+    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();
@@ -57,7 +57,7 @@ pub fn set_score(emu: &mut NesState, score: u32) {
 }
 
 pub fn get_score(emu: &mut NesState) -> u32 {
-    let binscore_addr = labels::get(".binScore");
+    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)