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

Apu callback, CPU instruction lengths

Browse Source
This commit is contained in:
scawful
2023-12-03 05:37:42 -05:00
parent a0019ab7fb
commit ca9cc42d6b
3 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,11 +43,14 @@ void APU::Update() {
for (auto i = 0; i < cycles_to_run; ++i) { for (auto i = 0; i < cycles_to_run; ++i) {
// Update the APU // Update the APU
// ... UpdateChannelSettings();
// Update the SPC700 // Update the SPC700
// ... uint8_t opcode = spc700_.read(spc700_.PC);
spc700_.ExecuteInstructions(opcode);
} }
ProcessSamples();
} }
void APU::ProcessSamples() { void APU::ProcessSamples() {

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

@@ -157,6 +157,10 @@ class APU : public Observer {
} }
} }
void SetReadyCallback(std::function<void()> callback) {
ready_callback_ = callback;
}
private: private:
// Constants for communication // Constants for communication
static const uint8_t READY_SIGNAL_0 = 0xAA; static const uint8_t READY_SIGNAL_0 = 0xAA;
@@ -187,6 +191,8 @@ class APU : public Observer {
DigitalSignalProcessor dsp_; DigitalSignalProcessor dsp_;
SPC700 spc700_{aram_}; SPC700 spc700_{aram_};
std::vector<int16_t> audioSamples_; std::vector<int16_t> audioSamples_;
std::function<void()> ready_callback_;
}; };
} // namespace emu } // namespace emu

28
src/app/emu/cpu.cc
View File

@@ -368,14 +368,14 @@ void CPU::ExecuteInstruction(uint8_t opcode) {
case 0xD0: // BNE Branch if not equal (zero clear) case 0xD0: // BNE Branch if not equal (zero clear)
{ {
operand = FetchByte(); operand = FetchSignedByte();
BNE(operand); BNE(operand);
break; break;
} }
case 0x10: // BPL Branch if plus (negative clear) case 0x10: // BPL Branch if plus (negative clear)
{ {
operand = FetchByte(); operand = FetchSignedByte();
BPL(operand); BPL(operand);
break; break;
} }
@@ -390,6 +390,18 @@ void CPU::ExecuteInstruction(uint8_t opcode) {
case 0x00: // BRK Break case 0x00: // BRK Break
{ {
BRK(); BRK();
std::cout << "BRK" << std::endl;
// Print all the registers
std::cout << "A: " << std::hex << std::setw(2) << std::setfill('0') << (int)A << std::endl;
std::cout << "X: " << std::hex << std::setw(2) << std::setfill('0') << (int)X << std::endl;
std::cout << "Y: " << std::hex << std::setw(2) << std::setfill('0') << (int)Y << std::endl;
std::cout << "S: " << std::hex << std::setw(2) << std::setfill('0') << (int)SP() << std::endl;
std::cout << "PC: " << std::hex << std::setw(4) << std::setfill('0') << (int)PC << std::endl;
std::cout << "PB: " << std::hex << std::setw(2) << std::setfill('0') << (int)PB << std::endl;
std::cout << "D: " << std::hex << std::setw(4) << std::setfill('0') << (int)D << std::endl;
std::cout << "DB: " << std::hex << std::setw(2) << std::setfill('0') << (int)DB << std::endl;
std::cout << "E: " << std::hex << std::setw(2) << std::setfill('0') << (int)E << std::endl;
break; break;
} }
@@ -1730,6 +1742,13 @@ uint8_t CPU::GetInstructionLength(uint8_t opcode) {
case 0x93: // STA SR Indirect Indexed, Y case 0x93: // STA SR Indirect Indexed, Y
case 0x95: // STA Direct Page Indexed, X case 0x95: // STA Direct Page Indexed, X
case 0x96: // STX Direct Page Indexed, Y case 0x96: // STX Direct Page Indexed, Y
case 0xC7: // CMP Direct Page Indirect Long
case 0xD7: // CMP DP Indirect Long Indexed, Y
case 0xD2: // CMP DP Indirect
case 0xD1: // CMP DP Indirect Indexed, Y
case 0x03: // ORA Stack Relative
case 0x13: // ORA SR Indirect Indexed, Y
case 0x07: // ORA Direct Page Indirect Long
return 2; return 2;
case 0x69: // ADC Immediate case 0x69: // ADC Immediate
@@ -1772,6 +1791,11 @@ uint8_t CPU::GetInstructionLength(uint8_t opcode) {
case 0x5D: // EOR Absolute Indexed, X case 0x5D: // EOR Absolute Indexed, X
case 0x59: // EOR Absolute Indexed, Y case 0x59: // EOR Absolute Indexed, Y
case 0x83: // STA Stack Relative Indirect Indexed, Y case 0x83: // STA Stack Relative Indirect Indexed, Y
case 0xCE: // DEC Absolute
case 0xD5: // CMP DP Indexed, X
case 0xD9: // CMP Absolute Indexed, Y
case 0xDD: // CMP Absolute Indexed, X
case 0x0C: // TSB Absolute
return 3; return 3;
case 0x2F: // AND Absolute Long case 0x2F: // AND Absolute Long