github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2026-01-02 14:44:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

limex: make NFAAccept::squash rel to LimEx base

Browse Source
This commit is contained in:
Justin Viiret
2016-09-05 09:56:58 +10:00
committed by Matthew Barr
parent 77fe1ef6e5
commit 5e3fa7a266
3 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nfa/limex_compile.cpp
View File

@@ -2020,12 +2020,13 @@ struct Factory {
maskSetBits(limex->accept, acceptMask);
maskSetBits(limex->acceptAtEOD, acceptEodMask);
// Transforms the index into the report list into an offset relative to
// the base of the limex.
auto report_offset_fn = [&](NFAAccept a) {
// Transforms the indices (report list, squash mask) into offsets
// relative to the base of the limex.
auto transform_offset_fn = [&](NFAAccept a) {
if (!a.single_report) {
a.reports = reportListOffset + a.reports * sizeof(ReportID);
}
a.squash = squashOffset + a.squash * sizeof(tableRow_t);
return a;
};
@@ -2036,7 +2037,7 @@ struct Factory {
NFAAccept *acceptsTable = (NFAAccept *)(limex_base + acceptsOffset);
assert(ISALIGNED(acceptsTable));
transform(accepts.begin(), accepts.end(), acceptsTable,
report_offset_fn);
transform_offset_fn);
// Write eod accept table.
limex->acceptEodOffset = acceptsEodOffset;
@@ -2045,7 +2046,7 @@ struct Factory {
NFAAccept *acceptsEodTable = (NFAAccept *)(limex_base + acceptsEodOffset);
assert(ISALIGNED(acceptsEodTable));
transform(acceptsEod.begin(), acceptsEod.end(), acceptsEodTable,
report_offset_fn);
transform_offset_fn);
// Write squash mask table.
limex->squashCount = verify_u32(squash.size());