zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2025-12-21 06:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning up

Browse Source
This commit is contained in:
Zoe Roux
2021-07-04 02:56:44 +02:00
parent eb02c23eb9 a6414f6e1e
commit 9a36eded32
57 changed files with 5597 additions and 5173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
sources/CPU/AddressingModes.cpp
View File

@@ -64,8 +64,8 @@ namespace ComSquare::CPU
uint24_t CPU::_getDirectIndirectIndexedYAddr()
{
uint16_t dp = this->readPC() + this->_registers.d;
uint24_t base = this->_bus->read(dp);
base += this->_bus->read(dp + 1) << 8u;
uint24_t base = this->_bus.read(dp);
base += this->_bus.read(dp + 1) << 8u;
base += this->_registers.dbr << 16u;
if ((base & 0x80000000u) == (((base + this->_registers.y) & 0x80000000u)))
this->_hasIndexCrossedPageBoundary = true;
@@ -75,9 +75,9 @@ namespace ComSquare::CPU
uint24_t CPU::_getDirectIndirectIndexedYLongAddr()
{
uint16_t dp = this->readPC() + this->_registers.d;
uint24_t base = this->_bus->read(dp);
base += this->_bus->read(dp + 1) << 8u;
base += this->_bus->read(dp + 2) << 16u;
uint24_t base = this->_bus.read(dp);
base += this->_bus.read(dp + 1) << 8u;
base += this->_bus.read(dp + 2) << 16u;
return base;
}
@@ -85,8 +85,8 @@ namespace ComSquare::CPU
{
uint16_t dp = this->readPC() + this->_registers.d;
dp += this->_registers.x;
uint24_t base = this->_bus->read(dp);
base += this->_bus->read(dp + 1) << 8u;
uint24_t base = this->_bus.read(dp);
base += this->_bus.read(dp + 1) << 8u;
base += this->_registers.dbr << 16u;
return base;
}
@@ -137,8 +137,8 @@ namespace ComSquare::CPU
{
uint16_t abs = this->readPC();
abs += this->readPC() << 8u;
uint24_t effective = this->_bus->read(abs);
effective += this->_bus->read(abs + 1) << 8u;
uint24_t effective = this->_bus.read(abs);
effective += this->_bus.read(abs + 1) << 8u;
return effective;
}
@@ -146,9 +146,9 @@ namespace ComSquare::CPU
{
uint16_t abs = this->readPC();
abs += this->readPC() << 8u;
uint24_t effective = this->_bus->read(abs);
effective += this->_bus->read(abs + 1) << 8u;
effective += this->_bus->read(abs + 2) << 16u;
uint24_t effective = this->_bus.read(abs);
effective += this->_bus.read(abs + 1) << 8u;
effective += this->_bus.read(abs + 2) << 16u;
return effective;
}
@@ -157,16 +157,16 @@ namespace ComSquare::CPU
uint24_t abs = this->readPC();
abs += this->readPC() << 8u;
abs += this->_registers.x;
uint24_t effective = this->_bus->read(abs);
effective += this->_bus->read(abs + 1) << 8u;
uint24_t effective = this->_bus.read(abs);
effective += this->_bus.read(abs + 1) << 8u;
return effective;
}
uint24_t CPU::_getDirectIndirectAddr()
{
uint16_t dp = this->readPC() + this->_registers.d;
uint24_t effective = this->_bus->read(dp);
effective += this->_bus->read(dp + 1) << 8u;
uint24_t effective = this->_bus.read(dp);
effective += this->_bus.read(dp + 1) << 8u;
effective += this->_registers.dbr << 16u;
return effective;
}
@@ -174,9 +174,9 @@ namespace ComSquare::CPU
uint24_t CPU::_getDirectIndirectLongAddr()
{
uint16_t dp = this->readPC() + this->_registers.d;
uint24_t effective = this->_bus->read(dp);
effective += this->_bus->read(++dp) << 8u;
effective += this->_bus->read(++dp) << 16u;
uint24_t effective = this->_bus.read(dp);
effective += this->_bus.read(++dp) << 8u;
effective += this->_bus.read(++dp) << 16u;
return effective;
}