zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2026-05-12 19:04:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implementing the STX

Browse Source
This commit is contained in:
AnonymusRaccoon
2020-02-13 14:05:47 +01:00
parent 4d30a35620
commit 997bb4fa7c
4 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/CPU/CPU.cpp
View File

@@ -236,6 +236,10 @@ namespace ComSquare::CPU
case Instructions::STA_SR: this->STA(this->_getStackRelativeAddr()); return 4 + !this->_registers.p.m;
case Instructions::STA_SRYi: this->STA(this->_getStackRelativeIndirectIndexedYAddr()); return 7 + !this->_registers.p.m;
case Instructions::STX_ABS: this->STX(this->_getAbsoluteAddr()); return 4 + !this->_registers.p.m;
case Instructions::STX_DP: this->STX(this->_getAbsoluteAddr()); return 3 + !this->_registers.p.m + this->_registers.dl != 0;
case Instructions::STX_DPY: this->STX(this->_getAbsoluteAddr()); return 4 + !this->_registers.p.m + this->_registers.dl != 0;
default:
throw InvalidOpcode("CPU", opcode);
}

8
sources/CPU/CPU.hpp
View File

@@ -218,7 +218,11 @@ namespace ComSquare::CPU
STA_DPYi = 0x91,
STA_DPYil = 0x97,
STA_SR = 0x83,
STA_SRYi = 0x93
STA_SRYi = 0x93,
STX_ABS = 0x8E,
STX_DP = 0x86,
STX_DPY = 0x96
};
//! @brief The main CPU
@@ -305,6 +309,8 @@ namespace ComSquare::CPU
void ADC(uint24_t valueAddr);
//! @brief Store the accumulator to memory.
void STA(uint24_t addr);
//! @brief Store the index register X to memory.
void STX(uint24_t addr);
public:
explicit CPU(std::shared_ptr<Memory::MemoryBus> bus, Cartridge::Header &cartridgeHeader);
//! @brief This function continue to execute the Cartridge code.

10
sources/CPU/Instructions/MemoryInstructions.cpp
View File

@@ -15,4 +15,14 @@ namespace ComSquare::CPU
this->_bus->write(addr + 1, this->_registers.ah);
}
}
void CPU::STX(uint24_t addr)
{
if (this->_registers.p.x_b)
this->_bus->write(addr, this->_registers.xl);
else {
this->_bus->write(addr, this->_registers.xl);
this->_bus->write(addr + 1, this->_registers.xh);
}
}
}

20
tests/CPU/testStore.cpp
View File

@@ -27,4 +27,24 @@ Test(STA, 16bits)
pair.second.cpu->STA(0x0);
auto data = pair.second.wram->_data[0] + (pair.second.wram->_data[1] << 8u);
cr_assert_eq(data, 0x11AB, "The stored value should be 0x11AB but it was 0x%x.", data);
}
Test(STX, 8bits)
{
auto pair = Init();
pair.second.cpu->_registers.p.x_b = true;
pair.second.cpu->_registers.x = 0x11;
pair.second.cpu->STX(0x0);
auto data = pair.second.wram->_data[0];
cr_assert_eq(data, 0x11, "The stored value should be 0x11 but it was 0x%x.", data);
}
Test(STX, 16bits)
{
auto pair = Init();
pair.second.cpu->_registers.p.x_b = false;
pair.second.cpu->_registers.x = 0x11AB;
pair.second.cpu->STX(0x0);
auto data = pair.second.wram->_data[0] + (pair.second.wram->_data[1] << 8u);
cr_assert_eq(data, 0x11AB, "The stored value should be 0x11AB but it was 0x%x.", data);
}