hilda 3.0.0__py3-none-any.whl → 3.0.1__py3-none-any.whl

hilda/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.0.0'
-__version_tuple__ = version_tuple = (3, 0, 0)
+__version__ = version = '3.0.1'
+__version_tuple__ = version_tuple = (3, 0, 1)

hilda/hilda_client.py

@@ -42,6 +42,7 @@ from hilda.snippets.mach import CFRunLoopServiceMachPort_hooks
 from hilda.symbol import Symbol
 from hilda.symbols_jar import SymbolsJar
 from hilda.ui.ui_manager import UiManager
+from hilda.watchpoints import WatchpointList
 
 lldb.KEYSTONE_SUPPORT = True
 try:
@@ -128,6 +129,7 @@ class HildaClient:
         self.process = self.target.GetProcess()
         self.symbols = SymbolsJar.create(self)
         self.breakpoints = BreakpointList(self)
+        self.watchpoints = WatchpointList(self)
         self.captured_objects = {}
         self.registers = Registers(self)
         self.arch = self.target.GetTriple().split('-')[0]

hilda/launch_lldb.py

@@ -61,6 +61,33 @@ class LLDBListenerThread(Thread, ABC):
                 sys.stderr.write(stderr)
             stderr = self.process.GetSTDERR(1024)
 
+    def _process_potential_watchpoint_event(self) -> None:
+        stopped_threads = self._get_stopped_threads(lldb.eStopReasonWatchpoint)
+        for thread in stopped_threads:
+            watchpoint_id = thread.GetStopReasonDataAtIndex(0)
+            frame = thread.GetFrameAtIndex(0)
+            if lldb.hilda_client is not None:
+                lldb.hilda_client.watchpoints._dispatch_watchpoint_callback(watchpoint_id, thread, frame)
+
+    def _get_stopped_threads(self, reason: Optional[int] = None) -> list[lldb.SBThread]:
+        if reason is None:
+            stop_reasons = [
+                lldb.eStopReasonSignal, lldb.eStopReasonException,
+                lldb.eStopReasonBreakpoint, lldb.eStopReasonWatchpoint,
+                lldb.eStopReasonPlanComplete, lldb.eStopReasonTrace,
+            ]
+        else:
+            stop_reasons = [reason]
+
+        return [thread for thread in self.process if thread.GetStopReason() in stop_reasons]
+
+    def _set_selected_thread_to_stopped_thread(self) -> None:
+        stopped_threads = self._get_stopped_threads()
+        if len(stopped_threads) < 1:
+            return
+        thread = stopped_threads[0]
+        self.process.SetSelectedThread(thread)
+
     def run(self):
         event = lldb.SBEvent()
         last_state = lldb.eStateStopped
@@ -87,18 +114,8 @@ class LLDBListenerThread(Thread, ABC):
                 logger.debug('Process Continued')
             elif state == lldb.eStateStopped and last_state == lldb.eStateRunning:
                 logger.debug('Process Stopped')
-                for thread in self.process:
-                    frame = thread.GetFrameAtIndex(0)
-                    stop_reason = thread.GetStopReason()
-                    logger.debug(f'tid = {hex(thread.GetThreadID())} pc = {frame.GetPC()}')
-                    if stop_reason not in [lldb.eStopReasonSignal, lldb.eStopReasonException,
-                                           lldb.eStopReasonBreakpoint,
-                                           lldb.eStopReasonWatchpoint, lldb.eStopReasonPlanComplete,
-                                           lldb.eStopReasonTrace,
-                                           lldb.eStopReasonSignal]:
-                        continue
-                    self.process.SetSelectedThread(thread)
-                    break
+                self._set_selected_thread_to_stopped_thread()
+                self._process_potential_watchpoint_event()
 
             last_state = state
 

hilda/symbol.py

@@ -145,6 +145,9 @@ class Symbol(int):
     def monitor(self, **args):
         return self._client.monitor(self, **args)
 
+    def watch(self, **args):
+        return self._client.watchpoints.add(self, **args)
+
     def bp(self, callback=None, **args):
         return self._client.bp(self, callback, **args)
 

hilda/watchpoints.py

@@ -0,0 +1,237 @@
+from typing import Callable, Generator, Optional, Union
+
+from hilda.lldb_importer import lldb
+
+
+class HildaWatchpoint:
+    """
+    Hilda's class representing an LLDB watchpoint, with some optional additional properties
+    """
+
+    def __init__(self, hilda, lldb_watchpoint: lldb.SBWatchpoint, where: Optional[int] = None) -> None:
+        """
+        Initialize a watchpoint list.
+
+        :param hilda.hilda_client.HildaClient hilda: Hilda client
+        """
+        self._hilda = hilda
+        self._where = where
+        self._callback = None
+
+        # Actual watchpoint from LLDB API
+        self.lldb_watchpoint = lldb_watchpoint
+
+    @property
+    def where(self) -> Optional[int]:
+        """
+        A value identifying where the watchpoint was set (when it was created).
+
+        It could be either an address (int) or a Hilda symbol object (Symbol, that inherits from int).
+        """
+        return self._where
+
+    @property
+    def id(self) -> int:
+        """ A number identifying the watchpoint. """
+        return self.lldb_watchpoint.GetID()
+
+    @property
+    def callback(self) -> Optional[Callable]:
+        """
+        A callback that will be executed when the watchpoint is hit.
+
+        Note that unless the callback explicitly continues (by calling `cont()`), the program will not continue.
+        The callback will be invoked as callback(hilda, *args), where hilda is the 'HildaClient'.
+        """
+        return self._callback
+
+    @callback.setter
+    def callback(self, callback: Optional[Callable]) -> None:
+        self._callback = callback
+
+    @property
+    def condition(self) -> Optional[str]:
+        """
+        An LLDB expression to make this a conditional watchpoint.
+        """
+        return self.lldb_watchpoint.GetCondition()
+
+    @condition.setter
+    def condition(self, condition: Optional[str]) -> None:
+        self.lldb_watchpoint.SetCondition(condition)
+
+    def __repr__(self) -> str:
+        return f'<{self.__class__.__name__} LLDB:{self.lldb_watchpoint} CALLBACK:{self.callback}>'
+
+    def __str__(self) -> str:
+        return repr(self)
+
+    def remove(self) -> None:
+        """
+        Remove the watchpoint.
+        """
+        self._hilda.watchpoints.remove(self)
+
+
+class WatchpointList:
+    """
+    Manager for `HildaWatchpoint` objects, each one wrapping another native LLDB watchpoint.
+    """
+
+    def __init__(self, hilda) -> None:
+        """
+        Initialize a watchpoint list.
+
+        :param hilda.hilda_client.HildaClient hilda: Hilda client
+        """
+        self._hilda = hilda
+        self._watchpoints = {}
+
+    def __contains__(self, id_or_wp: Union[int, HildaWatchpoint]) -> bool:
+        return self.get(id_or_wp) is not None
+
+    def __iter__(self) -> Generator[HildaWatchpoint, None, None]:
+        for wp in self._hilda.target.watchpoint_iter():
+            yield self[wp.GetID()]
+
+    def __len__(self) -> int:
+        return self._hilda.target.GetNumWatchpoints()
+
+    def __getitem__(self, id_or_wp: Union[int, HildaWatchpoint]) -> HildaWatchpoint:
+        """
+        Get a watchpoint by ID (or the watchpoint itself, though it usually makes little sense)
+
+        :param id_or_wp: Watchpoint's ID (or the watchpoint itself)
+        """
+        wp = self.get(id_or_wp)
+        if wp is None:
+            raise KeyError(id_or_wp)
+
+        return wp
+
+    def __delitem__(self, id_or_wp: Union[int, HildaWatchpoint]):
+        """
+        Remove a watchpoint.
+
+        :param id_or_wp: Watchpoint's ID (or the watchpoint itself)
+        """
+        self.remove(id_or_wp)
+
+    def __repr__(self) -> str:
+        return repr(dict(self.items()))
+
+    def __str__(self) -> str:
+        return repr(self)
+
+    def get(self, id_or_wp: Union[int, HildaWatchpoint]) -> Optional[HildaWatchpoint]:
+        """
+        Get a watchpoint by ID or the watchpoint itself.
+
+        :param id_or_wp: Watchpoint's ID (or the watchpoint itself)
+        :return: `HildaWatchpoint` is one exists, or `None` otherwise
+        """
+
+        if isinstance(id_or_wp, int):
+            wp = self._hilda.target.FindWatchpointByID(id_or_wp)
+        elif isinstance(id_or_wp, HildaWatchpoint):
+            wp = id_or_wp.lldb_watchpoint
+        else:
+            raise KeyError(f'Watchpoint "{id_or_wp}" could not be found')
+
+        if not wp.IsValid():
+            return None
+
+        wp_id = wp.GetID()
+        if wp_id not in self._watchpoints:
+            self._hilda.log_debug(f'Found a watchpoint added outside of the Hilda API {wp}')
+            self._watchpoints[wp_id] = HildaWatchpoint(self._hilda, wp)
+
+        return self._watchpoints[wp_id]
+
+    def add(self, where: int, size: int = 8, read: bool = True, write: bool = True,
+            callback: Optional[Callable] = None, condition: str = None) -> HildaWatchpoint:
+        """
+        Add a watchpoint.
+
+        :param where: The address of the watchpoint.
+        :param size: The size of the watchpoint (the address span to watch).
+        :param read: The watchpoint should monitor reads from memory in the specified address (and size).
+        :param write: The watchpoint should monitor writes to memory in the specified address (and size).
+        :param callback: A callback that will be executed when the watchpoint is hit.
+            Note that unless the callback explicitly continues (by calling cont()), the program will not continue.
+            The callback will be invoked as callback(hilda, *args), where hilda is the 'HildaClient'.
+        :param condition: An LLDB expression to make this a conditional watchpoint.
+        :return: The new watchpoint
+        """
+
+        error = lldb.SBError()
+        wp = self._hilda.target.WatchAddress(where, size, read, write, error)
+        if not wp.IsValid():
+            raise Exception(f'Failed to create watchpoint at {where} ({error})')
+
+        wp = HildaWatchpoint(self._hilda, wp, where)
+        wp.callback = callback
+        wp.condition = condition
+
+        self._watchpoints[wp.id] = wp
+
+        self._hilda.log_info(f'Watchpoint #{wp.id} has been set')
+        return wp
+
+    def remove(self, id_or_wp: Union[int, HildaWatchpoint]) -> None:
+        """
+        Remove a watchpoint.
+
+        :param id_or_wp: Watchpoint's ID (or the watchpoint itself)
+        """
+        wp = self[id_or_wp]
+        watchpoint_id = wp.id
+        self._hilda.target.DeleteWatchpoint(watchpoint_id)
+        self._hilda.log_debug(f'Watchpoint #{watchpoint_id} has been removed')
+
+    def clear(self) -> None:
+        """
+        Remove all watchpoints
+        """
+        for wp in list(self):
+            self.remove(wp)
+
+    def show(self) -> None:
+        """ Show existing watchpoints. """
+        for wp in self:
+            message = f'🚨 Watchpoint #{wp.id}'
+
+            if wp.where is not None:
+                message += f'\n\tWhere: {wp.where}'
+
+            self._hilda.log_info(message)
+
+    def items(self) -> Generator[tuple[int, HildaWatchpoint], None, None]:
+        """
+        Get a watchpoint ID and watchpoint object tuple for every watchpoint.
+        """
+        return ((wp.id, wp) for wp in self)
+
+    def keys(self) -> Generator[int, None, None]:
+        """
+        Get the watchpoint ID for every watchpoint.
+        """
+        return (wp.id for wp in self)
+
+    def values(self) -> Generator[HildaWatchpoint, None, None]:
+        """
+        Get the watchpoint object for every watchpoint.
+        """
+        return (wp for wp in self)
+
+    def _dispatch_watchpoint_callback(self, watchpoint_id: int, _, frame) -> None:
+        """
+        Route the watchpoint callback the specific watchpoint callback.
+        """
+        self._hilda._bp_frame = frame
+        try:
+            callback = self[watchpoint_id].callback
+            if callback is not None:
+                callback(self._hilda, frame, None, self[watchpoint_id])
+        finally:
+            self._hilda._bp_frame = None

{hilda-3.0.0.dist-info → hilda-3.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: hilda
-Version: 3.0.0
+Version: 3.0.1
 Summary: LLDB wrapped and empowered by iPython's features
 Author-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>, netanel cohen <netanelc305@protonmail.com>
 Maintainer-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>, netanel cohen <netanelc305@protonmail.com>

{hilda-3.0.0.dist-info → hilda-3.0.1.dist-info}/RECORD

@@ -3,21 +3,22 @@ gifs/ui.png,sha256=iaRwNZ9qVWUkUe2TJb_6VPsTu--7HrElA2duWiyZ-Oc,131
 gifs/xpc_print_message.gif,sha256=i5S8Y9bJm9n-NtOipFTAC8_jUR4uZCM4sOap_ccJX0k,939935
 hilda/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hilda/__main__.py,sha256=KWRqvukK4wraxCMtvH5nO25mFXLO5aWXa7z_VfAtbO8,90
-hilda/_version.py,sha256=feOY2rjYM8_-oXmp5ErPlMe-6zWTpyiw538tUrvFyEA,511
+hilda/_version.py,sha256=LoHm4tYT8EC9S2qaIOxZkFh7b3UUZ5jNAQr7bVyLo6Q,511
 hilda/breakpoints.py,sha256=ZVszQf4WtRgjM2JAn8E-b-Ve6kzVg5VwvTHv5_wGjwQ,19198
 hilda/cli.py,sha256=PCjrI7GrERIrZCODJYmPt6eyl-nPYZviTS8fBG3oIjM,3618
 hilda/common.py,sha256=El-ih7cvCv9PJ5OWb1jkCbh4GuaRD6gqlrFC5gyY-TE,498
 hilda/exceptions.py,sha256=8L1OvOqns4O4ieiH4YlrMbZkk_PvuyCq4UyqFAodkF8,2042
 hilda/hilda_ascii_art.html,sha256=-9YCjAKdGbjtdd6uoKrxkkcJq7j16r4dGka2bZ27b4o,120119
-hilda/hilda_client.py,sha256=Uqp0N91gHJFkN9vZ9NN4YLkHGDXym4JGKjn-08HUZVE,38804
-hilda/launch_lldb.py,sha256=gU1iJmxuH7w5HV_cy1igv-JageyQn2dmqSxx8vkpY0k,8033
+hilda/hilda_client.py,sha256=phSwiI3XfuLzMXlUw7-irbZbEgi7sEpDz2w7EGUUhf0,38897
+hilda/launch_lldb.py,sha256=-lmxif-w53oeTCea6ZHLiYHChkMpdDDO_zgTFWpAU6E,8597
 hilda/lldb_entrypoint.py,sha256=vTiClzfiTtjorlxEfIsI-W657KEGobx74qDhaZ8nPhM,1007
 hilda/lldb_importer.py,sha256=TCGpAWwiBuyNRsbgcYawiqm35t8XQLCJwoOfEqyBeik,526
 hilda/objective_c_class.py,sha256=AFGXFDkYUoHf_LVS6GJSyvMsIIYIviLx0PCa-f4pCT8,11561
 hilda/objective_c_symbol.py,sha256=lIZHef5iZe3AeUsK0uIsDtFnzSM-Ad6i2wfdj9DwLUM,8269
 hilda/registers.py,sha256=-9kk1MuKnWlJ0Z8zZ2RPV9nGRDtX1GXhCSkEvfnCktA,848
-hilda/symbol.py,sha256=yv8s0vQ6Z0ZoROeVE4RVaW0LFCyACZnFgp0QC6j05nI,7535
+hilda/symbol.py,sha256=UIDmnNq1tx1uORqgRNaO_gfW2y17mhyy4cz83UVFhcc,7623
 hilda/symbols_jar.py,sha256=Vqdv6iH92P6aSfcz5XiR0FbNRqKuUu48mi-GxvPr32w,6504
+hilda/watchpoints.py,sha256=j5wLEORXUkxeamjI2F61QXRrSXcGsbs4XTmN1UEa_A4,7895
 hilda/ipython_extensions/events.py,sha256=w_4V8FoJJMarWArEE8uzb2UXk1mqfslmI7XCyVb_XuE,1976
 hilda/ipython_extensions/keybindings.py,sha256=W_Cnh8lG5yVdK5x0A-4UeyBsoJBufbYl54Mqrbo8OwM,1922
 hilda/ipython_extensions/magics.py,sha256=ULb63-OyIaWwvSfwRvEG_65ibaI2RTxeX8yPJK8pbc0,1300
@@ -48,9 +49,9 @@ hilda/snippets/macho/macho_load_commands.py,sha256=vUWfFM2H6o8dMglXV7rHgh-EMTzS0
 hilda/ui/colors.json,sha256=f-ITquY3IInQreviTy23JfmxfJrGM1_MivACf1GKGqM,262
 hilda/ui/ui_manager.py,sha256=BmzI1sBx0PYCQDlB9Al7wsTEAMJxaJ7NW0DS4C7g5-0,2265
 hilda/ui/views.py,sha256=bzClOgKirKYs6nhsNRXpkGNIg3oIOmFb659GLWrlTdo,7792
-hilda-3.0.0.dist-info/LICENSE,sha256=M-LVJ0AFAYB82eueyl8brh-QLPe-iLNVgbCi79-3TDo,1078
-hilda-3.0.0.dist-info/METADATA,sha256=y0HMi2hFA-E3hr-kQL_5SBYqTxQdQBwvMLXUiSxklpo,23354
-hilda-3.0.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-hilda-3.0.0.dist-info/entry_points.txt,sha256=9n3O3j6V3XnVR_GcFqCWNgRAbalfukTSW2WvghsLVmA,46
-hilda-3.0.0.dist-info/top_level.txt,sha256=TVD7l1WkE1noT866YqPFhiQnjYCYZM5Xz54v_3EYpnI,11
-hilda-3.0.0.dist-info/RECORD,,
+hilda-3.0.1.dist-info/LICENSE,sha256=M-LVJ0AFAYB82eueyl8brh-QLPe-iLNVgbCi79-3TDo,1078
+hilda-3.0.1.dist-info/METADATA,sha256=S0GZw7zb-oTZXZGaW_zD_eBq0ba3EaA6Zs3OSZAI3qI,23354
+hilda-3.0.1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+hilda-3.0.1.dist-info/entry_points.txt,sha256=9n3O3j6V3XnVR_GcFqCWNgRAbalfukTSW2WvghsLVmA,46
+hilda-3.0.1.dist-info/top_level.txt,sha256=TVD7l1WkE1noT866YqPFhiQnjYCYZM5Xz54v_3EYpnI,11
+hilda-3.0.1.dist-info/RECORD,,

{hilda-3.0.0.dist-info → hilda-3.0.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (76.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any