cycle counting ingame

Author: kirjavascript

src/nmi/nmi.asm

@@ -24,13 +24,13 @@ nmi:    pha
         ldy #$02
         jsr generateNextPseudorandomNumber
         jsr copyCurrentScrollAndCtrlToPPU
-        lda #$01
-        sta verticalBlankingInterval
         jsr pollControllerButtons
 .if KEYBOARD
 ; Read Family BASIC Keyboard
         jsr pollKeyboard
 .endif
+        lda #$01
+        sta verticalBlankingInterval
         pla
         tay
         pla

src/util/core.asm

@@ -50,8 +50,6 @@ random10:
         bpl random10
         rts
 
-nmiWaitStart: ; used in tests
-
 ; canon is waitForVerticalBlankingInterval
 updateAudioWaitForNmiAndResetOamStaging:
         jsr updateAudio_jmp
@@ -88,8 +86,6 @@ updateAudioAndWaitForNmi:
         beq @checkForNmi
         rts
 
-nmiWaitEnd:
-
 updateAudioWaitForNmiAndDisablePpuRendering:
         jsr updateAudioAndWaitForNmi
         lda currentPpuMask

tests/src/cycle_count.rs

@@ -31,37 +31,34 @@ pub fn count_cycles() {
 
     println!("scoring routine most cycles: {}", highest);
 
-    use crate::video;
+    // use crate::video;
 
     // check clock cycles frames in each mode
 
     let mut emu = util::emulator(None);
-    let mut view = video::Video::new();
 
-    for _ in 0..3 { emu.run_until_vblank(); }
+    for mode in 0..labels::get("MODE_GAME_QUANTITY") {
 
-    let practise_type = labels::get("practiseType") as usize;
-    let game_mode = labels::get("gameMode") as usize;
-    let main_loop = labels::get("mainLoop");
-    let level_number = labels::get("levelNumber") as usize;
+        emu.reset();
+
+        for _ in 0..3 { emu.run_until_vblank(); }
 
+        let practise_type = labels::get("practiseType") as usize;
+        let game_mode = labels::get("gameMode") as usize;
+        let main_loop = labels::get("mainLoop");
+        let level_number = labels::get("levelNumber") as usize;
 
-    emu.memory.iram_raw[practise_type] = labels::get("MODE_TRANSITION") as _;
-    emu.memory.iram_raw[level_number] = 18;
-    emu.memory.iram_raw[game_mode] = 4;
-    emu.registers.pc = main_loop;
 
-    for _ in 0..5 { emu.run_until_vblank(); }
+        emu.memory.iram_raw[practise_type] = mode as _;
+        emu.memory.iram_raw[level_number] = 235;
+        emu.memory.iram_raw[game_mode] = 4;
+        emu.registers.pc = main_loop;
 
-    let (mut highest, mut level, mut lines) = (0, 0, 0);
+        for _ in 0..5 { emu.run_until_vblank(); }
 
-    for _ in 0..10 {
+        let (mut highest, mut _level, mut lines) = (0, 0, 0);
 
         for line in 0..5 {
-            emu.memory.iram_raw[labels::get("currentPiece") as usize] = 0x11;
-            emu.memory.iram_raw[labels::get("tetriminoX") as usize] = 0x5;
-            emu.memory.iram_raw[labels::get("tetriminoY") as usize] = 0x11;
-            emu.memory.iram_raw[labels::get("autorepeatY") as usize] = 0;
             emu.memory.iram_raw[labels::get("vramRow") as usize] = 0;
 
             playfield::clear(&mut emu);
@@ -75,58 +72,47 @@ pub fn count_cycles() {
                 _ => unreachable!("line"),
             });
 
-            emu.run_until_vblank();
-
-            for _ in 0..[44, 47, 47, 46, 45][line] {
+            emu.memory.iram_raw[labels::get("currentPiece") as usize] = 0x11;
+            emu.memory.iram_raw[labels::get("tetriminoX") as usize] = 0x5;
+            emu.memory.iram_raw[labels::get("tetriminoY") as usize] = 0x12;
+            emu.memory.iram_raw[labels::get("autorepeatY") as usize] = 0;
 
+            for _ in 0..45 {
                 let cycles = cycles_to_hblank(&mut emu);
 
                 if cycles > highest {
                     highest = cycles;
-                    level = emu.memory.iram_raw[level_number];
+                    _level = emu.memory.iram_raw[level_number];
                     lines = line;
                 }
-
-                println!("{}/{} ({} {})", highest, cycles, lines, level);
-
-                // std::thread::sleep(std::time::Duration::from_millis(50));
-
             }
-
-                emu.ppu.render_ntsc(video::WIDTH);
-                view.update(&emu.ppu.filtered_screen);
-
         }
-    }
-
-    // println!("{:#?}", (highest, level, lines));
 
-
-    loop {}
+        println!("cycles {} lines {} mode {}", highest, lines, mode);
+    }
 
 }
 
 fn cycles_to_hblank(emu: &mut NesState) -> u32 {
-    let nmi_wait_start = labels::get("nmiWaitStart");
-    let nmi_wait_end = labels::get("nmiWaitEnd");
+    let vblank = labels::get("verticalBlankingInterval") as usize;
     let mut cycles = 0;
     let mut done = false;
 
     while emu.ppu.current_scanline == 242 {
         emu.cycle();
         if !done {
             cycles += 1;
-            if emu.registers.pc >= nmi_wait_start && emu.registers.pc <= nmi_wait_end {
-                done = true
+            if emu.memory.iram_raw[vblank] == 1 {
+                done = true;
             }
         }
         let mut i = 0;
         while emu.cpu.tick >= 1 && i < 10 {
             emu.cycle();
             if !done {
                 cycles += 1;
-                if emu.registers.pc >= nmi_wait_start && emu.registers.pc <= nmi_wait_end {
-                    done = true
+                if emu.memory.iram_raw[vblank] == 1 {
+                    done = true;
                 }
             }
             i += 1;
@@ -136,21 +122,23 @@ fn cycles_to_hblank(emu: &mut NesState) -> u32 {
             emu.last_frame = emu.ppu.current_frame;
         }
     }
+    emu.memory.iram_raw[vblank] = 1;
+    done = false;
     while emu.ppu.current_scanline != 242 {
         emu.cycle();
         if !done {
             cycles += 1;
-            if emu.registers.pc >= nmi_wait_start && emu.registers.pc <= nmi_wait_end {
-                done = true
+            if emu.memory.iram_raw[vblank] == 0 {
+                done = true;
             }
         }
         let mut i = 0;
         while emu.cpu.tick >= 1 && i < 10 {
             emu.cycle();
             if !done {
                 cycles += 1;
-                if emu.registers.pc >= nmi_wait_start && emu.registers.pc <= nmi_wait_end {
-                    done = true
+                if emu.memory.iram_raw[vblank] == 0 {
+                    done = true;
                 }
             }
             i += 1;