And as usual, some last minute updates.

This commit is contained in:
Stephen Anthony 2020-06-06 16:37:13 -02:30
parent d983847c95
commit 070dd48f22
3 changed files with 4 additions and 4 deletions

View File

@ -19,6 +19,6 @@
#define VERSION_HXX
#define STELLA_VERSION "6.2"
#define STELLA_BUILD "5995"
#define STELLA_BUILD "5996"
#endif

View File

@ -125,7 +125,7 @@ string CartridgeEnhancedWidget::romDescription()
start -= start % std::min(int(size), 0x1000);
end = start + uInt16(myCart.mySize) - 1;
// special check for ROMs where the extra RAM is not included in the image (e.g. CV).
if((start & 0xFFF) < size)
if((start & 0xFFFU) < size)
{
start += myCart.myRomOffset;
}

View File

@ -44,7 +44,7 @@ void CartridgeEnhanced::install(System& system)
// or the ROM is < 4K (-> 1 segment)
myBankSegs = std::min(1 << (MAX_BANK_SHIFT - myBankShift),
int(mySize) / myBankSize); // e.g. = 1
myRomOffset = myRamBankCount > 0 ? 0 : uInt32(myRamSize) * 2;
myRomOffset = myRamBankCount > 0U ? 0U : static_cast<uInt16>(myRamSize * 2);
myRamMask = ramSize - 1; // e.g. = 0xFFFF (doesn't matter for RAM size 0)
myWriteOffset = myRamWpHigh ? ramSize : 0; // e.g. = 0x0000
myReadOffset = myRamWpHigh ? 0 : ramSize; // e.g. = 0x0080
@ -315,7 +315,7 @@ bool CartridgeEnhanced::patch(uInt16 address, uInt8 value)
}
else
{
if((address & myBankMask) < myRamSize * 2)
if(static_cast<size_t>(address & myBankMask) < myRamSize * 2)
{
// Normally, a write to the read port won't do anything
// However, the patch command is special in that ignores such