Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Normalize what graph is GED computed on #9

Merged
merged 3 commits into from
Feb 7, 2024
Merged

Normalize what graph is GED computed on #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00bd6a1
Normalize what graph is GEDed on
mahaloz Feb 7, 2024
0faf82e
bump project reqs
mahaloz Feb 7, 2024
4392669
Correct decompiling script
mahaloz Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions sailreval/decompilers/angr_dec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ def angr_decompile(
#

import angr
from angr.analyses.decompiler.optimization_passes import EagerReturnsSimplifier, LoweredSwitchSimplifier, \
ReturnDeduplicator
# TODO: update then when everything is in master of angr
from angr.analyses.decompiler.optimization_passes import LoweredSwitchSimplifier, ReturnDeduplicator
from cle.backends.coff import Coff
try:
from angr.analyses.decompiler.optimization_passes import (
DuplicationOptReverter, ConstPropOptReverter, CrossJumpReverter, FlipBooleanCmp, ITERegionConverter,
ReturnDeduplicator
ReturnDeduplicator, EagerReturnsSimplifier
)
except ImportError:
DuplicationOptReverter = 1
Expand All @@ -92,6 +92,7 @@ def angr_decompile(
FlipBooleanCmp = 4
ITERegionConverter = 5
ReturnDeduplicator = 6
EagerReturnsSimplifier = 7

#
# real code
Expand Down
6 changes: 3 additions & 3 deletions sailreval/metrics/ged_to_source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def ged_exact_score(
if source_cfg is None or dec_cfg is None:
return None

return ged_exact(source_cfg, dec_cfg)
return ged_exact(dec_cfg, source_cfg)


def ged_upperbound_score(
Expand All @@ -44,7 +44,7 @@ def ged_upperbound_score(
if source_cfg is None or dec_cfg is None:
return None

return ged_upperbound(source_cfg, dec_cfg)
return ged_upperbound(dec_cfg, source_cfg)


def ged_max_score(
Expand All @@ -59,7 +59,7 @@ def ged_max_score(
if source_cfg is None or dec_cfg is None:
return None

return ged_max(source_cfg, dec_cfg)
return ged_max(dec_cfg, source_cfg)


#
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ install_requires =
scipy
seaborn
pyelftools
cfgutils>=1.5.0
pyjoern==1.2.18.3
cfgutils>=1.7.0
pyjoern==1.2.18.6

python_requires = >= 3.6
packages = find:
Expand Down