objutils 0.10.12__tar.gz → 0.10.13__tar.gz

{objutils-0.10.12 → objutils-0.10.13}/.pre-commit-config.yaml

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

{objutils-0.10.12 → objutils-0.10.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: objutils
-Version: 0.10.12
+Version: 0.10.13
 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>

{objutils-0.10.12 → objutils-0.10.13}/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.12"
+__version__ = "0.10.13"
 
 __all__ = [
     "Image",

{objutils-0.10.12 → objutils-0.10.13}/objutils/image.py

@@ -165,6 +165,10 @@ Usage Examples
     if 0x1050 in img:
         data = img.read(0x1050, 16)
 
+    # Check if address range is fully contained
+    if img.contains_range(0x1000, 0x100):
+        data = img.read(0x1000, 0x100)
+
     # Iterate over sections
     for section in img:
         print(f"Section at 0x{section.start_address:08X}, "
@@ -468,8 +472,61 @@ class Image:
         return not (self == other)
 
     def __contains__(self, addr: int) -> bool:
-        """Check if address is contained in any section."""
-        return any(addr in sec for sec in self.sections)
+        """Check if address is contained in any section of the image.
+
+        Args:
+            addr: Address to check.
+
+        Returns:
+            True if the address is within any section, False otherwise.
+        """
+        return any(addr in section for section in self.sections)
+
+    def contains_range(self, addr: int, size: int) -> bool:
+        """Check if address range is fully contained in the image.
+
+        Args:
+            addr: Start address of the range.
+            size: Size of the range.
+
+        Returns:
+            True if the entire range [addr, addr + size) is covered by sections.
+        """
+        if size < 0:
+            return False
+        if size == 0:
+            return addr in self
+
+        # Check if the range is covered by sections.
+        # Since sections are sorted and non-overlapping, we can check continuity.
+        remaining_size = size
+        current_addr = addr
+
+        # Find the first section that could contain current_addr
+        import bisect
+        from operator import attrgetter
+        idx = bisect.bisect_right(self.sections, current_addr, key=attrgetter("start_address")) - 1
+        if idx < 0:
+            idx = 0
+
+        while idx < len(self.sections) and remaining_size > 0:
+            section = self.sections[idx]
+            if current_addr < section.start_address:
+                # Gap before this section
+                return False
+
+            if current_addr < section.start_address + len(section):
+                # current_addr is in this section
+                covered = min(remaining_size, (section.start_address + len(section)) - current_addr)
+                remaining_size -= covered
+                current_addr += covered
+            else:
+                # current_addr is beyond this section
+                pass
+
+            idx += 1
+
+        return remaining_size == 0
 
     def hexdump(self, fp=sys.stdout) -> None:
         """Print hexadecimal dump of all sections.
@@ -818,16 +875,21 @@ class Image:
         self._call_address_function("write_string", addr, value, encoding, **kws)
 
     def _address_contained(self, address: int, length: int) -> bool:
-        """Check if address range is contained in the image.
+        """Check if address range has ANY overlap with the image.
 
         Args:
             address: Start address to check.
             length: Length of the address range.
 
         Returns:
-            True if the address range is contained in any section, False otherwise.
+            True if the address range overlaps with any section, False otherwise.
         """
-        return address in self or (address + length - 1) in self
+        if length <= 0:
+            return False
+        end = address + length
+        # A range [address, end) overlaps with [s.start, s.end) if:
+        # address < s.end AND s.start < end
+        return any(address < (s.start_address + len(s)) and s.start_address < end for s in self.sections)
 
     def insert_section(
         self, data: Union[bytes, bytearray, memoryview, str], start_address: Optional[int] = None, join: bool = True
@@ -901,6 +963,8 @@ class Image:
             This method currently only validates the address range but does not
             perform the actual update operation. Full implementation is pending.
         """
+        if address is None:
+            address = self.address
         if not self._address_contained(address, len(data)):
             raise InvalidAddressError("Address-space not in range")
 

{objutils-0.10.12 → objutils-0.10.13}/objutils/scripts/oj_hex_split.py

@@ -1,135 +1,138 @@
-#!/usr/bin/env python
-"""Splits a HEX file into multiple files based on its sections."""
-
-__copyright__ = """
-   objutils - Object file library for Python.
-
-  (C) 2010-2026 by Christoph Schueler <cpu12.gems@googlemail.com>
-
-  All Rights Reserved
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-"""
-
-import argparse
-import sys
-from os import path
-from pathlib import Path
-
-from objutils import load, probe, dump, Image
-from ufilename import build_filename, SuffixPolicy, IdentityPolicy
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Splits a HEX file into multiple files based on its sections.")
-    parser.add_argument(
-        "input_file",
-        help="Input HEX file to be split.",
-    )
-    parser.add_argument(
-        "-o",
-        "--output-names",
-        nargs="+",
-        help="Optional list of output base names. If not provided, section numbers are used.",
-    )
-    parser.add_argument(
-        "-t",
-        "--type",
-        dest="output_type",
-        help="Output file type (e.g., ihex, srec). If omitted, it's inferred from the input file extension.",
-    )
-    parser.add_argument(
-        "-p",
-        "--prefix",
-        help="Prefix for output filenames. Defaults to input filename (without extension).",
-    )
-    parser.add_argument(
-        "-v",
-        "--verbose",
-        dest="verbose",
-        action="store_true",
-        default=False,
-        help="Verbose output",
-    )
-
-    args = parser.parse_args()
-
-    if not path.exists(args.input_file):
-        print(f"File '{args.input_file}' does not exist.")
-        sys.exit(1)
-
-    with open(args.input_file, "rb") as f:
-        file_type = probe(f)
-
-    if file_type is None:
-        print(f"Could not determine file type for '{args.input_file}'.")
-        sys.exit(1)
-
-    img = load(file_type, args.input_file)
-    
-    if not img.sections:
-        print(f"No sections found in '{args.input_file}'.")
-        sys.exit(0)
-
-    output_type = args.output_type
-    input_path = Path(args.input_file)
-    if not output_type:
-        ext = input_path.suffix.lower()
-        if ext in (".hex", ".ihex"):
-            output_type = "ihex"
-        elif ext in (".s19", ".srec", ".mot"):
-            output_type = "srec"
-        elif ext in (".bin",):
-            output_type = "bin"
-        else:
-            output_type = "ihex" # Fallback
-
-    base_prefix = args.prefix if args.prefix else input_path.stem
-    output_ext = input_path.suffix if not args.output_type else f".{args.output_type}"
-    # Normalize extension mapping for ufilename
-    if args.output_type:
-        if args.output_type == "ihex": output_ext = ".hex"
-        elif args.output_type == "srec": output_ext = ".s19"
-        elif args.output_type == "bin": output_ext = ".bin"
-
-    if args.verbose:
-        print(f"Splitting '{args.input_file}' into {len(img.sections)} sections...")
-
-    split_images = img.split()
-
-    for idx, new_img in enumerate(split_images):
-        section = new_img.sections[0]
-        if args.output_names and idx < len(args.output_names):
-            # User provided a list of names
-            name_policy = IdentityPolicy()
-            out_base = args.output_names[idx]
-        else:
-            # Default: append section number
-            name_policy = SuffixPolicy(suffix=f"_{idx:03d}")
-            out_base = base_prefix
-        
-        out_filename = build_filename(name_policy, out_base, output_ext)
-        
-        print(f"Writing '{out_filename}'...")
-        if args.verbose:
-            print(f"  Section {idx:03d} (0x{section.start_address:08x}, {len(section)} bytes)")
-            
-        dump(output_type, out_filename, new_img)
-
-    print(f"Successfully split into {len(split_images)} files.")
-
-
-if __name__ == "__main__":
-    main()
+#!/usr/bin/env python
+"""Splits a HEX file into multiple files based on its sections."""
+
+__copyright__ = """
+   objutils - Object file library for Python.
+
+  (C) 2010-2026 by Christoph Schueler <cpu12.gems@googlemail.com>
+
+  All Rights Reserved
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+"""
+
+import argparse
+import sys
+from os import path
+from pathlib import Path
+
+from objutils import load, probe, dump
+from ufilename import build_filename, SuffixPolicy, IdentityPolicy
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Splits a HEX file into multiple files based on its sections.")
+    parser.add_argument(
+        "input_file",
+        help="Input HEX file to be split.",
+    )
+    parser.add_argument(
+        "-o",
+        "--output-names",
+        nargs="+",
+        help="Optional list of output base names. If not provided, section numbers are used.",
+    )
+    parser.add_argument(
+        "-t",
+        "--type",
+        dest="output_type",
+        help="Output file type (e.g., ihex, srec). If omitted, it's inferred from the input file extension.",
+    )
+    parser.add_argument(
+        "-p",
+        "--prefix",
+        help="Prefix for output filenames. Defaults to input filename (without extension).",
+    )
+    parser.add_argument(
+        "-v",
+        "--verbose",
+        dest="verbose",
+        action="store_true",
+        default=False,
+        help="Verbose output",
+    )
+
+    args = parser.parse_args()
+
+    if not path.exists(args.input_file):
+        print(f"File '{args.input_file}' does not exist.")
+        sys.exit(1)
+
+    with open(args.input_file, "rb") as f:
+        file_type = probe(f)
+
+    if file_type is None:
+        print(f"Could not determine file type for '{args.input_file}'.")
+        sys.exit(1)
+
+    img = load(file_type, args.input_file)
+
+    if not img.sections:
+        print(f"No sections found in '{args.input_file}'.")
+        sys.exit(0)
+
+    output_type = args.output_type
+    input_path = Path(args.input_file)
+    if not output_type:
+        ext = input_path.suffix.lower()
+        if ext in (".hex", ".ihex"):
+            output_type = "ihex"
+        elif ext in (".s19", ".srec", ".mot"):
+            output_type = "srec"
+        elif ext in (".bin",):
+            output_type = "bin"
+        else:
+            output_type = "ihex"  # Fallback
+
+    base_prefix = args.prefix if args.prefix else input_path.stem
+    output_ext = input_path.suffix if not args.output_type else f".{args.output_type}"
+    # Normalize extension mapping for ufilename
+    if args.output_type:
+        if args.output_type == "ihex":
+            output_ext = ".hex"
+        elif args.output_type == "srec":
+            output_ext = ".s19"
+        elif args.output_type == "bin":
+            output_ext = ".bin"
+
+    if args.verbose:
+        print(f"Splitting '{args.input_file}' into {len(img.sections)} sections...")
+
+    split_images = img.split()
+
+    for idx, new_img in enumerate(split_images):
+        section = new_img.sections[0]
+        if args.output_names and idx < len(args.output_names):
+            # User provided a list of names
+            name_policy = IdentityPolicy()
+            out_base = args.output_names[idx]
+        else:
+            # Default: append section number
+            name_policy = SuffixPolicy(suffix=f"_{idx:03d}")
+            out_base = base_prefix
+
+        out_filename = build_filename(name_policy, out_base, output_ext)
+
+        print(f"Writing '{out_filename}'...")
+        if args.verbose:
+            print(f"  Section {idx:03d} (0x{section.start_address:08x}, {len(section)} bytes)")
+
+        dump(output_type, out_filename, new_img)
+
+    print(f"Successfully split into {len(split_images)} files.")
+
+
+if __name__ == "__main__":
+    main()

{objutils-0.10.12 → objutils-0.10.13}/objutils/section.py

@@ -47,6 +47,14 @@ Usage Examples
     # From bytes
     s1 = Section(start_address=0x1000, data=b"Hello")
 
+    # Check if address is in the section
+    if 0x1050 in s1:
+        data = s1.read(0x1050, 1)
+
+    # Check if address range is fully contained
+    if s1.contains_range(0x1000, 5):
+        data = s1.read(0x1000, 5)
+
     # From string (ASCII encoded)
     s2 = Section(0x2000, "World")
 
@@ -1201,6 +1209,22 @@ class Section:
     def __contains__(self, addr) -> bool:
         return self.start_address <= addr < (self.start_address + self.length)
 
+    def contains_range(self, addr: int, size: int) -> bool:
+        """Check if address range is fully contained in the section.
+
+        Args:
+            addr: Start address of the range.
+            size: Size of the range.
+
+        Returns:
+            True if the entire range [addr, addr + size) is within the section.
+        """
+        if size < 0:
+            return False
+        if size == 0:
+            return addr in self
+        return addr in self and (addr + size - 1) in self
+
     @property
     def address(self) -> int:  # Alias
         return self.start_address

{objutils-0.10.12 → objutils-0.10.13}/objutils/tests/test_image.py

@@ -124,6 +124,43 @@ def test_update2(images):
     img0.update_section(data=b"abcdefghij", address=0x109)
 
 
+def test_image_contains_range():
+    s1 = Section(0x100, b"0123")
+    s2 = Section(0x104, b"4567")
+    img = Image([s1, s2], join=False)
+
+    # Spanning across sections
+    assert img.contains_range(0x100, 8) is True
+    assert img.contains_range(0x102, 4) is True
+
+    # Gaps
+    s3 = Section(0x200, b"ABCD")
+    img2 = Image([s1, s3], join=False)
+    assert img2.contains_range(0x100, 4) is True
+    assert img2.contains_range(0x200, 4) is True
+    assert img2.contains_range(0x100, 0x104) is False  # Gap at 0x104-0x1FF
+
+    # Partial coverage
+    assert img2.contains_range(0x103, 2) is False
+
+
+def test_image_address_contained_overlap():
+    s1 = Section(0x100, b"0123")
+    img = Image(s1)
+
+    # Internal overlap
+    assert img._address_contained(0x101, 2) is True
+    # Start overlap
+    assert img._address_contained(0x0FF, 2) is True
+    # End overlap
+    assert img._address_contained(0x103, 2) is True
+    # Fully containing
+    assert img._address_contained(0x0F0, 0x100) is True
+    # No overlap
+    assert img._address_contained(0x0F0, 1) is False
+    assert img._address_contained(0x104, 1) is False
+
+
 """
 
 

{objutils-0.10.12 → objutils-0.10.13}/objutils/tests/test_section.py

@@ -96,6 +96,24 @@ def test_adress_out_of_range2():
     assert 0x15 not in s0
 
 
+def test_section_contains_range():
+    s = Section(0x100, b"0123456789")
+    # Full containment
+    assert s.contains_range(0x100, 10) is True
+    assert s.contains_range(0x100, 5) is True
+    assert s.contains_range(0x105, 5) is True
+
+    # Out of bounds
+    assert s.contains_range(0x0FF, 5) is False
+    assert s.contains_range(0x100, 11) is False
+    assert s.contains_range(0x10A, 1) is False
+
+    # Zero size
+    assert s.contains_range(0x100, 0) is True
+    assert s.contains_range(0x109, 0) is True
+    assert s.contains_range(0x10A, 0) is False
+
+
 def test_copy_data_from_other_section():
     data = Section(data="abcd", start_address=0x8000)
     section = Section(data=data)

{objutils-0.10.12 → objutils-0.10.13}/objutils/version.py

@@ -1,3 +1,3 @@
 """objutils version module"""
 
-__version__ = "0.10.12"
+__version__ = "0.10.13"

{objutils-0.10.12 → objutils-0.10.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "objutils"
-version = "0.10.12"
+version = "0.10.13"
 description = "Objectfile library for Python"
 authors = [
     {name = "Christoph Schueler", email = "cpu12.gems@googlemail.com"}
@@ -126,7 +126,7 @@ skip = ["*_i686", "*-musllinux*"]
 build-frontend = "build"
 
 [tool.bumpver]
-current_version = "0.10.12"
+current_version = "0.10.13"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true