mapfile-parser 2.10.0__cp310-cp310-musllinux_1_2_i686.whl → 2.11.0__cp310-cp310-musllinux_1_2_i686.whl

mapfile_parser/__init__.py

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

mapfile_parser/frontends/objdiff_report.py

@@ -247,7 +247,11 @@ tools:
   mapfile_parser:
     progress_report:
       # output: report.json # Optional
-      check_asm_paths: True
+      # If you don't have .NON_MATCHING markers in all your function and data
+      # symbols then you should set `check_asm_paths: True` and
+      # `report_data: False`, otherwise those progress will get a fake boost.
+      check_asm_paths: False
+      report_data: True
       # Change if the asm path in the build folder is deeper than two subfolders.
       # i.e.: "build/us/asm/header.o" -> `path_index: 3`.
       # i.e.: "build/us/asm/us/header.o" -> `path_index: 4`.
@@ -277,6 +281,12 @@ tools:
             - {p}
 """, end="")
 
+    print("      # The following categories are autogenerated and they are intended as a")
+    print("      # guide and examples on how to setup your own categories. Please don't")
+    print("      # commit them as-is.")
+    print()
+    print("      # List of categories. `id`s must be unique, but each path may be")
+    print("      # duplicated across categories.")
     print("      categories:")
     print("        # Categories by path")
     printCategories(categoriesByPath)
@@ -313,6 +323,7 @@ def processArguments(args: argparse.Namespace, decompConfig: decomp_settings.Con
             pathIndex = int(args.path_index)
         else:
             pathIndex = pathIndexDefault
+        reportCategories.setReportData(settings.reportData)
     else:
         outputPath = args.output
         if args.prefixes_to_trim is not None:
@@ -320,6 +331,7 @@ def processArguments(args: argparse.Namespace, decompConfig: decomp_settings.Con
         else:
             prefixesToTrim = []
         pathIndex = int(args.path_index) if args.path_index is not None else pathIndexDefault
+        reportCategories.setReportData(False)
 
     if decompConfig is not None:
         version = decompConfig.get_version_by_name(args.version)
@@ -402,7 +414,8 @@ tools:
   mapfile_parser:
     progress_report:
       # output: report.json # Optional
-      check_asm_paths: True
+      check_asm_paths: False
+      report_data: True
       # path_index: 2
       # List of build prefixes to trim from each object file
       prefixes_to_trim:
@@ -496,6 +509,7 @@ class SpecificSettings:
     categories: list[Category]
     pathIndex: int|None
     checkAsmPaths: bool
+    reportData: bool
 
     @staticmethod
     def fromDecompConfig(decompConfig: decomp_settings.Config|None=None) -> SpecificSettings|None:
@@ -507,6 +521,7 @@ class SpecificSettings:
         categories: list[Category] = []
         pathIndex: int|None = None
         checkAsmPaths: bool = False
+        reportData = False
         if decompConfig.tools is not None:
             mapfileParserConfig = decompConfig.tools.get("mapfile_parser")
             if mapfileParserConfig is not None:
@@ -530,6 +545,7 @@ class SpecificSettings:
                         if var is not None:
                             pathIndex = var
                         checkAsmPaths = bool(raw.get("check_asm_paths", False))
+                        reportData = bool(raw.get("report_data", False))
 
         return SpecificSettings(
             output,
@@ -537,6 +553,7 @@ class SpecificSettings:
             categories,
             pathIndex,
             checkAsmPaths,
+            reportData,
         )
 
 @dataclasses.dataclass

mapfile_parser/mapfile.py

@@ -100,6 +100,7 @@ class Symbol:
     Note the symbol with the actual `.NON_MATCHING` will have this member
     set to `false`.
     """
+    inferredStatic: bool = False
 
     def getVramStr(self) -> str:
         return f"0x{self.vram:08X}"
@@ -160,7 +161,7 @@ class Symbol:
 
 
     def clone(self) -> Symbol:
-        return Symbol(self.name, self.vram, self.size, self.vrom, self.align, self.nonmatchingSymExists)
+        return Symbol(self.name, self.vram, self.size, self.vrom, self.align, self.nonmatchingSymExists, self.inferredStatic)
 
 
     def __eq__(self, other: object) -> bool:
@@ -687,7 +688,7 @@ class MapFile:
             for section in segment:
                 newSection = Section(section.filepath, section.vram, section.size, section.sectionType, section.vrom, section.align, section.isFill)
                 for symbol in section:
-                    newSymbol = Symbol(symbol.name, symbol.vram, symbol.size, symbol.vrom, symbol.align, symbol.nonmatchingSymExists)
+                    newSymbol = Symbol(symbol.name, symbol.vram, symbol.size, symbol.vrom, symbol.align, symbol.nonmatchingSymExists, symbol.inferredStatic)
 
                     newSection._symbols.append(newSymbol)
                 newSegment._sectionsList.append(newSection)
@@ -702,7 +703,7 @@ class MapFile:
                 newSection = SectionRs(section.filepath, section.vram, section.size, section.sectionType, section.vrom, section.align, section.isFill)
                 for symbol in section._symbols:
                     size = symbol.size if symbol.size is not None else 0
-                    newSymbol = SymbolRs(symbol.name, symbol.vram, size, symbol.vrom, symbol.align, symbol.nonmatchingSymExists)
+                    newSymbol = SymbolRs(symbol.name, symbol.vram, size, symbol.vrom, symbol.align, symbol.nonmatchingSymExists, symbol.inferredStatic)
 
                     newSection.appendSymbol(newSymbol)
                 newSegment.appendFile(newSection)
@@ -1072,13 +1073,13 @@ class MapFile:
 
                             # Adjust the vram and vrom addresses of the section
                             # because they are relative to zero.
-                            sectTemp.vram += sect.vram
+                            sectTemp.vram += sect.vram - partialSegment.vram
                             if sectTemp.vrom is not None and sect.vrom is not None and partialSegment.vrom is not None:
                                 sectTemp.vrom = sectTemp.vrom + sect.vrom - partialSegment.vrom
 
                             # Adjust vram and vrom of symbols too.
                             for partialSym in sectTemp._symbols:
-                                partialSym.vram += sect.vram
+                                partialSym.vram += sect.vram - partialSegment.vram
                                 if partialSym.vrom is not None and sect.vrom is not None and partialSegment.vrom is not None:
                                     partialSym.vrom = partialSym.vrom + sect.vrom - partialSegment.vrom
 

mapfile_parser/mapfile_parser.pyi

@@ -82,8 +82,18 @@ class Symbol:
     vrom: int|None
     align: int|None
     nonmatchingSymExists: bool
-
-    def __init__(self, name: str, vram: int, size: int=0, vrom: int|None=None, align: int|None=None, nonmatchingSymExists: bool=False): ...
+    inferredStatic: bool
+
+    def __init__(
+        self,
+        name: str,
+        vram: int,
+        size: int=0,
+        vrom: int|None=None,
+        align: int|None=None,
+        nonmatchingSymExists: bool=False,
+        inferredStatic: bool=False,
+    ): ...
 
     def getVramStr(self) -> str: ...
     def getSizeStr(self) -> str: ...
@@ -301,6 +311,23 @@ class MapFile:
     def __len__(self) -> int: ...
 
 class ReportCategories:
+    """
+    Allows configuring certain aspects of the generated objdiff report file,
+    like categories.
+    """
     def __init__(self): ...
 
-    def push(self, id: str, name: str, paths: list[str]): ...
+    def push(self, id: str, name: str, paths: list[str]):
+        """
+        Add a category with the given list of paths.
+
+        If the category id already exists then the paths are merged together
+        with the previous list of paths.
+        """
+
+    def setReportData(self, reportData: bool):
+        """
+        Track data progress on the generated report file.
+
+        Defaults to `True`.
+        """

{mapfile_parser-2.10.0.dist-info → mapfile_parser-2.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapfile_parser
-Version: 2.10.0
+Version: 2.11.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -51,7 +51,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.10.0,<3.0.0
+mapfile_parser>=2.11.0,<3.0.0
 ```
 
 #### Development version
@@ -90,7 +90,7 @@ cargo add mapfile_parser
 Or add the following line manually to your `Cargo.toml` file:
 
 ```toml
-mapfile_parser = "2.10.0"
+mapfile_parser = "2.11.0"
 ```
 
 ## Versioning and changelog

{mapfile_parser-2.10.0.dist-info → mapfile_parser-2.11.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
-mapfile_parser-2.10.0.dist-info/METADATA,sha256=bev5YplmuDHyinu7Z-YeBA2vOfcRkaAGlv84q64RGMs,5648
-mapfile_parser-2.10.0.dist-info/WHEEL,sha256=iWqkfraa9obU3i3GMWhmcTfRUvfzCL3AABl-FB2iPGc,105
-mapfile_parser-2.10.0.dist-info/licenses/LICENSE,sha256=FT7oxTcFUtz2c5eYIYePfzj2UD3hvxtLTa3FWz_nJuM,1073
+mapfile_parser-2.11.0.dist-info/METADATA,sha256=cXRzabRyH-3jCMPfSv5mY5t_NOoEcj7H6-44k3fRRRM,5648
+mapfile_parser-2.11.0.dist-info/WHEEL,sha256=iWqkfraa9obU3i3GMWhmcTfRUvfzCL3AABl-FB2iPGc,105
+mapfile_parser-2.11.0.dist-info/licenses/LICENSE,sha256=FT7oxTcFUtz2c5eYIYePfzj2UD3hvxtLTa3FWz_nJuM,1073
 mapfile_parser.libs/libgcc_s-27e5a392.so.1,sha256=x5sO63liVwXxrjGGP371wB0RyQe1KEnIynYm82T0G0M,449745
-mapfile_parser/__init__.py,sha256=_IAX_b96JCG31ewTcS4cBCQW2hKV878G6ThikxqUEks,856
+mapfile_parser/__init__.py,sha256=p1d7qH8b9dqYKB-aZJBu4yC4WXzVau9Cr1GJ6Eh4CoM,856
 mapfile_parser/__main__.py,sha256=vErQTK2miHF7NseqLgI567tbFUjOrQ7UNxXOr_FwBhc,2176
 mapfile_parser/frontends/__init__.py,sha256=RIUBbM6crp4V4EeMQy0whTonYauh0Oi2oaxu1NfWNao,512
 mapfile_parser/frontends/bss_check.py,sha256=RierwrcKodWAf_-lD4xm9CjF_gh7ponlx0qEacRXKBk,9666
 mapfile_parser/frontends/first_diff.py,sha256=DyQRGHlYTVgfqEo6S25l335DgfJa2XbJ_V37-RQPmjM,10037
 mapfile_parser/frontends/jsonify.py,sha256=xchQspD7p0ai4ZzcKNgLN8pF9K56BGZN0YfcSUwWS5A,3550
-mapfile_parser/frontends/objdiff_report.py,sha256=2PnRn8dNBfAYNyixxT88PvQVcRggWB-YeDD9KDR-rSE,19767
+mapfile_parser/frontends/objdiff_report.py,sha256=Iuyb9HlFzSv-TILrywHLREvOKDPUF4QNari07iXP9jQ,20656
 mapfile_parser/frontends/pj64_syms.py,sha256=uQKjBM7qSAfeD9GvURpb_k-TdzynY3XINjp5jli_oJw,3213
 mapfile_parser/frontends/progress.py,sha256=QAzuds8q9gZVin7fgfeB_1bjKwnNYTfd31P_6rOHnRA,5601
 mapfile_parser/frontends/sym_info.py,sha256=10AA3CCIEvyjhnp9nOldaPeh2AdQpwh5vH79-1yVknc,4448
@@ -16,11 +16,11 @@ mapfile_parser/frontends/symbol_sizes_csv.py,sha256=Jr9hBYsMpq7sbLgMLiNi8u_qNXlA
 mapfile_parser/frontends/upload_frogress.py,sha256=PD9XupSd5LeD-xMjVUOjWDcQqK3gt4-1ykf7VVGBMoU,6528
 mapfile_parser/internals/__init__.py,sha256=WW--q8KRIfYTQLOMvRO7PCMSf7uWk-I1T20KU0C2a_0,327
 mapfile_parser/internals/objdiff_report.py,sha256=sZh7rUHdoWJfZKQ3EIeuNH9LqdEis2t7heCo1OOwKJU,6214
-mapfile_parser/mapfile.py,sha256=FSWKugZL_F2stvJ8o1MdgvaBeEJhJRRpm62JQ2TG_JA,42916
-mapfile_parser/mapfile_parser.cpython-310-i386-linux-gnu.so,sha256=3ua-M5FBn22fpgRjEoWctzh_ZL_YEnSsSNDo_88bcTo,3128241
-mapfile_parser/mapfile_parser.pyi,sha256=AuaCWiMySw-oBr-AR2NSbYbhpVP8TGS16rMeey6wc28,11227
+mapfile_parser/mapfile.py,sha256=kN3kOsTQENN0GrpybP-1Yn9NzK-E3qPMR23uuKciAWU,43060
+mapfile_parser/mapfile_parser.cpython-310-i386-linux-gnu.so,sha256=j7vTN2ZZdZLdHuZ-5rkr9kBbOldibIZ9DBWScGPkDTU,3136433
+mapfile_parser/mapfile_parser.pyi,sha256=urs5OyBZQIZpF_ncmk1Bfs3H8k9T2CCAGm26bWG9lck,11816
 mapfile_parser/mapfile_rs.py,sha256=0sVtLGvz5SMH5bKeTYu-3sM0f-_xXFRfDyY2g1GDh54,4078
 mapfile_parser/progress_stats.py,sha256=T9V52QIoNBtvsPAbYRlCOAio95Z8VxzZep8bCc1J-H0,2535
 mapfile_parser/progress_stats_rs.py,sha256=Rc9-PuZoKWVTO9TEIRk3Mpw0v6FdCFaJk2h7jUGyT_0,483
 mapfile_parser/utils.py,sha256=Bz6pcuR9lax72Y7avgbOIBlyN-1GcxfDxz5iBodr3n0,1517
-mapfile_parser-2.10.0.dist-info/RECORD,,
+mapfile_parser-2.11.0.dist-info/RECORD,,