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: delete RoseEngine::literalCount

Browse Source
This commit is contained in:
Justin Viiret 2017-01-31 11:31:17 +11:00 committed by Matthew Barr
parent 9550058e75
commit a5b3bc814f
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/rose/rose_build_bytecode.cpp
View File

@ -4699,11 +4699,9 @@ map<u32, LitFragment> groupByFragment(const RoseBuildImpl &build) {
/**
* \brief Build the interpreter programs for each literal.
*
* Returns the total number of literal fragments.
*/
static
u32 buildLiteralPrograms(RoseBuildImpl &build, build_context &bc) {
void buildLiteralPrograms(RoseBuildImpl &build, build_context &bc) {
// Build a reverse mapping from fragment -> final_id.
map<u32, flat_set<u32>> frag_to_final_map;
for (const auto &m : build.final_to_frag_map) {
@ -4734,8 +4732,6 @@ u32 buildLiteralPrograms(RoseBuildImpl &build, build_context &bc) {
frag.lit_program_offset = litPrograms[frag.fragment_id];
frag.delay_program_offset = delayRebuildPrograms[frag.fragment_id];
}
return num_fragments;
}
static
@ -5464,7 +5460,7 @@ aligned_unique_ptr<RoseEngine> RoseBuildImpl::buildFinalEngine(u32 minWidth) {
queue_count - leftfixBeginQueue, leftInfoTable,
&laggedRoseCount, &historyRequired);
u32 litProgramCount = buildLiteralPrograms(*this, bc);
buildLiteralPrograms(*this, bc);
u32 delayProgramOffset = buildDelayPrograms(*this, bc);
u32 anchoredProgramOffset = buildAnchoredPrograms(*this, bc);
@ -5659,7 +5655,6 @@ aligned_unique_ptr<RoseEngine> RoseBuildImpl::buildFinalEngine(u32 minWidth) {
engine->needsCatchup = bc.needs_catchup ? 1 : 0;
engine->literalCount = litProgramCount;
engine->reportProgramOffset = reportProgramOffset;
engine->reportProgramCount = reportProgramCount;
engine->delayProgramOffset = delayProgramOffset;

2
src/rose/rose_build_dump.cpp
View File

@ -1696,7 +1696,6 @@ void roseDumpText(const RoseEngine *t, FILE *f) {
fprintf(f, "\n");
fprintf(f, "total literal count : %u\n", t->totalNumLiterals);
fprintf(f, " prog table size : %u\n", t->literalCount);
fprintf(f, " delayed literals : %u\n", t->delay_count);
fprintf(f, "\n");
@ -1787,7 +1786,6 @@ void roseDumpStructRaw(const RoseEngine *t, FILE *f) {
DUMP_U32(t, reportProgramCount);
DUMP_U32(t, delayProgramOffset);
DUMP_U32(t, anchoredProgramOffset);
DUMP_U32(t, literalCount);
DUMP_U32(t, activeArrayCount);
DUMP_U32(t, activeLeftCount);
DUMP_U32(t, queueCount);

8
src/rose/rose_internal.h
View File

@ -367,14 +367,6 @@ struct RoseEngine {
*/
u32 anchoredProgramOffset;
/**
* \brief Number of entries in the arrays pointed to by litProgramOffset,
* litDelayRebuildProgramOffset.
*
* Note: NOT the total number of literals.
*/
u32 literalCount;
u32 activeArrayCount; //number of nfas tracked in the active array
u32 activeLeftCount; //number of nfas tracked in the active rose array
u32 queueCount; /**< number of nfa queues */