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

Fixed interaction with ideal ROM size between 3E and 3E+.

This commit is contained in:
Stephen Anthony 2020-06-09 15:56:31 -02:30
parent e497405216
commit 5c879d4a48
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/emucore/Cart3E.cxx
View File

@ -22,7 +22,14 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Cartridge3E::Cartridge3E(const ByteBuffer& image, size_t size, Cartridge3E::Cartridge3E(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings) const string& md5, const Settings& settings)
: CartridgeEnhanced(image, size, BSPF::nextMultipleOf(size, 1_KB), md5, settings) : Cartridge3E(image, size, BSPF::nextMultipleOf(size, 2_KB), md5, settings)
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Cartridge3E::Cartridge3E(const ByteBuffer& image, size_t size, size_t bsSize,
const string& md5, const Settings& settings)
: CartridgeEnhanced(image, size, bsSize, md5, settings)
{ {
myBankShift = BANK_SHIFT; myBankShift = BANK_SHIFT;
myRamSize = RAM_SIZE; myRamSize = RAM_SIZE;

17
src/emucore/Cart3E.hxx
View File

@ -65,7 +65,7 @@ class Cartridge3E : public CartridgeEnhanced
public: public:
/** /**
Create a new cartridge using the specified image and size Create a new cartridge using the specified image and size.
@param image Pointer to the ROM image @param image Pointer to the ROM image
@param size The size of the ROM image @param size The size of the ROM image
@ -76,6 +76,21 @@ class Cartridge3E : public CartridgeEnhanced
const Settings& settings); const Settings& settings);
virtual ~Cartridge3E() = default; virtual ~Cartridge3E() = default;
protected:
/**
Create a new cartridge using the specified image and size.
This is an alternate version of the constructor, meant to be used
only by classes inheriting from this class.
@param image Pointer to the ROM image
@param size The size of the ROM image
@param bsSize The size specified by the bankswitching scheme
@param md5 The md5sum of the ROM image
@param settings A reference to the various settings (read-only)
*/
Cartridge3E(const ByteBuffer& image, size_t size, size_t bsSize,
const string& md5, const Settings& settings);
public: public:
/** /**

2
src/emucore/Cart3EPlus.cxx
View File

@ -22,7 +22,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Cartridge3EPlus::Cartridge3EPlus(const ByteBuffer& image, size_t size, Cartridge3EPlus::Cartridge3EPlus(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings) const string& md5, const Settings& settings)
: Cartridge3E(image, size, md5, settings) : Cartridge3E(image, size, BSPF::nextMultipleOf(size, 1_KB), md5, settings)
{ {
myBankShift = BANK_SHIFT; myBankShift = BANK_SHIFT;
myRamSize = RAM_SIZE; myRamSize = RAM_SIZE;

2
src/emucore/CartEnhanced.hxx
View File

@ -41,8 +41,8 @@ class CartridgeEnhanced : public Cartridge
@param image Pointer to the ROM image @param image Pointer to the ROM image
@param size The size of the ROM image @param size The size of the ROM image
@param md5 The md5sum of the ROM image
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
@param md5 The md5sum of the ROM image
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
*/ */
CartridgeEnhanced(const ByteBuffer& image, size_t size, size_t bsSize, CartridgeEnhanced(const ByteBuffer& image, size_t size, size_t bsSize,