empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #52 from Perkka2/master

Browse source 
Slightly improved EPSM IRQ functionality
This commit is contained in:
NovaSquirrel 2021-10-17 15:50:32 -04:00 • committed by GitHub
commit c9b01cf899
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 58 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
Core/EPSMAudio.h
View file

@ -30,6 +30,7 @@ private:
uint8_t irqAHighValue; uint8_t irqAHighValue;
uint8_t irqALowValue; uint8_t irqALowValue;
uint8_t irqBValue; uint8_t irqBValue;
uint8_t irqEnable;
uint16_t currentRegister; uint16_t currentRegister;
@ -92,47 +93,59 @@ private:
break; break;
case 0x1: case 0x1:
if (currentRegister == 0x24) { if (irqEnable) {
//Timer A High 8 bits if (currentRegister == 0x24) {
//std::cout << "Timer A High 8 bits" << std::endl; //Timer A High 8 bits
irqAHighValue = value; irqAHighValue = value;
}
if (currentRegister == 0x25) {
//Timer A Low 2 bits
//std::cout << "Timer A Low 2 bits" << std::endl;
irqALowValue = (value & 0x3);
}
if (currentRegister == 0x26) {
//Timer B 8 bits
//std::cout << "Timer B 8 bits" << std::endl;
irqBValue = value;
}
if ((currentRegister == 0x27) && ((value & 0x5)|(value & 0xA))) {
//Load+Enable IRQ (0xA = TimerB, 0x5 = TimerA)
//std::cout << "Load+Enable IRQ" << std::endl;
if ((currentRegister == 0x27) && (value & 0x5)) {
irqATimer = (uint16_t(irqAHighValue) << 2) | irqALowValue;
irqACurrentTimer = 72 * (1024 - irqATimer) * 2;
irqATimerEnable = 1;
//std::cout << "Load+Enable IRQ A" << std::endl;
} }
if ((currentRegister == 0x27) && (value & 0xA)) { if (currentRegister == 0x25) {
irqBTimer = 1152 * (256 - irqBValue) * 2; //Timer A Low 2 bits
irqBCurrentTimer = irqBTimer; irqALowValue = (value & 0x3);
irqBTimerEnable = 1; }
//std::cout << "Load+Enable IRQ B " << irqBCurrentTimer << std::endl; if (currentRegister == 0x26) {
//Timer B 8 bits
irqBValue = value;
}
if (currentRegister == 0x27) {
//Load+Enable IRQ (0xA = TimerB, 0x5 = TimerA)
if ((value & 0x5)) {
irqATimer = (uint16_t(irqAHighValue) << 2) | irqALowValue;
irqACurrentTimer = 72 * (1024 - irqATimer) * 2;
irqATimerEnable = 1;
}
if ((value & 0xA)) {
irqBTimer = 1152 * (256 - irqBValue) * 2;
irqBCurrentTimer = irqBTimer;
irqBTimerEnable = 1;
}
if ((value & 0x10)) {
//Enable/Reset IRQ
_console->GetCpu()->ClearIrqSource(IRQSource::EPSM);
irqATimerEnable = 0;
}
if ((value & 0x20)) {
//Enable/Reset IRQ
_console->GetCpu()->ClearIrqSource(IRQSource::EPSM);
irqBTimerEnable = 0;
}
} }
} }
if ((currentRegister == 0x27) && (value & 0x30)) { if ((currentRegister == 0x29)) {
//Enable/Reset IRQ //std::cout << std::hex << "value: " << value << std::endl;
//std::cout << std::hex << uint16_t(value) << "Reset IRQ" << std::endl; if ((value & 0x3 && (value & 0x80))) {
_console->GetCpu()->ClearIrqSource(IRQSource::EPSM); //if ((value & 0x3 )) {
irqATimerEnable = 0; //enable IRQ's
irqBTimerEnable = 0; //std::cout << "enable IRQ's" << std::endl;
} irqEnable = 1;
if ((currentRegister == 0x29) && (value & 0x3)) { }
//enable IRQ's if (!(value & 0x83)) {
//std::cout << "enable IRQ's" << std::endl; //enable IRQ's
//std::cout << "enable IRQ's" << std::endl;
irqEnable = 0;
_console->GetCpu()->ClearIrqSource(IRQSource::EPSM);
irqATimerEnable = 0;
irqBTimerEnable = 0;
}
} }
break; break;
case 0x3: case 0x3:
@ -141,10 +154,6 @@ private:
}*/ }*/
break; break;
} }
//irqBValue = value;
//std::cout << std::hex << irqBValue << std::endl;
} }
uint32_t getClockFrequency() uint32_t getClockFrequency()
@ -170,13 +179,13 @@ protected:
EPSMSSGAudio::ClockAudio(); EPSMSSGAudio::ClockAudio();
_clock += getClockFrequency() / (double)_console->GetCpu()->GetClockRate(_console->GetModel()); _clock += getClockFrequency() / (double)_console->GetCpu()->GetClockRate(_console->GetModel());
_clockIRQ += (getClockFrequency()*6) / (double)_console->GetCpu()->GetClockRate(_console->GetModel()); _clockIRQ += _console->GetSettings()->GetEPSMClockFrequency() / (double)_console->GetCpu()->GetClockRate(_console->GetModel());
while (_clockIRQ >= _cycleCountIRQ) { while (_clockIRQ >= _cycleCountIRQ) {
_cycleCountIRQ++; _cycleCountIRQ++;
if (irqATimerEnable) { if (irqATimerEnable) {
irqACurrentTimer--; irqACurrentTimer--;
if (!irqACurrentTimer) { if (!irqACurrentTimer) {
irqATimerEnable = 0; irqACurrentTimer++;
_console->GetCpu()->SetIrqSource(IRQSource::EPSM); _console->GetCpu()->SetIrqSource(IRQSource::EPSM);
} }
@ -184,7 +193,7 @@ protected:
if (irqBTimerEnable) { if (irqBTimerEnable) {
irqBCurrentTimer--; irqBCurrentTimer--;
if (!irqBCurrentTimer) { if (!irqBCurrentTimer) {
irqBTimerEnable = 0; irqBCurrentTimer++;
_console->GetCpu()->SetIrqSource(IRQSource::EPSM); _console->GetCpu()->SetIrqSource(IRQSource::EPSM);
} }
@ -202,7 +211,7 @@ protected:
{ {
_clock--; _clock--;
int16_t samples[2]; int16_t samples[4];
OPN2_Clock(&_chip, samples); OPN2_Clock(&_chip, samples);
for (uint8_t x = 0; x < 2; x++) for (uint8_t x = 0; x < 2; x++)
@ -242,6 +251,7 @@ public:
_clock = 0; _clock = 0;
_clockIRQ = 0; _clockIRQ = 0;
irqEnable = 0;
irqATimerEnable = 0; irqATimerEnable = 0;
irqBTimerEnable = 0; irqBTimerEnable = 0;
@ -266,9 +276,9 @@ public:
const uint8_t a1 = !!(writeAddr & 0x2); const uint8_t a1 = !!(writeAddr & 0x2);
if (a0 == 0x0) { writeAddr = 0xC000; } if (a0 == 0x0) { writeAddr = 0xC000; }
if (a0 == 0x1) { writeAddr = 0xE000; } if (a0 == 0x1) { writeAddr = 0xE000; }
if (a1 == 0x0) { EPSMSSGAudio::WriteRegister(writeAddr, value); } if (a1 == 0x0) { EPSMSSGAudio::WriteRegister(writeAddr, writeValue); }
WriteToChip(a0 | (a1 << 1), writeValue); WriteToChip(a0 | (a1 << 1), writeValue);
WriteToChipIRQ(a0 | (a1 << 1), value); WriteToChipIRQ(a0 | (a1 << 1), writeValue);
} }
break; break;
case 0x401c: //0xC000 A0 = 0, A1 = 0 case 0x401c: //0xC000 A0 = 0, A1 = 0