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

-O gen-C++ refinements for BiF failures, negative vector indices, boolean vector operations

Browse source
This commit is contained in:
Vern Paxson 2023-06-15 11:08:14 -07:00
parent f64304067b
commit 18be4ba91b
9 changed files with 94 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/script_opt/CPP/Exprs.cc
View file

@ -114,7 +114,7 @@ string CPPCompile::GenExpr(const Expr* e, GenType gt, bool top_level)
case EXPR_COND:
return GenCondExpr(e, gt);
case EXPR_CALL:
return GenCallExpr(e->AsCallExpr(), gt);
return GenCallExpr(e->AsCallExpr(), gt, top_level);
case EXPR_LIST:
return GenListExpr(e, gt, false);
case EXPR_IN:
@ -291,7 +291,7 @@ string CPPCompile::GenCondExpr(const Expr* e, GenType gt)
return string("(") + gen1 + ") ? (" + gen2 + ") : (" + gen3 + ")";
}
string CPPCompile::GenCallExpr(const CallExpr* c, GenType gt)
string CPPCompile::GenCallExpr(const CallExpr* c, GenType gt, bool top_level)
{
const auto& t = c->GetType();
auto f = c->Func();
@ -347,7 +347,18 @@ string CPPCompile::GenCallExpr(const CallExpr* c, GenType gt)
// Indirect call.
gen = string("(") + gen + ")->AsFunc()";
string invoke_func = is_async ? "when_invoke__CPP" : "invoke__CPP";
string invoke_func;
if ( is_async )
invoke_func = "when_invoke__CPP";
else if ( t->Tag() == TYPE_VOID )
{
ASSERT(top_level);
invoke_func = "invoke_void__CPP";
}
else
invoke_func = "invoke__CPP";
auto args_list = string(", {") + GenExpr(args_l, GEN_VAL_PTR) + "}";
auto invoker = invoke_func + "(" + gen + args_list + ", f__CPP";
@ -356,6 +367,10 @@ string CPPCompile::GenCallExpr(const CallExpr* c, GenType gt)
invoker += ")";
if ( top_level )
// No need to use accessor.
return invoker;
if ( IsNativeType(t) && gt != GEN_VAL_PTR )
return invoker + NativeAccessor(t);