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

Merge remote-tracking branch 'origin/topic/vern/dump-no-opt-ZAM'

Browse source 
* origin/topic/vern/dump-no-opt-ZAM:
  fixed -O dump-final-ZAM to work in conjunction with -O no-ZAM-opt
This commit is contained in:
Arne Welzel 2024-12-02 10:59:04 +01:00
commit 423c2de4c8
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
7.1.0-dev.645 | 2024-12-02 10:59:04 +0100
* fixed -O dump-final-ZAM to work in conjunction with -O no-ZAM-opt (Vern Paxson, Corelight)
7.1.0-dev.643 | 2024-12-02 09:51:10 +0100 7.1.0-dev.643 | 2024-12-02 09:51:10 +0100
* Remove support for building against Spicy versions before 1.8 (Benjamin Bannier, Corelight) * Remove support for building against Spicy versions before 1.8 (Benjamin Bannier, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.1.0-dev.643 7.1.0-dev.645

17
src/script_opt/ZAM/Driver.cc
View file

@ -404,16 +404,19 @@ void ZAMCompiler::Dump() {
} }
} }
else if ( analysis_options.dump_final_ZAM ) { else if ( analysis_options.dump_final_ZAM ) {
ASSERT(remapped_frame);
printf("\nFrame for %s:\n", func->GetName().c_str()); printf("\nFrame for %s:\n", func->GetName().c_str());
for ( auto i = 0U; i < shared_frame_denizens.size(); ++i ) { if ( remapped_frame ) {
printf("frame[%d] =", i); for ( auto i = 0U; i < shared_frame_denizens.size(); ++i ) {
for ( auto& id : shared_frame_denizens[i].ids ) printf("frame[%d] =", i);
printf(" %s", id->Name()); for ( auto& id : shared_frame_denizens[i].ids )
printf("\n"); printf(" %s", id->Name());
printf("\n");
}
} }
else
for ( const auto& elem : frame_layout1 )
printf("frame[%d] = %s\n", elem.second, elem.first->Name());
} }
if ( ! insts2.empty() ) if ( ! insts2.empty() )