i would never in a million years have written that way, so no reason to change it to that after the fact

This commit is contained in:
goyuken 2014-05-19 03:21:46 +00:00
parent 4ee4088c4c
commit 27a7bc7c8f
1 changed files with 50 additions and 49 deletions

View File

@ -1,4 +1,5 @@
using BizHawk.Common;
using System;
using BizHawk.Common;
namespace BizHawk.Emulation.Cores.Atari.Atari2600
{
@ -16,29 +17,29 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
public byte AUDV = 0;
// 2 state counter
private bool _sr1 = true;
private bool sr1 = true;
// 4 bit shift register
private int _sr4 = 0x0f;
private int sr4 = 0x0f;
// 5 bit shift register
private int _sr5 = 0x1f;
private int sr5 = 0x1f;
// 3 state counter
private int _sr3 = 2;
private int sr3 = 2;
// counter based off AUDF
private byte _freqcnt;
private byte freqcnt;
// latched audio value
private bool _on = true;
private bool on = true;
private bool Run3()
{
_sr3++;
if (_sr3 == 3)
sr3++;
if (sr3 == 3)
{
_sr3 = 0;
sr3 = 0;
return true;
}
@ -47,46 +48,46 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
private bool Run4()
{
bool ret = (_sr4 & 1) != 0;
bool c = (_sr4 & 1) != 0 ^ (_sr4 & 2) != 0;
_sr4 = (_sr4 >> 1) | (c ? 8 : 0);
bool ret = (sr4 & 1) != 0;
bool c = (sr4 & 1) != 0 ^ (sr4 & 2) != 0;
sr4 = (sr4 >> 1) | (c ? 8 : 0);
return ret;
}
private bool Run5()
{
bool ret = (_sr5 & 1) != 0;
bool c = (_sr5 & 1) != 0 ^ (_sr5 & 4) != 0;
_sr5 = (_sr5 >> 1) | (c ? 16 : 0);
bool ret = (sr5 & 1) != 0;
bool c = (sr5 & 1) != 0 ^ (sr5 & 4) != 0;
sr5 = (sr5 >> 1) | (c ? 16 : 0);
return ret;
}
private bool One4()
{
bool ret = (_sr4 & 1) != 0;
_sr4 = (_sr4 >> 1) | 8;
bool ret = (sr4 & 1) != 0;
sr4 = (sr4 >> 1) | 8;
return ret;
}
private bool One5()
{
bool ret = (_sr5 & 1) != 0;
_sr5 = (_sr5 >> 1) | 16;
bool ret = (sr5 & 1) != 0;
sr5 = (sr5 >> 1) | 16;
return ret;
}
private bool Run1()
{
_sr1 = !_sr1;
return !_sr1;
sr1 = !sr1;
return !sr1;
}
private bool Run9()
{
bool ret = (_sr4 & 1) != 0;
bool c = (_sr5 & 1) != 0 ^ (_sr4 & 1) != 0;
_sr4 = (_sr4 >> 1) | ((_sr5 & 1) != 0 ? 8 : 0);
_sr5 = (_sr5 >> 1) | (c ? 16 : 0);
bool ret = (sr4 & 1) != 0;
bool c = (sr5 & 1) != 0 ^ (sr4 & 1) != 0;
sr4 = (sr4 >> 1) | ((sr5 & 1) != 0 ? 8 : 0);
sr5 = (sr5 >> 1) | (c ? 16 : 0);
return ret;
}
@ -96,28 +97,28 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
/// <returns>16 bit audio sample</returns>
public short Cycle()
{
if (++_freqcnt == AUDF)
if (++freqcnt == AUDF)
{
_freqcnt = 0;
freqcnt = 0;
switch (AUDC)
{
case 0x00:
case 0x0b:
// Both have a 1 s
One5();
_on = One4();
on = One4();
break;
case 0x01:
// Both run, but the 5 bit is ignored
_on = Run4();
on = Run4();
Run5();
break;
case 0x02:
if ((_sr5 & 0x0f) == 0 || (_sr5 & 0x0f) == 0x0f)
if ((sr5 & 0x0f) == 0 || (sr5 & 0x0f) == 0x0f)
{
_on = Run4();
on = Run4();
break;
}
@ -127,7 +128,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
case 0x03:
if (Run5())
{
_on = Run4();
on = Run4();
}
break;
@ -135,26 +136,26 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
case 0x04:
Run5();
One4();
_on = Run1();
on = Run1();
break;
case 0x05:
One5();
Run4();
_on = Run1();
on = Run1();
break;
case 0x06:
case 0x0a:
Run4(); // ???
Run5();
if ((_sr5 & 0x0f) == 0)
if ((sr5 & 0x0f) == 0)
{
_on = false;
on = false;
}
else if ((_sr5 & 0x0f) == 0x0f)
else if ((sr5 & 0x0f) == 0x0f)
{
_on = true;
on = true;
}
break;
@ -162,16 +163,16 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
case 0x07:
case 0x09:
Run4(); // ???
_on = Run5();
on = Run5();
break;
case 0x08:
_on = Run9();
on = Run9();
break;
case 0x0c:
case 0x0d:
if (Run3())
{
_on = Run1();
on = Run1();
}
break;
@ -192,7 +193,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
}
}
return (short)(_on ? AUDV * 1092 : 0);
return (short)(on ? AUDV * 1092 : 0);
}
public void SyncState(Serializer ser)
@ -200,12 +201,12 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
ser.Sync("AUDC", ref AUDC);
ser.Sync("AUDF", ref AUDF);
ser.Sync("AUDV", ref AUDV);
ser.Sync("sr1", ref _sr1);
ser.Sync("sr3", ref _sr3);
ser.Sync("sr4", ref _sr4);
ser.Sync("sr5", ref _sr5);
ser.Sync("freqcnt", ref _freqcnt);
ser.Sync("on", ref _on);
ser.Sync("sr1", ref sr1);
ser.Sync("sr3", ref sr3);
ser.Sync("sr4", ref sr4);
ser.Sync("sr5", ref sr5);
ser.Sync("freqcnt", ref freqcnt);
ser.Sync("on", ref on);
}
}
}