Skip to content

Change the APU to use time-tracking #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zstewar1 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Change the APU to use time-tracking #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9ee015e
Update pulse channel to use system clock.
zstewar1 May 1, 2023
d2a87d7
WIP: Channel 3
zstewar1 May 19, 2023
820e5c4
Get APU stuff into new state, work on getting GB into new state.
zstewar1 May 22, 2023
7431f96
Get everything building in the new system
zstewar1 May 27, 2023
eb67946
Get everything passing under the new system
zstewar1 May 28, 2023
b5290ae
validate that the two LFSR implementations are equivalent
zstewar1 May 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
546 changes: 322 additions & 224 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions feo3boy-memdev-derive/src/bitflags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ pub fn build_flags(item: &DeriveInput, flags: &BitFlags) -> Result<TokenStream>
impl #feo3boy::memdev::MemDevice for #ty {
const LEN: usize = 1;

fn read_byte_relative(&self, addr: #feo3boy::memdev::RelativeAddr) -> u8 {
fn read_byte_relative(&self, _ctx: &#feo3boy::memdev::ReadCtx, addr: #feo3boy::memdev::RelativeAddr) -> u8 {
const READABLE_BITS: #ty = #readable;
#feo3boy::check_addr!(#ty, addr);
#read
}

fn write_byte_relative(&mut self, addr: #feo3boy::memdev::RelativeAddr, val: u8) {
fn write_byte_relative(&mut self, _ctx: &#feo3boy::memdev::WriteCtx, addr: #feo3boy::memdev::RelativeAddr, val: u8) {
const WRITABLE_BITS: #ty = #writable;
#feo3boy::check_addr!(#ty, addr);
#write;
}

fn read_bytes_relative(&self, addr: #feo3boy::memdev::RelativeAddr, data: &mut [u8]) {
fn read_bytes_relative(&self, _ctx: &#feo3boy::memdev::ReadCtx, addr: #feo3boy::memdev::RelativeAddr, data: &mut [u8]) {
const READABLE_BITS: #ty = #readable;
#feo3boy::check_addr!(#ty, addr, data.len());
match data.first_mut() {
Expand All @@ -51,7 +51,7 @@ pub fn build_flags(item: &DeriveInput, flags: &BitFlags) -> Result<TokenStream>
}
}

fn write_bytes_relative(&mut self, addr: #feo3boy::memdev::RelativeAddr, data: &[u8]) {
fn write_bytes_relative(&mut self, _ctx: &#feo3boy::memdev::WriteCtx, addr: #feo3boy::memdev::RelativeAddr, data: &[u8]) {
const WRITABLE_BITS: #ty = #writable;
#feo3boy::check_addr!(#ty, addr, data.len());
match data.first().copied() {
Expand Down
8 changes: 4 additions & 4 deletions feo3boy-memdev-derive/src/bitswrapper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,19 @@ pub fn build_bits_wrapper(item: &DeriveInput, wrapper: &BitsWrapper) -> Result<T
impl #feo3boy::memdev::MemDevice for #ty {
const LEN: usize = 1;

fn read_byte_relative(&self, addr: #feo3boy::memdev::RelativeAddr) -> u8 {
fn read_byte_relative(&self, _ctx: &#feo3boy::memdev::ReadCtx, addr: #feo3boy::memdev::RelativeAddr) -> u8 {
const READABLE_BITS: u8 = #readable;
#feo3boy::check_addr!(#ty, addr);
#read
}

fn write_byte_relative(&mut self, addr: #feo3boy::memdev::RelativeAddr, val: u8) {
fn write_byte_relative(&mut self, _ctx: &#feo3boy::memdev::WriteCtx, addr: #feo3boy::memdev::RelativeAddr, val: u8) {
const WRITABLE_BITS: u8 = #writable;
#feo3boy::check_addr!(#ty, addr);
#write;
}

fn read_bytes_relative(&self, addr: #feo3boy::memdev::RelativeAddr, data: &mut [u8]) {
fn read_bytes_relative(&self, _ctx: &#feo3boy::memdev::ReadCtx, addr: #feo3boy::memdev::RelativeAddr, data: &mut [u8]) {
const READABLE_BITS: u8 = #readable;
#feo3boy::check_addr!(#ty, addr, data.len());
match data.first_mut() {
Expand All @@ -93,7 +93,7 @@ pub fn build_bits_wrapper(item: &DeriveInput, wrapper: &BitsWrapper) -> Result<T
}
}

fn write_bytes_relative(&mut self, addr: #feo3boy::memdev::RelativeAddr, data: &[u8]) {
fn write_bytes_relative(&mut self, _ctx: &#feo3boy::memdev::WriteCtx, addr: #feo3boy::memdev::RelativeAddr, data: &[u8]) {
const WRITABLE_BITS: u8 = #writable;
#feo3boy::check_addr!(#ty, addr, data.len());
match data.first().copied() {
Expand Down
8 changes: 4 additions & 4 deletions feo3boy-memdev-derive/src/bytewrapper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,25 @@ pub fn build_byte_wrapper(item: &DeriveInput, wrapper: &ByteWrapper) -> Result<T
impl #feo3boy::memdev::MemDevice for #ty {
const LEN: usize = 1;

fn read_byte_relative(&self, addr: #feo3boy::memdev::RelativeAddr) -> u8 {
fn read_byte_relative(&self, _ctx: &#feo3boy::memdev::ReadCtx, addr: #feo3boy::memdev::RelativeAddr) -> u8 {
#feo3boy::check_addr!(#ty, addr);
#read(self)
}

fn write_byte_relative(&mut self, addr: #feo3boy::memdev::RelativeAddr, val: u8) {
fn write_byte_relative(&mut self, _ctx: &#feo3boy::memdev::WriteCtx, addr: #feo3boy::memdev::RelativeAddr, val: u8) {
#feo3boy::check_addr!(#ty, addr);
#write(self, val)
}

fn read_bytes_relative(&self, addr: #feo3boy::memdev::RelativeAddr, data: &mut [u8]) {
fn read_bytes_relative(&self, _ctx: &#feo3boy::memdev::ReadCtx, addr: #feo3boy::memdev::RelativeAddr, data: &mut [u8]) {
#feo3boy::check_addr!(#ty, addr, data.len());
match data.first_mut() {
Some(data) => *data = #read(self),
None => {}
}
}

fn write_bytes_relative(&mut self, addr: #feo3boy::memdev::RelativeAddr, data: &[u8]) {
fn write_bytes_relative(&mut self, _ctx: &#feo3boy::memdev::WriteCtx, addr: #feo3boy::memdev::RelativeAddr, data: &[u8]) {
#feo3boy::check_addr!(#ty, addr, data.len());
match data.first().copied() {
Some(val) => #write(self, val),
Expand Down
16 changes: 8 additions & 8 deletions feo3boy-memdev-derive/src/passthrough.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,20 @@ pub fn build_passthrough(item: &DeriveInput) -> Result<TokenStream> {
impl #feo3boy::memdev::MemDevice for #ty {
const LEN: usize = <#field_ty as #feo3boy::memdev::MemDevice>::LEN;

fn read_byte_relative(&self, addr: #feo3boy::memdev::RelativeAddr) -> u8 {
#feo3boy::memdev::MemDevice::read_byte_relative(&self.#field, addr)
fn read_byte_relative(&self, ctx: &#feo3boy::memdev::ReadCtx, addr: #feo3boy::memdev::RelativeAddr) -> u8 {
#feo3boy::memdev::MemDevice::read_byte_relative(&self.#field, ctx, addr)
}

fn read_bytes_relative(&self, addr: #feo3boy::memdev::RelativeAddr, data: &mut [u8]) {
#feo3boy::memdev::MemDevice::read_bytes_relative(&self.#field, addr, data)
fn read_bytes_relative(&self, ctx: &#feo3boy::memdev::ReadCtx, addr: #feo3boy::memdev::RelativeAddr, data: &mut [u8]) {
#feo3boy::memdev::MemDevice::read_bytes_relative(&self.#field, ctx, addr, data)
}

fn write_byte_relative(&mut self, addr: #feo3boy::memdev::RelativeAddr, val: u8) {
#feo3boy::memdev::MemDevice::write_byte_relative(&mut self.#field, addr, val)
fn write_byte_relative(&mut self, ctx: &#feo3boy::memdev::WriteCtx, addr: #feo3boy::memdev::RelativeAddr, val: u8) {
#feo3boy::memdev::MemDevice::write_byte_relative(&mut self.#field, ctx, addr, val)
}

fn write_bytes_relative(&mut self, addr: #feo3boy::memdev::RelativeAddr, data: &[u8]) {
#feo3boy::memdev::MemDevice::write_bytes_relative(&mut self.#field, addr, data)
fn write_bytes_relative(&mut self, ctx: &#feo3boy::memdev::WriteCtx, addr: #feo3boy::memdev::RelativeAddr, data: &[u8]) {
#feo3boy::memdev::MemDevice::write_bytes_relative(&mut self.#field, ctx, addr, data)
}
}
})
Expand Down
11 changes: 11 additions & 0 deletions feo3boy-player/src/executor_selector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use std::marker::PhantomData;
use std::mem;

use clap::ValueEnum;
use feo3boy::clock::{SystemClock, SystemClockContext};
use feo3boy::gbz80core::direct_executor::DirectExecutor;
use feo3boy::gbz80core::direct_executor_v2::DirectExecutorV2;
use feo3boy::gbz80core::executor::{Executor, ExecutorConfig, ExecutorState};
Expand Down Expand Up @@ -192,3 +193,13 @@ where
self.ctx.interrupts_mut()
}
}

impl<C, E> SystemClockContext for MultiExecutorWrapperContext<C, E>
where
C: SystemClockContext,
{
#[inline]
fn clock(&self) -> &SystemClock {
self.ctx.clock()
}
}
4 changes: 2 additions & 2 deletions feo3boy-player/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ fn main() {
write_serial_data(&mut gb, &mut stdout);
gb.tick();

if let Some(sample) = gb.apu.consume_output_sample() {
if let Some(sample) = gb.consume_audio_sample() {
avg_sample_interval = if num_sample_intervals == 0.0 {
sample_instant.elapsed().as_micros() as f64
} else {
Expand All @@ -363,7 +363,7 @@ fn main() {
break;
}
} else if args.mute {
let emu_time = gb.elapsed_time();
let emu_time = gb.clock().elapsed_time();
if emu_time > scaled_time_since_startup {
// Emulator has gotten ahead of realtime, time to break.
break;
Expand Down
24 changes: 12 additions & 12 deletions feo3boy/benches/opcodes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ use feo3boy::gbz80core::direct_executor_v2::DirectExecutorV2;
use feo3boy::gbz80core::executor::Executor;
use feo3boy::gbz80core::microcode_executor::{MicrocodeExecutor, MicrocodeState};
use feo3boy::gbz80core::stepping_executor::{SteppingExecutor, SteppingExecutorState};
use feo3boy::gbz80core::Gbz80State;
use feo3boy::memdev::{AllRam, RootMemDevice};
use feo3boy::gbz80core::TestGb;
use feo3boy::memdev::AllRam;

fn run_until_halted<E: Executor>(gb: &mut (Gbz80State, AllRam, E::State)) -> (u8, u8, u8, u8) {
while !gb.0.halted {
fn run_until_halted<E: Executor>(gb: &mut TestGb<AllRam, E::State>) -> (u8, u8, u8, u8) {
while !gb.cpu.halted {
E::run_single_instruction(gb);
}
(
gb.1.read_byte(0xC000),
gb.1.read_byte(0xC001),
gb.1.read_byte(0xC002),
gb.1.read_byte(0xC003),
gb.mem[0xC000],
gb.mem[0xC001],
gb.mem[0xC002],
gb.mem[0xC003],
)
}

Expand All @@ -28,7 +28,7 @@ fn opcodes_benchmark(c: &mut Criterion) {
b.iter_batched_ref(
|| {
let mem = AllRam::from(fib);
(Gbz80State::default(), mem, ())
TestGb::new(mem, ())
},
|gb| run_until_halted::<DirectExecutor>(gb),
BatchSize::LargeInput,
Expand All @@ -38,7 +38,7 @@ fn opcodes_benchmark(c: &mut Criterion) {
b.iter_batched_ref(
|| {
let mem = AllRam::from(fib);
(Gbz80State::default(), mem, MicrocodeState::default())
TestGb::new(mem, MicrocodeState::default())
},
|gb| run_until_halted::<MicrocodeExecutor>(gb),
BatchSize::LargeInput,
Expand All @@ -48,7 +48,7 @@ fn opcodes_benchmark(c: &mut Criterion) {
b.iter_batched_ref(
|| {
let mem = AllRam::from(fib);
(Gbz80State::default(), mem, ())
TestGb::new(mem, ())
},
|gb| run_until_halted::<DirectExecutorV2>(gb),
BatchSize::LargeInput,
Expand All @@ -58,7 +58,7 @@ fn opcodes_benchmark(c: &mut Criterion) {
b.iter_batched_ref(
|| {
let mem = AllRam::from(fib);
(Gbz80State::default(), mem, SteppingExecutorState::default())
TestGb::new(mem, SteppingExecutorState::default())
},
|gb| run_until_halted::<SteppingExecutor>(gb),
BatchSize::LargeInput,
Expand Down
Loading