scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Apu cycling from SNES to Apu class

Browse Source
This commit is contained in:
scawful
2024-04-24 12:32:09 -04:00
parent 0225955939
commit aaf9724531
4 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/emu/audio/apu.cc
View File

@@ -17,6 +17,9 @@ namespace app {
namespace emu {
namespace audio {
static const double apuCyclesPerMaster = (32040 * 32) / (1364 * 262 * 60.0);
static const double apuCyclesPerMasterPal = (32040 * 32) / (1364 * 312 * 50.0);
static const uint8_t bootRom[0x40] = {
0xcd, 0xef, 0xbd, 0xe8, 0x00, 0xc6, 0x1d, 0xd0, 0xfc, 0x8f, 0xaa,
0xf4, 0x8f, 0xbb, 0xf5, 0x78, 0xcc, 0xf4, 0xd0, 0xfb, 0x2f, 0x19,
@@ -59,17 +62,14 @@ void Apu::Update() {
}
}
int Apu::RunCycles(uint32_t wanted_cycles) {
int run_cycles = 0;
uint32_t start_cycles = cycles_;
void Apu::RunCycles(uint64_t cycles) {
uint64_t sync_to =
(uint64_t)cycles *
(memory_.pal_timing() ? apuCyclesPerMasterPal : apuCyclesPerMaster);
while (run_cycles < wanted_cycles) {
while (cycles_ < sync_to) {
spc700_.RunOpcode();
run_cycles += (uint32_t)cycles_ - start_cycles;
start_cycles = cycles_;
}
return run_cycles;
}
void Apu::Cycle() {

6
src/app/emu/audio/apu.h
View File

@@ -56,14 +56,13 @@ typedef struct Timer {
*/
class Apu {
public:
Apu(MemoryImpl &memory, Clock &clock)
: clock_(clock), memory_(memory) {}
Apu(MemoryImpl &memory, Clock &clock) : clock_(clock), memory_(memory) {}
void Init();
void Reset();
void Update();
int RunCycles(uint32_t wanted_cycles);
void RunCycles(uint64_t cycles);
uint8_t SpcRead(uint16_t address);
void SpcWrite(uint16_t address, uint8_t data);
void SpcIdle(bool waiting);
@@ -76,6 +75,7 @@ class Apu {
void UpdateClock(int delta_time) { clock_.UpdateClock(delta_time); }
auto dsp() -> Dsp & { return dsp_; }
auto spc700() -> Spc700 & { return spc700_; }
// Port buffers (equivalent to $2140 to $2143 for the main CPU)
uint8_t in_ports_[6]; // includes 2 bytes of ram