github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

rose: update nfa info earlier, in engine blob

Browse Source
This commit is contained in:
Justin Viiret 2017-02-28 17:03:59 +11:00 committed by Matthew Barr
parent a0b0247e47
commit 246f9f4f86
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/rose/rose_build_bytecode.cpp
View File

@ -2150,9 +2150,19 @@ void findTransientQueues(const map<RoseVertex, left_build_info> &leftfix_info,
} }
static static
void updateNfaState(const build_context &bc, RoseStateOffsets *so, void updateNfaState(const build_context &bc, RoseEngine &proto,
NfaInfo *nfa_infos, u32 *fullStateSize, u32 *nfaStateSize, RoseStateOffsets *so, u32 *fullStateSize, u32 *nfaStateSize,
u32 *tStateSize) { u32 *tStateSize) {
if (!proto.nfaInfoOffset) {
assert(bc.engineOffsets.empty());
return;
}
// Our array of NfaInfo structures is in the engine blob.
NfaInfo *nfa_infos = (NfaInfo *)(bc.engine_blob.data() +
proto.nfaInfoOffset -
bc.engine_blob.base_offset);
*nfaStateSize = 0; *nfaStateSize = 0;
*tStateSize = 0; *tStateSize = 0;
*fullStateSize = 0; *fullStateSize = 0;
@ -5496,6 +5506,12 @@ aligned_unique_ptr<RoseEngine> RoseBuildImpl::buildFinalEngine(u32 minWidth) {
laggedRoseCount, longLitStreamStateRequired, laggedRoseCount, longLitStreamStateRequired,
historyRequired, &proto.stateOffsets); historyRequired, &proto.stateOffsets);
// Update state offsets to do with NFAs in proto and in the NfaInfo
// structures.
updateNfaState(bc, proto, &proto.stateOffsets,
&proto.scratchStateSize, &proto.nfaStateSize,
&proto.tStateSize);
scatter_plan_raw state_scatter = buildStateScatterPlan( scatter_plan_raw state_scatter = buildStateScatterPlan(
sizeof(u8), bc.numStates, proto.activeLeftCount, proto.rosePrefixCount, sizeof(u8), bc.numStates, proto.activeLeftCount, proto.rosePrefixCount,
proto.stateOffsets, cc.streaming, proto.activeArrayCount, proto.stateOffsets, cc.streaming, proto.activeArrayCount,
@ -5600,11 +5616,6 @@ aligned_unique_ptr<RoseEngine> RoseBuildImpl::buildFinalEngine(u32 minWidth) {
// Copy in the engine blob. // Copy in the engine blob.
bc.engine_blob.write_bytes(engine.get()); bc.engine_blob.write_bytes(engine.get());
NfaInfo *nfa_infos = (NfaInfo *)(ptr + proto.nfaInfoOffset);
updateNfaState(bc, &engine->stateOffsets, nfa_infos,
&engine->scratchStateSize, &engine->nfaStateSize,
&engine->tStateSize);
// Safety check: we shouldn't have written anything to the engine blob // Safety check: we shouldn't have written anything to the engine blob
// after we copied it into the engine bytecode. // after we copied it into the engine bytecode.
assert(bc.engine_blob.size() == engineBlobSize); assert(bc.engine_blob.size() == engineBlobSize);