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

Final changes to the TIA code for the 3.8 release. I've added 

TODOs and pointed out areas where improvements are likely needed,
in preparation for asking for help in the implementation.

Turned off 'resolvedata' in the debugger when disassembly ZP RAM.
It seems to be buggy in certain cases, and it's easier to just
leave it off in that mode, since (a) not many games run from ZP,
and (b) it's only at most 128 instructions.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2617 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2013-02-21 21:57:42 +00:00
parent b6ec874778
commit 5a65d64538
5 changed files with 65 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changes.txt
View File

@ -60,6 +60,10 @@
were being done multiple times, changing the state of the
registers and resulting in incorrect emulation.
* Worked around bug in debugger disassembly of zero-page RAM; for now,
the resolving of address vs. data sections is turned off in such a
case. This fixes lockups in 'Meltdown' ROM.
* Added support for different directories for saving/loading PNG
files. These are set with the 'snapsavedir' and 'snaploaddir'
commandline arguments (which replace the old 'snapdir'), and are

18
src/debugger/DiStella.cxx
View File

@ -53,9 +53,8 @@ DiStella::DiStella(const CartDebug& dbg, CartDebug::DisassemblyList& list,
Offset to code = $D000
Code range = $D000-$DFFF
=============================================*/
myAppData.start = 0x0000;
myAppData.end = 0x0FFF;
myAppData.start = 0x0000;
myAppData.end = 0x0FFF;
myOffset = (start - (start % 0x1000));
}
else // 2K ROM space
@ -65,19 +64,20 @@ DiStella::DiStella(const CartDebug& dbg, CartDebug::DisassemblyList& list,
starts. For a 2K game, it is usually 0xf800,
but can also be 0xf000.
=============================================*/
myAppData.start = 0x0000;
myAppData.end = 0x07FF;
myAppData.start = 0x0000;
myAppData.end = 0x07FF;
myOffset = (start & 0xF800);
}
}
else // ZP RAM
{
// For now, we assume all accesses below $1000 are zero-page
myAppData.start = 0x0080;
myAppData.end = 0x00FF;
myAppData.start = 0x0080;
myAppData.end = 0x00FF;
myOffset = 0;
// Resolve data is never used in ZP RAM mode
resolvedata = false;
}
myAppData.length = info.size;

4
src/debugger/DiStella.hxx
View File

@ -34,9 +34,7 @@
DisassemblyList structure rather than being printed.
All 7800-related stuff has been removed, as well as all commandline options.
For now, the only configurable item is whether to automatically determine
code vs. data sections (which is on by default). Over time, some of the
configurability of Distella may be added again.
Over time, some of the configurability of Distella may be added again.
@author Stephen Anthony
*/

88
src/emucore/TIA.cxx
View File

@ -39,7 +39,8 @@
#include "TIA.hxx"
#define HBLANK 68
#define USE_MMR_LATCHES
#define CLAMP_POS(reg) if(reg < 0) { reg += 160; } reg %= 160;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TIA::TIA(Console& console, Sound& sound, Settings& settings)
@ -953,33 +954,32 @@ void TIA::updateFrame(Int32 clock)
{
if(myCurrentHMOVEPos >= 97 && myCurrentHMOVEPos < 157)
{
myPOSP0 -= myMotionClockP0;
myPOSP1 -= myMotionClockP1;
myPOSM0 -= myMotionClockM0;
myPOSM1 -= myMotionClockM1;
myPOSBL -= myMotionClockBL;
myPOSP0 -= myMotionClockP0; if(myPOSP0 < 0) myPOSP0 += 160;
myPOSP1 -= myMotionClockP1; if(myPOSP1 < 0) myPOSP1 += 160;
myPOSM0 -= myMotionClockM0; if(myPOSM0 < 0) myPOSM0 += 160;
myPOSM1 -= myMotionClockM1; if(myPOSM1 < 0) myPOSM1 += 160;
myPOSBL -= myMotionClockBL; if(myPOSBL < 0) myPOSBL += 160;
myPreviousHMOVEPos = myCurrentHMOVEPos;
posChanged = true;
}
// Indicate that the HMOVE has been completed
myCurrentHMOVEPos = 0x7FFFFFFF;
posChanged = true;
}
#ifdef USE_MMR_LATCHES
// Apply extra clocks for 'more motion required/mmr'
if(myHMP0mmr) { myPOSP0 -= 17; posChanged = true; }
if(myHMP1mmr) { myPOSP1 -= 17; posChanged = true; }
if(myHMM0mmr) { myPOSM0 -= 17; posChanged = true; }
if(myHMM1mmr) { myPOSM1 -= 17; posChanged = true; }
if(myHMBLmmr) { myPOSBL -= 17; posChanged = true; }
#endif
// Make sure positions are in range
if(myHMP0mmr) { myPOSP0 -= 17; if(myPOSP0 < 0) myPOSP0 += 160; posChanged = true; }
if(myHMP1mmr) { myPOSP1 -= 17; if(myPOSP1 < 0) myPOSP1 += 160; posChanged = true; }
if(myHMM0mmr) { myPOSM0 -= 17; if(myPOSM0 < 0) myPOSM0 += 160; posChanged = true; }
if(myHMM1mmr) { myPOSM1 -= 17; if(myPOSM1 < 0) myPOSM1 += 160; posChanged = true; }
if(myHMBLmmr) { myPOSBL -= 17; if(myPOSBL < 0) myPOSBL += 160; posChanged = true; }
// Scanline change, so reset PF mask based on current CTRLPF reflection state
myPFMask = TIATables::PFMask[myCTRLPF & 0x01];
// TODO - handle changes to player timing
if(posChanged)
{
if(myPOSP0 < 0) { myPOSP0 += 160; } myPOSP0 %= 160;
if(myPOSP1 < 0) { myPOSP1 += 160; } myPOSP1 %= 160;
if(myPOSM0 < 0) { myPOSM0 += 160; } myPOSM0 %= 160;
if(myPOSM1 < 0) { myPOSM1 += 160; } myPOSM1 %= 160;
if(myPOSBL < 0) { myPOSBL += 160; } myPOSBL %= 160;
}
}
@ -1146,17 +1146,17 @@ void TIA::updateFrame(Int32 clock)
myHMOVEBlankEnabled = false;
}
// TODO - this needs to be updated to actually do as the comment suggests
#if 1
// See if we're at the end of a scanline
if(myClocksToEndOfScanLine == 228)
{
// Yes, so set PF mask based on current CTRLPF reflection state
myPFMask = TIATables::PFMask[myCTRLPF & 0x01];
// TODO - 01-21-99: These should be reset right after the first copy
// of the player has passed. However, for now we'll just reset at the
// end of the scanline since the other way would be too slow.
mySuppressP0 = mySuppressP1 = 0;
}
#endif
}
}
@ -1407,6 +1407,8 @@ bool TIA::poke(uInt16 addr, uInt8 value)
{
// TODO - 08-11-2009: determine correct delay instead of always
// using '8' in TIATables::PokeDelay
updateFrame(clock + 8);
myNUSIZ0 = value;
mySuppressP0 = 0;
break;
@ -1416,6 +1418,8 @@ bool TIA::poke(uInt16 addr, uInt8 value)
{
// TODO - 08-11-2009: determine correct delay instead of always
// using '8' in TIATables::PokeDelay
updateFrame(clock + 8);
myNUSIZ1 = value;
mySuppressP1 = 0;
break;
@ -1577,6 +1581,8 @@ bool TIA::poke(uInt16 addr, uInt8 value)
}
if(myPOSP0 != newx)
{
// TODO - update player timing
// Find out under what condition the player is being reset
delay = TIATables::PxPosResetWhen[myNUSIZ0 & 7][myPOSP0][newx];
@ -1625,6 +1631,8 @@ bool TIA::poke(uInt16 addr, uInt8 value)
}
if(myPOSP1 != newx)
{
// TODO - update player timing
// Find out under what condition the player is being reset
delay = TIATables::PxPosResetWhen[myNUSIZ1 & 7][myPOSP1][newx];
@ -1951,6 +1959,7 @@ bool TIA::poke(uInt16 addr, uInt8 value)
uInt16 middle = 4;
switch(myNUSIZ0 & 0x07)
{
// 1-pixel delay is taken care of in TIATables::PxMask
case 0x05: middle = 8; break; // double size
case 0x07: middle = 16; break; // quad size
}
@ -1959,9 +1968,8 @@ bool TIA::poke(uInt16 addr, uInt8 value)
{
myPOSM0 -= (8 - myMotionClockP0);
myPOSM0 += (8 - myMotionClockM0);
if(myPOSM0 < 0) myPOSM0 += 160;
}
myPOSM0 %= 160;
CLAMP_POS(myPOSM0);
}
myRESMP0 = value & 0x02;
@ -1980,6 +1988,7 @@ bool TIA::poke(uInt16 addr, uInt8 value)
uInt16 middle = 4;
switch(myNUSIZ1 & 0x07)
{
// 1-pixel delay is taken care of in TIATables::PxMask
case 0x05: middle = 8; break; // double size
case 0x07: middle = 16; break; // quad size
}
@ -1988,9 +1997,8 @@ bool TIA::poke(uInt16 addr, uInt8 value)
{
myPOSM1 -= (8 - myMotionClockP1);
myPOSM1 += (8 - myMotionClockM1);
if(myPOSM1 < 0) myPOSM1 += 160;
}
myPOSM1 %= 160;
CLAMP_POS(myPOSM1);
}
myRESMP1 = value & 0x02;
@ -2010,7 +2018,6 @@ bool TIA::poke(uInt16 addr, uInt8 value)
myHMOVEBlankEnabled = myAllowHMOVEBlanks ?
TIATables::HMOVEBlankEnableCycles[((clock - myClockWhenFrameStarted) % 228) / 3] : false;
#ifdef USE_MMR_LATCHES
// Do we have to undo some of the already applied cycles from an
// active graphics latch?
if(hpos + HBLANK < 17 * 4)
@ -2023,7 +2030,7 @@ bool TIA::poke(uInt16 addr, uInt8 value)
if(myHMBLmmr) myPOSBL = (myPOSBL + cycle_fix) % 160;
}
myHMP0mmr = myHMP1mmr = myHMM0mmr = myHMM1mmr = myHMBLmmr = false;
#endif
// Can HMOVE activities be ignored?
if(hpos >= -5 && hpos < 97 )
{
@ -2080,12 +2087,13 @@ bool TIA::poke(uInt16 addr, uInt8 value)
}
// Make sure positions are in range
if(myPOSP0 < 0) { myPOSP0 += 160; } myPOSP0 %= 160;
if(myPOSP1 < 0) { myPOSP1 += 160; } myPOSP1 %= 160;
if(myPOSM0 < 0) { myPOSM0 += 160; } myPOSM0 %= 160;
if(myPOSM1 < 0) { myPOSM1 += 160; } myPOSM1 %= 160;
if(myPOSBL < 0) { myPOSBL += 160; } myPOSBL %= 160;
CLAMP_POS(myPOSP0);
CLAMP_POS(myPOSP1);
CLAMP_POS(myPOSM0);
CLAMP_POS(myPOSM1);
CLAMP_POS(myPOSBL);
// TODO - handle late HMOVE's
mySuppressP0 = mySuppressP1 = 0;
break;
}
@ -2170,7 +2178,8 @@ void TIA::pokeHMP0(uInt8 value, Int32 clock)
if(value != 0x70 && value != 0x80)
myHMP0mmr = true;
}
if(myPOSP0 < 0) { myPOSP0 += 160; } myPOSP0 %= 160;
CLAMP_POS(myPOSP0);
// TODO - adjust player timing
}
myHMP0 = value;
}
@ -2203,7 +2212,8 @@ void TIA::pokeHMP1(uInt8 value, Int32 clock)
if(value != 0x70 && value != 0x80)
myHMP1mmr = true;
}
if(myPOSP1 < 0) { myPOSP1 += 160; } myPOSP1 %= 160;
CLAMP_POS(myPOSP1);
// TODO - adjust player timing
}
myHMP1 = value;
}
@ -2236,7 +2246,7 @@ void TIA::pokeHMM0(uInt8 value, Int32 clock)
if(value != 0x70 && value != 0x80)
myHMM0mmr = true;
}
if(myPOSM0 < 0) { myPOSM0 += 160; } myPOSM0 %= 160;
CLAMP_POS(myPOSM0);
}
myHMM0 = value;
}
@ -2269,7 +2279,7 @@ void TIA::pokeHMM1(uInt8 value, Int32 clock)
if(value != 0x70 && value != 0x80)
myHMM1mmr = true;
}
if(myPOSM1 < 0) { myPOSM1 += 160; } myPOSM1 %= 160;
CLAMP_POS(myPOSM1);
}
myHMM1 = value;
}
@ -2302,7 +2312,7 @@ void TIA::pokeHMBL(uInt8 value, Int32 clock)
if(value != 0x70 && value != 0x80)
myHMBLmmr = true;
}
if(myPOSBL < 0) { myPOSBL += 160; } myPOSBL %= 160;
CLAMP_POS(myPOSBL);
}
myHMBL = value;
}

4
src/emucore/TIATables.cxx
View File

@ -616,8 +616,8 @@ const Int16 TIATables::PokeDelay[64] = {
1, // VBLANK (0) / 1
0, // WSYNC
0, // RSYNC
8, // NUSIZ0 (0) / 8 TODO - calculate this instead of hardcoding
8, // NUSIZ1 (0) / 8 TODO - calculate this instead of hardcoding
0, // NUSIZ0
0, // NUSIZ1
0, // COLUP0
0, // COLUP1
0, // COLUPF