Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

C++ compilation support for 2-valued vector "for" loops

Browse source
This commit is contained in:
Vern Paxson 2022-09-16 16:45:09 -07:00
parent 7b8d92b4f6
commit a725cfa9e3
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/script_opt/CPP/Compile.h
View file

@ -727,7 +727,7 @@ private:
void GenWhenStmt(const WhenStmt* w); void GenWhenStmt(const WhenStmt* w);
void GenForStmt(const ForStmt* f); void GenForStmt(const ForStmt* f);
void GenForOverTable(const ExprPtr& tbl, const IDPtr& value_var, const IDPList* loop_vars); void GenForOverTable(const ExprPtr& tbl, const IDPtr& value_var, const IDPList* loop_vars);
void GenForOverVector(const ExprPtr& tbl, const IDPList* loop_vars); void GenForOverVector(const ExprPtr& tbl, const IDPtr& value_var, const IDPList* loop_vars);
void GenForOverString(const ExprPtr& str, const IDPList* loop_vars); void GenForOverString(const ExprPtr& str, const IDPList* loop_vars);
// Nested level of loops/switches for which "break"'s should be // Nested level of loops/switches for which "break"'s should be

17
src/script_opt/CPP/Stmts.cc
View file

@ -458,12 +458,13 @@ void CPPCompile::GenForStmt(const ForStmt* f)
auto v = f->StmtExprPtr(); auto v = f->StmtExprPtr();
auto t = v->GetType()->Tag(); auto t = v->GetType()->Tag();
auto loop_vars = f->LoopVars(); auto loop_vars = f->LoopVars();
auto value_var = f->ValueVar();
if ( t == TYPE_TABLE ) if ( t == TYPE_TABLE )
GenForOverTable(v, f->ValueVar(), loop_vars); GenForOverTable(v, value_var, loop_vars);
else if ( t == TYPE_VECTOR ) else if ( t == TYPE_VECTOR )
GenForOverVector(v, loop_vars); GenForOverVector(v, value_var, loop_vars);
else if ( t == TYPE_STRING ) else if ( t == TYPE_STRING )
GenForOverString(v, loop_vars); GenForOverString(v, loop_vars);
@ -515,7 +516,8 @@ void CPPCompile::GenForOverTable(const ExprPtr& tbl, const IDPtr& value_var,
} }
} }
void CPPCompile::GenForOverVector(const ExprPtr& vec, const IDPList* loop_vars) void CPPCompile::GenForOverVector(const ExprPtr& vec, const IDPtr& value_var,
const IDPList* loop_vars)
{ {
Emit("auto vv__CPP = %s;", GenExpr(vec, GEN_DONT_CARE)); Emit("auto vv__CPP = %s;", GenExpr(vec, GEN_DONT_CARE));
@ -523,7 +525,16 @@ void CPPCompile::GenForOverVector(const ExprPtr& vec, const IDPList* loop_vars)
StartBlock(); StartBlock();
Emit("if ( ! vv__CPP->Has(i__CPP) ) continue;"); Emit("if ( ! vv__CPP->Has(i__CPP) ) continue;");
Emit("%s = i__CPP;", IDName((*loop_vars)[0])); Emit("%s = i__CPP;", IDName((*loop_vars)[0]));
if ( value_var )
{
auto vv = IDName(value_var);
auto access = "vv__CPP->ValAt(i__CPP)";
auto native = GenericValPtrToGT(access, value_var->GetType(), GEN_NATIVE);
Emit("%s = %s;", IDName(value_var), native);
}
} }
void CPPCompile::GenForOverString(const ExprPtr& str, const IDPList* loop_vars) void CPPCompile::GenForOverString(const ExprPtr& str, const IDPList* loop_vars)