mapfile-parser 2.9.1__tar.gz → 2.9.3__tar.gz

{mapfile_parser-2.9.1 → mapfile_parser-2.9.3}/CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.9.3] - 2025-06-01
+
+### Fixed
+
+- Try to infer the rom address of sections and segments even when the mapfile
+  does not have it explictly on GNU mapfiles.
+
+## [2.9.2] - 2025-05-28
+
+### Changed
+
+- `objdiff_report`:
+  - Simplify emitted entries by avoiding using quotes as much as possible when
+    using the `--emit-categories` flag.
+  - Avoid printing the summary table when using the `--emit-categories`.
+  - Allow customizing the output of the summary table a little bit via the
+    Python API.
+
 ## [2.9.1] - 2025-05-27
 
 ### Added
@@ -595,6 +613,8 @@ Full changes: <https://github.com/Decompollaborate/mapfile_parser/compare/702a73
 - Initial release
 
 [unreleased]: https://github.com/Decompollaborate/mapfile_parser/compare/master...develop
+[2.9.3]: https://github.com/Decompollaborate/mapfile_parser/compare/2.9.2...2.9.3
+[2.9.2]: https://github.com/Decompollaborate/mapfile_parser/compare/2.9.1...2.9.2
 [2.9.1]: https://github.com/Decompollaborate/mapfile_parser/compare/2.9.0...2.9.1
 [2.9.0]: https://github.com/Decompollaborate/mapfile_parser/compare/2.8.1...2.9.0
 [2.8.1]: https://github.com/Decompollaborate/mapfile_parser/compare/2.8.0...2.8.1

{mapfile_parser-2.9.1 → mapfile_parser-2.9.3}/Cargo.lock

@@ -171,7 +171,7 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "mapfile_parser"
-version = "2.9.1"
+version = "2.9.3"
 dependencies = [
  "lazy_static",
  "objdiff-core",

{mapfile_parser-2.9.1 → mapfile_parser-2.9.3}/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "mapfile_parser"
-version = "2.9.1"
+version = "2.9.3"
 edition = "2021"
 rust-version = "1.74.0"
 authors = ["Anghelo Carvajal <angheloalf95@gmail.com>"]

{mapfile_parser-2.9.1 → mapfile_parser-2.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapfile_parser
-Version: 2.9.1
+Version: 2.9.3
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -55,7 +55,7 @@ If you use a `requirements.txt` file in your repository, then you can add
 this library with the following line:
 
 ```txt
-mapfile_parser>=2.9.1,<3.0.0
+mapfile_parser>=2.9.3,<3.0.0
 ```
 
 #### Development version
@@ -94,7 +94,7 @@ cargo add mapfile_parser
 Or add the following line manually to your `Cargo.toml` file:
 
 ```toml
-mapfile_parser = "2.9.1"
+mapfile_parser = "2.9.3"
 ```
 
 ## Versioning and changelog

{mapfile_parser-2.9.1 → mapfile_parser-2.9.3}/README.md

@@ -36,7 +36,7 @@ If you use a `requirements.txt` file in your repository, then you can add
 this library with the following line:
 
 ```txt
-mapfile_parser>=2.9.1,<3.0.0
+mapfile_parser>=2.9.3,<3.0.0
 ```
 
 #### Development version
@@ -75,7 +75,7 @@ cargo add mapfile_parser
 Or add the following line manually to your `Cargo.toml` file:
 
 ```toml
-mapfile_parser = "2.9.1"
+mapfile_parser = "2.9.3"
 ```
 
 ## Versioning and changelog

{mapfile_parser-2.9.1 → mapfile_parser-2.9.3}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = "mapfile_parser"
-version = "2.9.1"
+version = "2.9.3"
 description = "Map file parser library focusing decompilation projects"
 readme = "README.md"
 requires-python = ">=3.9"

{mapfile_parser-2.9.1 → mapfile_parser-2.9.3}/src/mapfile_parser/__init__.py

@@ -5,7 +5,7 @@
 
 from __future__ import annotations
 
-__version_info__ = (2, 9, 1)
+__version_info__ = (2, 9, 3)
 __version__ = ".".join(map(str, __version_info__)) # + "-dev0"
 __author__ = "Decompollaborate"
 

{mapfile_parser-2.9.1 → mapfile_parser-2.9.3}/src/mapfile_parser/frontends/objdiff_report.py

@@ -16,6 +16,12 @@ from .. import utils
 from ..internals import objdiff_report as report_internal
 
 
+@dataclasses.dataclass
+class SummaryTableConfig:
+    doUnits: bool = False
+    sort: bool = True
+    remaining: bool = False
+
 def doObjdiffReport(
         mapPath: Path,
         outputPath: Path,
@@ -27,6 +33,7 @@ def doObjdiffReport(
         nonmatchingsPath: Path|None=None,
         emitCategories: bool=False,
         quiet: bool=False,
+        summaryTableConfig: SummaryTableConfig|None=SummaryTableConfig(),
     ) -> int:
     if not mapPath.exists():
         print(f"Could not find mapfile at '{mapPath}'")
@@ -47,12 +54,16 @@ def doObjdiffReport(
         nonmatchingsPath=nonmatchingsPath,
     )
 
-    if not quiet:
+    if not quiet and summaryTableConfig is not None and not emitCategories:
         report = report_internal.Report.readFile(outputPath)
         if report is None:
             utils.eprint(f"Unable to read back the generated report at {outputPath}")
             return 1
-        table = report.asTableStr(sort=True)
+        table = report.asTableStr(
+            do_units=summaryTableConfig.doUnits,
+            sort=summaryTableConfig.sort,
+            remaining=summaryTableConfig.remaining,
+        )
         print(table, end="")
 
         # Output to GitHub Actions job summary, if available
@@ -241,18 +252,26 @@ tools:
       prefixes_to_trim:
 """, end="")
     for trim in prefixesToTrim:
-        print(f"        - \"{trim}\"")
+        print(f"        - {trim}")
 
     def printCategories(categories: list[Category]):
         for cat in categories:
+            ide = cat.ide
+            name = cat.name
+            if ide[0] in "0123456789":
+                ide = f'"{ide}"'
+            if name[0] in "0123456789":
+                name = f'"{name}"'
             print(f"""\
-        - id: "{cat.ide}"
-          name: "{cat.name}"
+        - id: {ide}
+          name: {name}
           paths:
 """, end="")
             for p in cat.paths:
+                if p[0] in "0123456789":
+                    p = f'"{p}"'
                 print(f"""\
-            - "{p}"
+            - {p}
 """, end="")
 
     print("      categories:")
@@ -323,7 +342,10 @@ def processArguments(args: argparse.Namespace, decompConfig: decomp_settings.Con
         nonmatchingsPath = args.nonmatchingspath
 
     emitCategories: bool = args.emit_categories
-    quiet: bool= args.quiet
+    if not args.quiet:
+        summaryTableConfig = SummaryTableConfig()
+    else:
+        summaryTableConfig = None
 
     exit(doObjdiffReport(
         mapPath,
@@ -334,7 +356,7 @@ def processArguments(args: argparse.Namespace, decompConfig: decomp_settings.Con
         pathIndex=pathIndex,
         nonmatchingsPath=nonmatchingsPath,
         emitCategories=emitCategories,
-        quiet=quiet
+        summaryTableConfig=summaryTableConfig,
     ))
 
 def addSubparser(subparser: argparse._SubParsersAction[argparse.ArgumentParser], decompConfig: decomp_settings.Config|None=None):

{mapfile_parser-2.9.1 → mapfile_parser-2.9.3}/src/rs/parser.rs

@@ -335,6 +335,9 @@ impl MapFile {
     ) -> Vec<segment::Segment> {
         let mut segments_list = Vec::with_capacity(temp_segment_list.len());
 
+        // We need to keep a calculated rom in case the segment doesn't specify it explicitly
+        let mut current_calculated_section_rom = 0;
+
         for (i, segment) in temp_segment_list.into_iter().enumerate() {
             if i == 0 && segment.is_placeholder() {
                 // skip the dummy segment if it has no size, sections or symbols
@@ -347,7 +350,13 @@ impl MapFile {
 
             let mut new_segment = segment.clone_no_sectionlist();
 
-            let mut vrom_offset = segment.vrom;
+            let mut vrom_offset = if let Some(vrom) = segment.vrom {
+                current_calculated_section_rom = vrom;
+                vrom
+            } else {
+                new_segment.vrom = Some(current_calculated_section_rom);
+                current_calculated_section_rom
+            };
             for mut section in segment.sections_list.into_iter() {
                 if section.is_placeholder() {
                     // drop placeholders
@@ -359,12 +368,12 @@ impl MapFile {
                 let symbols_count = section.symbols.len();
                 let is_noload_section = section.is_noload_section();
 
-                if section.vrom.is_some() {
-                    vrom_offset = section.vrom;
+                if let Some(vrom) = section.vrom {
+                    vrom_offset = vrom;
                 }
 
                 if !is_noload_section {
-                    section.vrom = vrom_offset;
+                    section.vrom = Some(vrom_offset);
                 }
 
                 if symbols_count > 0 {
@@ -377,7 +386,7 @@ impl MapFile {
                     // by the difference in vram address between the first symbol and the vram
                     // of the section.
                     if let Some(first_sym) = section.symbols.first() {
-                        sym_vrom = sym_vrom.map(|x| x + first_sym.vram - section.vram);
+                        sym_vrom = sym_vrom + first_sym.vram - section.vram;
 
                         // Aditionally, if the first symbol is missing then calculation of the size
                         // for the last symbol would be wrong, since we subtract the accumulated
@@ -397,8 +406,8 @@ impl MapFile {
 
                         if !is_noload_section {
                             // Only set vrom of non bss variables
-                            sym.vrom = sym_vrom;
-                            sym_vrom = sym_vrom.map(|x| x + sym_size);
+                            sym.vrom = Some(sym_vrom);
+                            sym_vrom += sym_size;
                         }
                     }
 
@@ -407,7 +416,7 @@ impl MapFile {
                     let sym_size = section.size - acummulated_size;
                     sym.size = sym_size;
                     if !is_noload_section {
-                        sym.vrom = sym_vrom;
+                        sym.vrom = Some(sym_vrom);
                         //sym_vrom += sym_size;
                     }
 
@@ -415,7 +424,8 @@ impl MapFile {
                 }
 
                 if !is_noload_section {
-                    vrom_offset = vrom_offset.map(|x| x + section.size);
+                    vrom_offset += section.size;
+                    current_calculated_section_rom += section.size;
                 }
 
                 new_segment.sections_list.push(section);