zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2026-05-25 15:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finishing to implements JSR/JLR and push

Browse Source
This commit is contained in:
AnonymusRaccoon
2020-02-14 15:20:19 +01:00
parent 31aa3c843e
commit 55d87bf9ac
5 changed files with 302 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/CPU/CPU.cpp
+20 -7
View File
@@ -281,6 +281,19 @@ namespace ComSquare::CPU
case Instructions::REP: this->REP(this->_getImmediateAddr()); return 3;
case Instructions::PHA: this->PHA(); return 3 + !this->_registers.p.m;
case Instructions::PHB: this->PHB(); return 3;
case Instructions::PHD: this->PHD(); return 4;
case Instructions::PHK: this->PHK(); return 3;
case Instructions::PHP: this->PHP(); return 3;
case Instructions::PHX: this->PHX(); return 3 + !this->_registers.p.x_b;
case Instructions::PHY: this->PHY(); return 3 + !this->_registers.p.x_b;
case Instructions::JSR_ABS: this->JSR(this->_getAbsoluteAddr()); return 6;
case Instructions::JSR_ABSXi: this->JSR(this->_getAbsoluteIndirectIndexedByXAddr()); return 8;
case Instructions::JSL: this->JSR(this->_getAbsoluteLongAddr()); return 8;
default:
throw InvalidOpcode("CPU", opcode);
}
@@ -293,18 +306,18 @@ namespace ComSquare::CPU
void CPU::_push(uint16_t data)
{
this->_bus->write(this->_registers.s--, data >> 8u);
this->_bus->write(this->_registers.s--, data);
this->_bus->write(this->_registers.s--, data << 8u);
}
uint8_t CPU::_pop()
{
return this->_bus->read(this->_registers.s++);
return this->_bus->read(++this->_registers.s);
}
uint16_t CPU::_pop16()
{
return this->_bus->read(this->_registers.s++) + (this->_bus->read(this->_registers.s++) << 8u);
return this->_bus->read(++this->_registers.s) + (this->_bus->read(++this->_registers.s) << 8u);
}
////////////////////////////////////////////////////////////////////
@@ -347,7 +360,7 @@ namespace ComSquare::CPU
uint24_t base = this->_bus->read(dp);
base += this->_bus->read(dp + 1) << 8u;
base += this->_registers.dbr << 16u;
if ((base & 0xF0000000u) == (((base + this->_registers.y) & 0xF0000000u)))
if ((base & 0x80000000u) == (((base + this->_registers.y) & 0x80000000u)))
this->_hasIndexCrossedPageBoundary = true;
return base + this->_registers.y;
}
@@ -390,7 +403,7 @@ namespace ComSquare::CPU
uint16_t abs = this->_bus->read(this->_registers.pac++);
abs += this->_bus->read(this->_registers.pac++) << 8u;
uint24_t effective = abs + (this->_registers.dbr << 16u);
if ((effective & 0xF0000000u) == (((effective + this->_registers.x) & 0xF0000000u)))
if ((effective & 0x80000000u) == (((effective + this->_registers.x) & 0x80000000u)))
this->_hasIndexCrossedPageBoundary = true;
return effective + this->_registers.x;
}
@@ -400,7 +413,7 @@ namespace ComSquare::CPU
uint16_t abs = this->_bus->read(this->_registers.pac++);
abs += this->_bus->read(this->_registers.pac++) << 8u;
uint24_t effective = abs + (this->_registers.dbr << 16u);
if ((effective & 0xF0000000u) == (((effective + this->_registers.y) & 0xF0000000u)))
if ((effective & 0x80000000u) == (((effective + this->_registers.y) & 0x80000000u)))
this->_hasIndexCrossedPageBoundary = true;
return effective + this->_registers.y;
}
@@ -438,7 +451,7 @@ namespace ComSquare::CPU
return effective;
}
uint24_t CPU::_getAbsoluteIndexedIndirectAddr()
uint24_t CPU::_getAbsoluteIndirectIndexedByXAddr()
{
uint24_t abs = this->_bus->read(this->_registers.pac++);
abs += this->_bus->read(this->_registers.pac++) << 8u;