zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2026-06-11 13:29:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reworking the memory management & fixing a bug in the memory viewer goto

Browse Source
This commit is contained in:
Zoe Roux
2021-02-03 23:43:07 +01:00
parent 0b28719f41
commit 874c21b0fd
29 changed files with 295 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Memory/ARectangleMemory.cpp
+19 -28
View File
@@ -9,38 +9,19 @@
namespace ComSquare::Memory
{
uint8_t ARectangleMemory::read(uint24_t addr)
uint24_t ARectangleMemory::getRelativeAddress(uint24_t addr)
{
addr += this->getStart();
uint8_t bank = addr >> 16u;
uint16_t page = addr;
unsigned bankCount = bank - this->_startBank;
unsigned pageCount = this->_endPage - this->_startPage;
if (bank < this->_startBank || bank > this->_endBank)
throw InvalidAddress("Rectangle memory read Invalid Bank", addr);
throw InvalidAddress("Rectangle memory: Invalid Bank", addr);
if (page < this->_startPage || page > this->_endPage)
throw InvalidAddress("Rectangle memory read Invalid Page", addr);
throw InvalidAddress("Rectangle memory: Invalid Page", addr);
page -= this->_startPage;
page += pageCount * bankCount;
return this->read_internal(page);
}
void ARectangleMemory::write(uint24_t addr, uint8_t data)
{
addr += this->getStart();
uint8_t bank = addr >> 16u;
uint16_t page = addr;
unsigned bankCount = bank - this->_startBank;
unsigned pageCount = this->_endPage - this->_startPage;
if (bank < this->_startBank || bank > this->_endBank)
throw InvalidRectangleAddress("Rectangle memory write Invalid Bank", addr, bank, this->_startBank, this->_endBank);
if (page < this->_startPage || page > this->_endPage)
throw InvalidRectangleAddress("Rectangle memory write Invalid Page", addr, page, this->_startPage, this->_endPage);
page -= this->_startPage;
page += pageCount * bankCount;
this->write_internal(page, data);
return pageCount * bankCount + page;
}
bool ARectangleMemory::hasMemoryAt(uint24_t addr)
@@ -54,11 +35,6 @@ namespace ComSquare::Memory
return false;
}
uint24_t ARectangleMemory::getStart()
{
return (this->_startBank << 16u) + this->_startPage;
}
void ARectangleMemory::setMemoryRegion(uint8_t startBank, uint8_t endBank, uint16_t startPage, uint16_t endPage)
{
this->_startBank = startBank;
@@ -66,4 +42,19 @@ namespace ComSquare::Memory
this->_startPage = startPage;
this->_endPage = endPage;
}
bool ARectangleMemory::isMirror()
{
return false;
}
std::shared_ptr<IMemory> ARectangleMemory::getMirrored()
{
return nullptr;
}
std::string ARectangleMemory::getValueName(uint24_t)
{
return "???";
}
}