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

limex: refactor non-accel loops into function

Browse Source
This commit is contained in:
Justin Viiret 2017-04-03 13:05:17 +10:00 committed by Matthew Barr
parent 578277e535
commit 152552423f
1 changed files with 59 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/nfa/limex_runtime_impl.h
View File

@ -60,6 +60,7 @@
#define RUN_ACCEL_FN JOIN(LIMEX_API_ROOT, _Run_Accel) #define RUN_ACCEL_FN JOIN(LIMEX_API_ROOT, _Run_Accel)
#define RUN_EXCEPTIONS_FN JOIN(LIMEX_API_ROOT, _Run_Exceptions) #define RUN_EXCEPTIONS_FN JOIN(LIMEX_API_ROOT, _Run_Exceptions)
#define REV_STREAM_FN JOIN(LIMEX_API_ROOT, _Rev_Stream) #define REV_STREAM_FN JOIN(LIMEX_API_ROOT, _Rev_Stream)
#define LOOP_NOACCEL_FN JOIN(LIMEX_API_ROOT, _Loop_No_Accel)
#define STREAM_FN JOIN(LIMEX_API_ROOT, _Stream) #define STREAM_FN JOIN(LIMEX_API_ROOT, _Stream)
#define STREAMCB_FN JOIN(LIMEX_API_ROOT, _Stream_CB) #define STREAMCB_FN JOIN(LIMEX_API_ROOT, _Stream_CB)
#define STREAMFIRST_FN JOIN(LIMEX_API_ROOT, _Stream_First) #define STREAMFIRST_FN JOIN(LIMEX_API_ROOT, _Stream_First)
@ -191,6 +192,50 @@ size_t RUN_ACCEL_FN(const STATE_T s, UNUSED const STATE_T accelMask,
} while (0) } while (0)
/**
* \brief LimEx NFAS inner loop without accel.
*
* Note that the "all zeroes" early death check is only performed if can_die is
* true.
*
*/
static really_inline
char LOOP_NOACCEL_FN(const IMPL_NFA_T *limex, const u8 *input, size_t *loc,
size_t length, STATE_T *s_ptr, struct CONTEXT_T *ctx,
u64a offset, const char flags, u64a *final_loc,
const char first_match, const char can_die) {
const ENG_STATE_T *reach = get_reach_table(limex);
#if SIZE < 256
const STATE_T exceptionMask = LOAD_FROM_ENG(&limex->exceptionMask);
#endif
const EXCEPTION_T *exceptions = getExceptionTable(EXCEPTION_T, limex);
STATE_T s = *s_ptr;
size_t i = *loc;
for (; i != length; i++) {
DUMP_INPUT(i);
if (can_die && ISZERO_STATE(s)) {
DEBUG_PRINTF("no states are switched on, early exit\n");
break;
}
STATE_T succ;
NFA_EXEC_GET_LIM_SUCC(limex, s, succ);
if (RUN_EXCEPTIONS_FN(limex, exceptions, s, EXCEPTION_MASK, i, offset,
&succ, final_loc, ctx, flags, 0, first_match)) {
return MO_HALT_MATCHING;
}
u8 c = input[i];
s = AND_STATE(succ, LOAD_FROM_ENG(&reach[limex->reachMap[c]]));
}
*loc = i;
*s_ptr = s;
return MO_CONTINUE_MATCHING;
}
static really_inline static really_inline
char STREAM_FN(const IMPL_NFA_T *limex, const u8 *input, size_t length, char STREAM_FN(const IMPL_NFA_T *limex, const u8 *input, size_t length,
struct CONTEXT_T *ctx, u64a offset, const char flags, struct CONTEXT_T *ctx, u64a offset, const char flags,
@ -216,51 +261,26 @@ char STREAM_FN(const IMPL_NFA_T *limex, const u8 *input, size_t length,
size_t min_accel_offset = 0; size_t min_accel_offset = 0;
if (!limex->accelCount || length < ACCEL_MIN_LEN) { if (!limex->accelCount || length < ACCEL_MIN_LEN) {
min_accel_offset = length; min_accel_offset = length;
if (limex->flags & LIMEX_FLAG_CANNOT_DIE) { goto without_accel;
goto cannot_die;
} else {
goto without_accel;
}
} else { } else {
goto with_accel; goto with_accel;
} }
cannot_die:
for (; i != min_accel_offset; i++) {
DUMP_INPUT(i);
STATE_T succ;
NFA_EXEC_GET_LIM_SUCC(limex, s, succ);
if (RUN_EXCEPTIONS_FN(limex, exceptions, s, EXCEPTION_MASK, i, offset,
&succ, final_loc, ctx, flags, 0, first_match)) {
return MO_HALT_MATCHING;
}
u8 c = input[i];
s = AND_STATE(succ, LOAD_FROM_ENG(&reach[limex->reachMap[c]]));
}
goto finished;
without_accel: without_accel:
for (; i != min_accel_offset; i++) { if (limex->flags & LIMEX_FLAG_CANNOT_DIE) {
DUMP_INPUT(i); const char can_die = 0;
if (ISZERO_STATE(s)) { if (LOOP_NOACCEL_FN(limex, input, &i, min_accel_offset, &s, ctx, offset,
DEBUG_PRINTF("no states are switched on, early exit\n"); flags, final_loc, first_match,
ctx->s = s; can_die) == MO_HALT_MATCHING) {
return MO_CONTINUE_MATCHING; return MO_HALT_MATCHING;
} }
} else {
STATE_T succ; const char can_die = 1;
NFA_EXEC_GET_LIM_SUCC(limex, s, succ); if (LOOP_NOACCEL_FN(limex, input, &i, min_accel_offset, &s, ctx, offset,
flags, final_loc, first_match,
if (RUN_EXCEPTIONS_FN(limex, exceptions, s, EXCEPTION_MASK, i, offset, can_die) == MO_HALT_MATCHING) {
&succ, final_loc, ctx, flags, 0, first_match)) {
return MO_HALT_MATCHING; return MO_HALT_MATCHING;
} }
u8 c = input[i];
s = AND_STATE(succ, LOAD_FROM_ENG(&reach[limex->reachMap[c]]));
} }
with_accel: with_accel:
@ -313,7 +333,6 @@ with_accel:
s = AND_STATE(succ, LOAD_FROM_ENG(&reach[limex->reachMap[c]])); s = AND_STATE(succ, LOAD_FROM_ENG(&reach[limex->reachMap[c]]));
} }
finished:
ctx->s = s; ctx->s = s;
if ((first_match || (flags & CALLBACK_OUTPUT)) && limex->acceptCount) { if ((first_match || (flags & CALLBACK_OUTPUT)) && limex->acceptCount) {
@ -1022,6 +1041,7 @@ enum nfa_zombie_status JOIN(LIMEX_API_ROOT, _zombie_status)(
#undef RUN_ACCEL_FN #undef RUN_ACCEL_FN
#undef RUN_EXCEPTIONS_FN #undef RUN_EXCEPTIONS_FN
#undef REV_STREAM_FN #undef REV_STREAM_FN
#undef LOOP_NOACCEL_FN
#undef STREAM_FN #undef STREAM_FN
#undef STREAMCB_FN #undef STREAMCB_FN
#undef STREAMFIRST_FN #undef STREAMFIRST_FN