|
18 | 18 |
|
19 | 19 |
|
20 | 20 | def is_sane_function(ff): |
21 | | - return not ff.is_syscall and not ff.has_unresolved_calls and not ff.has_unresolved_jumps and not ff.alignment |
| 21 | + return not ff.is_syscall and not ff.has_unresolved_calls and not ff.has_unresolved_jumps and not ff.is_alignment |
22 | 22 |
|
23 | 23 |
|
24 | 24 | def map_callsites(cfg): |
@@ -115,7 +115,7 @@ def test_CADET_00003(): |
115 | 115 | 0x804869a, |
116 | 116 | } |
117 | 117 |
|
118 | | - non_syscall_functions = [v for k,v in cfg.functions.items() if not v.is_syscall and not v.alignment] |
| 118 | + non_syscall_functions = [v for k,v in cfg.functions.items() if not v.is_syscall and not v.is_alignment] |
119 | 119 | #check startpoints, I know that sometimes they could be None, but this should not happen in CADET_00003 |
120 | 120 | function_entrypoints = set([f.startpoint.addr for f in non_syscall_functions]) |
121 | 121 | print("additional:", list(map(hex, function_entrypoints-legitimate_functions))) |
@@ -201,7 +201,7 @@ def test_0b32aa01_01(): |
201 | 201 | 0x8048695 |
202 | 202 | } |
203 | 203 |
|
204 | | - non_syscall_functions = [v for k,v in cfg.functions.items() if not v.is_syscall and not v.alignment] |
| 204 | + non_syscall_functions = [v for k,v in cfg.functions.items() if not v.is_syscall and not v.is_alignment] |
205 | 205 | #check startpoints, I know that sometimes they could be None, but this should not happen in CADET_00003 |
206 | 206 | function_entrypoints = set([f.startpoint.addr for f in non_syscall_functions]) |
207 | 207 | print("additional:", list(map(hex,function_entrypoints-legitimate_functions))) |
@@ -368,7 +368,7 @@ def test_fullcfg_properties(): |
368 | 368 |
|
369 | 369 | # check that we do not encounter any unexpected jumpout |
370 | 370 | if not ff.is_syscall and ff.returning and not ff.has_unresolved_calls and \ |
371 | | - not ff.has_unresolved_jumps and ff.startpoint is not None and not ff.alignment and ff.endpoints: |
| 371 | + not ff.has_unresolved_jumps and ff.startpoint is not None and not ff.is_alignment and ff.endpoints: |
372 | 372 | if not cfg_utils.is_floatingpoint_function(backend,ff): |
373 | 373 | if len(ff.jumpout_sites) > 0: |
374 | 374 | unexpected_jumpout = [(binary,int(jo.addr)) for jo in ff.jumpout_sites \ |
|
0 commit comments