6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-06 13:31:55 +00:00
Code Issues Projects Releases Wiki Activity

Ensures safe Megacart cartridge sizes too.

Browse Source
This commit is contained in:
Thomas Harte 2018-10-18 21:09:05 -04:00
parent 34e13d0d4d
commit 6a2db52adb
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Machines/ColecoVision/ColecoVision.cpp
View File

@ -141,11 +141,19 @@ class ConcreteMachine:
cartridge_address_limit_ = static_cast<uint16_t>(0x8000 + cartridge_.size() - 1); cartridge_address_limit_ = static_cast<uint16_t>(0x8000 + cartridge_.size() - 1);
if(cartridge_.size() > 32768) { if(cartridge_.size() > 32768) {
// Ensure the cartrige is a multiple of 16kb in size, as that won't
// be checked when paging.
const size_t extension = (16384 - cartridge_.size() & 16383) % 16384;
cartridge_.resize(cartridge_.size() + extension);
cartridge_pages_[0] = &cartridge_[cartridge_.size() - 16384]; cartridge_pages_[0] = &cartridge_[cartridge_.size() - 16384];
cartridge_pages_[1] = cartridge_.data(); cartridge_pages_[1] = cartridge_.data();
is_megacart_ = true; is_megacart_ = true;
} else { } else {
// Ensure at least 32kb is allocated to the cartrige so that
// reads are never out of bounds.
cartridge_.resize(32768); cartridge_.resize(32768);
cartridge_pages_[0] = cartridge_.data(); cartridge_pages_[0] = cartridge_.data();
cartridge_pages_[1] = cartridge_.data() + 16384; cartridge_pages_[1] = cartridge_.data() + 16384;
is_megacart_ = false; is_megacart_ = false;