ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2600: fix hard reset sound crash caused by recent fuddlings

This commit is contained in:
goyuken 2014-05-26 01:21:31 +00:00
parent 898c57f5d9
commit 4f744323cf
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs
View File

@ -11,7 +11,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
private TIA _tia; private TIA _tia;
private DCFilter _dcfilter; private DCFilter _dcfilter;
private MapperBase _mapper; private MapperBase _mapper;
private bool _hardResetSignal;
public byte[] Ram; public byte[] Ram;
@ -29,12 +28,12 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
return _tia.ReadMemory(addr, false); return _tia.ReadMemory(addr, false);
} }
if ((addr & 0x1080) == 0x0080) if ((addr & 0x1080) == 0x0080)
{ {
return M6532.ReadMemory(addr, false); return M6532.ReadMemory(addr, false);
} }
return Rom[addr & 0x0FFF]; return Rom[addr & 0x0FFF];
} }
@ -45,12 +44,12 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
{ {
return _tia.ReadMemory(addr, true); return _tia.ReadMemory(addr, true);
} }
if ((addr & 0x1080) == 0x0080) if ((addr & 0x1080) == 0x0080)
{ {
return M6532.ReadMemory(addr, true); return M6532.ReadMemory(addr, true);
} }
return Rom[addr & 0x0FFF]; return Rom[addr & 0x0FFF];
} }
@ -309,7 +308,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
string.Format( string.Format(
"{0}\r\nSHA1:{1}\r\nMD5:{2}\r\nMapper Impl \"{3}\"", "{0}\r\nSHA1:{1}\r\nMD5:{2}\r\nMapper Impl \"{3}\"",
this._game.Name, this._game.Name,
Util.Hash_SHA1(Rom), Util.Hash_SHA1(Rom),
Util.Hash_MD5(Rom), Util.Hash_MD5(Rom),
_mapper.GetType()); _mapper.GetType());
} }
@ -346,6 +345,12 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
_frame++; _frame++;
_islag = true; _islag = true;
_tia.LineCount = 0; _tia.LineCount = 0;
if (Controller["Power"])
{
HardReset();
}
_tia.BeginAudioFrame(); _tia.BeginAudioFrame();
while (_tia.LineCount < _tia.NominalNumScanlines) while (_tia.LineCount < _tia.NominalNumScanlines)
{ {
@ -355,13 +360,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
_tia.CompleteAudioFrame(); _tia.CompleteAudioFrame();
if (_hardResetSignal)
{
HardReset();
}
_hardResetSignal = Controller["Power"];
if (_islag) if (_islag)
{ {
LagCount++; LagCount++;
@ -399,7 +397,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
if (Controller["P1 Left"]) { value &= 0xBF; } if (Controller["P1 Left"]) { value &= 0xBF; }
if (Controller["P1 Right"]) { value &= 0x7F; } if (Controller["P1 Right"]) { value &= 0x7F; }
if (Controller["P1 Button"]) { value &= 0xF7; } if (Controller["P1 Button"]) { value &= 0xF7; }
if (!peek) if (!peek)
{ {
_islag = false; _islag = false;
@ -418,7 +416,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
if (Controller["P2 Left"]) { value &= 0xBF; } if (Controller["P2 Left"]) { value &= 0xBF; }
if (Controller["P2 Right"]) { value &= 0x7F; } if (Controller["P2 Right"]) { value &= 0x7F; }
if (Controller["P2 Button"]) { value &= 0xF7; } if (Controller["P2 Button"]) { value &= 0xF7; }
if (!peek) if (!peek)
{ {
_islag = false; _islag = false;
@ -438,7 +436,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
if (SyncSettings.BW) { value &= 0xF7; } if (SyncSettings.BW) { value &= 0xF7; }
if (SyncSettings.LeftDifficulty) { value &= 0xBF; } if (SyncSettings.LeftDifficulty) { value &= 0xBF; }
if (SyncSettings.RightDifficulty) { value &= 0x7F; } if (SyncSettings.RightDifficulty) { value &= 0x7F; }
if (!peek) if (!peek)
{ {
_islag = false; _islag = false;
@ -447,4 +445,4 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
return value; return value;
} }
} }
} }