Use pyvex Lifter.lift instead of _lift (#56)

* Use pyvex Lifter.lift instead of _lift * Pass inst as a positional arg
angr · Aug 31, 2023 · 7af95b9 · 7af95b9
1 parent 06db4e6
commit 7af95b9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/angr_platforms/avr/lift_avr.py b/angr_platforms/avr/lift_avr.py
@@ -1645,18 +1645,18 @@ def main():
     for num, test in enumerate(tests):
         print(num)
         lifter = LifterAVR(ArchAVR(), 0)
-        lifter._lift(data=test)
+        lifter.lift(data=test)
 
     print("Lifter test:")
     for test in tests:
         lifter = LifterAVR(ArchAVR(), 0)
-        lifter._lift(data=test)
+        lifter.lift(data=test)
         lifter.irsb.pp()
 
     print("Full tests:")
     fulltest = b"".join(tests)
     lifter = LifterAVR(ArchAVR(), 0)
-    lifter._lift(data=fulltest)
+    lifter.lift(data=fulltest)
     lifter.irsb.pp()
 
 

diff --git a/angr_platforms/bf/lift_bf.py b/angr_platforms/bf/lift_bf.py
@@ -256,9 +256,9 @@ class LifterBF(GymratLifter):
     test1 = b'<>+-[].,'
     test2 = b'<>+-[].,'
     lifter = LifterBF(arch=archinfo.arch_from_id('bf'), addr=0)
-    lifter._lift(data=test1)
+    lifter.lift(data=test1)
     lifter.irsb.pp()
 
     lifter = LifterBF(arch=ArchBF(), addr=0)
-    lifter._lift(data=test2)
+    lifter.lift(data=test2)
     lifter.irsb.pp()
diff --git a/tests/test_tricore.py b/tests/test_tricore.py
@@ -18,7 +18,7 @@ def test_lifting_abs_instructions(self):
         print("Lifting (ABS format) ldmst 1000, e2", "-"*50)
         inst = b'e5020005'
         lifter = LifterTRICORE(ArchTRICORE(), 0)
-        lifter._lift(data=inst)
+        lifter.lift(inst)
         lifter.irsb.pp()
         self.assertEqual(lifter.irsb.arch.name, 'TRICORE')
         self.assertEqual(lifter.irsb.stmts_used, 14)
@@ -27,7 +27,7 @@ def test_lifting_absb_instructions(self):
         print("\nLifting (ABSB format) st.t 0x1000, 1, 0", "-"*50)
         inst = b'D5010001'
         lifter = LifterTRICORE(ArchTRICORE(), 0)
-        lifter._lift(data=inst)
+        lifter.lift(inst)
         lifter.irsb.pp()
         self.assertEqual(lifter.irsb.arch.name, 'TRICORE')
         self.assertEqual(lifter.irsb.stmts_used, 21)