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

Debugger: Fixed multi-threading crash when calling PeekRAM for $4015 from another thread

Browse source
This commit is contained in:
Sour 2018-12-25 22:40:41 -05:00
parent 071f69520b
commit 9666426dc1
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Core/APU.cpp
View file

@ -80,9 +80,6 @@ void APU::FrameCounterTick(FrameType type)
uint8_t APU::GetStatus()
{
//$4015 read
Run();
uint8_t status = 0;
status |= _squareChannel[0]->GetStatus() ? 0x01 : 0x00;
status |= _squareChannel[1]->GetStatus() ? 0x02 : 0x00;
@ -97,6 +94,9 @@ uint8_t APU::GetStatus()
uint8_t APU::ReadRAM(uint16_t addr)
{
//$4015 read
Run();
uint8_t status = GetStatus();
//Reading $4015 clears the Frame Counter interrupt flag.
@ -107,6 +107,10 @@ uint8_t APU::ReadRAM(uint16_t addr)
uint8_t APU::PeekRAM(uint16_t addr)
{
if(_console->GetEmulationThreadId() == std::this_thread::get_id()) {
//Only run the APU (to catch up) if we're running this in the emulation thread (not 100% accurate, but we can't run the APU from any other thread without locking)
Run();
}
return GetStatus();
}