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

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
Thomas Jentzsch 2022-06-10 17:37:23 +02:00
parent 0fc409b2fc 67c2e7b6ad
commit 42b6a29274
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes.txt
View File

@ -12,7 +12,7 @@
Release History Release History
=========================================================================== ===========================================================================
6.6 to 6.7 (June 11, 2022) 6.6 to 6.7 (June 13, 2022)
* IMPORTANT NOTES: * IMPORTANT NOTES:
- Because of fixes to JSON handling, all remappings will be reset - Because of fixes to JSON handling, all remappings will be reset

2
debian/changelog vendored
View File

@ -2,7 +2,7 @@ stella (6.7) stable; urgency=high
* Version 6.7 release * Version 6.7 release
-- Stephen Anthony <sa666666@gmail.com> Sat, 11 Jun 2022 17:09:59 -0230 -- Stephen Anthony <sa666666@gmail.com> Mon, 13 Jun 2022 17:09:59 -0230
stella (6.6) stable; urgency=high stella (6.6) stable; urgency=high

14
src/emucore/CartDetector.cxx
View File

@ -353,9 +353,9 @@ bool CartDetector::isProbably0FA0(const ByteBuffer& image, size_t size)
// accessing address 0xFC0 using 'BIT $FC0', 'BIT $FC0' or 'STA $FC0' // accessing address 0xFC0 using 'BIT $FC0', 'BIT $FC0' or 'STA $FC0'
// Also a game (Motocross) using 'BIT $EFC0' has been found // Also a game (Motocross) using 'BIT $EFC0' has been found
static constexpr uInt8 signature[4][3] = { static constexpr uInt8 signature[4][3] = {
{ 0x2C, 0xC0, 0x0F }, // BIT $FC0 (H.E.R.O., Kung-Fu Master) { 0x2C, 0xC0, 0x0F }, // BIT $FC0 (H.E.R.O., Kung-Fu Master)
{ 0x8D, 0xC0, 0x0F }, // STA $FC0 (Pole Position, Subterranea) { 0x8D, 0xC0, 0x0F }, // STA $FC0 (Pole Position, Subterranea)
{ 0xAD, 0xC0, 0x0F }, // LDA $FC0 (Front Line, Zaxxon) { 0xAD, 0xC0, 0x0F }, // LDA $FC0 (Front Line, Zaxxon)
{ 0x2C, 0xC0, 0xEF } // BIT $EFC0 (Motocross) { 0x2C, 0xC0, 0xEF } // BIT $EFC0 (Motocross)
}; };
for(uInt32 i = 0; i < 4; ++i) for(uInt32 i = 0; i < 4; ++i)
@ -384,7 +384,7 @@ bool CartDetector::isProbably3E(const ByteBuffer& image, size_t size)
bool CartDetector::isProbably3EX(const ByteBuffer& image, size_t size) bool CartDetector::isProbably3EX(const ByteBuffer& image, size_t size)
{ {
// 3EX cart have at least 2 occurrences of the string "3EX" // 3EX cart have at least 2 occurrences of the string "3EX"
static constexpr uInt8 _3EX[] = { '3', 'E', 'X'}; static constexpr uInt8 _3EX[] = { '3', 'E', 'X' };
return searchForBytes(image, size, _3EX, 3, 2); return searchForBytes(image, size, _3EX, 3, 2);
} }
@ -470,7 +470,7 @@ bool CartDetector::isProbablyBUS(const ByteBuffer& image, size_t size)
// BUS ARM code has 2 occurrences of the string BUS // BUS ARM code has 2 occurrences of the string BUS
// Note: all Harmony/Melody custom drivers also contain the value // Note: all Harmony/Melody custom drivers also contain the value
// 0x10adab1e (LOADABLE) if needed for future improvement // 0x10adab1e (LOADABLE) if needed for future improvement
static constexpr uInt8 bus[] = { 'B', 'U', 'S'}; static constexpr uInt8 bus[] = { 'B', 'U', 'S' };
return searchForBytes(image, size, bus, 3, 2); return searchForBytes(image, size, bus, 3, 2);
} }
@ -768,7 +768,7 @@ bool CartDetector::isProbablySB(const ByteBuffer& image, size_t size)
bool CartDetector::isProbablyTVBoy(const ByteBuffer& image, size_t size) bool CartDetector::isProbablyTVBoy(const ByteBuffer& image, size_t size)
{ {
// TV Boy cart bankswitching switches banks by accessing addresses 0x1800..$187F // TV Boy cart bankswitching switches banks by accessing addresses 0x1800..$187F
static constexpr uInt8 signature[5] = {0x91, 0x82, 0x6c, 0xfc, 0xff}; // STA ($82),Y; JMP ($FFFC) static constexpr uInt8 signature[5] = { 0x91, 0x82, 0x6c, 0xfc, 0xff }; // STA ($82),Y; JMP ($FFFC)
return searchForBytes(image, size, signature, 5); return searchForBytes(image, size, signature, 5);
} }
@ -827,7 +827,7 @@ bool CartDetector::isProbablyX07(const ByteBuffer& image, size_t size)
bool CartDetector::isProbablyPlusROM(const ByteBuffer& image, size_t size) bool CartDetector::isProbablyPlusROM(const ByteBuffer& image, size_t size)
{ {
// PlusCart uses this pattern to detect a PlusROM // PlusCart uses this pattern to detect a PlusROM
static constexpr uInt8 signature[3] = {0x8d, 0xf0, 0x1f}; // STA $1FF0 static constexpr uInt8 signature[3] = { 0x8d, 0xf0, 0x1f }; // STA $1FF0
return searchForBytes(image, size, signature, 3); return searchForBytes(image, size, signature, 3);
} }

2
src/unix/stella.spec
View File

@ -100,7 +100,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
%_datadir/icons/large/%{name}.png %_datadir/icons/large/%{name}.png
%changelog %changelog
* Sat Jun 11 2022 Stephen Anthony <sa666666@gmail.com> 6.7-1 * Mon Jun 13 2022 Stephen Anthony <sa666666@gmail.com> 6.7-1
- Version 6.7 release - Version 6.7 release
* Tue Nov 16 2021 Stephen Anthony <sa666666@gmail.com> 6.6-1 * Tue Nov 16 2021 Stephen Anthony <sa666666@gmail.com> 6.6-1