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

Final updates for recent 64-bit cycles refactoring.

This commit is contained in:
Stephen Anthony 2017-09-08 18:52:03 -02:30
parent c4d04ffe26
commit 823c693a9e
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/StateManager.cxx
View File

@ -28,7 +28,7 @@
#include "StateManager.hxx" #include "StateManager.hxx"
#define STATE_HEADER "05000301state" #define STATE_HEADER "05000302state"
#define MOVIE_HEADER "03030000movie" #define MOVIE_HEADER "03030000movie"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/emucore/AtariVox.cxx
View File

@ -140,7 +140,7 @@ void AtariVox::clockDataIn(bool value)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void AtariVox::reset() void AtariVox::reset()
{ {
myLastDataWriteCycle = mySystem.cycles(); myLastDataWriteCycle = 0;
myEEPROM->systemReset(); myEEPROM->systemReset();
} }

6
src/emucore/M6532.cxx
View File

@ -31,7 +31,8 @@ M6532::M6532(const Console& console, const Settings& settings)
: myConsole(console), : myConsole(console),
mySettings(settings), mySettings(settings),
myTimer(0), mySubTimer(0), myDivider(1), myTimer(0), mySubTimer(0), myDivider(1),
myTimerWrapped(false), myWrappedThisCycle(false), mySetTimerCycle(0), myLastCycle(0), myTimerWrapped(false), myWrappedThisCycle(false),
mySetTimerCycle(0), myLastCycle(0),
myDDRA(0), myDDRB(0), myOutA(0), myOutB(0), myDDRA(0), myDDRB(0), myOutA(0), myOutB(0),
myInterruptFlag(false), myInterruptFlag(false),
myEdgeDetectPositive(false) myEdgeDetectPositive(false)
@ -54,8 +55,7 @@ void M6532::reset()
myTimerWrapped = false; myTimerWrapped = false;
myWrappedThisCycle = false; myWrappedThisCycle = false;
mySetTimerCycle = 0; mySetTimerCycle = myLastCycle = 0;
myLastCycle = mySystem->cycles();
// Zero the I/O registers // Zero the I/O registers
myDDRA = myDDRB = myOutA = myOutB = 0x00; myDDRA = myDDRB = myOutA = myOutB = 0x00;

2
src/emucore/M6532.hxx
View File

@ -174,7 +174,7 @@ class M6532 : public Device
uInt64 mySetTimerCycle; uInt64 mySetTimerCycle;
// Last cycle considered in emu updates // Last cycle considered in emu updates
Int32 myLastCycle; uInt64 myLastCycle;
// Data Direction Register for Port A // Data Direction Register for Port A
uInt8 myDDRA; uInt8 myDDRA;

2
src/emucore/System.cxx
View File

@ -70,7 +70,7 @@ void System::reset(bool autodetect)
mySystemInAutodetect = autodetect; mySystemInAutodetect = autodetect;
// Reset all devices // Reset all devices
myCycles = 0; // Must be done first (the reset() methods use its value) myCycles = 0; // Must be done first (the reset() methods may use its value)
myM6532.reset(); myM6532.reset();
myTIA.reset(); myTIA.reset();
myCart.reset(); myCart.reset();

2
src/emucore/System.hxx
View File

@ -388,7 +388,7 @@ class System : public Serializable
// Cartridge device attached to the system // Cartridge device attached to the system
Cartridge& myCart; Cartridge& myCart;
// Number of system cycles executed since instantiation // Number of system cycles executed since last reset
uInt64 myCycles; uInt64 myCycles;
// Null device to use for page which are not installed // Null device to use for page which are not installed