objutils 0.10.20__tar.gz → 0.10.22__tar.gz

{objutils-0.10.20 → objutils-0.10.22}/.github/workflows/pythonapp.yml

@@ -22,12 +22,12 @@ jobs:
           - os: windows-latest
             cibw_archs_windows: AMD64
     steps:
-      - uses: actions/checkout@v6
-      - uses: pypa/cibuildwheel@v3.3
+      - uses: actions/checkout@v7.0.1
+      - uses: pypa/cibuildwheel@v4.3.1
         env:
           CIBW_ARCHS_WINDOWS: ${{ matrix.cibw_archs_windows || '' }}
           CIBW_ARCHS_MACOS: arm64
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v7.0.2
         with:
           name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
@@ -36,12 +36,12 @@ jobs:
     name: Build source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7.0.1
       - name: Build sdist
         run: |
           pip install -U build
           python -m build --sdist
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v7.0.2
         with:
           path: dist/*.tar.gz
           include-hidden-files: true
@@ -53,11 +53,11 @@ jobs:
       id-token: write
       contents: read
     steps:
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8.0.2
         with:
           path: dist
           merge-multiple: true
       - name: Publish package to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.13.0
+        uses: pypa/gh-action-pypi-publish@v1.14.2
         with:
           attestations: true

{objutils-0.10.20 → objutils-0.10.22}/.idea/objutils@1.iml

@@ -8,4 +8,4 @@
     <orderEntry type="jdk" jdkName="Poetry (objutils) (2)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>

{objutils-0.10.20 → objutils-0.10.22}/.pre-commit-config.yaml

@@ -42,7 +42,7 @@ repos:
         args: ["--line-length=132"]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.17.0
+    rev: v0.17.1
     hooks:
       - id: ruff
         args: ["--fix", "--exit-non-zero-on-fix"]

{objutils-0.10.20 → objutils-0.10.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: objutils
-Version: 0.10.20
+Version: 0.10.22
 Summary: Objectfile library for Python
 Keywords: hex files,intel hex,s19,srec,srecords,object files,map files,embedded,microcontroller,ECU,shf,rfc4194
 Author-Email: Christoph Schueler <cpu12.gems@googlemail.com>
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3.15
 Project-URL: Repository, https://www.github.com/Christoph2/objutils
 Requires-Python: <4.0,>=3.10
 Requires-Dist: construct>=2.10.70
-Requires-Dist: mako>=1.3.3
+Requires-Dist: mako>=1.4.2
 Requires-Dist: sqlalchemy>=2.0.29
 Requires-Dist: rich>=14.2
 Requires-Dist: numpy>=2.2.5
@@ -74,7 +74,7 @@ Or with Poetry:
 Prerequisites
 -------------
 
-- Python >= 3.9
+- Python 3.10 to 3.15
 
 Features
 --------

{objutils-0.10.20 → objutils-0.10.22}/docs/README.rst

@@ -37,7 +37,7 @@ Or with Poetry:
 Prerequisites
 -------------
 
-- Python >= 3.9
+- Python 3.10 to 3.15
 
 Features
 --------

{objutils-0.10.20 → objutils-0.10.22}/docs/installation.rst

@@ -4,7 +4,7 @@ Installation and Getting Started
 Supported Python and platforms
 ------------------------------
 
-- Python >= 3.9 (CPython; PyPy not tested)
+- Python 3.10 to 3.15 (CPython; PyPy not tested)
 - Cross-platform; no OS-specific restrictions
 
 Install

{objutils-0.10.20 → objutils-0.10.22}/objutils/__init__.py

@@ -13,7 +13,7 @@ Registers CODECS and implements an interface to them.
 The first parameter is always the codec name.
 """
 
-__version__ = "0.10.20"
+__version__ = "0.10.22"
 
 __all__ = [
     "Image",

{objutils-0.10.20 → objutils-0.10.22}/objutils/dwarf/__init__.py

@@ -639,7 +639,6 @@ class DwarfProcessor:
         Earlier or later DWARF versions may not parse correctly.
     """
 
-
     UTF8String = CString(encoding="utf8")
 
     def __init__(self, elf_parser, *, verbose: bool = True):
@@ -1112,7 +1111,7 @@ class DwarfProcessor:
                         debug_abbrev_offset = dbgInfo.body.debug_abbrev_offset
                         address_size = dbgInfo.body.address_size
                     else:
-                        if version > 5: # Handle messed up version numbers in some binaries (e.g. 39424)
+                        if version > 5:  # Handle messed up version numbers in some binaries (e.g. 39424)
                             address_size = self.elf_address_size
                         else:
                             address_size = dbgInfo.body.address_size

{objutils-0.10.20 → objutils-0.10.22}/objutils/dwarf/sm.py

@@ -139,6 +139,25 @@ from construct import Array
 from objutils.dwarf import constants
 
 
+class DynamicValue:
+
+    """Represents a dynamic value (can only evaluated by a debugger) on the DWARF stack.
+    """
+
+    def __init__(self, expr: str):
+        self.expr = expr
+
+    def __str__(self) -> str:
+        return self.expr
+
+    def __repr__(self):
+        return f"DynamicValue({self.expr})"
+
+    @property
+    def value(self):
+        return self.expr
+
+
 @dataclass
 class TypedValue:
     """Represents a value on the DWARF stack with an associated type.
@@ -2438,5 +2457,5 @@ class StackMachine:
                 result.append(f"{opcode.name}()")
 
         # Return summary of executed ops
-        res_val = self.stack.pop() if not self.stack.empty() else None
+        res_val = self.stack.pop() if not self.stack.empty() else DynamicValue("; ".join(result))
         return EvaluationResult(value=res_val, representation="; ".join(result))

{objutils-0.10.20 → objutils-0.10.22}/objutils/dwarf/traverser.py

@@ -1374,9 +1374,9 @@ class AttributeParser:
                 lower_bound = 0
                 upper_bound = 0
                 if "lower_bound" in entry.attributes_map:
-                    lower_bound = int(entry.attributes_map["lower_bound"].raw_value)
+                    lower_bound = self.dwarf_expression(entry.attributes_map["lower_bound"].form, entry.attributes_map["lower_bound"].raw_value)
                 if "upper_bound" in entry.attributes_map:
-                    upper_bound = int(entry.attributes_map["upper_bound"].raw_value)
+                    upper_bound = self.dwarf_expression(entry.attributes_map["upper_bound"].form, entry.attributes_map["upper_bound"].raw_value)
                 print(
                     f"{'    ' * level}{tag} '{name}'{type_info} [lower_bound={lower_bound}: upper_bound={upper_bound}] [off=0x{entry.offset:08x}]"
                 )

{objutils-0.10.20 → objutils-0.10.22}/objutils/tests/test_elf.py

@@ -10,12 +10,14 @@ Based on the actual ElfParser API which uses:
 """
 
 import collections
+import gc
 import tempfile
+import weakref
 from pathlib import Path
 
 import pytest
 
-from objutils.elf import ElfParser
+from objutils.elf import ElfParser, import_dwarf_to_db, model
 
 # Test data directory
 EXAMPLES_DIR = Path(__file__).parent.parent.parent / "examples"
@@ -341,6 +343,57 @@ class TestElfInMemoryDatabase:
             parser_disk.close()
             parser_mem.close()
 
+    def test_in_memory_context_manager_closes_parser(self, sample_elf_path):
+        """Context-manager usage must release in-memory parser resources."""
+        with ElfParser(str(sample_elf_path), in_memory=True) as parser:
+            assert parser.session is not None
+            assert parser.e_machine == 83
+
+        assert parser._closed is True
+        assert parser.db is None
+        assert parser.session is None
+        assert parser.fp is None
+
+    def test_in_memory_close_is_idempotent(self, sample_elf_path):
+        """Calling close() multiple times should be safe."""
+        parser = ElfParser(str(sample_elf_path), in_memory=True)
+        parser.close()
+        parser.close()
+        assert parser._closed is True
+
+    def test_in_memory_multiple_parsers_sequential_cleanup(self, sample_elf_path):
+        """Opening multiple in-memory parsers sequentially must not raise cleanup errors."""
+        for _ in range(25):
+            with ElfParser(str(sample_elf_path), in_memory=True) as parser:
+                assert isinstance(parser.e_entry, int)
+
+    def test_in_memory_stress_multiple_elf_files_cleanup(self):
+        """Stress-test in-memory cleanup across multiple ELF files and many open/close cycles."""
+        available_elfs = [EXAMPLES_DIR / name for name in SAMPLE_ELF_FILES if (EXAMPLES_DIR / name).exists()]
+        if not available_elfs:
+            pytest.skip("No sample ELF files found for stress test")
+
+        for cycle in range(15):
+            for elf_path in available_elfs:
+                with ElfParser(str(elf_path), in_memory=True) as parser:
+                    # Touch common ELF and optional debug/DWARF query paths.
+                    assert isinstance(parser.e_machine, int)
+                    _ = parser.debug_sections()
+                    ref = weakref.ref(parser)
+
+                assert parser._closed is True
+                assert parser.db is None
+                assert parser.session is None
+                assert parser.fp is None
+
+                del parser
+                gc.collect()
+                assert ref() is None
+
+            # Force periodic collection between larger batches.
+            if cycle % 5 == 4:
+                gc.collect()
+
 
 class TestElfImageCreation:
     """Test image creation from ELF."""
@@ -378,5 +431,34 @@ class TestElfDebugSections:
         assert isinstance(debug_secs, (collections.OrderedDict, type(None)))
 
 
+class TestDwarfImportRegression:
+    """Regression tests for DWARF importer into .prgdb databases."""
+
+    def test_import_dwarf_populates_database(self):
+        """Importing DWARF should succeed and persist DIE/attribute rows."""
+        candidates = [
+            EXAMPLES_DIR / "lang-generics.elf",
+            EXAMPLES_DIR / "hello_xcp.ino.elf",
+            EXAMPLES_DIR / "avr.elf",
+        ]
+        elf_path = next((p for p in candidates if p.exists()), None)
+        if elf_path is None:
+            pytest.skip("No suitable ELF sample found for DWARF import regression test")
+
+        with tempfile.TemporaryDirectory(ignore_cleanup_errors=True) as tmpdir:
+            out_db = Path(tmpdir) / "imported.prgdb"
+            rc = import_dwarf_to_db(str(elf_path), str(out_db), quiet=True, verbose=False, force=True)
+            assert rc == 0
+            assert out_db.exists()
+
+            db = model.Model(str(out_db))
+            try:
+                session = db.session
+                assert session.query(model.DebugInformationEntry).count() > 0
+                assert session.query(model.DIEAttribute).count() > 0
+            finally:
+                db.close()
+
+
 if __name__ == "__main__":
     pytest.main([__file__, "-v"])

{objutils-0.10.20 → objutils-0.10.22}/objutils/version.py

@@ -1,3 +1,3 @@
 """objutils version module"""
 
-__version__ = "0.10.20"
+__version__ = "0.10.22"

{objutils-0.10.20 → objutils-0.10.22}/poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.4.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.5.1 and should not be changed by hand.
 
 [[package]]
 name = "bandit"
@@ -473,14 +473,14 @@ files = [
 
 [[package]]
 name = "mako"
-version = "1.4.1"
+version = "1.4.2"
 description = "A super-fast templating language that borrows the best ideas from the existing templating languages."
 optional = false
 python-versions = ">=3.10"
 groups = ["main"]
 files = [
-    {file = "mako-1.4.1-py3-none-any.whl", hash = "sha256:a359d9a94a541213958742b2698d0a7757bb83551767bc468a74b9905aba9617"},
-    {file = "mako-1.4.1.tar.gz", hash = "sha256:d7904710b662996425a21627710c4777c45053146942cf8a7aebf757c92b8c27"},
+    {file = "mako-1.4.2-py3-none-any.whl", hash = "sha256:e70a2a4308952b33a21208bfd6725da79fae5a8c224578f8cfdeb60e5ace03df"},
+    {file = "mako-1.4.2.tar.gz", hash = "sha256:7227a060ee3af55a493af61d73d6beef13044b81dba9586736c13945f09464ce"},
 ]
 
 [package.dependencies]
@@ -840,19 +840,19 @@ dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "requests
 
 [[package]]
 name = "python-discovery"
-version = "1.5.1"
+version = "1.6.2"
 description = "Python interpreter discovery"
 optional = true
-python-versions = ">=3.8"
+python-versions = ">=3.9"
 groups = ["main"]
 markers = "extra == \"dev\""
 files = [
-    {file = "python_discovery-1.5.1-py3-none-any.whl", hash = "sha256:ac07f44cade589d954e9d6a1e1468539fdddd2cf676beb51da73e0f156b7c932"},
-    {file = "python_discovery-1.5.1.tar.gz", hash = "sha256:e2ea8b884cd1701f386eda8cf327b87743f1dc21b7f784470799537d95635384"},
+    {file = "python_discovery-1.6.2-py3-none-any.whl", hash = "sha256:f0c697f95a3aaec4174a6e5e58f5885e25768684bafc76f1afde384709ebdcf2"},
+    {file = "python_discovery-1.6.2.tar.gz", hash = "sha256:cd1738ca1d37c86ef9d0b654dd46fcee1e41c97c6add12575e8501ced39afdb4"},
 ]
 
 [package.dependencies]
-filelock = ">=3.15.4"
+filelock = ">=3.16.1"
 
 [[package]]
 name = "pytokens"
@@ -1278,23 +1278,24 @@ files = [
 
 [[package]]
 name = "virtualenv"
-version = "21.7.1"
+version = "21.14.8"
 description = "Virtual Python Environment builder"
 optional = true
 python-versions = ">=3.9"
 groups = ["main"]
 markers = "extra == \"dev\""
 files = [
-    {file = "virtualenv-21.7.1-py3-none-any.whl", hash = "sha256:6394973f990536e34c05157179146c020284c42fe01da1dfeb0ba16c345280d9"},
-    {file = "virtualenv-21.7.1.tar.gz", hash = "sha256:d0dbfaa5483487baea28d7210ef8d24c9d1bd0f10f449eeb215568825a9b334e"},
+    {file = "virtualenv-21.14.8-py3-none-any.whl", hash = "sha256:d2a347fdbc1a65e33c2c5e84dc767b4a3538a25749536a752744d4fe1f71c37a"},
+    {file = "virtualenv-21.14.8.tar.gz", hash = "sha256:394e45ed610ceffb5018e1a179e3a8012c02fd87fe792ab4aae67ce5e7e3afbd"},
 ]
 
 [package.dependencies]
-distlib = ">=0.3.7,<1"
-filelock = {version = ">=3.24.2,<4", markers = "python_version >= \"3.10\""}
-platformdirs = ">=3.9.1,<5"
-python-discovery = ">=1.4.2"
-typing-extensions = {version = ">=4.13.2", markers = "python_version < \"3.11\""}
+distlib = ">=0.4.3,<1"
+filelock = {version = ">=3.24.2,<5", markers = "python_version >= \"3.10\""}
+packaging = ">=26.3"
+platformdirs = ">=4.4,<5"
+python-discovery = ">=1.6.1"
+typing-extensions = {version = ">=4.16", markers = "python_version < \"3.11\""}
 
 [extras]
 dev = ["bandit", "black", "bumpver", "pre-commit", "pytest", "pyupgrade", "ruff"]
@@ -1302,4 +1303,4 @@ dev = ["bandit", "black", "bumpver", "pre-commit", "pytest", "pyupgrade", "ruff"
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.10,<4.0"
-content-hash = "475a756479a1e65c792ba6db90321384df674104e2b68b0f9acf7c37b1ca0246"
+content-hash = "b9d21d0225b6115e6970117ad5d21f189cc2d9c1a5541f2fe54a2d78b533ebdb"

{objutils-0.10.20 → objutils-0.10.22}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "objutils"
-version = "0.10.20"
+version = "0.10.22"
 description = "Objectfile library for Python"
 authors = [
     {name = "Christoph Schueler", email = "cpu12.gems@googlemail.com"}
@@ -51,7 +51,7 @@ keywords=[
 
 dependencies = [
 	"construct>=2.10.70",
-	"mako>=1.3.3",
+	"mako>=1.4.2",
 	"sqlalchemy>=2.0.29",
 	"rich>=14.2",
 	"numpy>=2.2.5",
@@ -127,7 +127,7 @@ skip = ["*_i686", "*-musllinux*"]
 build-frontend = "build"
 
 [tool.bumpver]
-current_version = "0.10.20"
+current_version = "0.10.22"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true