otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fast block search part 4 - almost there

Browse source 
now using recursion
This commit is contained in:
tildearrow 2025-04-07 18:56:23 -05:00
parent ef7e6b9ce2
commit ecb9782025
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/engine/cmdStreamOps.cpp
View file

@ -685,6 +685,7 @@ SafeWriter* findSubBlocks(SafeWriter* stream, std::vector<SafeWriter*>& subBlock
// repeat until we run out of matches // repeat until we run out of matches
while (true) { while (true) {
matchSize=48;
matches.clear(); matches.clear();
// fast match algorithm // fast match algorithm
@ -776,7 +777,14 @@ SafeWriter* findSubBlocks(SafeWriter* stream, std::vector<SafeWriter*>& subBlock
std::vector<BlockMatch> workMatches; std::vector<BlockMatch> workMatches;
bool newBlocks=false; bool newBlocks=false;
while (matchSize>=48) { // try with a smaller size
matchSize=0;
for (BlockMatch& i: matches) {
if (i.done) continue;
if (i.len>matchSize) matchSize=i.len;
}
//while (matchSize>=48) {
workMatches.clear(); workMatches.clear();
// find matches with matching size // find matches with matching size
for (BlockMatch& i: matches) { for (BlockMatch& i: matches) {
@ -817,9 +825,9 @@ SafeWriter* findSubBlocks(SafeWriter* stream, std::vector<SafeWriter*>& subBlock
} else { } else {
blockSize=0; blockSize=0;
} }
gains=-6; gains=-4;
} }
gains+=(blockSize-5); gains+=(blockSize-3);
} }
// make sub-blocks // make sub-blocks
@ -903,16 +911,10 @@ SafeWriter* findSubBlocks(SafeWriter* stream, std::vector<SafeWriter*>& subBlock
} }
} }
// try with a smaller size //if (matchSize>=48) {
matchSize=0; //logV("trying next size %d",matchSize);
for (BlockMatch& i: matches) { //}
if (i.done) continue; //}
if (i.len>matchSize) matchSize=i.len;
}
if (matchSize>=48) {
logV("trying next size %d",matchSize);
}
}
logV("done!"); logV("done!");
@ -1374,11 +1376,11 @@ SafeWriter* DivEngine::saveCommand(DivCSProgress* progress, unsigned int disable
if (addr<blockOff.size()) { if (addr<blockOff.size()) {
// turn it into call // turn it into call
addr=blockOff[addr]; addr=blockOff[addr];
buf[j]=0xf5; buf[j]=0xf8;
buf[j+1]=addr&0xff; buf[j+1]=addr&0xff;
buf[j+2]=(addr>>8)&0xff; buf[j+2]=(addr>>8)&0xff;
buf[j+3]=(addr>>16)&0xff; //buf[j+3]=(addr>>16)&0xff;
buf[j+4]=(addr>>24)&0xff; //buf[j+4]=(addr>>24)&0xff;
} else { } else {
logE("requested symbol %d is out of bounds!",addr); logE("requested symbol %d is out of bounds!",addr);
} }