hilda 3.3.0__tar.gz → 3.4.1__tar.gz

{hilda-3.3.0 → hilda-3.4.1}/.github/workflows/python-app.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [ 3.9, "3.10", "3.11", "3.12", "3.13" ]
+        python-version: [ 3.9 ]
         os: [ macos-latest ]
 
     steps:

{hilda-3.3.0 → hilda-3.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hilda
-Version: 3.3.0
+Version: 3.4.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.3.0 → hilda-3.4.1}/hilda/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '3.3.0'
-__version_tuple__ = version_tuple = (3, 3, 0)
+__version__ = version = '3.4.1'
+__version_tuple__ = version_tuple = (3, 4, 1)
 
-__commit_id__ = commit_id = 'g3f52b1753'
+__commit_id__ = commit_id = 'g2ae9e5677'

{hilda-3.3.0 → hilda-3.4.1}/hilda/launch_lldb.py

@@ -61,14 +61,6 @@ 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 = [
@@ -115,7 +107,6 @@ class LLDBListenerThread(Thread, ABC):
             elif state == lldb.eStateStopped and last_state == lldb.eStateRunning:
                 logger.debug('Process Stopped')
                 self._set_selected_thread_to_stopped_thread()
-                self._process_potential_watchpoint_event()
 
             last_state = state
 

{hilda-3.3.0 → hilda-3.4.1}/hilda/snippets/macho/macho_load_commands.py

@@ -6,7 +6,9 @@ from hilda.snippets.macho.apple_version import version_t
 from hilda.symbol import SymbolFormatField
 
 # See: https://opensource.apple.com/source/xnu/xnu-7195.81.3/EXTERNAL_HEADERS/mach-o/loader.h
+# And: https://github.com/blacktop/go-macho/blob/master/types/commands.go
 LC_REQ_DYLD = 0x80000000
+LC_SEP = 0x8000000
 
 LOAD_COMMAND_TYPE = Enum(Int32ul,
                          LC_SEGMENT=0x1,
@@ -62,7 +64,12 @@ LOAD_COMMAND_TYPE = Enum(Int32ul,
                          LC_BUILD_VERSION=0x32,
                          LC_DYLD_EXPORTS_TRIE=(0x33 | LC_REQ_DYLD),
                          LC_DYLD_CHAINED_FIXUPS=(0x34 | LC_REQ_DYLD),
-                         LC_FILESET_ENTRY=(0x35 | LC_REQ_DYLD)
+                         LC_FILESET_ENTRY=(0x35 | LC_REQ_DYLD),
+                         LC_ATOM_INFO=0x36,
+                         LC_FUNCTION_VARIANTS=0x37,
+                         LC_FUNCTION_VARIANT_FIXUPS=0x38,
+                         LC_TARGET_TRIPLE=0x39,
+                         LC_SEP_CACHE_SLIDE=(0x1 | LC_SEP)
                          )
 
 

{hilda-3.3.0 → hilda-3.4.1}/hilda/symbols.py

@@ -277,12 +277,6 @@ class SymbolList:
             -> Optional[Tuple[lldb.SBSymbol, lldb.SBAddress, str, int, int]]:
         lldb_symbol_context_list = list(self._hilda.target.FindSymbols(name))
 
-        for lldb_symbol_context in list(lldb_symbol_context_list):
-            # Verify because FindSymbols finds `_Z3foov` when looking for `foo`
-            if lldb_symbol_context.symbol.name != name:
-                lldb_symbol_context_list.remove(lldb_symbol_context)
-                self._hilda.log_debug(f'Ignoring symbol {lldb_symbol_context.symbol.name} (similar to {name})')
-
         if address is not None:
             for lldb_symbol_context in list(lldb_symbol_context_list):
                 lldb_symbol_context_address = lldb_symbol_context.symbol.GetStartAddress().GetLoadAddress(
@@ -453,7 +447,7 @@ class SymbolList:
                     arg_count = min(6, arg_count)
                     options['expr'] = {f'$arg{i + 3}': 'po' for i in range(arg_count)}
             name = options.get('name', name)
-            address.monitor(name=name, **options)
+            self._hilda.symbol(address).monitor(name=name, **options)
 
     # Filters
 

{hilda-3.3.0 → hilda-3.4.1}/hilda/watchpoints.py

@@ -51,6 +51,9 @@ class HildaWatchpoint:
     @callback.setter
     def callback(self, callback: Optional[Callable]) -> None:
         self._callback = callback
+        # TODO: Figure out a way to add set this callback programmatically
+        self._hilda.lldb_handle_command(f'watchpoint command add -F '
+                                        f'lldb.hilda_client.watchpoints._dispatch_watchpoint_callback {self.id}')
 
     @property
     def condition(self) -> Optional[str]:
@@ -256,10 +259,11 @@ class WatchpointList:
         """
         return (wp for wp in self)
 
-    def _dispatch_watchpoint_callback(self, watchpoint_id: int, _, frame) -> None:
+    def _dispatch_watchpoint_callback(self, frame, wp, internal_dict) -> None:
         """
         Route the watchpoint callback the specific watchpoint callback.
         """
+        watchpoint_id = wp.GetID()
         self._hilda._bp_frame = frame
         try:
             callback = self[watchpoint_id].callback

{hilda-3.3.0 → hilda-3.4.1}/hilda.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hilda
-Version: 3.3.0
+Version: 3.4.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.3.0 → hilda-3.4.1}/tests/conftest.py

@@ -3,7 +3,7 @@ import pytest
 from hilda.hilda_client import HildaClient
 from hilda.launch_lldb import create_hilda_client_using_attach_by_name
 
-PROCESS = 'awdd'
+PROCESS = 'remoted'
 
 
 @pytest.fixture(scope='function')

{hilda-3.3.0 → hilda-3.4.1}/tests/test_symbols/test_objective_c_symbol.py

@@ -148,6 +148,7 @@ def test_symbol_str_recursive(hilda_client):
     assert '+ alloc;' in hilda_client.ns({1: 2, 3: 4}).objc_symbol._to_str(True)
 
 
+@pytest.mark.skip('Not fully supported')
 def test_set_implementation(hilda_client):
     pid = hilda_client.symbols.getpid()