|
@@ -9,7 +9,6 @@ import typing
|
|
|
|
|
|
import pytest
|
|
|
import smgdc.angr
|
|
|
-import smgdc.vtable as vt_helpers
|
|
|
from smgdc.validate import LinuxBinary
|
|
|
|
|
|
|
|
@@ -88,8 +87,8 @@ def test_vtable(game_bin: LinuxBinary, vtsym_name: str, vtasserts: list[VTableCh
|
|
|
# tests vtable translation
|
|
|
vtsym = game_bin.angr.loader.find_symbol(vtsym_name)
|
|
|
assert vtsym, f"Could not find vtable symbol {vtsym_name}"
|
|
|
- orig_vtable, *thunk_vtables = vt_helpers.get_vtables_from_address(game_bin, vtsym)
|
|
|
- win_vtable = vt_helpers.get_windows_vtables_from(game_bin, vtsym)
|
|
|
+ orig_vtable, *thunk_vtables = game_bin.vtable_disambiguator.get_vtables_from_address(vtsym)
|
|
|
+ win_vtable = game_bin.vtable_disambiguator.get_windows_vtables_from(vtsym)
|
|
|
|
|
|
for check in map(VTableCheck._make, vtasserts):
|
|
|
symbol = game_bin.angr.loader.find_symbol(check.symbol_name)
|