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

Allow access to current frame count from TIA; minor formatting cleanup.

This commit is contained in:
Stephen Anthony 2017-09-23 10:20:36 -02:30
parent e695c3b3a5
commit e7b732b115
3 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/debugger/TIADebug.cxx
View File

@ -691,7 +691,7 @@ void TIADebug::setENABLOld(bool b)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int TIADebug::frameCount() const
{
return myTIA.myFrameManager.frameCount();
return myTIA.frameCount();
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

14
src/emucore/tia/TIA.cxx
View File

@ -813,18 +813,6 @@ bool TIA::enableColorLoss(bool enabled)
return true;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt32 TIA::frameCycles() const
{
return uInt32(mySystem->cycles() - myCyclesAtFrameStart);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt64 TIA::cycles() const
{
return uInt64(mySystem->cycles());
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool TIA::electronBeamPos(uInt32& x, uInt32& y) const
{
@ -1628,4 +1616,4 @@ void TIA::setAccessFlags(uInt16 address, uInt8 flags)
myAccessBase[address & TIA_READ_MASK] |= flags;
}
}
#endif // DEBUGGER_SUPPORT
#endif // DEBUGGER_SUPPORT

24
src/emucore/tia/TIA.hxx
View File

@ -38,6 +38,7 @@
#include "PaddleReader.hxx"
#include "DelayQueueIterator.hxx"
#include "Control.hxx"
#include "System.hxx"
/**
This class is a device that emulates the Television Interface Adaptor
@ -259,14 +260,21 @@ class TIA : public Device
uInt32 scanlinesLastFrame() const { return myFrameManager.scanlinesLastFrame(); }
/**
Answers the system cycles from the start of the current frame.
Answers the total system cycles from the start of the emulation.
*/
uInt32 frameCycles() const;
uInt64 cycles() const { return uInt64(mySystem->cycles()); }
/**
Answers the total system cycles from the start of the current ROM's emulation.
Answers the frame count from the start of the emulation.
*/
uInt64 cycles() const;
uInt32 frameCount() const { return myFrameManager.frameCount(); }
/**
Answers the system cycles from the start of the current frame.
*/
uInt32 frameCycles() const {
return uInt32(mySystem->cycles() - myCyclesAtFrameStart);
}
/**
Answers whether the TIA is currently in being rendered
@ -548,10 +556,10 @@ class TIA : public Device
#ifdef DEBUGGER_SUPPORT
void createAccessBase();
/**
Query/change the given address type to use the given disassembly flags
Query/change the given address type to use the given disassembly flags
@param address The address to modify
@param flags A bitfield of DisasmType directives for the given address
@param address The address to modify
@param flags A bitfield of DisasmType directives for the given address
*/
uInt8 getAccessFlags(uInt16 address) const override;
void setAccessFlags(uInt16 address, uInt8 flags) override;
@ -729,7 +737,7 @@ class TIA : public Device
uInt64 myCyclesAtFrameStart;
#ifdef DEBUGGER_SUPPORT
// The arrays containing information about every byte of TIA
// The arrays containing information about every byte of TIA
// indicating whether and how (RW) it is used.
BytePtr myAccessBase;
// The array used to skip the first two TIA access trackings