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

Added savestate 'plumbing', for when the new TIA classes are finalized. 

Bumped lowest version of state file format to 4.8, to make sure old
state files will not be loaded.
This commit is contained in:
Stephen Anthony 2016-11-25 14:58:07 -03:30
parent eebf8c046f
commit 6818da1566
13 changed files with 326 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emucore/StateManager.cxx
View File

@ -30,7 +30,7 @@
#include "StateManager.hxx"
#define STATE_HEADER "03090100state"
#define STATE_HEADER "04080000state"
#define MOVIE_HEADER "03030000movie"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

41
src/emucore/tia/core_6502ts/Ball.cxx
View File

@ -150,4 +150,43 @@ void Ball::updateEnabled()
myEnabled = myIsDelaying ? myEnabledOld : myEnabledNew;
}
} // namespace TIA6502tsCore
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: implement this once the class is finalized
bool Ball::save(Serializer& out) const
{
try
{
out.putString(name());
// TODO - save instance variables
}
catch(...)
{
cerr << "ERROR: TIA_Ball::save" << endl;
return false;
}
return false;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: implement this once the class is finalized
bool Ball::load(Serializer& in)
{
try
{
if(in.getString() != name())
return false;
// TODO - load instance variables
}
catch(...)
{
cerr << "ERROR: TIA_Ball::load" << endl;
return false;
}
return false;
}
} // namespace TIA6502tsCore

12
src/emucore/tia/core_6502ts/Ball.hxx
View File

@ -20,11 +20,12 @@
#ifndef TIA_6502TS_CORE_BALL
#define TIA_6502TS_CORE_BALL
#include "Serializable.hxx"
#include "bspf.hxx"
namespace TIA6502tsCore {
class Ball
class Ball : public Serializable
{
public:
@ -58,6 +59,13 @@ class Ball
void shuffleStatus();
/**
Serializable methods (see that class for more information).
*/
bool save(Serializer& out) const override;
bool load(Serializer& in) override;
string name() const override { return "TIA_Ball"; }
public:
uInt32 collision;
@ -96,4 +104,4 @@ class Ball
} // namespace TIA6502tsCore
#endif // TIA_6502TS_CORE_BALL
#endif // TIA_6502TS_CORE_BALL

39
src/emucore/tia/core_6502ts/FrameManager.cxx
View File

@ -241,4 +241,43 @@ void FrameManager::finalizeFrame()
setState(State::overscan);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: implement this once the class is finalized
bool FrameManager::save(Serializer& out) const
{
try
{
out.putString(name());
// TODO - save instance variables
}
catch(...)
{
cerr << "ERROR: TIA_FrameManager::save" << endl;
return false;
}
return false;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: implement this once the class is finalized
bool FrameManager::load(Serializer& in)
{
try
{
if(in.getString() != name())
return false;
// TODO - load instance variables
}
catch(...)
{
cerr << "ERROR: TIA_FrameManager::load" << endl;
return false;
}
return false;
}
} // namespace TIA6502tsCore

12
src/emucore/tia/core_6502ts/FrameManager.hxx
View File

@ -21,11 +21,13 @@
#define TIA_6502TS_CORE_FRAME_MANAGER
#include <functional>
#include "Serializable.hxx"
#include "bspf.hxx"
namespace TIA6502tsCore {
class FrameManager
class FrameManager : public Serializable
{
public:
@ -40,7 +42,6 @@ class FrameManager
FrameManager();
public:
void setHandlers(callback frameStartCallback, callback frameCompletionCallback);
void reset();
@ -61,6 +62,13 @@ class FrameManager
uInt32 currentLine() const;
/**
Serializable methods (see that class for more information).
*/
bool save(Serializer& out) const override;
bool load(Serializer& in) override;
string name() const override { return "TIA_FrameManager"; }
private:
enum State {

39
src/emucore/tia/core_6502ts/Missile.cxx
View File

@ -131,4 +131,43 @@ uInt8 Missile::getPixel(uInt8 colorIn) const
return collision ? colorIn : myColor;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: implement this once the class is finalized
bool Missile::save(Serializer& out) const
{
try
{
out.putString(name());
// TODO - save instance variables
}
catch(...)
{
cerr << "ERROR: TIA_Missile::save" << endl;
return false;
}
return false;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: implement this once the class is finalized
bool Missile::load(Serializer& in)
{
try
{
if(in.getString() != name())
return false;
// TODO - load instance variables
}
catch(...)
{
cerr << "ERROR: TIA_Missile::load" << endl;
return false;
}
return false;
}
} // namespace TIA6502tsCore

10
src/emucore/tia/core_6502ts/Missile.hxx
View File

@ -20,11 +20,12 @@
#ifndef TIA_6502TS_CORE_MISSILE
#define TIA_6502TS_CORE_MISSILE
#include "Serializable.hxx"
#include "bspf.hxx"
namespace TIA6502tsCore {
class Missile
class Missile : public Serializable
{
public:
Missile(uInt32 collisionMask);
@ -55,6 +56,13 @@ class Missile
uInt8 getPixel(uInt8 colorIn) const;
/**
Serializable methods (see that class for more information).
*/
bool save(Serializer& out) const override;
bool load(Serializer& in) override;
string name() const override { return "TIA_Missile"; }
public:
uInt32 collision;

39
src/emucore/tia/core_6502ts/Player.cxx
View File

@ -270,4 +270,43 @@ void Player::updatePattern()
}
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: implement this once the class is finalized
bool Player::save(Serializer& out) const
{
try
{
out.putString(name());
// TODO - save instance variables
}
catch(...)
{
cerr << "ERROR: TIA_Player::save" << endl;
return false;
}
return false;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: implement this once the class is finalized
bool Player::load(Serializer& in)
{
try
{
if(in.getString() != name())
return false;
// TODO - load instance variables
}
catch(...)
{
cerr << "ERROR: TIA_Player::load" << endl;
return false;
}
return false;
}
} // namespace TIA6502tsCore

10
src/emucore/tia/core_6502ts/Player.hxx
View File

@ -20,11 +20,12 @@
#ifndef TIA_6502TS_CORE_PLAYER
#define TIA_6502TS_CORE_PLAYER
#include "Serializable.hxx"
#include "bspf.hxx"
namespace TIA6502tsCore {
class Player
class Player : public Serializable
{
public:
Player(uInt32 collisionMask);
@ -61,6 +62,13 @@ class Player
uInt8 getRespClock() const;
/**
Serializable methods (see that class for more information).
*/
bool save(Serializer& out) const override;
bool load(Serializer& in) override;
string name() const override { return "TIA_Player"; }
public:
uInt32 collision;

39
src/emucore/tia/core_6502ts/Playfield.cxx
View File

@ -152,4 +152,43 @@ void Playfield::applyColors()
}
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: implement this once the class is finalized
bool Playfield::save(Serializer& out) const
{
try
{
out.putString(name());
// TODO - save instance variables
}
catch(...)
{
cerr << "ERROR: TIA_Playfield::save" << endl;
return false;
}
return false;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: implement this once the class is finalized
bool Playfield::load(Serializer& in)
{
try
{
if(in.getString() != name())
return false;
// TODO - load instance variables
}
catch(...)
{
cerr << "ERROR: TIA_Playfield::load" << endl;
return false;
}
return false;
}
} // namespace TIA6502tsCore

10
src/emucore/tia/core_6502ts/Playfield.hxx
View File

@ -20,11 +20,12 @@
#ifndef TIA_6502TS_CORE_PLAYFIELD
#define TIA_6502TS_CORE_PLAYFIELD
#include "Serializable.hxx"
#include "bspf.hxx"
namespace TIA6502tsCore {
class Playfield
class Playfield : public Serializable
{
public:
Playfield(uInt32 collisionMask);
@ -51,6 +52,13 @@ class Playfield
uInt8 getPixel(uInt8 colorIn) const;
/**
Serializable methods (see that class for more information).
*/
bool save(Serializer& out) const override;
bool load(Serializer& in) override;
string name() const override { return "TIA_Playfield"; }
public:
uInt32 collision;

57
src/emucore/tia/core_6502ts/TIA.cxx
View File

@ -141,17 +141,59 @@ void TIA::installDelegate(System& system, Device& device)
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: stub
bool TIA::save(Serializer& out) const
{
return false;
try
{
out.putString(name());
// TODO - save instance variables
// Save the state of each graphics object
if(!myPlayfield.save(out)) return false;
if(!myMissile0.save(out)) return false;
if(!myMissile1.save(out)) return false;
if(!myPlayer0.save(out)) return false;
if(!myPlayer1.save(out)) return false;
if(!myBall.save(out)) return false;
// Save the sound sample stuff ...
mySound.save(out);
}
catch(...)
{
cerr << "ERROR: TIA::save" << endl;
return false;
}
return false; // for now, until class is finalized
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: stub
bool TIA::load(Serializer& in)
{
return false;
try
{
if(in.getString() != name())
return false;
// TODO - load instance variables
// Load the state of each graphics object
if(!myPlayfield.load(in)) return false;
if(!myMissile0.load(in)) return false;
if(!myMissile1.load(in)) return false;
if(!myPlayer0.load(in)) return false;
if(!myPlayer1.load(in)) return false;
if(!myBall.load(in)) return false;
}
catch(...)
{
cerr << "ERROR: TIA::load" << endl;
return false;
}
return false; // for now, until class is finalized
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -463,19 +505,21 @@ bool TIA::loadDisplay(Serializer& in)
return false;
}
// TODO: stub
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void TIA::update()
{
mySystem->m6502().execute(25000);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: add yoffset
uInt8* TIA::currentFrameBuffer() const
{
return myCurrentFrameBuffer.get();
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: stub
// TODO: add yoffset
uInt8* TIA::previousFrameBuffer() const
{
return myPreviousFrameBuffer.get();
@ -530,6 +574,7 @@ uInt32 TIA::clocksThisLine() const
return 0;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// TODO: stub
uInt32 TIA::scanlines() const
{

42
src/emucore/tia/core_6502ts/TIA.hxx
View File

@ -50,15 +50,6 @@ class TIA : public AbstractTIA
void install(System& system) override;
bool save(Serializer& out) const override;
bool load(Serializer& in) override;
string name() const override
{
return "TIA";
}
uInt8 peek(uInt16 address) override;
bool poke(uInt16 address, uInt8 value) override;
@ -77,12 +68,18 @@ class TIA : public AbstractTIA
uInt8* previousFrameBuffer() const override;
/**
Answers vertical info about the framebuffer (height and starting line)
*/
uInt32 height() const override;
uInt32 ystart() const override;
/**
Changes the current Height/YStart properties.
Note that calls to these method(s) must be eventually followed by
::frameReset() for the changes to take effect.
*/
void setHeight(uInt32 height) override;
void setYStart(uInt32 ystart) override;
void enableAutoFrame(bool enabled) override;
@ -119,6 +116,29 @@ class TIA : public AbstractTIA
void setJitterRecoveryFactor(Int32 f) override;
/**
Save the current state of this device to the given Serializer.
@param out The Serializer object to use
@return False on any errors, else true
*/
bool save(Serializer& out) const override;
/**
Load the current state of this device from the given Serializer.
@param in The Serializer object to use
@return False on any errors, else true
*/
bool load(Serializer& in) override;
/**
Get a descriptor for the device name (used in error checking).
@return The name of the object
*/
string name() const override { return "TIA"; }
private:
enum HState {blank, frame};