Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

dynamically adjust the cycles per frame based on displayconfig/refresh rate. fixes PAL IPL flickering

Layle1065ed117e6d
diff --git a/crates/gecko/src/flipper/vi/regs.rs b/crates/gecko/src/flipper/vi/regs.rs
index e2731eb..edfbaea 100644
--- a/crates/gecko/src/flipper/vi/regs.rs
+++ b/crates/gecko/src/flipper/vi/regs.rs
@@ -1,6 +1,6 @@
use crate::flipper::vi;
use crate::gamecube::GameCube;
-use crate::mmio::traits::{MmioAccess, MmioRegister, WriteMask};
+use crate::mmio::traits::{MmioAccess, WriteMask};
use chapa::BitEnum;
// 0xCC002000 2 R/W VTR (Vertical Timing Register)
@@ -32,7 +32,18 @@ pub enum RefreshRate {
Hz50,
}
-#[derive(Debug, BitEnum)]
+impl RefreshRate {
+ #[inline(always)]
+ pub fn cycles_per_frame(&self) -> u64 {
+ const CPU_CORE_CLOCK: u64 = 486_000_000;
+ match self {
+ RefreshRate::Hz60 => CPU_CORE_CLOCK / 60,
+ RefreshRate::Hz50 => CPU_CORE_CLOCK / 50,
+ }
+ }
+}
+
+#[derive(Debug, BitEnum, PartialEq, Eq)]
pub enum VideoFormat {
Ntsc = 0,
Pal = 1,
@@ -94,10 +105,11 @@ impl MmioAccess<GameCube> for DisplayConfiguration {
fn write(self, gc: &mut GameCube, _: WriteMask) {
// TODO: Rising edge on RST clears the register. Just a test for now.
if self.reset() && !gc.vi.dcr.reset() {
- gc.vi.dcr = <DisplayConfiguration as MmioRegister>::from_raw(0);
+ gc.vi.dcr = DisplayConfiguration::from_raw(0);
} else {
gc.vi.dcr = self;
}
+
vi::ensure_half_line_scheduled(gc);
}
}
diff --git a/crates/gecko/src/scheduler.rs b/crates/gecko/src/scheduler.rs
index cde2bb5..85dfe99 100644
--- a/crates/gecko/src/scheduler.rs
+++ b/crates/gecko/src/scheduler.rs
@@ -1,8 +1,8 @@
use std::collections::VecDeque;
+use crate::flipper::vi::regs::RefreshRate;
use crate::gamecube::GameCube;
-pub const CYCLES_PER_VSYNC: u64 = 486_000_000 / 60; // TODO: fix
pub const TIMEBASE_DIVISOR: u64 = 12;
pub const CPU_CYCLES_PER_DSP_TICK: u64 = 6; // ~486MHz CPU / ~81MHz DSP
pub const DSP_BATCH_SIZE: u64 = 1024;
@@ -30,7 +30,7 @@ impl Scheduler {
timebase_offset: 0,
events: VecDeque::with_capacity(8),
};
- s.schedule_at(CYCLES_PER_VSYNC, crate::scheduler::vsync_handler);
+ s.schedule_at(RefreshRate::Hz60.cycles_per_frame(), crate::scheduler::vsync_handler);
s.schedule_at(
CPU_CYCLES_PER_DSP_TICK * DSP_BATCH_SIZE,
crate::scheduler::dsp_batch_handler,
@@ -108,8 +108,9 @@ impl Scheduler {
/// Reschedules itself every frame.
pub fn vsync_handler(gc: &mut GameCube) {
gc.vsync_pending = true;
+ let rate = gc.vi.dcr.video_format().refresh_rate();
gc.scheduler
- .schedule_in(CYCLES_PER_VSYNC, crate::scheduler::vsync_handler);
+ .schedule_in(rate.cycles_per_frame(), crate::scheduler::vsync_handler);
}
/// Reschedules itself every DSP batch.
diff --git a/crates/tinybench/src/main.rs b/crates/tinybench/src/main.rs
index e62c74f..d6d2e72 100644
--- a/crates/tinybench/src/main.rs
+++ b/crates/tinybench/src/main.rs
@@ -1,11 +1,8 @@
use clap::Parser;
use gecko::flipper::si::pad::PadStatus;
use gecko::gamecube::GameCube;
-use gecko::scheduler::CYCLES_PER_VSYNC;
use std::time::Instant;
-const CPU_CLOCK_HZ: f64 = 486_000_000.0;
-
#[derive(Parser)]
#[command(about = "Benchmark tool")]
struct Args {
@@ -113,8 +110,9 @@ fn run_bench(emulator: &mut GameCube, args: &Args) {
let total_elapsed = bench_start.elapsed().as_secs_f64();
let total_fps = frame_count as f64 / total_elapsed;
- let emulated_cycles = frame_count * CYCLES_PER_VSYNC;
- let emulated_seconds = emulated_cycles as f64 / CPU_CLOCK_HZ;
+ let rate = emulator.vi.dcr.video_format().refresh_rate();
+ let emulated_cycles = frame_count * rate.cycles_per_frame();
+ let emulated_seconds = emulated_cycles as f64 / 486_000_000.0;
let speed_pct = (emulated_seconds / total_elapsed) * 100.0;
println!();