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

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
thrust26 2020-05-06 21:32:44 +02:00
parent b85f7af4bf f3f0617940
commit dd7dbaecbc
6 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changes.txt
View File

@ -42,6 +42,9 @@
* Removed unused CV+ and DASH bank switching types. * Removed unused CV+ and DASH bank switching types.
* Added debugger pseudo-register '_scanend', which gives the number of
scanlines at the end of the last frame.
-Have fun! -Have fun!

1
docs/debugger.html
View File

@ -755,6 +755,7 @@ that holds 'number of scanlines' on an actual console).</p>
<tr><td> _fcycles</td><td> Number of cycles since frame started</td></tr> <tr><td> _fcycles</td><td> Number of cycles since frame started</td></tr>
<tr><td> _icycles</td><td> Number of cycles of last instruction</td></tr> <tr><td> _icycles</td><td> Number of cycles of last instruction</td></tr>
<tr><td> _scan</td><td> Current scanline count</td></tr> <tr><td> _scan</td><td> Current scanline count</td></tr>
<tr><td> _scanend</td><td> Scanline count at end of last frame</td></tr>
<tr><td> _scycles</td><td> Number of cycles in current scanline</td></tr> <tr><td> _scycles</td><td> Number of cycles in current scanline</td></tr>
<tr><td> _vblank</td><td> Whether vertical blank is enabled (1 or 0)</td></tr> <tr><td> _vblank</td><td> Whether vertical blank is enabled (1 or 0)</td></tr>
<tr><td> _vsync</td><td> Whether vertical sync is enabled (1 or 0)</td></tr> <tr><td> _vsync</td><td> Whether vertical sync is enabled (1 or 0)</td></tr>

3
src/debugger/Debugger.cxx
View File

@ -875,7 +875,7 @@ std::array<Debugger::BuiltinFunction, 18> Debugger::ourBuiltinFunctions = { {
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Names are defined here, but processed in YaccParser // Names are defined here, but processed in YaccParser
std::array<Debugger::PseudoRegister, 11> Debugger::ourPseudoRegisters = { { std::array<Debugger::PseudoRegister, 12> Debugger::ourPseudoRegisters = { {
// Debugger::PseudoRegister Debugger::ourPseudoRegisters[NUM_PSEUDO_REGS] = { // Debugger::PseudoRegister Debugger::ourPseudoRegisters[NUM_PSEUDO_REGS] = {
{ "_bank", "Currently selected bank" }, { "_bank", "Currently selected bank" },
{ "_cclocks", "Color clocks on current scanline" }, { "_cclocks", "Color clocks on current scanline" },
@ -885,6 +885,7 @@ std::array<Debugger::PseudoRegister, 11> Debugger::ourPseudoRegisters = { {
{ "_fcycles", "Number of cycles since frame started" }, { "_fcycles", "Number of cycles since frame started" },
{ "_icycles", "Number of cycles of last instruction" }, { "_icycles", "Number of cycles of last instruction" },
{ "_scan", "Current scanline count" }, { "_scan", "Current scanline count" },
{ "_scanend", "Scanline count at end of last frame" },
{ "_scycles", "Number of cycles in current scanline" }, { "_scycles", "Number of cycles in current scanline" },
{ "_vblank", "Whether vertical blank is enabled (1 or 0)" }, { "_vblank", "Whether vertical blank is enabled (1 or 0)" },
{ "_vsync", "Whether vertical sync is enabled (1 or 0)" } { "_vsync", "Whether vertical sync is enabled (1 or 0)" }

2
src/debugger/Debugger.hxx
View File

@ -363,7 +363,7 @@ class Debugger : public DialogContainer
string name, help; string name, help;
}; };
static std::array<BuiltinFunction, 18> ourBuiltinFunctions; static std::array<BuiltinFunction, 18> ourBuiltinFunctions;
static std::array<PseudoRegister, 11> ourPseudoRegisters; static std::array<PseudoRegister, 12> ourPseudoRegisters;
private: private:
// rewind/unwind n states // rewind/unwind n states

2
src/libretro/Makefile.common
View File

@ -39,7 +39,7 @@ SOURCES_CXX := \
$(CORE_DIR)/emucore/Booster.cxx \ $(CORE_DIR)/emucore/Booster.cxx \
$(CORE_DIR)/emucore/Cart.cxx \ $(CORE_DIR)/emucore/Cart.cxx \
$(CORE_DIR)/emucore/CartDetector.cxx \ $(CORE_DIR)/emucore/CartDetector.cxx \
$(CORE_DIR)/emucore/CartEnhanced.o \ $(CORE_DIR)/emucore/CartEnhanced.cxx \
$(CORE_DIR)/emucore/Cart0840.cxx \ $(CORE_DIR)/emucore/Cart0840.cxx \
$(CORE_DIR)/emucore/Cart2K.cxx \ $(CORE_DIR)/emucore/Cart2K.cxx \
$(CORE_DIR)/emucore/Cart3E.cxx \ $(CORE_DIR)/emucore/Cart3E.cxx \

4
src/yacc/YaccParser.cxx
View File

@ -234,7 +234,9 @@ TiaMethod getTiaSpecial(char* ch)
{ {
if(BSPF::equalsIgnoreCase(ch, "_scan")) if(BSPF::equalsIgnoreCase(ch, "_scan"))
return &TIADebug::scanlines; return &TIADebug::scanlines;
if(BSPF::equalsIgnoreCase(ch, "_scycles")) else if(BSPF::equalsIgnoreCase(ch, "_scanend"))
return &TIADebug::scanlinesLastFrame;
else if(BSPF::equalsIgnoreCase(ch, "_scycles"))
return &TIADebug::cyclesThisLine; return &TIADebug::cyclesThisLine;
else if(BSPF::equalsIgnoreCase(ch, "_fcount")) else if(BSPF::equalsIgnoreCase(ch, "_fcount"))
return &TIADebug::frameCount; return &TIADebug::frameCount;