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

rose_build_add: remove unused max_adj param

Browse Source 
In prepAcceptForAddAnchoredNFA(), we used to support different values
for max_adj. Since it's now always zero, remove it.
This commit is contained in:
Justin Viiret 2018-01-17 10:59:58 +11:00 committed by Chang, Harry
parent 08bf909e2b
commit ea9d1f69fb
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rose/rose_build_add.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2017, Intel Corporation * Copyright (c) 2015-2018, Intel Corporation
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -1849,10 +1849,9 @@ bool RoseBuildImpl::addChainTail(const raw_puff &rp, u32 *queue_out,
return true; /* failure is not yet an option */ return true; /* failure is not yet an option */
} }
static static
bool prepAcceptForAddAnchoredNFA(RoseBuildImpl &tbi, const NGHolder &w, bool prepAcceptForAddAnchoredNFA(RoseBuildImpl &tbi, const NGHolder &w,
u32 max_adj, NFAVertex u, NFAVertex u,
const vector<DepthMinMax> &vertexDepths, const vector<DepthMinMax> &vertexDepths,
map<u32, DepthMinMax> &depthMap, map<u32, DepthMinMax> &depthMap,
map<NFAVertex, set<u32>> &reportMap, map<NFAVertex, set<u32>> &reportMap,
@ -1883,9 +1882,9 @@ bool prepAcceptForAddAnchoredNFA(RoseBuildImpl &tbi, const NGHolder &w,
depthMap[lit_id] = unionDepthMinMax(depthMap[lit_id], d); depthMap[lit_id] = unionDepthMinMax(depthMap[lit_id], d);
} }
if (depthMap[lit_id].max + depth(max_adj) > max_anchored_depth) { if (depthMap[lit_id].max > max_anchored_depth) {
DEBUG_PRINTF("depth=%s exceeds maxAnchoredRegion=%u\n", DEBUG_PRINTF("depth=%s exceeds maxAnchoredRegion=%u\n",
(depthMap[lit_id].max + depth(max_adj)).str().c_str(), depthMap[lit_id].max.str().c_str(),
tbi.cc.grey.maxAnchoredRegion); tbi.cc.grey.maxAnchoredRegion);
return false; return false;
} }
@ -1932,7 +1931,7 @@ bool RoseBuildImpl::addAnchoredAcyclic(const NGHolder &h) {
flat_set<u32> added_lit_ids; /* literal ids added for this NFA */ flat_set<u32> added_lit_ids; /* literal ids added for this NFA */
for (auto v : inv_adjacent_vertices_range(h.accept, h)) { for (auto v : inv_adjacent_vertices_range(h.accept, h)) {
if (!prepAcceptForAddAnchoredNFA(*this, h, 0, v, vertexDepths, depthMap, if (!prepAcceptForAddAnchoredNFA(*this, h, v, vertexDepths, depthMap,
reportMap, allocated_reports, reportMap, allocated_reports,
added_lit_ids)) { added_lit_ids)) {
removeAddedLiterals(*this, added_lit_ids); removeAddedLiterals(*this, added_lit_ids);
@ -1946,7 +1945,7 @@ bool RoseBuildImpl::addAnchoredAcyclic(const NGHolder &h) {
if (v == h.accept) { if (v == h.accept) {
continue; continue;
} }
if (!prepAcceptForAddAnchoredNFA(*this, h, 0, v, vertexDepths, depthMap, if (!prepAcceptForAddAnchoredNFA(*this, h, v, vertexDepths, depthMap,
reportMap, allocated_reports_eod, reportMap, allocated_reports_eod,
added_lit_ids)) { added_lit_ids)) {
removeAddedLiterals(*this, added_lit_ids); removeAddedLiterals(*this, added_lit_ids);