From 0b45bc0a2d293463450f821d7913e41952215f37 Mon Sep 17 00:00:00 2001
From: Stephen Anthony
Date: Sun, 1 Nov 2020 18:27:41 -0330
Subject: [PATCH] Added new debugger pseudo-registers to the changelog. Changed
string "Cycl." to "Cycle", since there was no point using a '.' with a
fixed-width font.
---
Changes.txt | 5 ++++-
docs/debugger.html | 4 ++--
src/common/Version.hxx | 2 +-
src/debugger/gui/TiaInfoWidget.cxx | 4 ++--
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Changes.txt b/Changes.txt
index 60049604f..84e4996ad 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -23,7 +23,10 @@
- Autodetection of serial ports no longer messes up devices plugged
into other serial ports.
- * Added CPU load stats to debugger.
+ * Added CPU load stats to debugger. Related to this, added debugger
+ pseudo-registers '_ftimreadcycles' and '_fwsynccycles' to show the
+ number of cycles since the start of frame under certain circumstances
+ (see manual for more details).
* Fixed bug with aspect correction and fullscreen mode; snapshots from
such a mode are now pixel-exact.
diff --git a/docs/debugger.html b/docs/debugger.html
index 6b262e02c..7f4c108bc 100644
--- a/docs/debugger.html
+++ b/docs/debugger.html
@@ -1149,9 +1149,9 @@ as illustrated:
- Frame Cycle: The number of CPU cycles that have been executed this frame since
VSYNC was cleared at scanline 0.
-- WSync Cycl.: The number of CPU cycles that have been skipped by WSYNC this frame since
+
- WSync Cycle: The number of CPU cycles that have been skipped by WSYNC this frame since
VSYNC was cleared at scanline 0.
-- Timer Cycl.: The number of CPU cycles (approximately) that have been used by timer read loops since
+
- Timer Cycle: The number of CPU cycles (approximately) that have been used by timer read loops since
VSYNC was cleared at scanline 0.
- Total: The total number of CPU cycles since this ROM was loaded or reset.
- Delta: The number of CPU cycles that have been executed since the last debugger
diff --git a/src/common/Version.hxx b/src/common/Version.hxx
index 3106dd6c7..c6c81ab47 100644
--- a/src/common/Version.hxx
+++ b/src/common/Version.hxx
@@ -19,6 +19,6 @@
#define VERSION_HXX
#define STELLA_VERSION "6.4"
-#define STELLA_BUILD "6236"
+#define STELLA_BUILD "6237"
#endif
diff --git a/src/debugger/gui/TiaInfoWidget.cxx b/src/debugger/gui/TiaInfoWidget.cxx
index c892422c5..3a0a3b27f 100644
--- a/src/debugger/gui/TiaInfoWidget.cxx
+++ b/src/debugger/gui/TiaInfoWidget.cxx
@@ -64,13 +64,13 @@ TiaInfoWidget::TiaInfoWidget(GuiObject* boss, const GUI::Font& lfont,
// Left: WSync Cycles
ypos += lineHeight + VGAP;
- new StaticTextWidget(boss, lfont, xpos, ypos + 1, longstr ? "WSync Cycl." : "WSync C.");
+ new StaticTextWidget(boss, lfont, xpos, ypos + 1, longstr ? "WSync Cycle" : "WSync C.");
myWSyncCylces = new EditTextWidget(boss, nfont, xpos + lwidth, ypos - 1, fwidth, lineHeight);
myWSyncCylces->setEditable(false, true);
// Left: Timer Cycles
ypos += lineHeight + VGAP;
- new StaticTextWidget(boss, lfont, xpos, ypos + 1, longstr ? "Timer Cycl." : "Timer C.");
+ new StaticTextWidget(boss, lfont, xpos, ypos + 1, longstr ? "Timer Cycle" : "Timer C.");
myTimerCylces = new EditTextWidget(boss, nfont, xpos + lwidth, ypos - 1, fwidth, lineHeight);
myTimerCylces->setEditable(false, true);