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

Remove OutfixInfo::chained (which meant "is MPV")

Browse Source
This commit is contained in:
Justin Viiret 2016-04-18 13:12:15 +10:00 committed by Matthew Barr
parent 16985ab6e5
commit 319d47ae4f
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rose/rose_build_add.cpp
View File

@ -1777,7 +1777,6 @@ bool RoseBuildImpl::addOutfix(const NGHolder &h, const raw_som_dfa &haig) {
bool RoseBuildImpl::addOutfix(const raw_puff &rp) { bool RoseBuildImpl::addOutfix(const raw_puff &rp) {
if (!mpv_outfix) { if (!mpv_outfix) {
mpv_outfix = make_unique<OutfixInfo>(MpvProto()); mpv_outfix = make_unique<OutfixInfo>(MpvProto());
mpv_outfix->chained = true;
} }
auto *mpv = mpv_outfix->mpv(); auto *mpv = mpv_outfix->mpv();
@ -1803,7 +1802,6 @@ bool RoseBuildImpl::addChainTail(const raw_puff &rp, u32 *queue_out,
u32 *event_out) { u32 *event_out) {
if (!mpv_outfix) { if (!mpv_outfix) {
mpv_outfix = make_unique<OutfixInfo>(MpvProto()); mpv_outfix = make_unique<OutfixInfo>(MpvProto());
mpv_outfix->chained = true;
} }
auto *mpv = mpv_outfix->mpv(); auto *mpv = mpv_outfix->mpv();

5
src/rose/rose_build_bytecode.cpp
View File

@ -1340,7 +1340,7 @@ void prepMpv(RoseBuildImpl &tbi, build_context &bc, size_t *historyRequired,
assert(!mpv_outfix); assert(!mpv_outfix);
mpv_outfix = &out; mpv_outfix = &out;
} else { } else {
assert(!out.chained); assert(!out.mpv());
} }
} }
@ -1348,7 +1348,6 @@ void prepMpv(RoseBuildImpl &tbi, build_context &bc, size_t *historyRequired,
return; return;
} }
assert(mpv_outfix->chained);
auto *mpv = mpv_outfix->mpv(); auto *mpv = mpv_outfix->mpv();
auto nfa = mpvCompile(mpv->puffettes, mpv->triggered_puffettes); auto nfa = mpvCompile(mpv->puffettes, mpv->triggered_puffettes);
assert(nfa); assert(nfa);
@ -1408,7 +1407,7 @@ bool prepOutfixes(RoseBuildImpl &tbi, build_context &bc,
assert(tbi.qif.allocated_count() == bc.engineOffsets.size()); assert(tbi.qif.allocated_count() == bc.engineOffsets.size());
for (auto &out : tbi.outfixes) { for (auto &out : tbi.outfixes) {
if (out.chained) { if (out.mpv()) {
continue; /* already done */ continue; /* already done */
} }
DEBUG_PRINTF("building outfix %zd\n", &out - &tbi.outfixes[0]); DEBUG_PRINTF("building outfix %zd\n", &out - &tbi.outfixes[0]);

1
src/rose/rose_build_impl.h
View File

@ -385,7 +385,6 @@ struct OutfixInfo {
depth minWidth = depth::infinity(); depth minWidth = depth::infinity();
depth maxWidth = 0; depth maxWidth = 0;
u64a maxOffset = 0; u64a maxOffset = 0;
bool chained = false;
bool in_sbmatcher = false; //!< handled by small-block matcher. bool in_sbmatcher = false; //!< handled by small-block matcher.
private: private:

5
src/rose/rose_build_merge.cpp
View File

@ -2417,9 +2417,6 @@ void mergeOutfixInfo(OutfixInfo &winner, const OutfixInfo &victim) {
// layer at runtime will protect us from extra matches if only one was in // layer at runtime will protect us from extra matches if only one was in
// the small block matcher. // the small block matcher.
winner.in_sbmatcher &= victim.in_sbmatcher; winner.in_sbmatcher &= victim.in_sbmatcher;
// We should never have merged outfixes that differ in these properties.
assert(winner.chained == victim.chained);
} }
static static
@ -2651,7 +2648,6 @@ void mergeOutfixCombo(RoseBuildImpl &tbi, const ReportManager &rm,
for (auto it = tbi.outfixes.begin(); it != tbi.outfixes.end(); ++it) { for (auto it = tbi.outfixes.begin(); it != tbi.outfixes.end(); ++it) {
auto &outfix = *it; auto &outfix = *it;
assert(!outfix.is_dead()); assert(!outfix.is_dead());
assert(!outfix.chained);
if (outfix.rdfa()) { if (outfix.rdfa()) {
auto *rdfa = outfix.rdfa(); auto *rdfa = outfix.rdfa();
@ -2727,7 +2723,6 @@ void mergeOutfixes(RoseBuildImpl &tbi) {
vector<raw_som_dfa *> som_dfas; vector<raw_som_dfa *> som_dfas;
for (auto &outfix : tbi.outfixes) { for (auto &outfix : tbi.outfixes) {
assert(!outfix.chained);
if (outfix.rdfa()) { if (outfix.rdfa()) {
dfas.push_back(outfix.rdfa()); dfas.push_back(outfix.rdfa());
} else if (outfix.holder()) { } else if (outfix.holder()) {