github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-07-15 15:04:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

rose: move leftfix info into engine blob, refactor

Browse Source
This commit is contained in:
Justin Viiret 2017-02-28 13:55:46 +11:00 committed by Matthew Barr
parent 395d6ae650
commit c619621573
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/rose/rose_build_bytecode.cpp
View File

@ -2718,6 +2718,18 @@ void writeDkeyInfo(const ReportManager &rm, build_context &bc,
proto.dkeyLogSize = fatbit_size(proto.dkeyCount); proto.dkeyLogSize = fatbit_size(proto.dkeyCount);
} }
static
void writeLeftInfo(build_context &bc, RoseEngine &proto,
const vector<LeftNfaInfo> &leftInfoTable) {
proto.leftOffset =
bc.engine_blob.add(begin(leftInfoTable), end(leftInfoTable));
proto.activeLeftIterOffset = writeActiveLeftIter(bc, leftInfoTable);
proto.roseCount = verify_u32(leftInfoTable.size());
proto.activeLeftCount = verify_u32(leftInfoTable.size());
proto.rosePrefixCount = countRosePrefixes(leftInfoTable);
}
static static
bool hasBoundaryReports(const BoundaryReports &boundary) { bool hasBoundaryReports(const BoundaryReports &boundary) {
if (!boundary.report_at_0.empty()) { if (!boundary.report_at_0.empty()) {
@ -5388,12 +5400,12 @@ aligned_unique_ptr<RoseEngine> RoseBuildImpl::buildFinalEngine(u32 minWidth) {
proto.lastByteHistoryIterOffset = buildLastByteIter(g, bc); proto.lastByteHistoryIterOffset = buildLastByteIter(g, bc);
proto.eagerIterOffset = writeEagerQueueIter( proto.eagerIterOffset = writeEagerQueueIter(
eager_queues, proto.leftfixBeginQueue, queue_count, bc); eager_queues, proto.leftfixBeginQueue, queue_count, bc);
proto.activeLeftIterOffset = writeActiveLeftIter(bc, leftInfoTable);
addSomRevNfas(bc, proto, ssm); addSomRevNfas(bc, proto, ssm);
writeLookaroundTables(bc, proto); writeLookaroundTables(bc, proto);
writeDkeyInfo(rm, bc, proto); writeDkeyInfo(rm, bc, proto);
writeLeftInfo(bc, proto, leftInfoTable);
// Enforce role table resource limit. // Enforce role table resource limit.
if (num_vertices(g) > cc.grey.limitRoseRoleCount) { if (num_vertices(g) > cc.grey.limitRoseRoleCount) {
@ -5461,17 +5473,11 @@ aligned_unique_ptr<RoseEngine> RoseBuildImpl::buildFinalEngine(u32 minWidth) {
currOffset += verify_u32(sbsize); currOffset += verify_u32(sbsize);
} }
currOffset = ROUNDUP_N(currOffset, alignof(LeftNfaInfo));
proto.leftOffset = currOffset;
currOffset += sizeof(LeftNfaInfo) * leftInfoTable.size();
currOffset = ROUNDUP_N(currOffset, sizeof(u32)); currOffset = ROUNDUP_N(currOffset, sizeof(u32));
proto.nfaInfoOffset = currOffset; proto.nfaInfoOffset = currOffset;
currOffset += sizeof(NfaInfo) * queue_count; currOffset += sizeof(NfaInfo) * queue_count;
proto.activeArrayCount = proto.leftfixBeginQueue; proto.activeArrayCount = proto.leftfixBeginQueue;
proto.activeLeftCount = verify_u32(leftInfoTable.size());
proto.rosePrefixCount = countRosePrefixes(leftInfoTable);
proto.anchorStateSize = atable ? anchoredStateSize(*atable) : 0; proto.anchorStateSize = atable ? anchoredStateSize(*atable) : 0;
@ -5517,7 +5523,6 @@ aligned_unique_ptr<RoseEngine> RoseBuildImpl::buildFinalEngine(u32 minWidth) {
proto.rolesWithStateCount = bc.numStates; proto.rolesWithStateCount = bc.numStates;
proto.roseCount = verify_u32(leftInfoTable.size());
proto.initMpvNfa = mpv_as_outfix ? 0 : MO_INVALID_IDX; proto.initMpvNfa = mpv_as_outfix ? 0 : MO_INVALID_IDX;
proto.stateSize = mmbit_size(bc.numStates); proto.stateSize = mmbit_size(bc.numStates);
@ -5600,7 +5605,6 @@ aligned_unique_ptr<RoseEngine> RoseBuildImpl::buildFinalEngine(u32 minWidth) {
// Copy in other tables // Copy in other tables
bc.engine_blob.write_bytes(engine.get()); bc.engine_blob.write_bytes(engine.get());
copy_bytes(ptr + engine->leftOffset, leftInfoTable);
// 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.