Fixed bug in 'MDM' debugger tab; it was always showing bank 0.

Updated docs for upcoming 4.1 release.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2983 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

Announce.txt

@@ -9,7 +9,7 @@
      SSSS     ttt  eeeee llll llll  aaaaa
 
 ===========================================================================
-                Release 4.0 for Linux, MacOSX and Windows
+                Release 4.1 for Linux, MacOSX and Windows
 ===========================================================================
 
 The Atari 2600 Video Computer System (VCS), introduced in 1977, was the
@@ -21,27 +21,27 @@ all of your favourite Atari 2600 games again!  Stella was originally
 developed for Linux by Bradford W. Mott, however, it has been ported to a
 number of other platforms and is currently maintained by Stephen Anthony.
 
-This is the 4.0 release of Stella for Linux, Mac OSX and Windows.  The
+This is the 4.1 release of Stella for Linux, Mac OSX and Windows.  The
 distributions currently available are:
 
-  * Binaries for Windows XP/Vista/7/8 :
+  * Binaries for Windows XP_SP3/Vista/7/8 :
-      Stella-4.0-win32.exe   (32-bit EXE installer)
+      Stella-4.1-win32.exe   (32-bit EXE installer)
-      Stella-4.0-x64.exe     (64-bit EXE installer)
+      Stella-4.1-x64.exe     (64-bit EXE installer)
-      Stella-4.0-windows.zip (32/64 bit versions)
+      Stella-4.1-windows.zip (32/64 bit versions)
 
   * Binary distribution for MacOS X 10.5 and above :
-      Stella-4.0-macosx.dmg (32/64-bit Intel Universal Binary)
+      Stella-4.1-macosx.dmg (32/64-bit Intel Universal Binary)
 
   * Binary distribution in 32-bit & 64-bit Ubuntu DEB format :
-      stella_4.0-1_i386.deb
+      stella_4.1-1_i386.deb
-      stella_4.0-1_amd64.deb
+      stella_4.1-1_amd64.deb
 
   * Binary distribution in 32-bit & 64-bit RPM format :
-      stella-4.0-2.i386.rpm
+      stella-4.1-2.i386.rpm
-      stella-4.0-2.x86_64.rpm
+      stella-4.1-2.x86_64.rpm
 
   * Source code distribution for all platforms :
-      stella-4.0-src.tar.gz
+      stella-4.1-src.tar.gz
 
 
 Distribution Site

Changes.txt

@@ -12,7 +12,7 @@
                                Release History
 ===========================================================================
 
-4.0 to 4.1: (xxx xx, 2014)
+4.0 to 4.1: (September xx, 2014)
 
   * Improved 'DASH' bankswitching scheme support; there is now a debugger
     tab for changing banks and viewing internal cart RAM, and

debian/changelog

@@ -1,3 +1,10 @@
+stella (4.1-1) stable; urgency=high
+
+  * Version 4.1 release
+
+ -- Stephen Anthony <stephena@users.sf.net>  Sun, 31 Aug 2014 20:43:06 -0230
+
+
 stella (4.0-1) stable; urgency=high
 
   * Version 4.0 release

docs/index.html

@@ -10,7 +10,7 @@
   <br><br>
   <center><h2><b>A multi-platform Atari 2600 VCS emulator</b></h2></center>
 
-  <center><h4><b>Release 4.0</b></h4></center>
+  <center><h4><b>Release 4.1</b></h4></center>
   <br><br>
 
   <center><h2><b>User's Guide</b></h2></center>
@@ -54,7 +54,7 @@
 
   <br><br><br>
 
-  <center><b>February 1999 - July 2014</b></center>
+  <center><b>February 1999 - September 2014</b></center>
     <center><b>The Stella Team</b></center>
   <center><b><a href="http://stella.sourceforge.net">Stella Homepage</a></b></center>
 
@@ -354,13 +354,12 @@
   <p>
   <h3><b><u>Windows</u></b></h3>
 
-  <p>The Windows version of Stella is designed to work on Windows XP/Vista/7/8
+  <p>The Windows version of Stella is designed to work on Windows XP_SP3/Vista/7/8
   with the following:</p>
 
   <ul>
     <li>Direct3D or OpenGL capable video card</li>
-    <li>64-bit port has been tested on Windows Vista and above only; it may work on
+    <li>64-bit port has been tested on Windows Vista and above only</li>
-      WinXP64 as well, but isn't a priority</li>
     <li>Visual C++ 2012/2013 (or Express version) is required to compile the Stella source code</li>
   </ul>
 

src/common/Version.hxx

@@ -22,7 +22,7 @@
 
 #include <cstdlib>
 
-#define STELLA_VERSION "4.1_pre3"
+#define STELLA_VERSION "4.1_beta1"
 #define STELLA_BUILD atoi("$Rev$" + 6)
 
 #endif

src/debugger/gui/CartMDMWidget.cxx

@@ -88,3 +88,15 @@ void CartridgeMDMWidget::handleCommand(CommandSender* sender,
     myCart.myBankingDisabled = myBankDisabled->getState();
   }
 }
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+string CartridgeMDMWidget::bankState()
+{
+  ostringstream& buf = buffer();
+
+  buf << "Bank = " << dec << myCart.myCurrentBank
+      << ", hotspot = " << "$" << Common::Base::HEX4
+      << (myCart.myCurrentBank+0x800);
+
+  return buf.str();
+}

src/debugger/gui/CartMDMWidget.hxx

@@ -38,6 +38,8 @@ class CartridgeMDMWidget : public CartDebugWidget
     void loadConfig();
     void handleCommand(CommandSender* sender, int cmd, int data, int id);
 
+    string bankState();
+
   private:
     CartridgeMDM& myCart;
     PopUpWidget* myBank;

src/macosx/Info-Stella.plist

@@ -53,7 +53,7 @@
 	<key>CFBundleSignature</key>
 	<string>StLa</string>
 	<key>CFBundleVersion</key>
-	<string>4.0</string>
+	<string>4.1</string>
 	<key>LSMinimumSystemVersionByArchitecture</key>
 	<dict>
 		<key>i386</key>

src/unix/stella.spec

@@ -1,5 +1,5 @@
 %define name    stella
-%define version 4.0
+%define version 4.1
 %define rel     1
 
 %define enable_gl 1

src/windows/stella.rc

@@ -36,8 +36,8 @@ IDI_ICON                ICON                    "stella.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,0,0,0
+ FILEVERSION 4,1,0,0
- PRODUCTVERSION 4,0,0,0
+ PRODUCTVERSION 4,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -55,12 +55,12 @@ BEGIN
             VALUE "Comments", "The multi-platform Atari 2600 emulator.  Stella is released under the GPLv2."
             VALUE "CompanyName", "The Stella Team (http://stella.sourceforge.net)"
             VALUE "FileDescription", "Stella"
-            VALUE "FileVersion", "4.0"
+            VALUE "FileVersion", "4.1"
             VALUE "InternalName", "Stella"
             VALUE "LegalCopyright", "Copyright (C) 1995-2014 The Stella Team"
             VALUE "OriginalFilename", "Stella.exe"
             VALUE "ProductName", "Stella"
-            VALUE "ProductVersion", "4.0"
+            VALUE "ProductVersion", "4.1"
         END
     END
     BLOCK "VarFileInfo"