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

rose: inline block-mode eod check

Browse Source
This commit is contained in:
Justin Viiret
2016-06-14 16:58:13 +10:00
committed by Matthew Barr
parent 159c09b70e
commit a9eba12cce
3 changed files with 49 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/rose/rose.h
View File

@@ -39,8 +39,6 @@
// Initialise state space for engine use.
void roseInitState(const struct RoseEngine *t, char *state);
void roseBlockEodExec(const struct RoseEngine *t, u64a offset,
struct hs_scratch *scratch);
void roseBlockExec_i(const struct RoseEngine *t, struct hs_scratch *scratch);
/* assumes core_info in scratch has been init to point to data */
@@ -57,28 +55,15 @@ void roseBlockExec(const struct RoseEngine *t, struct hs_scratch *scratch) {
// If this block is shorter than our minimum width, then no pattern in this
// RoseEngine could match.
/* minWidth checks should have already been performed by the caller */
const size_t length = scratch->core_info.len;
assert(length >= t->minWidth);
assert(scratch->core_info.len >= t->minWidth);
// Similarly, we may have a maximum width (for engines constructed entirely
// of bi-anchored patterns).
/* This check is now handled by the interpreter */
assert(t->maxBiAnchoredWidth == ROSE_BOUND_INF
|| length <= t->maxBiAnchoredWidth);
|| scratch->core_info.len <= t->maxBiAnchoredWidth);
roseBlockExec_i(t, scratch);
if (!t->requiresEodCheck) {
DEBUG_PRINTF("no eod check required\n");
return;
}
if (can_stop_matching(scratch)) {
DEBUG_PRINTF("bailing, already halted\n");
return;
}
roseBlockEodExec(t, length, scratch);
}
/* assumes core_info in scratch has been init to point to data */