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

More syntax fixes; indicate plural of "Cycle" as "Cycls" in the debugger (we really need more room here :) )

This commit is contained in:
Stephen Anthony 2020-11-01 19:07:39 -03:30
parent d404ec8daf
commit 7ff0121ffa
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/debugger.html
View File

@ -1147,11 +1147,11 @@ as illustrated:</p>
<p><img src="graphics/debugger_tiainfo.png"></p> <p><img src="graphics/debugger_tiainfo.png"></p>
<p>The indicators are as follows (note that all these are read-only):</p> <p>The indicators are as follows (note that all these are read-only):</p>
<ul> <ul>
<li><b>Frame Cycle</b>: The number of CPU cycles that have been executed this frame since <li><b>Frame Cycls</b>: The number of CPU cycles that have been executed this frame since
VSYNC was cleared at scanline 0.</li> VSYNC was cleared at scanline 0.</li>
<li><b>WSync Cycle</b>: The number of CPU cycles that have been skipped by WSYNC this frame since <li><b>WSync Cycls</b>: The number of CPU cycles that have been skipped by WSYNC this frame since
VSYNC was cleared at scanline 0.</li> VSYNC was cleared at scanline 0.</li>
<li><b>Timer Cycle</b>: The number of CPU cycles (approximately) that have been used by timer read loops since <li><b>Timer Cycls</b>: The number of CPU cycles (approximately) that have been used by timer read loops since
VSYNC was cleared at scanline 0.</li> VSYNC was cleared at scanline 0.</li>
<li><b>Total</b>: The total number of CPU cycles since this ROM was loaded or reset.</li> <li><b>Total</b>: The total number of CPU cycles since this ROM was loaded or reset.</li>
<li><b>Delta</b>: The number of CPU cycles that have been executed since the last debugger <li><b>Delta</b>: The number of CPU cycles that have been executed since the last debugger

2
src/common/Version.hxx
View File

@ -19,6 +19,6 @@
#define VERSION_HXX #define VERSION_HXX
#define STELLA_VERSION "6.4" #define STELLA_VERSION "6.4"
#define STELLA_BUILD "6237" #define STELLA_BUILD "6238"
#endif #endif

8
src/debugger/gui/TiaInfoWidget.cxx
View File

@ -43,7 +43,7 @@ TiaInfoWidget::TiaInfoWidget(GuiObject* boss, const GUI::Font& lfont,
+ EditTextWidget::calcWidth(lfont) * 3 <= max_w; + EditTextWidget::calcWidth(lfont) * 3 <= max_w;
const int lineHeight = lfont.getLineHeight(); const int lineHeight = lfont.getLineHeight();
int xpos = x, ypos = y + VBORDER; int xpos = x, ypos = y + VBORDER;
int lwidth = lfont.getStringWidth(longstr ? "Frame Cycle" : "F. Cycle"); int lwidth = lfont.getStringWidth(longstr ? "Frame Cycls" : "F. Cycls");
int lwidth8 = lwidth - lfont.getMaxCharWidth() * 3; int lwidth8 = lwidth - lfont.getMaxCharWidth() * 3;
int lwidthR = lfont.getStringWidth(longstr ? "Frame Cnt." : "Frame "); int lwidthR = lfont.getStringWidth(longstr ? "Frame Cnt." : "Frame ");
int fwidth = EditTextWidget::calcWidth(lfont, 5); int fwidth = EditTextWidget::calcWidth(lfont, 5);
@ -58,19 +58,19 @@ TiaInfoWidget::TiaInfoWidget(GuiObject* boss, const GUI::Font& lfont,
// Left column // Left column
// Left: Frame Cycle // Left: Frame Cycle
xpos = x; xpos = x;
new StaticTextWidget(boss, lfont, xpos, ypos + 1, longstr ? "Frame Cycle" : "F. Cycle"); new StaticTextWidget(boss, lfont, xpos, ypos + 1, longstr ? "Frame Cycls" : "F. Cycls");
myFrameCycles = new EditTextWidget(boss, nfont, xpos + lwidth, ypos - 1, fwidth, lineHeight); myFrameCycles = new EditTextWidget(boss, nfont, xpos + lwidth, ypos - 1, fwidth, lineHeight);
myFrameCycles->setEditable(false, true); myFrameCycles->setEditable(false, true);
// Left: WSync Cycles // Left: WSync Cycles
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
new StaticTextWidget(boss, lfont, xpos, ypos + 1, longstr ? "WSync Cycle" : "WSync C."); new StaticTextWidget(boss, lfont, xpos, ypos + 1, longstr ? "WSync Cycls" : "WSync C.");
myWSyncCylces = new EditTextWidget(boss, nfont, xpos + lwidth, ypos - 1, fwidth, lineHeight); myWSyncCylces = new EditTextWidget(boss, nfont, xpos + lwidth, ypos - 1, fwidth, lineHeight);
myWSyncCylces->setEditable(false, true); myWSyncCylces->setEditable(false, true);
// Left: Timer Cycles // Left: Timer Cycles
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
new StaticTextWidget(boss, lfont, xpos, ypos + 1, longstr ? "Timer Cycle" : "Timer C."); new StaticTextWidget(boss, lfont, xpos, ypos + 1, longstr ? "Timer Cycls" : "Timer C.");
myTimerCylces = new EditTextWidget(boss, nfont, xpos + lwidth, ypos - 1, fwidth, lineHeight); myTimerCylces = new EditTextWidget(boss, nfont, xpos + lwidth, ypos - 1, fwidth, lineHeight);
myTimerCylces->setEditable(false, true); myTimerCylces->setEditable(false, true);