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

Solving tests

Browse Source
This commit is contained in:
Anonymus Raccoon
2020-03-25 18:19:58 +01:00
parent 2dbc661028
commit 4d8854cfd6
4 changed files with 123 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/CPU/CPU.cpp
+3 -1
View File
@@ -411,7 +411,9 @@ namespace ComSquare::CPU
uint16_t CPU::_pop16()
{
return this->_bus->read(++this->_registers.s) + (this->_bus->read(++this->_registers.s) << 8u);
uint16_t value = this->_bus->read(++this->_registers.s);
value +=this->_bus->read(++this->_registers.s) << 8u;
return value;
}
std::string CPU::getName()
sources/Debugger/CPUDebug.cpp
+1 -1
View File
@@ -175,7 +175,7 @@ namespace ComSquare::Debugger
std::string CPUDebug::_getAbsoluteValue(uint24_t pc)
{
std::stringstream ss;
ss << "$" << std::hex << (this->_bus->read(pc) + (this->_bus->read(pc + 1) << 8u), true);
ss << "$" << std::hex << (this->_bus->read(pc) + (this->_bus->read(pc + 1, true) << 8u));
return ss.str();
}
tests/APU/testAPUInstructions.cpp
+80 -40
View File
@@ -647,7 +647,8 @@ Test(ProgramFlow, BPL)
Test(ProgramFlow, BBS)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.pc = 0;
@@ -665,7 +666,8 @@ Test(ProgramFlow, BBS)
Test(ProgramFlow, BBC)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.pc = 0;
@@ -683,7 +685,8 @@ Test(ProgramFlow, BBC)
Test(ProgramFlow, CBNE)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.pc = 0;
@@ -702,7 +705,8 @@ Test(ProgramFlow, CBNE)
Test(ProgramFlow, DBNZ)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.pc = 0;
@@ -719,7 +723,8 @@ Test(ProgramFlow, DBNZ)
Test(ProgramFlow, JMP)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.pc = 0x32;
@@ -743,7 +748,8 @@ Test(ProgramFlow, JMP)
Test(DecimalCompensation, DAA)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.c = true;
@@ -756,7 +762,8 @@ Test(DecimalCompensation, DAA)
Test(DecimalCompensation, DAS)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.c = false;
@@ -775,7 +782,8 @@ Test(DecimalCompensation, DAS)
Test(MultiplicationDivision, MUL)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.a = 10;
@@ -787,7 +795,8 @@ Test(MultiplicationDivision, MUL)
Test(MultiplicationDivision, DIV)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.ya = 235;
@@ -811,7 +820,8 @@ Test(MultiplicationDivision, DIV)
Test(XVIbitArithmetic, INCW)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalWrite(apu->_internalRegisters.pc, 0x55);
@@ -825,7 +835,8 @@ Test(XVIbitArithmetic, INCW)
Test(XVIbitArithmetic, DECW)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalWrite(apu->_internalRegisters.pc, 0x55);
@@ -839,7 +850,8 @@ Test(XVIbitArithmetic, DECW)
Test(XVIbitArithmetic, ADDW)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.ya = 0x4321;
@@ -856,7 +868,8 @@ Test(XVIbitArithmetic, ADDW)
Test(XVIbitArithmetic, SUBW)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.ya = 0x4321;
@@ -873,7 +886,8 @@ Test(XVIbitArithmetic, SUBW)
Test(XVIbitArithmetic, CMPW)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.ya = 0x2211;
@@ -893,7 +907,8 @@ Test(XVIbitArithmetic, CMPW)
Test(XVIbitDataTransmission, MOVW)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.pc = 0;
@@ -919,7 +934,8 @@ Test(XVIbitDataTransmission, MOVW)
Test(VIIIbitShiftRotation, ASL)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.a = 0x66;
@@ -937,7 +953,8 @@ Test(VIIIbitShiftRotation, ASL)
Test(VIIIbitShiftRotation, LSR)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.a = 0x66;
@@ -955,7 +972,8 @@ Test(VIIIbitShiftRotation, LSR)
Test(VIIIbitShiftRotation, ROL)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.a = 0x66;
@@ -973,7 +991,8 @@ Test(VIIIbitShiftRotation, ROL)
Test(VIIIbitShiftRotation, ROR)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.a = 0x66;
@@ -991,7 +1010,8 @@ Test(VIIIbitShiftRotation, ROR)
Test(VIIIShiftRotation, XCN)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.a = 0b10101010;
@@ -1008,7 +1028,8 @@ Test(VIIIShiftRotation, XCN)
Test(VIIIbitIncrementDecrement, INC)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalWrite(apu->_internalRegisters.pc, 0x55);
@@ -1020,7 +1041,8 @@ Test(VIIIbitIncrementDecrement, INC)
Test(VIIIbitIncrementDecrement, INCreg)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.a = 0x76;
@@ -1031,7 +1053,8 @@ Test(VIIIbitIncrementDecrement, INCreg)
Test(VIIIbitIncrementDecrement, DEC)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalWrite(apu->_internalRegisters.pc, 0x55);
@@ -1043,7 +1066,8 @@ Test(VIIIbitIncrementDecrement, DEC)
Test(VIIIbitIncrementDecrement, DECreg)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.a = 0x76;
@@ -1060,7 +1084,8 @@ Test(VIIIbitIncrementDecrement, DECreg)
Test(VIIILogical, ANDacc)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.x = 4;
@@ -1073,7 +1098,8 @@ Test(VIIILogical, ANDacc)
Test(VIIILogical, AND)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.x = 4;
@@ -1087,7 +1113,8 @@ Test(VIIILogical, AND)
Test(VIIILogical, ORacc)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.x = 4;
@@ -1100,7 +1127,8 @@ Test(VIIILogical, ORacc)
Test(VIIILogical, OR)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.x = 4;
@@ -1114,7 +1142,8 @@ Test(VIIILogical, OR)
Test(VIIILogical, EORacc)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.x = 4;
@@ -1127,7 +1156,8 @@ Test(VIIILogical, EORacc)
Test(VIIILogical, EOR)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.x = 4;
@@ -1147,7 +1177,8 @@ Test(VIIILogical, EOR)
Test(VIIIArithmetic, ADC)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.x = 4;
@@ -1165,7 +1196,8 @@ Test(VIIIArithmetic, ADC)
Test(VIIIArithmetic, ADCacc)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.x = 4;
@@ -1182,7 +1214,8 @@ Test(VIIIArithmetic, ADCacc)
Test(VIIIArithmetic, SBC)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.x = 4;
@@ -1200,7 +1233,8 @@ Test(VIIIArithmetic, SBC)
Test(VIIIArithmetic, SBCacc)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.x = 4;
@@ -1217,7 +1251,8 @@ Test(VIIIArithmetic, SBCacc)
Test(VIIIArithmetic, CMP)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.x = 4;
@@ -1231,7 +1266,8 @@ Test(VIIIArithmetic, CMP)
Test(VIIIArithmetic, CMPacc)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.x = 4;
@@ -1250,7 +1286,8 @@ Test(VIIIArithmetic, CMPacc)
Test(VIIIDataTransmission, MovRegToReg)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.a = 23;
@@ -1262,7 +1299,8 @@ Test(VIIIDataTransmission, MovRegToReg)
Test(VIIIDataTransmission, MovMemToMem)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.pc = 0x23;
@@ -1277,7 +1315,8 @@ Test(VIIIDataTransmission, MovMemToMem)
Test(VIIIDataTransmission, MovRegToMem)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.x = 0x23;
@@ -1291,7 +1330,8 @@ Test(VIIIDataTransmission, MovRegToMem)
Test(VIIIDataTransmission, MovMemToReg)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
int result = 0;
apu->_internalRegisters.x = 0x23;
tests/APU/testOperand.cpp
+39 -26
View File
@@ -11,18 +11,20 @@
using namespace ComSquare;
Test(_get, immediate)
Test(apu_get, immediate)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
apu->_internalRegisters.pc = 0x32;
apu->_internalWrite(0x32, 0x40);
cr_assert_eq(apu->_getImmediateData(), 0x40);
}
Test(_get, direct)
Test(apu_get, direct)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
apu->_internalRegisters.pc = 0x32;
apu->_internalRegisters.p = true;
@@ -30,27 +32,30 @@ Test(_get, direct)
cr_assert_eq(apu->_getDirectAddr(), 0x140);
}
Test(_get, X)
Test(apu_get, X)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
apu->_internalRegisters.x = 0x32;
apu->_internalRegisters.p = true;
cr_assert_eq(apu->_getIndexXAddr(), 0x132);
}
Test(_get, Y)
Test(apu_get, Y)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
apu->_internalRegisters.y = 0x32;
apu->_internalRegisters.p = true;
cr_assert_eq(apu->_getIndexYAddr(), 0x132);
}
Test(_get, directbyX)
Test(apu_get, directbyX)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
apu->_internalRegisters.pc = 0x32;
apu->_internalRegisters.x = 0x03;
@@ -58,9 +63,10 @@ Test(_get, directbyX)
cr_assert_eq(apu->_getDirectAddrByX(), 0x43);
}
Test(_get, directbyY)
Test(apu_get, directbyY)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
apu->_internalRegisters.pc = 0x32;
apu->_internalRegisters.y = 0x05;
@@ -68,9 +74,10 @@ Test(_get, directbyY)
cr_assert_eq(apu->_getDirectAddrByY(), 0x45);
}
Test(_get, absolute)
Test(apu_get, absolute)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
apu->_internalRegisters.pc = 0x32;
apu->_internalWrite(0x32, 0b00001111);
@@ -78,9 +85,10 @@ Test(_get, absolute)
cr_assert_eq(apu->_getAbsoluteAddr(), 61455);
}
Test(_get, absolutebyx)
Test(apu_get, absolutebyx)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
apu->_internalRegisters.pc = 0x32;
apu->_internalRegisters.x = 10;
@@ -89,9 +97,10 @@ Test(_get, absolutebyx)
cr_assert_eq(apu->_getAbsoluteByXAddr(), 64025);
}
Test(_get, absoluteaddrbyx)
Test(apu_get, absoluteaddrbyx)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
apu->_internalRegisters.pc = 0x32;
apu->_internalRegisters.x = 10;
@@ -100,9 +109,10 @@ Test(_get, absoluteaddrbyx)
cr_assert_eq(apu->_getAbsoluteAddrByX(), 61465);
}
Test(_get, absoluteaddrbyy)
Test(apu_get, absoluteaddrbyy)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
apu->_internalRegisters.pc = 0x32;
apu->_internalRegisters.y = 10;
@@ -111,9 +121,10 @@ Test(_get, absoluteaddrbyy)
cr_assert_eq(apu->_getAbsoluteAddrByY(), 61465);
}
Test(_get, absolutebit)
Test(apu_get, absolutebit)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
std::pair<uint24_t, uint24_t> result;
apu->_internalRegisters.pc = 0x32;
@@ -124,9 +135,10 @@ Test(_get, absolutebit)
cr_assert_eq(result.second, 7);
}
Test(_get, absolutebyxdirect)
Test(apu_get, absolutebyxdirect)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
apu->_internalRegisters.pc = 0x32;
apu->_internalRegisters.p = true;
@@ -137,9 +149,10 @@ Test(_get, absolutebyxdirect)
cr_assert_eq(apu->_getAbsoluteDirectByXAddr(), 0b0110101100001101);
}
Test(_get, absolutedirectbyy)
Test(apu_get, absolutedirectbyy)
{
auto apu = Init().second.apu;
Init()
auto apu = snes.apu;
apu->_internalRegisters.pc = 0x32;
apu->_internalRegisters.p = true;