splat64 0.33.1__py3-none-any.whl → 0.33.2__py3-none-any.whl

splat/__init__.py

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

splat/segtypes/common/asmtu.py

@@ -1,10 +1,4 @@
-from pathlib import Path
-from typing import Optional, TextIO
-
-from ...util import log, options
-
 from .asm import CommonSegAsm
-from .codesubsegment import CommonSegCodeSubsegment
 
 
 class CommonSegAsmtu(CommonSegAsm):
@@ -18,48 +12,4 @@ class CommonSegAsmtu(CommonSegAsm):
         out_path = self.out_path()
         assert out_path is not None, str(self)
 
-        out_path.parent.mkdir(parents=True, exist_ok=True)
-
-        self.print_file_boundaries()
-
-        with open(out_path, "w", newline="\n") as f:
-            # Write `.text` contents
-            for line in self.get_asm_file_header():
-                f.write(line + "\n")
-            f.write(self.spim_section.disassemble())
-
-            # Disassemble the siblings to this file by respecting the `section_order`
-            for sect in self.section_order:
-                if sect == self.get_linker_section_linksection():
-                    continue
-
-                sibling = self.siblings.get(sect)
-                if sibling is None:
-                    continue
-
-                if (
-                    isinstance(sibling, CommonSegCodeSubsegment)
-                    and sibling.spim_section is not None
-                    and not sibling.should_self_split()
-                ):
-                    f.write("\n")
-                    f.write(f"{sibling.get_section_asm_line()}\n\n")
-                    f.write(sibling.spim_section.disassemble())
-
-            # Another loop to check anything that somehow may not be present on the `section_order`
-            for sect, sibling in self.siblings.items():
-                if sect == self.get_linker_section_linksection():
-                    continue
-
-                if sect in self.section_order:
-                    # Already handled on the above loop
-                    continue
-
-                if (
-                    isinstance(sibling, CommonSegCodeSubsegment)
-                    and sibling.spim_section is not None
-                    and not sibling.should_self_split()
-                ):
-                    f.write("\n")
-                    f.write(f"{sibling.get_section_asm_line()}\n\n")
-                    f.write(sibling.spim_section.disassemble())
+        self.split_as_asmtu_file(out_path)

splat/segtypes/common/c.py

@@ -250,7 +250,7 @@ class CommonSegC(CommonSegCodeSubsegment):
                         assert func_sym is not None
 
                         if (
-                            not entry.function.getName() in self.global_asm_funcs
+                            entry.function.getName() not in self.global_asm_funcs
                             and options.opts.disassemble_all
                             and not is_new_c_file
                         ):
@@ -281,7 +281,7 @@ class CommonSegC(CommonSegCodeSubsegment):
                 section = self.spim_section.get_section()
                 old_value = section.getGpRelHack()
                 section.setGpRelHack(False)
-                self.split_as_asm_file(self.asm_out_path())
+                self.split_as_asmtu_file(self.asm_out_path())
                 section.setGpRelHack(old_value)
 
     def get_c_preamble(self):
@@ -304,7 +304,7 @@ class CommonSegC(CommonSegCodeSubsegment):
 
             if rodata_sym.vramEnd != next_rodata_sym.vram:
                 log.write(
-                    f"\nA gap was detected in migrated rodata symbols!", status="warn"
+                    "\nA gap was detected in migrated rodata symbols!", status="warn"
                 )
                 log.write(
                     f"\t In function '{func.getName()}' (0x{func.vram:08X}), gap detected between '{rodata_sym.getName()}' (0x{rodata_sym.vram:08X}) and '{next_rodata_sym.getName()}' (0x{next_rodata_sym.vram:08X})"
@@ -313,7 +313,7 @@ class CommonSegC(CommonSegCodeSubsegment):
                     f"\t The address of the missing rodata symbol is 0x{rodata_sym.vramEnd:08X}"
                 )
                 log.write(
-                    f"\t Try to force the migration of that symbol with `force_migration:True` in the symbol_addrs.txt file; or avoid the migration of symbols around this address with `force_not_migration:True`"
+                    "\t Try to force the migration of that symbol with `force_migration:True` in the symbol_addrs.txt file; or avoid the migration of symbols around this address with `force_not_migration:True`"
                 )
 
     def create_c_asm_file(

splat/segtypes/common/codesubsegment.py

@@ -238,12 +238,69 @@ class CommonSegCodeSubsegment(Segment):
         if self.spim_section is None:
             return
 
-        if out_path:
-            out_path.parent.mkdir(parents=True, exist_ok=True)
+        if not out_path:
+            return
+
+        out_path.parent.mkdir(parents=True, exist_ok=True)
+
+        self.print_file_boundaries()
+
+        with open(out_path, "w", newline="\n") as f:
+            # Write `.text` contents
+            for line in self.get_asm_file_header():
+                f.write(line + "\n")
+            f.write(self.spim_section.disassemble())
 
-            self.print_file_boundaries()
+    # Same as above but write all sections from siblings
+    def split_as_asmtu_file(self, out_path: Optional[Path]):
+        if self.spim_section is None:
+            return
+
+        if not out_path:
+            return
 
-            with open(out_path, "w", newline="\n") as f:
-                for line in self.get_asm_file_header():
-                    f.write(line + "\n")
-                f.write(self.spim_section.disassemble())
+        out_path.parent.mkdir(parents=True, exist_ok=True)
+
+        self.print_file_boundaries()
+
+        with open(out_path, "w", newline="\n") as f:
+            # Write `.text` contents
+            for line in self.get_asm_file_header():
+                f.write(line + "\n")
+            f.write(self.spim_section.disassemble())
+
+            # Disassemble the siblings to this file by respecting the `section_order`
+            for sect in self.section_order:
+                if sect == self.get_linker_section_linksection():
+                    continue
+
+                sibling = self.siblings.get(sect)
+                if sibling is None:
+                    continue
+
+                if (
+                    isinstance(sibling, CommonSegCodeSubsegment)
+                    and sibling.spim_section is not None
+                    and not sibling.should_self_split()
+                ):
+                    f.write("\n")
+                    f.write(f"{sibling.get_section_asm_line()}\n\n")
+                    f.write(sibling.spim_section.disassemble())
+
+            # Another loop to check anything that somehow may not be present on the `section_order`
+            for sect, sibling in self.siblings.items():
+                if sect == self.get_linker_section_linksection():
+                    continue
+
+                if sect in self.section_order:
+                    # Already handled on the above loop
+                    continue
+
+                if (
+                    isinstance(sibling, CommonSegCodeSubsegment)
+                    and sibling.spim_section is not None
+                    and not sibling.should_self_split()
+                ):
+                    f.write("\n")
+                    f.write(f"{sibling.get_section_asm_line()}\n\n")
+                    f.write(sibling.spim_section.disassemble())

{splat64-0.33.1.dist-info → splat64-0.33.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splat64
-Version: 0.33.1
+Version: 0.33.2
 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.33.1,<1.0.0
+splat64[mips]>=0.33.2,<1.0.0
 ```
 
 ### Optional dependencies

{splat64-0.33.1.dist-info → splat64-0.33.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-splat/__init__.py,sha256=s0MHlzXtpFFqwUXdK_QTP2zGUxVKBhE7XytlqRTJv_Y,291
+splat/__init__.py,sha256=RsNLR9JOXykmo-1waX9VcDxc1ayMcuHDl38qCnLmJ4E,291
 splat/__main__.py,sha256=T333dHDgr-2HYYhtARnYMEjdECnYiNIKfcXDD99o22A,732
 splat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 splat/disassembler/__init__.py,sha256=IubLMnm_F5cZ7WUPBfk1VJ7vdj6i1if5GG6RBvEoBEA,226
@@ -21,12 +21,12 @@ splat/segtypes/linker_entry.py,sha256=e2IzjAWC1B_JCx5pxBdKJrzOCse4SYUBrLHM8l3AR3
 splat/segtypes/segment.py,sha256=Y8OaNle09VeQ8pghzMQtxu8I2sWKy8fWPdfRH1zkUXU,28820
 splat/segtypes/common/__init__.py,sha256=mnq0acScilSCCo6q2PvkDk0Or3V8qitA7I8QMVw8haI,631
 splat/segtypes/common/asm.py,sha256=k3p4vgbQJP40iyTgQkIci1j3CpKkWksqoWBx2Pb2oh8,703
-splat/segtypes/common/asmtu.py,sha256=5FOVAXjqhM-kynm-nOuS1k7E9048WAW2eNHdKYtR5m8,2288
+splat/segtypes/common/asmtu.py,sha256=C52kKh-8YeDHu0EucEfQ-tQMtDgfKfwAJ6wwiW6nOBU,354
 splat/segtypes/common/bin.py,sha256=6rxYRXTdAVEs3AFMgmhelOwOmKMg3bbkl-j4k4wqql4,1229
 splat/segtypes/common/bss.py,sha256=nktRbKrDivweyLdsUQkL5guSayqpwn7NK5j3gq3arKc,3084
-splat/segtypes/common/c.py,sha256=FBcEQ6GB5-F5wZQCahh2FjkqLkWFHBTehql8SuLVQyY,20419
+splat/segtypes/common/c.py,sha256=AZvMW2qiyXYs_n7Yfz58BzwnH2ll7iyBAktkIZlvaCI,20419
 splat/segtypes/common/code.py,sha256=CFDbn2YCoRIpUT07vTW0rUQtG58X0sxTtp17VPbrZsc,10706
-splat/segtypes/common/codesubsegment.py,sha256=_fpQF7O5pq4CBclhqcR4_KbiY8Oo2p7gaMEnkICBfQ4,8558
+splat/segtypes/common/codesubsegment.py,sha256=7iLNf-H076OHcnpRqPgDWZTJJgPkWUMSp0nSCvAfB1Q,10646
 splat/segtypes/common/cpp.py,sha256=p-duowCt4czrmaWgj1LuFw5LGfdyB_uaeLTKVmH80Cg,180
 splat/segtypes/common/data.py,sha256=r9G_vYieNlRze-5wGOKFazvFjpuodfSLad6iCNsBOAU,5665
 splat/segtypes/common/databin.py,sha256=ucbbsc_M1332KifjExuDsf1wqm4-GZAiLqOwwrUwUpQ,1194
@@ -94,8 +94,8 @@ splat/util/n64/find_code_length.py,sha256=uUoPoUORAjsAvH8oGqwnGvw6j8I_NnSrZtA-x9
 splat/util/n64/rominfo.py,sha256=U6TieblUAmxhZsn7u8nbjOKkbC6ygsC_7IiLLaOWwUE,14646
 splat/util/psx/__init__.py,sha256=kCCaR-KB1mNlIcXB4OuuSQ2zVLbWg_SnIZIUeyjeBBI,39
 splat/util/psx/psxexeinfo.py,sha256=MrxY28nes0uzpFmCz0o9JFbF8s1eQRQNOpC_82wsMVI,5725
-splat64-0.33.1.dist-info/METADATA,sha256=xym78Asaf2XRy0p1LkMu9m-PMZzjArFAkiBoztPKzgs,3830
-splat64-0.33.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-splat64-0.33.1.dist-info/entry_points.txt,sha256=O7Xy-qNOHcI87-OQrWJ-OhRDws74SuwVb_4rtnp0eLo,52
-splat64-0.33.1.dist-info/licenses/LICENSE,sha256=97VMVzjG8yQvsf8NG2M9IFSbh7R8cifJnc6QK1cZqj8,1070
-splat64-0.33.1.dist-info/RECORD,,
+splat64-0.33.2.dist-info/METADATA,sha256=CFJ6z02JMyJ-uNmy8mBoRrVFXUvxbPnmlmk653LBbd0,3830
+splat64-0.33.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+splat64-0.33.2.dist-info/entry_points.txt,sha256=O7Xy-qNOHcI87-OQrWJ-OhRDws74SuwVb_4rtnp0eLo,52
+splat64-0.33.2.dist-info/licenses/LICENSE,sha256=97VMVzjG8yQvsf8NG2M9IFSbh7R8cifJnc6QK1cZqj8,1070
+splat64-0.33.2.dist-info/RECORD,,