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

removal of unused functionality and some follow-on simplifications

Browse source
This commit is contained in:
Vern Paxson 2023-06-16 16:16:13 -07:00 • committed by Arne Welzel
parent ecc93606c4
commit b6b4a81e0d
9 changed files with 17 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/script_opt/ZAM/ZBody.cc
View file

@ -193,10 +193,10 @@ ZBody::~ZBody()
void ZBody::SetInsts(vector<ZInst*>& _insts)
{
ninst = _insts.size();
auto insts_copy = new ZInst[ninst];
end_pc = _insts.size();
auto insts_copy = new ZInst[end_pc];
for ( auto i = 0U; i < ninst; ++i )
for ( auto i = 0U; i < end_pc; ++i )
insts_copy[i] = *_insts[i];
insts = insts_copy;
@ -206,10 +206,10 @@ void ZBody::SetInsts(vector<ZInst*>& _insts)
void ZBody::SetInsts(vector<ZInstI*>& instsI)
{
ninst = instsI.size();
auto insts_copy = new ZInst[ninst];
end_pc = instsI.size();
auto insts_copy = new ZInst[end_pc];
for ( auto i = 0U; i < ninst; ++i )
for ( auto i = 0U; i < end_pc; ++i )
{
auto& iI = *instsI[i];
insts_copy[i] = iI;
@ -228,7 +228,7 @@ void ZBody::InitProfile()
{
inst_count = new vector<int>;
inst_CPU = new vector<double>;
for ( auto i = 0U; i < ninst; ++i )
for ( auto i = 0U; i < end_pc; ++i )
{
inst_count->push_back(0);
inst_CPU->push_back(0.0);
@ -245,7 +245,7 @@ ValPtr ZBody::Exec(Frame* f, StmtFlowType& flow)
double t = analysis_options.profile_ZAM ? util::curr_CPU_time() : 0.0;
#endif
auto val = DoExec(f, 0, flow);
auto val = DoExec(f, flow);
#ifdef DEBUG
if ( analysis_options.profile_ZAM )
@ -255,10 +255,9 @@ ValPtr ZBody::Exec(Frame* f, StmtFlowType& flow)
return val;
}
ValPtr ZBody::DoExec(Frame* f, int start_pc, StmtFlowType& flow)
ValPtr ZBody::DoExec(Frame* f, StmtFlowType& flow)
{
int pc = start_pc;
const int end_pc = ninst;
int pc = 0;
// Return value, or nil if none.
const ZVal* ret_u = nullptr;
@ -293,6 +292,9 @@ ValPtr ZBody::DoExec(Frame* f, int start_pc, StmtFlowType& flow)
flow = FLOW_RETURN; // can be over-written by a Hook-Break
// Clear any leftover error state.
ZAM_error = false;
while ( pc < end_pc && ! ZAM_error )
{
auto& z = insts[pc];
@ -369,9 +371,6 @@ ValPtr ZBody::DoExec(Frame* f, int start_pc, StmtFlowType& flow)
delete[] frame;
}
// Clear any error state.
ZAM_error = false;
return result;
}
@ -449,7 +448,7 @@ void ZBody::Dump() const
printf("Final code:\n");
for ( unsigned i = 0; i < ninst; ++i )
for ( unsigned i = 0; i < end_pc; ++i )
{
auto& inst = insts[i];
printf("%d: ", i);
@ -472,25 +471,6 @@ TraversalCode ZBody::Traverse(TraversalCallback* cb) const
HANDLE_TC_STMT_POST(tc);
}
ValPtr ZAMResumption::Exec(Frame* f, StmtFlowType& flow)
{
return am->DoExec(f, xfer_pc, flow);
}
void ZAMResumption::StmtDescribe(ODesc* d) const
{
d->Add("<resumption of compiled code>");
}
TraversalCode ZAMResumption::Traverse(TraversalCallback* cb) const
{
TraversalCode tc = cb->PreStmt(this);
HANDLE_TC_STMT_PRE(tc);
tc = cb->PostStmt(this);
HANDLE_TC_STMT_POST(tc);
}
// Unary vector operation of v1 <vec-op> v2.
static void vec_exec(ZOp op, TypePtr t, VectorVal*& v1, const VectorVal* v2, const ZInst& z)
{