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

gen-zam: fixes for generating ZAM operations relating to indirect calls

Browse source
This commit is contained in:
Vern Paxson 2023-12-01 17:01:41 -08:00 • committed by Tim Wojtulewicz
parent 6f8c54d69a
commit 4e07a9681d
2 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tools/gen-zam/src/Gen-ZAM.cc
View file

@ -1757,13 +1757,16 @@ void ZAM_InternalOpTemplate::Parse(const string& attr, const string& line, const
{ {
if ( attr != "num-call-args" ) if ( attr != "num-call-args" )
{ {
if ( attr == "indirect-call" ) if ( attr == "indirect-call" || attr == "indirect-local-call" )
{ {
if ( words.size() != 1 ) if ( words.size() != 1 )
g->Gripe("indirect-call takes one argument", line); g->Gripe("indirect-call takes one argument", line);
// Note, currently only works with a *subsequent* // Note, currently only works with a *subsequent*
// num-call-args, whose setting needs to be 'n'. // num-call-args, whose setting needs to be 'n'.
is_indirect_call = true; is_indirect_call = true;
if ( attr == "indirect-local-call" )
is_local_indirect_call = true;
} }
else else
ZAM_OpTemplate::Parse(attr, line, words); ZAM_OpTemplate::Parse(attr, line, words);
@ -1805,10 +1808,23 @@ void ZAM_InternalOpTemplate::Parse(const string& attr, const string& line, const
{ {
func = "func"; func = "func";
eval += "auto sel = z.v" + to_string(arg_slot) + ";\n"; if ( is_local_indirect_call )
eval += "auto func = (sel < 0) ? "; {
eval += "aux->id_val->GetVal()->AsFunc() : "; eval += "auto sel = z.v" +
eval += "frame[sel].AsFunc();\n"; to_string(arg_slot) + ";\n";
eval += "auto func = frame[sel].AsFunc();\n";
}
else
{
eval += "auto func_v = aux->id_val->GetVal();\n";
eval += "auto func = func_v ? func_v->AsFunc() : nullptr;\n";
}
eval += "if ( ! func )\n";
eval += "\t{\n";
eval += "\tZAM_run_time_error(z.loc, \"value used but not set\");\n";
eval += "\tbreak;\n";
eval += "\t}\n";
} }
eval += "auto n = aux->n;\n"; eval += "auto n = aux->n;\n";

3
tools/gen-zam/src/Gen-ZAM.h
View file

@ -847,6 +847,9 @@ private:
// True if the internal operation corresponds to an indirect call, // True if the internal operation corresponds to an indirect call,
// i.e., one through a variable rather than one directly specified. // i.e., one through a variable rather than one directly specified.
bool is_indirect_call = false; bool is_indirect_call = false;
// Refinement of is_indirect_call, when it's also via a local variable.
bool is_local_indirect_call = false;
}; };
// An internal operation that assigns a result to a frame element. // An internal operation that assigns a result to a frame element.