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

Rose: make HWLM callbacks take scratch as ctx

Browse Source
This commit is contained in:
Justin Viiret 2016-03-03 14:14:30 +11:00 committed by Matthew Barr
parent f7a40b200d
commit 6af1ead0aa
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rose/block.c
View File

@ -61,11 +61,11 @@ void runAnchoredTableBlock(const struct RoseEngine *t, const void *atable,
if (nfa->type == MCCLELLAN_NFA_8) { if (nfa->type == MCCLELLAN_NFA_8) {
nfaExecMcClellan8_B(nfa, curr->anchoredMinDistance, nfaExecMcClellan8_B(nfa, curr->anchoredMinDistance,
local_buffer, local_alen, local_buffer, local_alen,
roseAnchoredCallback, &scratch->tctxt); roseAnchoredCallback, scratch);
} else { } else {
nfaExecMcClellan16_B(nfa, curr->anchoredMinDistance, nfaExecMcClellan16_B(nfa, curr->anchoredMinDistance,
local_buffer, local_alen, local_buffer, local_alen,
roseAnchoredCallback, &scratch->tctxt); roseAnchoredCallback, scratch);
} }
} }
@ -193,7 +193,7 @@ void roseBlockExec_i(const struct RoseEngine *t, struct hs_scratch *scratch,
DEBUG_PRINTF("BEGIN SMALL BLOCK (over %zu/%zu)\n", sblen, length); DEBUG_PRINTF("BEGIN SMALL BLOCK (over %zu/%zu)\n", sblen, length);
DEBUG_PRINTF("-- %016llx\n", tctxt->groups); DEBUG_PRINTF("-- %016llx\n", tctxt->groups);
hwlmExec(sbtable, scratch->core_info.buf, sblen, 0, roseCallback, hwlmExec(sbtable, scratch->core_info.buf, sblen, 0, roseCallback,
tctxt, tctxt->groups); scratch, tctxt->groups);
goto exit; goto exit;
} }
@ -249,7 +249,7 @@ void roseBlockExec_i(const struct RoseEngine *t, struct hs_scratch *scratch,
DEBUG_PRINTF("BEGIN FLOATING (over %zu/%zu)\n", flen, length); DEBUG_PRINTF("BEGIN FLOATING (over %zu/%zu)\n", flen, length);
DEBUG_PRINTF("-- %016llx\n", tctxt->groups); DEBUG_PRINTF("-- %016llx\n", tctxt->groups);
hwlmExec(ftable, buffer, flen, t->floatingMinDistance, hwlmExec(ftable, buffer, flen, t->floatingMinDistance,
roseCallback, tctxt, tctxt->groups); roseCallback, scratch, tctxt->groups);
} }
exit:; exit:;

3
src/rose/eod.c
View File

@ -93,7 +93,8 @@ hwlmcb_rv_t roseEodRunMatcher(const struct RoseEngine *t, u64a offset,
struct RoseContext *tctxt = &scratch->tctxt; struct RoseContext *tctxt = &scratch->tctxt;
const struct HWLM *etable = getELiteralMatcher(t); const struct HWLM *etable = getELiteralMatcher(t);
hwlmExec(etable, eod_data, eod_len, adj, roseCallback, tctxt, tctxt->groups); hwlmExec(etable, eod_data, eod_len, adj, roseCallback, scratch,
tctxt->groups);
// We may need to fire delayed matches // We may need to fire delayed matches
return cleanUpDelayed(t, scratch, 0, offset); return cleanUpDelayed(t, scratch, 0, offset);

8
src/rose/match.c
View File

@ -223,8 +223,8 @@ event_enqueued:
} }
int roseAnchoredCallback(u64a end, u32 id, void *ctx) { int roseAnchoredCallback(u64a end, u32 id, void *ctx) {
struct RoseContext *tctxt = ctx; struct hs_scratch *scratch = ctx;
struct hs_scratch *scratch = tctxtToScratch(tctxt); struct RoseContext *tctxt = &scratch->tctxt;
struct core_info *ci = &scratch->core_info; struct core_info *ci = &scratch->core_info;
const struct RoseEngine *t = ci->rose; const struct RoseEngine *t = ci->rose;
@ -507,8 +507,8 @@ anchored_leftovers:;
} }
hwlmcb_rv_t roseCallback(size_t start, size_t end, u32 id, void *ctxt) { hwlmcb_rv_t roseCallback(size_t start, size_t end, u32 id, void *ctxt) {
struct RoseContext *tctx = ctxt; struct hs_scratch *scratch = ctxt;
struct hs_scratch *scratch = tctxtToScratch(tctx); struct RoseContext *tctx = &scratch->tctxt;
const struct RoseEngine *t = scratch->core_info.rose; const struct RoseEngine *t = scratch->core_info.rose;
u64a real_end = end + tctx->lit_offset_adjust; u64a real_end = end + tctx->lit_offset_adjust;

8
src/rose/stream.c
View File

@ -83,11 +83,11 @@ void runAnchoredTableStream(const struct RoseEngine *t, const void *atable,
if (nfa->type == MCCLELLAN_NFA_8) { if (nfa->type == MCCLELLAN_NFA_8) {
nfaExecMcClellan8_SimpStream(nfa, state, scratch->core_info.buf, nfaExecMcClellan8_SimpStream(nfa, state, scratch->core_info.buf,
start, adj, alen, roseAnchoredCallback, start, adj, alen, roseAnchoredCallback,
&scratch->tctxt); scratch);
} else { } else {
nfaExecMcClellan16_SimpStream(nfa, state, scratch->core_info.buf, nfaExecMcClellan16_SimpStream(nfa, state, scratch->core_info.buf,
start, adj, alen, roseAnchoredCallback, start, adj, alen,
&scratch->tctxt); roseAnchoredCallback, scratch);
} }
next_nfa: next_nfa:
@ -542,7 +542,7 @@ void roseStreamExec(const struct RoseEngine *t, struct hs_scratch *scratch,
} }
DEBUG_PRINTF("BEGIN FLOATING (over %zu/%zu)\n", flen, length); DEBUG_PRINTF("BEGIN FLOATING (over %zu/%zu)\n", flen, length);
hwlmExecStreaming(ftable, scratch, flen, start, roseCallback, tctxt, hwlmExecStreaming(ftable, scratch, flen, start, roseCallback, scratch,
tctxt->groups, stream_state); tctxt->groups, stream_state);
} }