splat64 0.32.2__tar.gz → 0.32.3__tar.gz

{splat64-0.32.2 → splat64-0.32.3}/CHANGELOG.md

@@ -1,5 +1,10 @@
 # splat Release Notes
 
+### 0.32.3
+
+- Fix "unrecognized YAML option" error if disassemble_all is provided via CLI and as a YAML option.
+- Slightly speed up `bss` disassembly for projects over thousands of subsegments in the same top-level segment.
+
 ### 0.32.2
 
 * Fix jumptable labels not being properly formatted with the given `symbol_name_format`.

{splat64-0.32.2 → splat64-0.32.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splat64
-Version: 0.32.2
+Version: 0.32.3
 Summary: A binary splitting tool to assist with decompilation and modding projects
 Project-URL: Repository, https://github.com/ethteck/splat
 Project-URL: Issues, https://github.com/ethteck/splat/issues
@@ -76,7 +76,7 @@ The brackets corresponds to the optional dependencies to install while installin
 If you use a `requirements.txt` file in your repository, then you can add this library with the following line:
 
 ```txt
-splat64[mips]>=0.32.2,<1.0.0
+splat64[mips]>=0.32.3,<1.0.0
 ```
 
 ### Optional dependencies

{splat64-0.32.2 → splat64-0.32.3}/README.md

@@ -21,7 +21,7 @@ The brackets corresponds to the optional dependencies to install while installin
 If you use a `requirements.txt` file in your repository, then you can add this library with the following line:
 
 ```txt
-splat64[mips]>=0.32.2,<1.0.0
+splat64[mips]>=0.32.3,<1.0.0
 ```
 
 ### Optional dependencies

{splat64-0.32.2 → splat64-0.32.3}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "splat64"
 # Should be synced with src/splat/__init__.py
-version = "0.32.2"
+version = "0.32.3"
 description = "A binary splitting tool to assist with decompilation and modding projects"
 readme = "README.md"
 license = {file = "LICENSE"}

{splat64-0.32.2 → splat64-0.32.3}/src/splat/__init__.py

@@ -1,7 +1,7 @@
 __package_name__ = __name__
 
 # Should be synced with pyproject.toml
-__version__ = "0.32.2"
+__version__ = "0.32.3"
 __author__ = "ethteck"
 
 from . import util as util

{splat64-0.32.2 → splat64-0.32.3}/src/splat/segtypes/common/bss.py

@@ -60,7 +60,9 @@ class CommonSegBss(CommonSegData):
                 f"Segment '{self.name}' (type '{self.type}') requires a vram address. Got '{self.vram_start}'"
             )
 
-        next_subsegment = self.parent.get_next_subsegment_for_ram(self.vram_start)
+        next_subsegment = self.parent.get_next_subsegment_for_ram(
+            self.vram_start, self.index_within_group
+        )
         if next_subsegment is None:
             bss_end = self.get_most_parent().vram_end
         else:

{splat64-0.32.2 → splat64-0.32.3}/src/splat/segtypes/common/code.py

@@ -270,6 +270,8 @@ class CommonSegCode(CommonSegGroup):
                 sibling.siblings[segment.get_linker_section_linksection()] = segment
 
         ret = self._insert_all_auto_sections(ret, base_segments, readonly_before)
+        for i, seg in enumerate(ret):
+            seg.index_within_group = i
 
         return ret
 

{splat64-0.32.2 → splat64-0.32.3}/src/splat/segtypes/common/group.py

@@ -110,11 +110,16 @@ class CommonSegGroup(CommonSegment):
                 self.special_vram_segment = True
             segment.is_auto_segment = is_auto_segment
 
+            segment.index_within_group = len(ret)
+
             ret.append(segment)
             prev_start = start
             if end is not None:
                 last_rom_end = end
 
+        for i, seg in enumerate(ret):
+            seg.index_within_group = i
+
         return ret
 
     @property
@@ -165,13 +170,17 @@ class CommonSegGroup(CommonSegment):
                 return sub
         return None
 
-    def get_next_subsegment_for_ram(self, addr: int) -> Optional[Segment]:
+    def get_next_subsegment_for_ram(
+        self, addr: int, current_subseg_index: Optional[int]
+    ) -> Optional[Segment]:
         """
         Returns the first subsegment which comes after the specified address,
         or None in case this address belongs to the last subsegment of this group
         """
 
-        for sub in self.subsegments:
+        start = current_subseg_index if current_subseg_index is not None else 0
+
+        for sub in self.subsegments[start:]:
             if sub.vram_start is None:
                 continue
             assert isinstance(sub.vram_start, int)

{splat64-0.32.2 → splat64-0.32.3}/src/splat/segtypes/segment.py

@@ -255,7 +255,7 @@ class Segment:
 
     @staticmethod
     def parse_suggestion_rodata_section_start(
-        yaml: Union[dict, list]
+        yaml: Union[dict, list],
     ) -> Optional[bool]:
         if isinstance(yaml, dict):
             suggestion_rodata_section_start = yaml.get(
@@ -354,6 +354,8 @@ class Segment:
         # Is an automatic segment, generated automatically or declared on the yaml by the user
         self.is_auto_segment: bool = False
 
+        self.index_within_group: Optional[int] = None
+
         if self.rom_start is not None and self.rom_end is not None:
             if self.rom_start > self.rom_end:
                 log.error(

{splat64-0.32.2 → splat64-0.32.3}/src/splat/util/options.py

@@ -554,10 +554,10 @@ def _parse_yaml(
         detect_redundant_function_end=p.parse_opt(
             "detect_redundant_function_end", bool, True
         ),
-        # Command line argument takes precedence over yaml option
-        disassemble_all=(
-            disasm_all if disasm_all else p.parse_opt("disassemble_all", bool, False)
-        ),
+        # Setting either option will produce a full disassembly,
+        # but we still have to check the yaml option first to avoid leaving option unparsed,
+        # because splat would complain about an unrecognized yaml option otherwise.
+        disassemble_all=p.parse_opt("disassemble_all", bool, False) or disasm_all,
         global_vram_start=p.parse_optional_opt("global_vram_start", int),
         global_vram_end=p.parse_optional_opt("global_vram_end", int),
         use_gp_rel_macro_nonmatching=p.parse_opt(