Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

tighter scheduler loop

Layle36b5b55685bb
diff --git a/Cargo.toml b/Cargo.toml
index dfc0ffa..f12b8f3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,12 +43,12 @@ egui-winit = { git = "https://github.com/ioncodes/egui.git" }
[profile.release-max]
inherits = "release"
-lto = "fat"
codegen-units = 1
debug = false
[profile.release]
debug = true
+lto = "fat"
[profile.dev]
opt-level = 3
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..6f4185c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,9 @@
+short term todolist
+
+- [ ] JIT for CPU
+- [ ] JIT for DSP
+- [ ] Fix idle detection for CPU
+- [ ] Implement mailbox polling detection for DSP?
+- [ ] HLE? IDK if ever a goal
+
+JIT via Cranelift
\ No newline at end of file
diff --git a/crates/gecko/src/gamecube.rs b/crates/gecko/src/gamecube.rs
index bad860f..90e4fb4 100644
--- a/crates/gecko/src/gamecube.rs
+++ b/crates/gecko/src/gamecube.rs
@@ -264,7 +264,15 @@ impl GameCube {
pub fn run_until_vsync(&mut self) {
self.prepare_frame();
while !self.vsync_pending {
- self.step();
+ self.scheduler.update_deadline();
+ // Execute a slice of CPU instructions until the next event deadline
+ while self.scheduler.cycles < self.scheduler.next_deadline() {
+ self.step_cpu();
+ }
+ // Drain all events that are now due
+ while let Some(event) = self.scheduler.poll() {
+ self.process_event(event);
+ }
}
}
diff --git a/crates/gecko/src/scheduler.rs b/crates/gecko/src/scheduler.rs
index 750861e..1a6c41c 100644
--- a/crates/gecko/src/scheduler.rs
+++ b/crates/gecko/src/scheduler.rs
@@ -16,6 +16,7 @@ pub enum EventKind {
pub struct Scheduler {
pub cycles: u64,
+ next_deadline: u64,
timebase_offset: i64,
events: BinaryHeap<Reverse<(u64, EventKind)>>,
}
@@ -24,6 +25,7 @@ impl Scheduler {
pub fn new() -> Self {
let mut s = Scheduler {
cycles: 0,
+ next_deadline: 0,
timebase_offset: 0,
events: BinaryHeap::new(),
};
@@ -32,6 +34,17 @@ impl Scheduler {
s
}
+ /// Set `next_deadline` to the next event deadline so the CPU knows
+ /// how far it can run before an event must be serviced.
+ /// This may later be updated if an event is scheduled sooner than the current target.
+ #[inline(always)]
+ pub fn update_deadline(&mut self) {
+ self.next_deadline = self
+ .events
+ .peek()
+ .map_or(self.cycles, |Reverse((d, _))| *d);
+ }
+
pub fn timebase(&self) -> u64 {
((self.cycles / TIMEBASE_DIVISOR) as i64 + self.timebase_offset) as u64
}
@@ -58,6 +71,9 @@ impl Scheduler {
pub fn schedule_at(&mut self, deadline: u64, kind: EventKind) {
self.events.push(Reverse((deadline, kind)));
+ if deadline < self.next_deadline {
+ self.next_deadline = deadline;
+ }
}
pub fn schedule_in(&mut self, delay: u64, kind: EventKind) {
@@ -73,7 +89,8 @@ impl Scheduler {
}
}
- pub fn next_event_deadline(&self) -> Option<u64> {
- self.events.peek().map(|Reverse((d, _))| *d)
+ #[inline(always)]
+ pub fn next_deadline(&self) -> u64 {
+ self.next_deadline
}
}