paoda
/
zba
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: move audio sync, video sync variables

This commit is contained in:
Rekai Nyangadzayi Musuka 2022-07-21 11:05:49 -03:00
parent 5d9a57c7eb
commit 03ded099d2
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/emu.zig
View File

@ -10,7 +10,8 @@ const Timer = std.time.Timer;
const Thread = std.Thread; const Thread = std.Thread;
const Atomic = std.atomic.Atomic; const Atomic = std.atomic.Atomic;
const audio_sync = true; const sync_audio = false;
const sync_video: RunKind = .UnlimitedFPS;
// 228 Lines which consist of 308 dots (which are 4 cycles long) // 228 Lines which consist of 308 dots (which are 4 cycles long)
const cycles_per_frame: u64 = 228 * (308 * 4); //280896 const cycles_per_frame: u64 = 228 * (308 * 4); //280896
@ -35,10 +36,10 @@ const RunKind = enum {
LimitedBusy, LimitedBusy,
}; };
pub fn run(kind: RunKind, quit: *Atomic(bool), fps: *FpsTracker, sched: *Scheduler, cpu: *Arm7tdmi) void { pub fn run(quit: *Atomic(bool), fps: *FpsTracker, sched: *Scheduler, cpu: *Arm7tdmi) void {
if (audio_sync) log.info("Audio sync enabled", .{}); if (sync_audio) log.info("Audio sync enabled", .{});
switch (kind) { switch (sync_video) {
.Unlimited => runUnsynchronized(quit, sched, cpu, null), .Unlimited => runUnsynchronized(quit, sched, cpu, null),
.Limited => runSynchronized(quit, sched, cpu, null), .Limited => runSynchronized(quit, sched, cpu, null),
.UnlimitedFPS => runUnsynchronized(quit, sched, cpu, fps), .UnlimitedFPS => runUnsynchronized(quit, sched, cpu, fps),
@ -77,14 +78,14 @@ pub fn runUnsynchronized(quit: *Atomic(bool), sched: *Scheduler, cpu: *Arm7tdmi,
while (!quit.load(.SeqCst)) { while (!quit.load(.SeqCst)) {
runFrame(sched, cpu); runFrame(sched, cpu);
if (audio_sync) syncToAudio(cpu); if (sync_audio) syncToAudio(cpu);
tracker.tick(); tracker.tick();
} }
} else { } else {
while (!quit.load(.SeqCst)) { while (!quit.load(.SeqCst)) {
runFrame(sched, cpu); runFrame(sched, cpu);
if (audio_sync) syncToAudio(cpu); if (sync_audio) syncToAudio(cpu);
} }
} }
} }
@ -105,7 +106,7 @@ pub fn runSynchronized(quit: *Atomic(bool), sched: *Scheduler, cpu: *Arm7tdmi, f
// If we happen to also be syncing to audio, we choose to spin on // If we happen to also be syncing to audio, we choose to spin on
// the amount of time needed for audio to catch up rather than // the amount of time needed for audio to catch up rather than
// our expected wake-up time // our expected wake-up time
if (audio_sync) syncToAudio(cpu) else spinLoop(&timer, wake_time); if (sync_audio) syncToAudio(cpu) else spinLoop(&timer, wake_time);
wake_time = new_wake_time; wake_time = new_wake_time;
tracker.tick(); tracker.tick();
@ -115,7 +116,7 @@ pub fn runSynchronized(quit: *Atomic(bool), sched: *Scheduler, cpu: *Arm7tdmi, f
runFrame(sched, cpu); runFrame(sched, cpu);
const new_wake_time = syncToVideo(&timer, wake_time); const new_wake_time = syncToVideo(&timer, wake_time);
// see above comment // see above comment
if (audio_sync) syncToAudio(cpu) else spinLoop(&timer, wake_time); if (sync_audio) syncToAudio(cpu) else spinLoop(&timer, wake_time);
wake_time = new_wake_time; wake_time = new_wake_time;
} }

2
src/main.zig
View File

@ -99,7 +99,7 @@ pub fn main() anyerror!void {
// Run Emulator in it's separate thread // Run Emulator in it's separate thread
// From this point on, interacting with Arm7tdmi or Scheduler // From this point on, interacting with Arm7tdmi or Scheduler
// be justified, as it will require to be thread-afe // be justified, as it will require to be thread-afe
const emu_thread = try Thread.spawn(.{}, emu.run, .{ .LimitedFPS, &quit, &emu_rate, &scheduler, &cpu }); const emu_thread = try Thread.spawn(.{}, emu.run, .{ &quit, &emu_rate, &scheduler, &cpu });
defer emu_thread.join(); defer emu_thread.join();
var title_buf: [0x20]u8 = std.mem.zeroes([0x20]u8); var title_buf: [0x20]u8 = std.mem.zeroes([0x20]u8);