objutils 0.10.8__tar.gz → 0.10.9__tar.gz

{objutils-0.10.8 → objutils-0.10.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: objutils
-Version: 0.10.8
+Version: 0.10.9
 Summary: Objectfile library for Python
 License: GPLv2
 License-File: LICENSE

{objutils-0.10.8 → objutils-0.10.9}/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.8"
+__version__ = "0.10.9"
 
 __all__ = [
     "Image",

{objutils-0.10.8 → objutils-0.10.9}/objutils/elf/defs.py

@@ -1303,26 +1303,36 @@ class ProgramHeader(enum.IntEnum):
         PT_HIPROC: End of processor-specific segment types
     """
 
-    PT_NULL = 0  # Program header table entry unused.
-    PT_LOAD = 1  # Loadable program segment.
-    PT_DYNAMIC = 2  # Dynamic linking information.
-    PT_INTERP = 3  # Program interpreter.
-    PT_NOTE = 4  # Auxiliary information.
-    PT_SHLIB = 5  # Reserved.
-    PT_PHDR = 6  # Entry for header table itself.
-    PT_TLS = 7  # Thread-local storage segment
-    PT_NUM = 8  # Number of defined types
-    PT_LOOS = 0x60000000  # Start of OS-specific
-    PT_GNU_EH_FRAME = 0x6474E550  # GCC .eh_frame_hdr segment
-    PT_GNU_STACK = 0x6474E551  # Indicates stack executability
-    PT_GNU_RELRO = 0x6474E552  # Read-only after relocation
-    PT_GNU_PROPERTY = 0x6474E553  # GNU property
+    NULL = 0  # Program header table entry unused.
+    LOAD = 1  # Loadable program segment.
+    DYNAMIC = 2  # Dynamic linking information.
+    INTERP = 3  # Program interpreter.
+    NOTE = 4  # Auxiliary information.
+    SHLIB = 5  # Reserved.
+    PHDR = 6  # Entry for header table itself.
+    TLS = 7  # Thread-local storage segment
+    NUM = 8  # Number of defined types
+    LOOS = 0x60000000  # Start of OS-specific
+    GNU_EH_FRAME = 0x6474E550  # GCC .eh_frame_hdr segment
+    GNU_STACK = 0x6474E551  # Indicates stack executability
+    GNU_RELRO = 0x6474E552  # Read-only after relocation
+    GNU_PROPERTY = 0x6474E553  # GNU property
+    PAX_FLAGS = 0x65041580
 
     PT_LOSUNW = 0x6FFFFFFA
     PT_SUNWBSS = 0x6FFFFFFA  # Sun Specific segment
     PT_SUNWSTACK = 0x6FFFFFFB  # Stack segment
     PT_HISUNW = 0x6FFFFFFF
     PT_HIOS = 0x6FFFFFFF  # End of OS-specific
+    ARM_ARCHEXT = 0x70000000
+    ARM_EXIDX = 0x70000001
+    AARCH64_MEMTAG_MTE = 0x70000002
+    # MIPS_REGINFO = 0x70000000
+    # MIPS_RTPROC = 0x70000001
+    # MIPS_OPTIONS = 0x70000002
+    MIPS_ABIFLAGS = 0x70000003
+
+
     PT_LOPROC = 0x70000000  # Start of processor-specific.
     PT_ARM_EXIDX = PT_LOPROC + 1  # Frame unwind information
     PT_HIPROC = 0x7FFFFFFF  # End of processor-specific
@@ -1337,7 +1347,7 @@ def program_header_name(tp: int) -> str:
     Returns:
         Program header type name without the "PT_" prefix.
     """
-    return ProgramHeader(tp).name[3:]
+    return ProgramHeader(tp).name
 
 
 PF_X = 0x1  # Execute.

{objutils-0.10.8 → objutils-0.10.9}/objutils/pecoff/model.py

@@ -85,7 +85,7 @@ from contextlib import contextmanager
 
 from sqlalchemy import Column, Integer, Numeric, String, create_engine, event
 from sqlalchemy.engine import Engine
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import declarative_base
 from sqlalchemy.orm import Session, sessionmaker
 
 Base = declarative_base()

{objutils-0.10.8 → objutils-0.10.9}/objutils/pecoff/pdb/__init__.py

@@ -1420,7 +1420,7 @@ def pdb_symbols_for_pe(pe_path: str, symbol_path: str | None = None) -> list[dic
                 if sym.tag != "SymTagData":
                     continue
                 ti = session.type_info(mod_base, sym.TypeIndex)
-                print(f"{sym.tag:15}", sym.Name, hex(sym.Address - mod_base), sym.Size, sym.decode_flags(), "==>", ti)
+                # print(f"{sym.tag:15}", sym.Name, hex(sym.Address - mod_base), sym.Size, sym.decode_flags(), "==>", ti)
                 result.append(symbols.VariableType(sym.Name, ti, sym.Address - mod_base, sym.Size))
             return result
             """

{objutils-0.10.8 → objutils-0.10.9}/objutils/scripts/oj_coff_info.py

@@ -17,6 +17,7 @@ def main(argv: list[str] | None = None) -> int:
     parser = argparse.ArgumentParser(description="Display informations about PE/COFF files.")
     parser.add_argument("pe_file", help="PE/COFF file (.exe/.dll/.obj)")
     parser.add_argument("--pdb", "-p", dest="pdb_file", nargs="*", help="Path to PDB file if not in same location as PE file")
+    parser.add_argument("--symbols", "-s", action="store_true", help="Dump symbols from PDB file if available")
     args = parser.parse_args(argv)
 
     # dump_type_tree: bool = False
@@ -53,7 +54,10 @@ def main(argv: list[str] | None = None) -> int:
             f"0x{s['size_of_raw_data']:06X} 0x{s['virtual_size']:06X}"
         )
 
-    if pp.symbols:
+    if pp.symbols and args.symbols:
+        # pp.symbols = sorted(pp.symbols, key=lambda s: s.name)
+        pp.symbols = sorted(pp.symbols, key=lambda s: s.location)
+
         print_header("Symbols (COFF or PDB)")
         print("Name                                               Value              Size")
         print("-" * 80)

{objutils-0.10.8 → objutils-0.10.9}/objutils/scripts/oj_elf_info.py

@@ -89,22 +89,12 @@ def main():
         )
 
     print_header("Segments")
-    print("Type         Offset     VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align")
-    print("-" * 71)
+    print("Type          Offset     VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align")
+    print("-" * 72)
     for segment in ep.segments:
         print(
-            f"{program_header_name(segment.p_type):12} 0x{segment.p_offset:08x} 0x{segment.p_vaddr:08x} 0x{segment.p_paddr:08x} 0x{segment.p_filesz:05x} 0x{segment.p_memsz:05x} {program_header_flags_name(segment.p_flags):3} {segment.p_align:>5}"
+            f"{program_header_name(segment.p_type):13} 0x{segment.p_offset:08x} 0x{segment.p_vaddr:08x} 0x{segment.p_paddr:08x} 0x{segment.p_filesz:05x} 0x{segment.p_memsz:05x} {program_header_flags_name(segment.p_flags):3} {segment.p_align:>5}"
         )
-        """
-        p_type = 1
-        p_offset = 148
-        p_vaddr = 0
-        p_paddr = 0
-        p_filesz = 12924
-        p_memsz = 12924
-        p_flags = 5
-        p_align = 2
-        """
 
     comment = ep.comment
     if comment:

{objutils-0.10.8 → objutils-0.10.9}/objutils/tests/test_image.py

@@ -399,7 +399,7 @@ def test_get_section2():
     assert len(sec) == 64
 
 
-@pytest.mark.parametrize("join,", [False, True])
+@pytest.mark.parametrize("join", [False, True])
 def test_get_section_raises(join):
     img = Image(join=join)
     img.insert_section(data=range(10), start_address=0x030)

{objutils-0.10.8 → objutils-0.10.9}/objutils/version.py

@@ -1,3 +1,3 @@
 """objutils version module"""
 
-__version__ = "0.10.8"
+__version__ = "0.10.9"

{objutils-0.10.8 → objutils-0.10.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "objutils"
-version = "0.10.8"
+version = "0.10.9"
 description = "Objectfile library for Python"
 authors = ["Christoph Schueler <cpu12.gems@googlemail.com>"]
 license = "GPLv2"
@@ -121,7 +121,7 @@ skip = ["*_i686", "*-musllinux*"]
 build-frontend = "build"
 
 [tool.bumpver]
-current_version = "0.10.8"
+current_version = "0.10.9"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true