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

try try again

This commit is contained in:
alyosha-tas 2016-05-16 20:35:52 -04:00
parent ed02acc6bc
commit b60876f902
3 changed files with 249 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/TIA.cs
View File

@ -269,43 +269,44 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
private int[] _palette; private int[] _palette;
private byte pf0_update = 0; private byte pf0_update;
private byte pf1_update = 0; private byte pf1_update;
private byte pf2_update = 0; private byte pf2_update;
private bool pf0_updater = false; private bool pf0_updater;
private bool pf1_updater = false; private bool pf1_updater;
private bool pf2_updater = false; private bool pf2_updater;
private byte pf0_delay_clock = 0; private byte pf0_delay_clock;
private byte pf1_delay_clock = 0; private byte pf1_delay_clock;
private byte pf2_delay_clock = 0; private byte pf2_delay_clock;
private byte pf0_max_delay = 0; private byte pf0_max_delay;
private byte pf1_max_delay = 0; private byte pf1_max_delay;
private byte pf2_max_delay = 0; private byte pf2_max_delay;
private int enam0_delay = 0; private int enam0_delay;
private int enam1_delay = 0; private int enam1_delay;
private int enamb_delay = 0; private int enamb_delay;
private bool enam0_val = false; private bool enam0_val;
private bool enam1_val = false; private bool enam1_val;
private bool enamb_val = false; private bool enamb_val;
private bool p0_stuff = false; private bool p0_stuff;
private bool p1_stuff = false; private bool p1_stuff;
private bool m0_stuff = false; private bool m0_stuff;
private bool m1_stuff = false; private bool m1_stuff;
private bool b_stuff = false; private bool b_stuff;
private int HMP0_delay = 0; private int HMP0_delay;
private byte HMP0_val = 0; private byte HMP0_val;
private int HMP1_delay = 0; private int HMP1_delay;
private byte HMP1_val = 0; private byte HMP1_val;
private int prg0_delay = 0; private int prg0_delay;
private int prg1_delay = 0; private int prg1_delay;
private byte prg0_val = 0; private byte prg0_val;
private byte prg1_val = 0; private byte prg1_val;
private bool do_ticks;
private bool do_ticks = false;
private byte _hsyncCnt; private byte _hsyncCnt;
private int _capChargeStart; private int _capChargeStart;
private bool _capCharging; private bool _capCharging;
@ -418,6 +419,44 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
_CurrentScanLine = 0; _CurrentScanLine = 0;
_audioClocks = 0; _audioClocks = 0;
pf0_update = 0;
pf1_update = 0;
pf2_update = 0;
pf0_updater = false;
pf1_updater = false;
pf2_updater = false;
pf0_delay_clock = 0;
pf1_delay_clock = 0;
pf2_delay_clock = 0;
pf0_max_delay = 0;
pf1_max_delay = 0;
pf2_max_delay = 0;
enam0_delay = 0;
enam1_delay = 0;
enamb_delay = 0;
enam0_val = false;
enam1_val = false;
enamb_val = false;
p0_stuff = false;
p1_stuff = false;
m0_stuff = false;
m1_stuff = false;
b_stuff = false;
HMP0_delay = 0;
HMP0_val = 0;
HMP1_delay = 0;
HMP1_val = 0;
prg0_delay = 0;
prg1_delay = 0;
prg0_val = 0;
prg1_val = 0;
do_ticks = false;
_player0 = new PlayerData(); _player0 = new PlayerData();
_player1 = new PlayerData(); _player1 = new PlayerData();
_playField = new PlayfieldData(); _playField = new PlayfieldData();
@ -550,10 +589,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
if (_hsyncCnt <= 0) if (_hsyncCnt <= 0)
{ {
_core.Cpu.RDY = true; _core.Cpu.RDY = true;
_player0.Draw_Main = true;
_player1.Draw_Main = true;
_player0.Missile.Draw_Main = true;
_player1.Missile.Draw_Main = true;
} }
@ -1237,9 +1272,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
//_playField.Grp = (uint)((_playField.Grp & 0xFFF00) + ReverseBits(value, 8)); //_playField.Grp = (uint)((_playField.Grp & 0xFFF00) + ReverseBits(value, 8));
} }
else if (maskedAddr == 0x10) // RESP0 else if (maskedAddr == 0x10) // RESP0
{ {
_player0.Draw_Main = false;
// Resp depends on HMOVE // Resp depends on HMOVE
if (!_hmove.LateHBlankReset) if (!_hmove.LateHBlankReset)
{ {
@ -1253,9 +1286,7 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
} }
} }
else if (maskedAddr == 0x11) // RESP1 else if (maskedAddr == 0x11) // RESP1
{ {
_player1.Draw_Main = false;
// RESP depends on HMOVE // RESP depends on HMOVE
if (!_hmove.LateHBlankReset) if (!_hmove.LateHBlankReset)
{ {
@ -1271,8 +1302,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
} }
else if (maskedAddr == 0x12) // RESM0 else if (maskedAddr == 0x12) // RESM0
{ {
_player0.Missile.Draw_Main = false;
if (!_hmove.LateHBlankReset) if (!_hmove.LateHBlankReset)
{ {
_player0.Missile.HPosCnt = (byte)(_hsyncCnt < 68 ? 160 - 2 : 160 - 4); _player0.Missile.HPosCnt = (byte)(_hsyncCnt < 68 ? 160 - 2 : 160 - 4);
@ -1287,8 +1316,6 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
} }
else if (maskedAddr == 0x13) // RESM1 else if (maskedAddr == 0x13) // RESM1
{ {
_player1.Missile.Draw_Main = false;
if (!_hmove.LateHBlankReset) if (!_hmove.LateHBlankReset)
{ {
_player1.Missile.HPosCnt = (byte)(_hsyncCnt < 68 ? 160 - 2 : 160 - 4); _player1.Missile.HPosCnt = (byte)(_hsyncCnt < 68 ? 160 - 2 : 160 - 4);
@ -1490,37 +1517,36 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
// the explicit exact times in the scanline, instead of just approximately spaced // the explicit exact times in the scanline, instead of just approximately spaced
public void GetSamples(short[] samples) public void GetSamples(short[] samples)
{ {
var sample_size = _audioClocks; if (_audioClocks > 0)
if (sample_size == 0) sample_size = 2;
var samples31khz = new short[sample_size]; // mono
int elapsedCycles = frameEndCycles - frameStartCycles;
if (elapsedCycles == 0)
{ {
elapsedCycles = 1; // better than diving by zero var samples31khz = new short[_audioClocks]; // mono
int elapsedCycles = frameEndCycles - frameStartCycles;
if (elapsedCycles == 0)
{
elapsedCycles = 1; // better than diving by zero
}
int start = 0;
while (commands.Count > 0)
{
var cmd = commands.Dequeue();
int pos = (cmd.Time * samples31khz.Length) / elapsedCycles;
pos = Math.Min(pos, samples31khz.Length); // sometimes the cpu timestamp of the write is > frameEndCycles
GetSamplesImmediate(samples31khz, start, pos - start);
start = pos;
ApplyAudioCommand(cmd);
}
GetSamplesImmediate(samples31khz, start, samples31khz.Length - start);
// convert from 31khz to 44khz
for (var i = 0; i < samples.Length / 2; i++)
{
samples[i * 2] = samples31khz[(int)(((double)samples31khz.Length / (double)(samples.Length / 2)) * i)];
samples[(i * 2) + 1] = samples[i * 2];
}
} }
int start = 0;
while (commands.Count > 0)
{
var cmd = commands.Dequeue();
int pos = (cmd.Time * samples31khz.Length) / elapsedCycles;
pos = Math.Min(pos, samples31khz.Length); // sometimes the cpu timestamp of the write is > frameEndCycles
GetSamplesImmediate(samples31khz, start, pos - start);
start = pos;
ApplyAudioCommand(cmd);
}
GetSamplesImmediate(samples31khz, start, samples31khz.Length - start);
// convert from 31khz to 44khz
for (var i = 0; i < samples.Length / 2; i++)
{
samples[i * 2] = samples31khz[(int)(((double)samples31khz.Length / (double)(samples.Length / 2)) * i)];
samples[(i * 2) + 1] = samples[i * 2];
}
_audioClocks = 0; _audioClocks = 0;
} }
@ -1547,6 +1573,48 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
_ball.SyncState(ser); _ball.SyncState(ser);
_hmove.SyncState(ser); _hmove.SyncState(ser);
ser.Sync("hsyncCnt", ref _hsyncCnt); ser.Sync("hsyncCnt", ref _hsyncCnt);
// add everything to the state
ser.Sync("PF0_up",ref pf0_update);
ser.Sync("PF1_up", ref pf1_update);
ser.Sync("PF2_up", ref pf2_update);
ser.Sync("PF0_upper", ref pf0_updater);
ser.Sync("PF1_upper", ref pf1_updater);
ser.Sync("PF2_upper", ref pf2_updater);
ser.Sync("PF0_delay", ref pf0_delay_clock);
ser.Sync("PF1_delay", ref pf1_delay_clock);
ser.Sync("PF2_delay", ref pf2_delay_clock);
ser.Sync("PF0_max", ref pf0_max_delay);
ser.Sync("PF1_max", ref pf1_max_delay);
ser.Sync("PF2_max", ref pf2_max_delay);
ser.Sync("Enam0_delay", ref enam0_delay);
ser.Sync("Enam1_delay", ref enam1_delay);
ser.Sync("Enab_delay", ref enamb_delay);
ser.Sync("Enam0_val", ref enam0_val);
ser.Sync("Enam1_val", ref enam1_val);
ser.Sync("Enab_val", ref enamb_val);
ser.Sync("P0_stuff", ref p0_stuff);
ser.Sync("P1_stuff", ref p1_stuff);
ser.Sync("M0_stuff", ref m0_stuff);
ser.Sync("M1_stuf", ref m1_stuff);
ser.Sync("b_stuff", ref b_stuff);
ser.Sync("hmp0_delay", ref HMP0_delay);
ser.Sync("hmp0_val", ref HMP0_val);
ser.Sync("hmp1_delay", ref HMP1_delay);
ser.Sync("hmp1_val", ref HMP1_val);
ser.Sync("PRG0_delay", ref prg0_delay);
ser.Sync("PRG1_delay", ref prg1_delay);
ser.Sync("PRG0_val", ref prg0_val);
ser.Sync("PRG1_val", ref prg1_val);
ser.Sync("Ticks", ref do_ticks);
// some of these things weren't in the state because they weren't needed if // some of these things weren't in the state because they weren't needed if
// states were always taken at frame boundaries // states were always taken at frame boundaries
ser.Sync("capChargeStart", ref _capChargeStart); ser.Sync("capChargeStart", ref _capChargeStart);
@ -1556,6 +1624,8 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
ser.Sync("CurrentScanLine", ref _CurrentScanLine); ser.Sync("CurrentScanLine", ref _CurrentScanLine);
ser.Sync("scanlinebuffer", ref _scanlinebuffer, false); ser.Sync("scanlinebuffer", ref _scanlinebuffer, false);
ser.Sync("AudioClocks", ref _audioClocks); ser.Sync("AudioClocks", ref _audioClocks);
ser.Sync("FrameStartCycles", ref frameStartCycles);
ser.Sync("FrameEndCycles", ref frameEndCycles);
ser.BeginSection("Player0"); ser.BeginSection("Player0");
_player0.SyncState(ser); _player0.SyncState(ser);

86
BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.MissleData.cs
View File

@ -14,15 +14,36 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
public byte Hm; public byte Hm;
public byte Collisions; public byte Collisions;
// Resp commands do not trugger start signals for main copies. We need to model this // Resp commands do not trigger start signals for main copies. We need to model this
public bool Draw_Main; public int Draw_To;
public byte ScanCnt;
public bool ScanCntInit;
public int Start_Signal;
public int Signal_Reached;
public bool Tick() public bool Tick()
{ {
var result = false; var result = false;
if (ScanCntInit==true)
{
if (ScanCnt < (1 << Size) && Enabled && !ResetToPlayer)
{
result = true;
ScanCnt++;
} else
{
ScanCntInit = false;
}
}
/*
// At hPosCnt == 0, start drawing the missile, if enabled // At hPosCnt == 0, start drawing the missile, if enabled
if (HPosCnt < (1 << Size) && Draw_Main == true) if (HPosCnt < (1 << Size))
{ {
if (Enabled && !ResetToPlayer) if (Enabled && !ResetToPlayer)
{ {
@ -65,15 +86,56 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
result = true; result = true;
} }
} }
} }*/
// Increment the counter if (Start_Signal == 160)
HPosCnt++; {
ScanCnt = 0;
Start_Signal++;
ScanCntInit = true;
}
if (Start_Signal == 16 && ((Number & 0x07) == 0x01 || ((Number & 0x07) == 0x03)))
{
ScanCnt = 0;
Start_Signal++;
ScanCntInit = true;
}
if (Start_Signal == 32 && ((Number & 0x07) == 0x02 || ((Number & 0x07) == 0x03) || ((Number & 0x07) == 0x06)))
{
ScanCnt = 0;
Start_Signal++;
ScanCntInit = true;
}
if (Start_Signal == 64 && ((Number & 0x07) == 0x04 || ((Number & 0x07) == 0x06)))
{
ScanCnt = 0;
Start_Signal++;
ScanCntInit = true;
}
// Increment the counter
HPosCnt++;
// Counter loops at 160 // Counter loops at 160
HPosCnt %= 160; HPosCnt %= 160;
return result; //our goal here is to send a start signal 4 clocks before drawing begins. The properly emulates
//drawing on a real TIA
if (HPosCnt == 156 || HPosCnt == 12 || HPosCnt == 28 || HPosCnt == 60)
{
Start_Signal = HPosCnt;
Signal_Reached = HPosCnt + 5;
}
if (Start_Signal < Signal_Reached)
{
Start_Signal++;
}
return result;
} }
public void SyncState(Serializer ser) public void SyncState(Serializer ser)
@ -86,8 +148,12 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
ser.Sync("number", ref Number); ser.Sync("number", ref Number);
ser.Sync("HM", ref Hm); ser.Sync("HM", ref Hm);
ser.Sync("collisions", ref Collisions); ser.Sync("collisions", ref Collisions);
ser.Sync("draw_main", ref Draw_Main); ser.Sync("start_signal", ref Start_Signal);
ser.EndSection(); ser.Sync("signal_reached", ref Signal_Reached);
ser.Sync("draw_to", ref Draw_To);
ser.Sync("scanCnt", ref ScanCnt);
ser.Sync("scanCntInit", ref ScanCntInit);
ser.EndSection();
} }
} }
} }

38
BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.PlayerData.cs
View File

@ -20,8 +20,9 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
public byte Nusiz; public byte Nusiz;
public byte Collisions; public byte Collisions;
// Resp commands do not trugger start signals for main copies. We need to model this // Resp commands do not trigger start signals for main copies. We need to model this
public bool Draw_Main; public int Start_Signal;
public int Signal_Reached;
public bool Tick() public bool Tick()
{ {
@ -113,9 +114,10 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
// At counter position 0 we should initalize the scan counter. // At counter position 0 we should initalize the scan counter.
// Note that for double and quad sized players that the scan counter is not started immediately. // Note that for double and quad sized players that the scan counter is not started immediately.
if (HPosCnt == 0 && Draw_Main==true) if (Start_Signal==160)
{ {
ScanCnt = 0; ScanCnt = 0;
Start_Signal++;
if ((Nusiz & 0x07) == 0x05) if ((Nusiz & 0x07) == 0x05)
{ {
ScanCntInit = true; ScanCntInit = true;
@ -130,20 +132,23 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
} }
} }
if (HPosCnt == 16 && ((Nusiz & 0x07) == 0x01 || ((Nusiz & 0x07) == 0x03))) if (Start_Signal == 16 && ((Nusiz & 0x07) == 0x01 || ((Nusiz & 0x07) == 0x03)))
{ {
ScanCnt = 0; ScanCnt = 0;
} Start_Signal++;
}
if (HPosCnt == 32 && ((Nusiz & 0x07) == 0x02 || ((Nusiz & 0x07) == 0x03) || ((Nusiz & 0x07) == 0x06))) if (Start_Signal == 32 && ((Nusiz & 0x07) == 0x02 || ((Nusiz & 0x07) == 0x03) || ((Nusiz & 0x07) == 0x06)))
{ {
ScanCnt = 0; ScanCnt = 0;
} Start_Signal++;
}
if (HPosCnt == 64 && ((Nusiz & 0x07) == 0x04 || ((Nusiz & 0x07) == 0x06))) if (Start_Signal == 64 && ((Nusiz & 0x07) == 0x04 || ((Nusiz & 0x07) == 0x06)))
{ {
ScanCnt = 0; ScanCnt = 0;
} Start_Signal++;
}
// Increment the counter // Increment the counter
HPosCnt++; HPosCnt++;
@ -151,6 +156,18 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
// Counter loops at 160 // Counter loops at 160
HPosCnt %= 160; HPosCnt %= 160;
//our goal here is to send a start signal 4 clocks before drawing begins. This properly emulates
//drawing on a real TIA
if (HPosCnt==156 || HPosCnt==12 || HPosCnt==28 || HPosCnt==60)
{
Start_Signal = HPosCnt-1;
Signal_Reached = HPosCnt + 5;
}
if (Start_Signal<Signal_Reached)
{
Start_Signal++;
}
return result; return result;
} }
@ -168,7 +185,8 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
ser.Sync("delay", ref Delay); ser.Sync("delay", ref Delay);
ser.Sync("nusiz", ref Nusiz); ser.Sync("nusiz", ref Nusiz);
ser.Sync("collisions", ref Collisions); ser.Sync("collisions", ref Collisions);
ser.Sync("draw_main", ref Draw_Main); ser.Sync("start_signal", ref Start_Signal);
ser.Sync("signal_reached", ref Signal_Reached);
} }
} }
} }