ShuriZma
/
quickerNES
mirror of https://github.com/SergioMartin86/quickerNES.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed tests passing

This commit is contained in:
Sergio Martin 2024-02-06 19:34:49 +01:00
parent d7451c91b2
commit 9c5b498cc3
26 changed files with 194 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/quickerNES/core/core.hpp
View File

@ -232,6 +232,12 @@ class Core : private Cpu
*outputDataPos += 4; *referenceDataPos += 4;
}
static inline void deserializeBlockHead(size_t* inputDataPos, size_t* referenceDataPos)
{
*inputDataPos += 4; *referenceDataPos += 4;
*inputDataPos += 4; *referenceDataPos += 4;
}
static inline void serializeDifferentialData(
const uint8_t* __restrict__ inputData,
const size_t inputDataSize,
@ -362,8 +368,8 @@ class Core : private Cpu
if (HEADBlockEnabled == true) serializeBlockHead(outputData, &outputDataPos, &referenceDataPos, "TIME", inputDataSize);
if (outputData != nullptr) memcpy(&outputData[outputDataPos], inputData, inputDataSize);
outputDataPos += inputDataSize; referenceDataPos += inputDataSize;
serializeContiguousData(inputData, inputDataSize, outputData, &outputDataPos);
if (useDifferentialCompression == true) referenceDataPos += inputDataSize;
}
// CPUR Block
@ -383,8 +389,8 @@ class Core : private Cpu
if (HEADBlockEnabled == true) serializeBlockHead(outputData, &outputDataPos, &referenceDataPos, "CPUR", inputDataSize);
if (outputData != nullptr) memcpy(&outputData[outputDataPos], inputData, inputDataSize);
outputDataPos += inputDataSize; referenceDataPos += inputDataSize;
serializeContiguousData(inputData, inputDataSize, outputData, &outputDataPos);
if (useDifferentialCompression == true) referenceDataPos += inputDataSize;
}
if (PPURBlockEnabled == true)
@ -394,8 +400,8 @@ class Core : private Cpu
if (HEADBlockEnabled == true) serializeBlockHead(outputData, &outputDataPos, &referenceDataPos, "PPUR", inputDataSize);
if (outputData != nullptr) memcpy(&outputData[outputDataPos], inputData, inputDataSize);
outputDataPos += inputDataSize; referenceDataPos += inputDataSize;
serializeContiguousData(inputData, inputDataSize, outputData, &outputDataPos);
if (useDifferentialCompression == true) referenceDataPos += inputDataSize;
}
// APUR Block
@ -409,8 +415,8 @@ class Core : private Cpu
if (HEADBlockEnabled == true) serializeBlockHead(outputData, &outputDataPos, &referenceDataPos, "APUR", inputDataSize);
if (outputData != nullptr) memcpy(&outputData[outputDataPos], inputData, inputDataSize);
outputDataPos += inputDataSize; referenceDataPos += inputDataSize;
serializeContiguousData(inputData, inputDataSize, outputData, &outputDataPos);
if (useDifferentialCompression == true) referenceDataPos += inputDataSize;
}
// CTRL Block
@ -421,8 +427,8 @@ class Core : private Cpu
if (HEADBlockEnabled == true) serializeBlockHead(outputData, &outputDataPos, &referenceDataPos, "CTRL", inputDataSize);
if (outputData != nullptr) memcpy(&outputData[outputDataPos], inputData, inputDataSize);
outputDataPos += inputDataSize; referenceDataPos += inputDataSize;
serializeContiguousData(inputData, inputDataSize, outputData, &outputDataPos);
if (useDifferentialCompression == true) referenceDataPos += inputDataSize;
}
// MAPR Block
@ -433,8 +439,8 @@ class Core : private Cpu
if (HEADBlockEnabled == true) serializeBlockHead(outputData, &outputDataPos, &referenceDataPos, "MAPR", inputDataSize);
if (outputData != nullptr) memcpy(&outputData[outputDataPos], inputData, inputDataSize);
outputDataPos += inputDataSize; referenceDataPos += inputDataSize;
serializeContiguousData(inputData, inputDataSize, outputData, &outputDataPos);
if (useDifferentialCompression == true) referenceDataPos += inputDataSize;
}
// LRAM Block

8
tests/arkanoid.warpless.test
View File

@ -5,5 +5,11 @@
"Sequence File": "arkanoid.warpless.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "MAPR", "CTRL", "APUR" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/arkanoid.warps.test
View File

@ -5,5 +5,11 @@
"Sequence File": "arkanoid.warps.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "MAPR", "CTRL", "APUR" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/castlevania1.anyPercent.test
View File

@ -5,5 +5,11 @@
"Sequence File": "castlevania1.anyPercent.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/castlevania1.pacifist.test
View File

@ -5,5 +5,11 @@
"Sequence File": "castlevania1.pacifist.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/galaga.anyPercent.test
View File

@ -5,5 +5,11 @@
"Sequence File": "galaga.anyPercent.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/metroid.playaround.test
View File

@ -5,5 +5,11 @@
"Sequence File": "metroid.playaround.sol",
"Disable State Blocks": [ "HEAD", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/nigelMansell.anyPercent.test
View File

@ -5,5 +5,11 @@
"Sequence File": "nigelMansell.anyPercent.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/ninjaGaiden.anyPercent.test
View File

@ -5,5 +5,11 @@
"Sequence File": "ninjaGaiden.anyPercent.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/ninjaGaiden.pacifist.test
View File

@ -5,5 +5,11 @@
"Sequence File": "ninjaGaiden.pacifist.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/ninjaGaiden2.anyPercent.test
View File

@ -5,5 +5,11 @@
"Sequence File": "ninjaGaiden2.anyPercent.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/ninjaGaiden2.pacifist.test
View File

@ -5,5 +5,11 @@
"Sequence File": "ninjaGaiden2.pacifist.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/novaTheSquirrel.anyPercent.test
View File

@ -5,5 +5,11 @@
"Sequence File": "novaTheSquirrel.anyPercent.sol",
"Disable State Blocks": [ "HEAD", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/princeOfPersia.anyPercent.test
View File

@ -5,5 +5,11 @@
"Sequence File": "princeOfPersia.anyPercent.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/rcProAmII.race1.test
View File

@ -5,5 +5,11 @@
"Sequence File": "rcProAmII.race1.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "NTAB", "SPRT", "CTRL", "APUR" ],
"Controller 1 Type": "FourScore1",
"Controller 2 Type": "FourScore2"
"Controller 2 Type": "FourScore2",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/saintSeiyaKanketsuHen.anyPercent.test
View File

@ -5,5 +5,11 @@
"Sequence File": "saintSeiyaKanketsuHen.anyPercent.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/saintSeiyaOugonDensetsu.anyPercent.test
View File

@ -5,5 +5,11 @@
"Sequence File": "saintSeiyaKanketsuHen.anyPercent.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/saiyuukiWorld.anyPercent.test
View File

@ -5,5 +5,11 @@
"Sequence File": "saiyuukiWorld.anyPercent.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

10
tests/saiyuukiWorld.lastHalf.test
View File

@ -3,7 +3,13 @@
"Expected ROM SHA1": "C2F12D915A4D0B1FFDF8A64AE1092CE6A2D08770",
"Initial State File": "saiyuukiWorld.lastHalf.state",
"Sequence File": "saiyuukiWorld.lastHalf.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Disable State Blocks": [ ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/solarJetman.anyPercent.test
View File

@ -7,5 +7,11 @@
"Sequence File": "solarJetman.anyPercent.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/sprilo.anyPercent.test
View File

@ -5,5 +5,11 @@
"Sequence File": "sprilo.anyPercent.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/superMarioBros.warpless.test
View File

@ -5,5 +5,11 @@
"Sequence File": "superMarioBros.warpless.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/superMarioBros.warps.test
View File

@ -5,5 +5,11 @@
"Sequence File": "superMarioBros.warps.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/superMarioBros3.warps.test
View File

@ -5,5 +5,11 @@
"Sequence File": "superMarioBros3.warps.sol",
"Disable State Blocks": [ "HEAD", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/superOffroad.anyPercent.test
View File

@ -5,5 +5,11 @@
"Sequence File": "superOffroad.anyPercent.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}

8
tests/tennis.anyPercent.test
View File

@ -5,5 +5,11 @@
"Sequence File": "tennis.anyPercent.sol",
"Disable State Blocks": [ "HEAD", "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ],
"Controller 1 Type": "Joypad",
"Controller 2 Type": "None"
"Controller 2 Type": "None",
"Differential Compression":
{
"Enabled": false,
"Max Differences": 2200,
"Use Zlib": true
}
}