diff --git a/Announce.txt b/Announce.txt index 0e6c7b85d..191408bd2 100644 --- a/Announce.txt +++ b/Announce.txt @@ -9,7 +9,7 @@ SSSS ttt eeeee llll llll aaaaa =========================================================================== - Release 5.1 for Linux, MacOSX and Windows + Release 5.1.1 for Linux, MacOSX and Windows =========================================================================== The Atari 2600 Video Computer System (VCS), introduced in 1977, was the @@ -21,30 +21,30 @@ 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 5.1 release of Stella for Linux, Mac OSX and Windows. The +This is the 5.1.1 release of Stella for Linux, Mac OSX and Windows. The distributions currently available are: * Binaries for Windows XP_SP3(*)/Vista/7/8/10 : - Stella-5.1-win32.exe (32-bit EXE installer) - Stella-5.1-x64.exe (64-bit EXE installer) - Stella-5.1-windows.zip (32/64 bit versions) + Stella-5.1.1-win32.exe (32-bit EXE installer) + Stella-5.1.1-x64.exe (64-bit EXE installer) + Stella-5.1.1-windows.zip (32/64 bit versions) (*) Note: Support for Windows XP is problematic on some systems, and will probably be discontinued in a future release. * Binary distribution for MacOS X 10.7 and above : - Stella-5.1-macosx.dmg (64-bit Intel) + Stella-5.1.1-macosx.dmg (64-bit Intel) * Binary distribution in 32-bit & 64-bit Ubuntu DEB format : - stella_5.1-1_i386.deb - stella_5.1-1_amd64.deb + stella_5.1.1-1_i386.deb + stella_5.1.1-1_amd64.deb * Binary distribution in 32-bit & 64-bit RPM format : - stella-5.1-2.i386.rpm - stella-5.1-2.x86_64.rpm + stella-5.1.1-2.i386.rpm + stella-5.1.1-2.x86_64.rpm * Source code distribution for all platforms : - stella-5.1-src.tar.xz + stella-5.1.1-src.tar.xz Distribution Site diff --git a/Changes.txt b/Changes.txt index 05fc999be..845bd1416 100644 --- a/Changes.txt +++ b/Changes.txt @@ -136,6 +136,9 @@ * Fixed bug in TIA collision handling; it is now disabled in VBlank. + * Improve TIA PF collision handling during hblank; this fixes a bug in + Thrust ROM. + * Fixed wrong display of HM values in debugger after 'HMCLR' has been executed. diff --git a/debian/changelog b/debian/changelog index 250f3a179..c27055554 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +stella (5.1.1-1) stable; urgency=high + + * Version 5.1.1 release + + -- Stephen Anthony Wed, 21 Feb 2018 17:09:59 -0230 + + stella (5.1-1) stable; urgency=high * Version 5.1 release diff --git a/docs/debugger.html b/docs/debugger.html index 6af0123c9..9fb87cfe9 100644 --- a/docs/debugger.html +++ b/docs/debugger.html @@ -6,7 +6,7 @@
Stella
-

Release 5.1

+

Release 5.1.1

Integrated Debugger

(a work in progress)


diff --git a/docs/index.html b/docs/index.html index efcd59155..615a894a2 100644 --- a/docs/index.html +++ b/docs/index.html @@ -10,7 +10,7 @@

A multi-platform Atari 2600 VCS emulator

-

Release 5.1

+

Release 5.1.1



User's Guide

diff --git a/src/emucore/M6502.cxx b/src/emucore/M6502.cxx index d9497cb7d..85016829a 100644 --- a/src/emucore/M6502.cxx +++ b/src/emucore/M6502.cxx @@ -238,6 +238,21 @@ bool M6502::execute(uInt64 number) return result.isSuccess(); } +bool M6502::startDebugger(const string& message, int address, bool read) { + handleHalt(); + + mySystem->tia().updateEmulation(); + mySystem->m6532().updateEmulation(); + + #ifndef DEBUGGER_SUPPORT + return false; + #endif + + if (!myDebugger) return false; + + return myDebugger->start(message, address, read); +} + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - inline void M6502::_execute(uInt64 cycles, DispatchResult& result) { diff --git a/src/emucore/M6502.hxx b/src/emucore/M6502.hxx index 5504a5366..4dd0e3899 100644 --- a/src/emucore/M6502.hxx +++ b/src/emucore/M6502.hxx @@ -333,6 +333,12 @@ class M6502 : public Serializable void updateStepStateByInstruction(); #endif // DEBUGGER_SUPPORT + /** + Make sure that the current hardware state is up to date (TIA & RIOT) and dispatch + debugger. + */ + bool startDebugger(const string& message = "", int address = -1, bool read = true); + private: /** Bit fields used to indicate that certain conditions need to be diff --git a/src/unix/stella.spec b/src/unix/stella.spec index 8034789ea..38ebec3b4 100644 --- a/src/unix/stella.spec +++ b/src/unix/stella.spec @@ -1,5 +1,5 @@ %define name stella -%define version 5.1 +%define version 5.1.1 %define rel 1 %define enable_sound 1 @@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %_datadir/icons/large/%{name}.png %changelog +* Wed Feb 21 2018 Stephen Anthony 5.1.1-1 +- Version 5.1.1 release + * Sun Feb 04 2018 Stephen Anthony 5.1-1 - Version 5.1 release diff --git a/src/windows/stella.rc b/src/windows/stella.rc index 57c0a4282..4b5e223ed 100755 --- a/src/windows/stella.rc +++ b/src/windows/stella.rc @@ -36,8 +36,8 @@ IDI_ICON ICON "stella.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 5,1,0,0 - PRODUCTVERSION 5,1,0,0 + FILEVERSION 5,1,1,0 + PRODUCTVERSION 5,1,1,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 (https://stella-emu.github.io)" VALUE "FileDescription", "Stella" - VALUE "FileVersion", "5.1" + VALUE "FileVersion", "5.1.1" VALUE "InternalName", "Stella" VALUE "LegalCopyright", "Copyright (C) 1995-2018 The Stella Team" VALUE "OriginalFilename", "Stella.exe" VALUE "ProductName", "Stella" - VALUE "ProductVersion", "5.1" + VALUE "ProductVersion", "5.1.1" END END BLOCK "VarFileInfo"