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

Merge branch 'release/5.1' into release/6.0

This commit is contained in:
Christian Speckner 2018-08-05 17:54:22 +02:00
parent 9488c2b5fe d8178f546b
commit e07617b618
9 changed files with 52 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Announce.txt
View File

@ -9,7 +9,7 @@
SSSS ttt eeeee llll llll aaaaa 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 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 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. 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: distributions currently available are:
* Binaries for Windows XP_SP3(*)/Vista/7/8/10 : * Binaries for Windows XP_SP3(*)/Vista/7/8/10 :
Stella-5.1-win32.exe (32-bit EXE installer) Stella-5.1.1-win32.exe (32-bit EXE installer)
Stella-5.1-x64.exe (64-bit EXE installer) Stella-5.1.1-x64.exe (64-bit EXE installer)
Stella-5.1-windows.zip (32/64 bit versions) Stella-5.1.1-windows.zip (32/64 bit versions)
(*) Note: Support for Windows XP is problematic on some systems, (*) Note: Support for Windows XP is problematic on some systems,
and will probably be discontinued in a future release. and will probably be discontinued in a future release.
* Binary distribution for MacOS X 10.7 and above : * 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 : * Binary distribution in 32-bit & 64-bit Ubuntu DEB format :
stella_5.1-1_i386.deb stella_5.1.1-1_i386.deb
stella_5.1-1_amd64.deb stella_5.1.1-1_amd64.deb
* Binary distribution in 32-bit & 64-bit RPM format : * Binary distribution in 32-bit & 64-bit RPM format :
stella-5.1-2.i386.rpm stella-5.1.1-2.i386.rpm
stella-5.1-2.x86_64.rpm stella-5.1.1-2.x86_64.rpm
* Source code distribution for all platforms : * Source code distribution for all platforms :
stella-5.1-src.tar.xz stella-5.1.1-src.tar.xz
Distribution Site Distribution Site

3
Changes.txt
View File

@ -136,6 +136,9 @@
* Fixed bug in TIA collision handling; it is now disabled in VBlank. * 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 * Fixed wrong display of HM values in debugger after 'HMCLR' has been
executed. executed.

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
stella (5.1.1-1) stable; urgency=high
* Version 5.1.1 release
-- Stephen Anthony <stephena@users.sf.net> Wed, 21 Feb 2018 17:09:59 -0230
stella (5.1-1) stable; urgency=high stella (5.1-1) stable; urgency=high
* Version 5.1 release * Version 5.1 release

2
docs/debugger.html
View File

@ -6,7 +6,7 @@
<body> <body>
<center><b><font size="7">Stella</font></b></center> <center><b><font size="7">Stella</font></b></center>
<center><h4><b>Release 5.1</b></h4></center> <center><h4><b>Release 5.1.1</b></h4></center>
<center><h1><b>Integrated Debugger</b></h1></center> <center><h1><b>Integrated Debugger</b></h1></center>
<center><h4><b>(a work in progress)</b></h4></center> <center><h4><b>(a work in progress)</b></h4></center>
<br> <br>

2
docs/index.html
View File

@ -10,7 +10,7 @@
<br><br> <br><br>
<center><h2><b>A multi-platform Atari 2600 VCS emulator</b></h2></center> <center><h2><b>A multi-platform Atari 2600 VCS emulator</b></h2></center>
<center><h4><b>Release 5.1</b></h4></center> <center><h4><b>Release 5.1.1</b></h4></center>
<br><br> <br><br>
<center><h2><b>User's Guide</b></h2></center> <center><h2><b>User's Guide</b></h2></center>

15
src/emucore/M6502.cxx
View File

@ -238,6 +238,21 @@ bool M6502::execute(uInt64 number)
return result.isSuccess(); 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) inline void M6502::_execute(uInt64 cycles, DispatchResult& result)
{ {

6
src/emucore/M6502.hxx
View File

@ -333,6 +333,12 @@ class M6502 : public Serializable
void updateStepStateByInstruction(); void updateStepStateByInstruction();
#endif // DEBUGGER_SUPPORT #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: private:
/** /**
Bit fields used to indicate that certain conditions need to be Bit fields used to indicate that certain conditions need to be

5
src/unix/stella.spec
View File

@ -1,5 +1,5 @@
%define name stella %define name stella
%define version 5.1 %define version 5.1.1
%define rel 1 %define rel 1
%define enable_sound 1 %define enable_sound 1
@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
%_datadir/icons/large/%{name}.png %_datadir/icons/large/%{name}.png
%changelog %changelog
* Wed Feb 21 2018 Stephen Anthony <stephena@users.sf.net> 5.1.1-1
- Version 5.1.1 release
* Sun Feb 04 2018 Stephen Anthony <stephena@users.sf.net> 5.1-1 * Sun Feb 04 2018 Stephen Anthony <stephena@users.sf.net> 5.1-1
- Version 5.1 release - Version 5.1 release

8
src/windows/stella.rc
View File

@ -36,8 +36,8 @@ IDI_ICON ICON "stella.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 5,1,0,0 FILEVERSION 5,1,1,0
PRODUCTVERSION 5,1,0,0 PRODUCTVERSION 5,1,1,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -55,12 +55,12 @@ BEGIN
VALUE "Comments", "The multi-platform Atari 2600 emulator. Stella is released under the GPLv2." 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 "CompanyName", "The Stella Team (https://stella-emu.github.io)"
VALUE "FileDescription", "Stella" VALUE "FileDescription", "Stella"
VALUE "FileVersion", "5.1" VALUE "FileVersion", "5.1.1"
VALUE "InternalName", "Stella" VALUE "InternalName", "Stella"
VALUE "LegalCopyright", "Copyright (C) 1995-2018 The Stella Team" VALUE "LegalCopyright", "Copyright (C) 1995-2018 The Stella Team"
VALUE "OriginalFilename", "Stella.exe" VALUE "OriginalFilename", "Stella.exe"
VALUE "ProductName", "Stella" VALUE "ProductName", "Stella"
VALUE "ProductVersion", "5.1" VALUE "ProductVersion", "5.1.1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"