splat64 0.37.0__tar.gz → 0.37.1__tar.gz

{splat64-0.37.0 → splat64-0.37.1}/CHANGELOG.md

@@ -1,5 +1,11 @@
 # splat Release Notes
 
+### 0.37.1
+
+* Fix `make_full_disasm_for_code` not extracting data-only TUs.
+* Fix `make_full_disasm_for_code` and `disassemble_all` combo
+  * Fixes not writing other sections to asm file when both options are enabled.
+
 ### 0.37.0
 
 * Add define check to allow using `macro.inc` instead of `labels.inc` in `include_asm.h`.

{splat64-0.37.0 → splat64-0.37.1}/PKG-INFO

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

{splat64-0.37.0 → splat64-0.37.1}/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.37.0,<1.0.0
+splat64[mips]>=0.37.1,<1.0.0
 ```
 
 ### Optional dependencies

{splat64-0.37.0 → splat64-0.37.1}/docs/Configuration.md

@@ -848,6 +848,16 @@ Emit a full `.s` file for each `c`/`cpp` segment containing disassembly of .text
 
 Can be used to generate "target" or "expected" objects for asm diffing.
 
+To generate `.s` files for data-only TUs (or rodata/bss only, or any other combination that doesn't have a text section) a dummy `c` or `cpp` section with the same name as the data section must be defined in the yaml with an start value of `auto` instead of a number. For example:
+
+```yaml
+      - [auto, c, boot/rom_offsets]
+
+      # -- Other c or data subsegments --
+
+      - [0x00F340, .data, boot/rom_offsets]
+```
+
 ### global_vram_start and global_vram_end
 
 Allow specifying that the global memory range may be larger than what was automatically detected.

{splat64-0.37.0 → splat64-0.37.1}/pyproject.toml

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

{splat64-0.37.0 → splat64-0.37.1}/src/splat/__init__.py

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

{splat64-0.37.0 → splat64-0.37.1}/src/splat/segtypes/common/c.py

@@ -152,6 +152,8 @@ class CommonSegC(CommonSegCodeSubsegment):
 
     def split(self, rom_bytes: bytes):
         if self.is_auto_segment:
+            if options.opts.make_full_disasm_for_code:
+                self.split_as_asmtu_file(self.asm_out_path())
             return
 
         if self.rom_start != self.rom_end:

{splat64-0.37.0 → splat64-0.37.1}/src/splat/segtypes/common/codesubsegment.py

@@ -252,22 +252,21 @@ class CommonSegCodeSubsegment(Segment):
             f.write(self.spim_section.disassemble())
 
     # 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
-
+    def split_as_asmtu_file(self, out_path: Path):
         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.spim_section would be None if the current section was
+            # declared `auto` in the yaml.
+            # This can be useful when there are TUs with only data/rodata/bss/etc
+            # sections but not text section.
+            if self.spim_section is not None:
+                # 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:
@@ -281,25 +280,31 @@ class CommonSegCodeSubsegment(Segment):
                 if (
                     isinstance(sibling, CommonSegCodeSubsegment)
                     and sibling.spim_section is not None
-                    and not sibling.should_self_split()
+                    and (
+                        not sibling.should_self_split()
+                        or options.opts.make_full_disasm_for_code
+                    )
                 ):
                     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`
+            # Another loop to check anything that somehow may not be present in 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
+                    # Already handled in the above loop
                     continue
 
                 if (
                     isinstance(sibling, CommonSegCodeSubsegment)
                     and sibling.spim_section is not None
-                    and not sibling.should_self_split()
+                    and (
+                        not sibling.should_self_split()
+                        or options.opts.make_full_disasm_for_code
+                    )
                 ):
                     f.write("\n")
                     f.write(f"{sibling.get_section_asm_line()}\n\n")

{splat64-0.37.0 → splat64-0.37.1}/src/splat/util/file_presets.py

@@ -42,9 +42,6 @@ def write_include_asm_h():
         return
 
     directory = options.opts.generated_asm_macros_directory.as_posix()
-    print()
-    print(directory)
-    print()
 
     if options.opts.include_asm_macro_style == "maspsx_hack":
         include_asm_macro = """\

{splat64-0.37.0 → splat64-0.37.1}/test/basic_app/expected/asm/main.s

@@ -86,3 +86,51 @@ glabel func_800004A0
     /* 10E8 800004E8 27BD0018 */   addiu     $sp, $sp, 0x18
 endlabel func_800004A0
     /* 10EC 800004EC 00000000 */  nop
+
+.section .data, "wa"
+
+nonmatching D_80000500
+
+dlabel D_80000500
+    /* 1100 80000500 00000001 */ .word 0x00000001
+enddlabel D_80000500
+
+nonmatching D_80000504
+
+dlabel D_80000504
+    /* 1104 80000504 00000000 */ .word 0x00000000
+    /* 1108 80000508 00000000 */ .word 0x00000000
+    /* 110C 8000050C 00000000 */ .word 0x00000000
+enddlabel D_80000504
+
+.section .rodata, "a"
+
+nonmatching D_80000510
+
+dlabel D_80000510
+    /* 1110 80000510 00010203 */ .word 0x00010203
+    /* 1114 80000514 04050607 */ .word 0x04050607
+enddlabel D_80000510
+
+.align 3
+nonmatching jtbl_80000518
+
+dlabel jtbl_80000518
+    /* 1118 80000518 80000448 */ .word .L80000448
+    /* 111C 8000051C 80000450 */ .word .L80000450
+    /* 1120 80000520 80000458 */ .word .L80000458
+    /* 1124 80000524 80000460 */ .word .L80000460
+    /* 1128 80000528 80000468 */ .word .L80000468
+    /* 112C 8000052C 80000470 */ .word .L80000470
+    /* 1130 80000530 80000478 */ .word .L80000478
+    /* 1134 80000534 80000480 */ .word .L80000480
+    /* 1138 80000538 00000000 */ .word 0x00000000
+    /* 113C 8000053C 00000000 */ .word 0x00000000
+enddlabel jtbl_80000518
+
+.section .bss, "wa"
+
+nonmatching D_80000540, 0x80
+
+dlabel D_80000540
+    /* 80000540 */ .space 0x80