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

Added ignored blocks in the light state

This commit is contained in:
Sergio Martin 2024-01-20 20:16:54 +01:00
parent 10111ac5ec
commit 992ac1ea2c
24 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/tester.cpp
View File

@ -111,9 +111,6 @@ int main(int argc, char *argv[])
// Disable rendering // Disable rendering
e.disableRendering(); e.disableRendering();
// Getting initial hash
auto initialHash = e.getStateHash();
// Getting lite state size // Getting lite state size
const auto liteStateSize = e.getLiteStateSize(); const auto liteStateSize = e.getLiteStateSize();
@ -142,10 +139,9 @@ int main(int argc, char *argv[])
printf("[] Cycle Type: '%s'\n", cycleType.c_str()); printf("[] Cycle Type: '%s'\n", cycleType.c_str());
printf("[] Emulation Core: '%s'\n", emulationCoreName.c_str()); printf("[] Emulation Core: '%s'\n", emulationCoreName.c_str());
printf("[] ROM File: '%s'\n", romFilePath.c_str()); printf("[] ROM File: '%s'\n", romFilePath.c_str());
printf("[] ROM SHA1: '%s'\n", romSHA1.c_str()); //printf("[] ROM SHA1: '%s'\n", romSHA1.c_str());
printf("[] Sequence File: '%s'\n", sequenceFilePath.c_str()); printf("[] Sequence File: '%s'\n", sequenceFilePath.c_str());
printf("[] Sequence Length: %lu\n", sequenceLength); printf("[] Sequence Length: %lu\n", sequenceLength);
printf("[] Initial State Hash: 0x%lX%lX\n", initialHash.first, initialHash.second);
#ifdef _USE_QUICKNES #ifdef _USE_QUICKNES
printf("[] State Size: %lu bytes\n", e.getFullStateSize()); printf("[] State Size: %lu bytes\n", e.getFullStateSize());
#endif #endif

3
tests/README.md
View File

@ -16,4 +16,5 @@ For Saiyuuki World
- We use the movie https://tasvideos.org/4422M by aiqiyou & J.Y distributed under the CC2.0 license - We use the movie https://tasvideos.org/4422M by aiqiyou & J.Y distributed under the CC2.0 license
For Metroid For Metroid
- We use part of the movie https://tasvideos.org/3666M by The8bitbeast distributed under the CC2.0 license - We use part of the movie https://tasvideos.org/3666M by The8bitbeast distributed under the CC2.0 license

2
tests/galaga.anyPercent.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "DA54C223D79FA59EB95437854B677CF69B5CAC8A", "Expected ROM SHA1": "DA54C223D79FA59EB95437854B677CF69B5CAC8A",
"Initial State File": "", "Initial State File": "",
"Sequence File": "galaga.anyPercent.sol", "Sequence File": "galaga.anyPercent.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

2
tests/ironSword.anyPercent.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "97B79E432F62403FB9F877090850C41112A9A168", "Expected ROM SHA1": "97B79E432F62403FB9F877090850C41112A9A168",
"Initial State File": "", "Initial State File": "",
"Sequence File": "ironSword.anyPercent.sol", "Sequence File": "ironSword.anyPercent.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

2
tests/metroid.playaround.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "ECF39EC5A33E6A6F832F03E8FFC61C5D53F4F90B", "Expected ROM SHA1": "ECF39EC5A33E6A6F832F03E8FFC61C5D53F4F90B",
"Initial State File": "", "Initial State File": "",
"Sequence File": "metroid.playaround.sol", "Sequence File": "metroid.playaround.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

2
tests/nigelMansell.anyPercent.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "BBE5CF2DFA0B5422776A530D6F1B617238A8569F", "Expected ROM SHA1": "BBE5CF2DFA0B5422776A530D6F1B617238A8569F",
"Initial State File": "", "Initial State File": "",
"Sequence File": "nigelMansell.anyPercent.sol", "Sequence File": "nigelMansell.anyPercent.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "SPRT", "CTRL" ]
} }

2
tests/ninjaGaiden.anyPercent.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "CA513F841D75EFEB33BB8099FB02BEEB39F6BB9C", "Expected ROM SHA1": "CA513F841D75EFEB33BB8099FB02BEEB39F6BB9C",
"Initial State File": "", "Initial State File": "",
"Sequence File": "ninjaGaiden.anyPercent.sol", "Sequence File": "ninjaGaiden.anyPercent.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

2
tests/ninjaGaiden.pacifist.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "CA513F841D75EFEB33BB8099FB02BEEB39F6BB9C", "Expected ROM SHA1": "CA513F841D75EFEB33BB8099FB02BEEB39F6BB9C",
"Initial State File": "", "Initial State File": "",
"Sequence File": "ninjaGaiden.pacifist.sol", "Sequence File": "ninjaGaiden.pacifist.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

2
tests/ninjaGaiden2.anyPercent.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "B1796660E4A4CEFC72181D4BF4F97999BC048A77", "Expected ROM SHA1": "B1796660E4A4CEFC72181D4BF4F97999BC048A77",
"Initial State File": "", "Initial State File": "",
"Sequence File": "ninjaGaiden2.anyPercent.sol", "Sequence File": "ninjaGaiden2.anyPercent.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

2
tests/ninjaGaiden2.pacifist.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "B1796660E4A4CEFC72181D4BF4F97999BC048A77", "Expected ROM SHA1": "B1796660E4A4CEFC72181D4BF4F97999BC048A77",
"Initial State File": "", "Initial State File": "",
"Sequence File": "ninjaGaiden2.pacifist.sol", "Sequence File": "ninjaGaiden2.pacifist.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

2
tests/novaTheSquirrel.anyPercent.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "B6B07EE76492ED475F39167C89B342353F999231", "Expected ROM SHA1": "B6B07EE76492ED475F39167C89B342353F999231",
"Initial State File": "", "Initial State File": "",
"Sequence File": "novaTheSquirrel.anyPercent.sol", "Sequence File": "novaTheSquirrel.anyPercent.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

2
tests/princeOfPersia.anyPercent.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "6B58F149F34FA829135619C58700CAAA95B9CDE3", "Expected ROM SHA1": "6B58F149F34FA829135619C58700CAAA95B9CDE3",
"Initial State File": "", "Initial State File": "",
"Sequence File": "princeOfPersia.anyPercent.sol", "Sequence File": "princeOfPersia.anyPercent.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

10
tests/run_benchmark.sh
View File

@ -1,27 +1,19 @@
#!/bin/bash #!/bin/bash
# Finding all test scripts # Finding all test scripts
testScriptList=`find . -type f -name *.test` testScriptList=`find . -type f -name "*.test"`
# Iterating over the scripts # Iterating over the scripts
for script in ${testScriptList}; do for script in ${testScriptList}; do
# Getting base folder
folder=`dirname ${script}`
# Getting filename # Getting filename
fileName=`basename ${script}` fileName=`basename ${script}`
# Going to folder
pushd ${folder}
# Running script on quickerNES # Running script on quickerNES
quickerNESTester ${fileName} --cycleType Rerecord quickerNESTester ${fileName} --cycleType Rerecord
# Running script on quickerNES # Running script on quickerNES
quickNESTester ${fileName} --cycleType Rerecord quickNESTester ${fileName} --cycleType Rerecord
# Coming back
popd
done done

2
tests/saintSeiyaKanketsuHen.anyPercent.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "F871D9B3DAFDDCDAD5F2ACD71044292E5169064E", "Expected ROM SHA1": "F871D9B3DAFDDCDAD5F2ACD71044292E5169064E",
"Initial State File": "", "Initial State File": "",
"Sequence File": "saintSeiyaKanketsuHen.anyPercent.sol", "Sequence File": "saintSeiyaKanketsuHen.anyPercent.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "SPRT", "CTRL" ]
} }

2
tests/saintSeiyaOugonDensetsu.anyPercent.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "3F3B499CF50386084E053BCA096AE8E52330CFAE", "Expected ROM SHA1": "3F3B499CF50386084E053BCA096AE8E52330CFAE",
"Initial State File": "", "Initial State File": "",
"Sequence File": "saintSeiyaKanketsuHen.anyPercent.sol", "Sequence File": "saintSeiyaKanketsuHen.anyPercent.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

2
tests/saiyuukiWorld.anyPercent.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "C2F12D915A4D0B1FFDF8A64AE1092CE6A2D08770", "Expected ROM SHA1": "C2F12D915A4D0B1FFDF8A64AE1092CE6A2D08770",
"Initial State File": "", "Initial State File": "",
"Sequence File": "saiyuukiWorld.anyPercent.sol", "Sequence File": "saiyuukiWorld.anyPercent.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

2
tests/saiyuukiWorld.lastHalf.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "C2F12D915A4D0B1FFDF8A64AE1092CE6A2D08770", "Expected ROM SHA1": "C2F12D915A4D0B1FFDF8A64AE1092CE6A2D08770",
"Initial State File": "saiyuukiWorld.lastHalf.state", "Initial State File": "saiyuukiWorld.lastHalf.state",
"Sequence File": "saiyuukiWorld.lastHalf.sol", "Sequence File": "saiyuukiWorld.lastHalf.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

2
tests/solarJetman.anyPercent.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "872B91A2F7A2F635061EF43F79E7F7E9F59F5C50", "Expected ROM SHA1": "872B91A2F7A2F635061EF43F79E7F7E9F59F5C50",
"Initial State File": "", "Initial State File": "",
"Sequence File": "solarJetman.anyPercent.sol", "Sequence File": "solarJetman.anyPercent.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

2
tests/sprilo.anyPercent.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "6EC09B9B51320A536A786D3D4719432B714C5779", "Expected ROM SHA1": "6EC09B9B51320A536A786D3D4719432B714C5779",
"Initial State File": "", "Initial State File": "",
"Sequence File": "sprilo.anyPercent.sol", "Sequence File": "sprilo.anyPercent.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

2
tests/superMarioBros.warpless.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "EA343F4E445A9050D4B4FBAC2C77D0693B1D0922", "Expected ROM SHA1": "EA343F4E445A9050D4B4FBAC2C77D0693B1D0922",
"Initial State File": "", "Initial State File": "",
"Sequence File": "superMarioBros.warpless.sol", "Sequence File": "superMarioBros.warpless.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

2
tests/superMarioBros.warps.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "EA343F4E445A9050D4B4FBAC2C77D0693B1D0922", "Expected ROM SHA1": "EA343F4E445A9050D4B4FBAC2C77D0693B1D0922",
"Initial State File": "", "Initial State File": "",
"Sequence File": "superMarioBros.warps.sol", "Sequence File": "superMarioBros.warps.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

2
tests/superMarioBros3.warps.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "A03E7E526E79DF222E048AE22214BCA2BC49C449", "Expected ROM SHA1": "A03E7E526E79DF222E048AE22214BCA2BC49C449",
"Initial State File": "", "Initial State File": "",
"Sequence File": "superMarioBros3.warps.sol", "Sequence File": "superMarioBros3.warps.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "CHRR", "NTAB", "SPRT", "CTRL" ]
} }

2
tests/superOffroad.anyPercent.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "57919B685B55EE3ED3AD98FB1D25626B98BE7D39", "Expected ROM SHA1": "57919B685B55EE3ED3AD98FB1D25626B98BE7D39",
"Initial State File": "", "Initial State File": "",
"Sequence File": "superOffroad.anyPercent.sol", "Sequence File": "superOffroad.anyPercent.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "SPRT", "CTRL" ]
} }

2
tests/tennis.anyPercent.test
View File

@ -3,5 +3,5 @@
"Expected ROM SHA1": "80D99C035E6A5AB9718E413EC25CBE094F085962", "Expected ROM SHA1": "80D99C035E6A5AB9718E413EC25CBE094F085962",
"Initial State File": "", "Initial State File": "",
"Sequence File": "tennis.anyPercent.sol", "Sequence File": "tennis.anyPercent.sol",
"Disable State Blocks": [ ] "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ]
} }