Swap Lifter.lift and Lifter._lift to respect public/private semantics

pyvex/lifting/gym/arm_spotter.py

@@ -415,12 +415,12 @@ def __init__(self, *args):
         super().__init__(*args)
         self.thumb: bool = False
 
-    def lift(self, disassemble=False, dump_irsb=False):
+    def _lift(self, disassemble=False, dump_irsb=False):
         if self.irsb.addr & 1:
             # Thumb!
             self.instrs = self.thumb_instrs
             self.thumb = True
         else:
             self.instrs = self.arm_instrs
             self.thumb = False
-        super().lift(disassemble, dump_irsb)
+        super()._lift(disassemble, dump_irsb)

pyvex/lifting/libvex.py

@@ -48,7 +48,7 @@ class LibVEXLifter(Lifter):
     def get_vex_log():
         return bytes(ffi.buffer(pvc.msg_buffer, pvc.msg_current_size)).decode() if pvc.msg_buffer != ffi.NULL else None
 
-    def lift(self):
+    def _lift(self):
         try:
             _libvex_lock.acquire()
 

pyvex/lifting/lift_function.py

@@ -126,7 +126,7 @@ def lift(
                 )
 
             try:
-                final_irsb = lifter(arch, addr)._lift(
+                final_irsb = lifter(arch, addr).lift(
                     u_data,
                     bytes_offset - skip,
                     max_bytes,
@@ -142,7 +142,7 @@ def lift(
                 )
             except SkipStatementsError:
                 assert skip_stmts is True
-                final_irsb = lifter(arch, addr)._lift(
+                final_irsb = lifter(arch, addr).lift(
                     u_data,
                     bytes_offset - skip,
                     max_bytes,

pyvex/lifting/lifter.py

@@ -46,7 +46,7 @@ def __init__(self, arch, addr):
         self.arch = arch
         self.addr = addr
 
-    def _lift(
+    def lift(
         self,
         data,
         bytes_offset=None,
@@ -62,7 +62,7 @@ def _lift(
         load_from_ro_regions=False,
     ):
         """
-        Wrapper around the `lift` method on Lifters. Should not be overridden in child classes.
+        Wrapper around the `_lift` method on Lifters. Should not be overridden in child classes.
 
         :param data:                The bytes to lift as either a python string of bytes or a cffi buffer object.
         :param bytes_offset:        The offset into `data` to start lifting at.
@@ -95,10 +95,10 @@ def _lift(
         self.irsb = irsb
         self.cross_insn_opt = cross_insn_opt
         self.load_from_ro_regions = load_from_ro_regions
-        self.lift()
+        self._lift()
         return self.irsb
 
-    def lift(self):
+    def _lift(self):
         """
         Lifts the data using the information passed into _lift. Should be overridden in child classes.
 

pyvex/lifting/util/lifter_helper.py

@@ -97,7 +97,7 @@ def decode(self):
             log.exception(f"Error decoding block at offset {bytepos:#x} (address {addr:#x}):")
             raise
 
-    def lift(self, disassemble=False, dump_irsb=False):
+    def _lift(self, disassemble=False, dump_irsb=False):
         self.thedata = (
             self.data[: self.max_bytes]
             if isinstance(self.data, (bytes, bytearray, memoryview))

tests/test_lift.py

@@ -27,7 +27,7 @@ class NOPLifter(GymratLifter):
 
         lifter = NOPLifter(archinfo.ArchAMD64(), 0)
         # this should not throw an exception
-        block = lifter._lift("\x0F\x0Fa")
+        block = lifter.lift("\x0F\x0Fa")
         assert block.size == 2
         assert block.instructions == 1
         assert block.jumpkind == JumpKind.NoDecode