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

Some more DPC+ updates. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2526 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2012-06-04 19:20:27 +00:00
parent 02ebafaf7d
commit b231dda2a9
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/emucore/CartDPCPlus.cxx
View File

@ -60,7 +60,7 @@ CartridgeDPCPlus::CartridgeDPCPlus(const uInt8* image, uInt32 size,
int offset = size - 29 * 1024; int offset = size - 29 * 1024;
myProgramImage += offset; myProgramImage += offset;
// myDisplayImage += offset; // myDisplayImage += offset;
myFrequencyImage += offset; // myFrequencyImage += offset;
} }
#ifdef THUMB_SUPPORT #ifdef THUMB_SUPPORT
@ -69,23 +69,7 @@ CartridgeDPCPlus::CartridgeDPCPlus(const uInt8* image, uInt32 size,
(uInt16*)myDPCRAM, (uInt16*)myDPCRAM,
settings.getBool("thumb.trapfatal")); settings.getBool("thumb.trapfatal"));
#endif #endif
setInitialState();
// Reset various ROM and RAM locations
memset(myDPCRAM, 0, 8192);
// Copy DPC display data to Harmony RAM
memcpy(myDisplayImage, myProgramImage + 0x6000, 0x1000);
// Initialize the DPC data fetcher registers
for(uInt16 i = 0; i < 8; ++i)
myTops[i] = myBottoms[i] = myCounters[i] = myFractionalIncrements[i] =
myFractionalCounters[i] = 0;
// Set waveforms to first waveform entry
myMusicWaveforms[0] = myMusicWaveforms[1] = myMusicWaveforms[2] = 0;
// Initialize the DPC's random number generator register (must be non-zero)
myRandomNumber = 0x2B435044; // "DPC+"
// DPC+ always starts in bank 5 // DPC+ always starts in bank 5
myStartBank = 5; myStartBank = 5;
@ -108,6 +92,15 @@ void CartridgeDPCPlus::reset()
mySystemCycles = mySystem->cycles(); mySystemCycles = mySystem->cycles();
myFractionalClocks = 0.0; myFractionalClocks = 0.0;
setInitialState();
// Upon reset we switch to the startup bank
bank(myStartBank);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CartridgeDPCPlus::setInitialState()
{
// Reset various ROM and RAM locations // Reset various ROM and RAM locations
memset(myDPCRAM, 0, 8192); memset(myDPCRAM, 0, 8192);
@ -124,9 +117,6 @@ void CartridgeDPCPlus::reset()
// Initialize the DPC's random number generator register (must be non-zero) // Initialize the DPC's random number generator register (must be non-zero)
myRandomNumber = 0x2B435044; // "DPC+" myRandomNumber = 0x2B435044; // "DPC+"
// Upon reset we switch to the startup bank
bank(myStartBank);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

5
src/emucore/CartDPCPlus.hxx
View File

@ -149,6 +149,11 @@ class CartridgeDPCPlus : public Cartridge
bool poke(uInt16 address, uInt8 value); bool poke(uInt16 address, uInt8 value);
private: private:
/**
Sets the initial state of the DPC pointers and RAM
*/
void setInitialState();
/** /**
Clocks the random number generator to move it to its next state Clocks the random number generator to move it to its next state
*/ */