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

extensive rewrite of generation & execution of run-time initialization

Browse source
This commit is contained in:
Vern Paxson 2021-11-07 17:00:19 -08:00
parent bc3bf4ea6c
commit e1a760e674
26 changed files with 3459 additions and 1580 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -232,7 +232,12 @@ string CPPCompile::GenConstExpr(const ConstExpr* c, GenType gt)
const auto& t = c->GetType();
if ( ! IsNativeType(t) )
return NativeToGT(const_vals[c->Value()], t, gt);
{
auto v = c->ValuePtr();
int consts_offset; // ignored
(void)RegisterConstant(v, consts_offset);
return NativeToGT(const_vals[v.get()]->Name(), t, gt);
}
return NativeToGT(GenVal(c->ValuePtr()), t, gt);
}
@ -1177,8 +1182,10 @@ string CPPCompile::GenField(const ExprPtr& rec, int field)
// New mapping.
mapping_slot = num_rf_mappings++;
ASSERT(processed_types.count(rt) > 0);
auto rt_offset = processed_types[rt]->Offset();
string field_name = rt->FieldName(field);
field_decls.emplace_back(pair(rt, rt->FieldDecl(field)));
field_decls.emplace_back(pair(rt_offset, rt->FieldDecl(field)));
if ( record_field_mappings.count(rt) > 0 )
// We're already tracking this record.
@ -1217,7 +1224,7 @@ string CPPCompile::GenEnum(const TypePtr& t, const ValPtr& ev)
mapping_slot = num_ev_mappings++;
string enum_name = et->Lookup(v);
enum_names.emplace_back(pair(et, move(enum_name)));
enum_names.emplace_back(pair(TypeOffset(t), move(enum_name)));
if ( enum_val_mappings.count(et) > 0 )
{