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

Make sure to use correct 'virtual' size of ROM when creating the internal buffer.

This commit is contained in:
Stephen Anthony 2020-06-09 11:19:49 -02:30
parent 8483b6d160
commit 476a2b2c56
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/emucore/CartEnhanced.cxx
View File

@ -52,7 +52,8 @@ CartridgeEnhanced::CartridgeEnhanced(const ByteBuffer& image, size_t size,
} }
} }
else else
mySize = size; // Make sure to use size defined by the bankswitching scheme
mySize = std::max(size, bsSize);
// Initialize ROM with all 0's, to fill areas that the ROM may not cover // Initialize ROM with all 0's, to fill areas that the ROM may not cover
size_t bufSize = std::max<size_t>(mySize, System::PAGE_SIZE); size_t bufSize = std::max<size_t>(mySize, System::PAGE_SIZE);
@ -73,7 +74,9 @@ CartridgeEnhanced::CartridgeEnhanced(const ByteBuffer& image, size_t size,
// TODO: should we mirror here too?? // TODO: should we mirror here too??
// Directly copy the ROM image into the buffer // Directly copy the ROM image into the buffer
std::copy_n(image.get(), mySize, myImage.get()); // Only copy up to the amount of data the ROM provides; extra unused
// space will be filled with 0's from above
std::copy_n(image.get(), std::min(mySize, size), myImage.get());
} }
else else
{ {