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

fast block search part 5

Browse source 
call protection
This commit is contained in:
tildearrow 2025-04-07 19:05:17 -05:00
parent ecb9782025
commit 914ba11e3b
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/engine/cmdStreamOps.cpp
View file

@ -675,17 +675,19 @@ struct BlockMatch {
#define OVERLAPS(a1,a2,b1,b2) ((b1)<(a2) && (b2)>(a1)) #define OVERLAPS(a1,a2,b1,b2) ((b1)<(a2) && (b2)>(a1))
#define MIN_MATCH_SIZE 16
// TODO: // TODO:
// - check whether a block consists only of calls // - check whether a block consists only of calls
// - see if we can optimize better // - see if we can optimize better
SafeWriter* findSubBlocks(SafeWriter* stream, std::vector<SafeWriter*>& subBlocks, unsigned char* speedDial) { SafeWriter* findSubBlocks(SafeWriter* stream, std::vector<SafeWriter*>& subBlocks, unsigned char* speedDial) {
unsigned char* buf=stream->getFinalBuf(); unsigned char* buf=stream->getFinalBuf();
size_t matchSize=48; size_t matchSize=MIN_MATCH_SIZE;
std::vector<BlockMatch> matches; std::vector<BlockMatch> matches;
// repeat until we run out of matches // repeat until we run out of matches
while (true) { while (true) {
matchSize=48; matchSize=MIN_MATCH_SIZE;
matches.clear(); matches.clear();
// fast match algorithm // fast match algorithm
@ -747,8 +749,6 @@ SafeWriter* findSubBlocks(SafeWriter* stream, std::vector<SafeWriter*>& subBlock
// self-overlapping // self-overlapping
i.done=true; i.done=true;
} else { } else {
nonOverlapCount++;
/*
bool onlyCalls=true; bool onlyCalls=true;
for (size_t j=i.orig; j<i.orig+i.len; j+=8) { for (size_t j=i.orig; j<i.orig+i.len; j+=8) {
if (buf[j]!=0xf4) { if (buf[j]!=0xf4) {
@ -761,7 +761,6 @@ SafeWriter* findSubBlocks(SafeWriter* stream, std::vector<SafeWriter*>& subBlock
} else { } else {
nonOverlapCount++; nonOverlapCount++;
} }
*/
} }
} }
@ -784,7 +783,7 @@ SafeWriter* findSubBlocks(SafeWriter* stream, std::vector<SafeWriter*>& subBlock
if (i.len>matchSize) matchSize=i.len; if (i.len>matchSize) matchSize=i.len;
} }
//while (matchSize>=48) { //while (matchSize>=MIN_MATCH_SIZE) {
workMatches.clear(); workMatches.clear();
// find matches with matching size // find matches with matching size
for (BlockMatch& i: matches) { for (BlockMatch& i: matches) {
@ -911,7 +910,7 @@ SafeWriter* findSubBlocks(SafeWriter* stream, std::vector<SafeWriter*>& subBlock
} }
} }
//if (matchSize>=48) { //if (matchSize>=MIN_MATCH_SIZE) {
//logV("trying next size %d",matchSize); //logV("trying next size %d",matchSize);
//} //}
//} //}