splat64 0.32.0__py3-none-any.whl → 0.32.2__py3-none-any.whl

splat/__init__.py

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

splat/disassembler/spimdisasm_disassembler.py

@@ -7,7 +7,7 @@ from typing import Set
 
 class SpimdisasmDisassembler(disassembler.Disassembler):
     # This value should be kept in sync with the version listed on requirements.txt and pyproject.toml
-    SPIMDISASM_MIN = (1, 31, 0)
+    SPIMDISASM_MIN = (1, 32, 0)
 
     def configure(self):
         # Configure spimdisasm

splat/scripts/split.py

@@ -271,11 +271,9 @@ def do_scan(
     for segment in scan_bar:
         assert isinstance(segment, Segment)
         scan_bar.set_description(f"Scanning {brief_seg_name(segment, 20)}")
-        typ = segment.type
-        if segment.type == "bin" and segment.is_name_default():
-            typ = "unk"
 
-        stats.add_size(typ, segment.size)
+        for ty, sub_stats in segment.statistics.items():
+            stats.add_size(ty, sub_stats.size)
 
         if segment.should_scan():
             # Check cache but don't write anything
@@ -287,7 +285,8 @@ def do_scan(
 
             processed_segments.append(segment)
 
-            stats.count_split(typ)
+            for ty, sub_stats in segment.statistics.items():
+                stats.count_split(ty, sub_stats.count)
 
     symbols.mark_c_funcs_as_defined()
     return processed_segments
@@ -305,7 +304,8 @@ def do_split(
         split_bar.set_description(f"Splitting {brief_seg_name(segment, 20)}")
 
         if cache.check_cache_hit(segment, True):
-            stats.count_cached(segment.type)
+            for ty, sub_stats in segment.statistics.items():
+                stats.count_cached(ty, sub_stats.count)
             continue
 
         if segment.should_split():

splat/segtypes/common/bin.py

@@ -3,7 +3,7 @@ from typing import Optional
 
 from ...util import log, options
 
-from .segment import CommonSegment
+from .segment import CommonSegment, SegmentType
 
 
 class CommonSegBin(CommonSegment):
@@ -33,3 +33,10 @@ class CommonSegBin(CommonSegment):
 
             f.write(rom_bytes[self.rom_start : self.rom_end])
         self.log(f"Wrote {self.name} to {path}")
+
+    @property
+    def statistics_type(self) -> SegmentType:
+        stats_type = self.type
+        if self.is_name_default():
+            stats_type = "unk"
+        return stats_type

splat/segtypes/common/codesubsegment.py

@@ -122,7 +122,7 @@ class CommonSegCodeSubsegment(Segment):
         )
 
         # Gather symbols found by spimdisasm and create those symbols in splat's side
-        for referenced_vram in func_spim.instrAnalyzer.referencedVrams:
+        for referenced_vram in func_spim.referencedVrams:
             context_sym = self.spim_section.get_section().getSymbol(
                 referenced_vram, tryPlusOffset=False
             )

splat/segtypes/common/data.py

@@ -145,6 +145,16 @@ class CommonSegData(CommonSegCodeSubsegment, CommonSegGroup):
                 self.get_most_parent(), symbol.contextSym
             )
 
+            # Gather symbols found by spimdisasm and create those symbols in splat's side
+            for referenced_vram in symbol.referencedVrams:
+                context_sym = self.spim_section.get_section().getSymbol(
+                    referenced_vram, tryPlusOffset=False
+                )
+                if context_sym is not None:
+                    symbols.create_symbol_from_spim_symbol(
+                        self.get_most_parent(), context_sym
+                    )
+
             # Hint to the user that we are now in the .rodata section and no longer in the .data section (assuming rodata follows data)
             if (
                 self.suggestion_rodata_section_start

splat/segtypes/common/group.py

@@ -3,7 +3,7 @@ from typing import List, Optional
 from ...util import log
 
 from .segment import CommonSegment
-from ..segment import Segment
+from ..segment import empty_statistics, Segment, SegmentStatistics
 
 
 class CommonSegGroup(CommonSegment):
@@ -124,6 +124,14 @@ class CommonSegGroup(CommonSegment):
                 return True
         return False
 
+    @property
+    def statistics(self) -> SegmentStatistics:
+        stats = empty_statistics()
+        for sub in self.subsegments:
+            for ty, info in sub.statistics.items():
+                stats[ty] = stats[ty].merge(info)
+        return stats
+
     def get_linker_entries(self):
         return [entry for sub in self.subsegments for entry in sub.get_linker_entries()]
 

splat/segtypes/common/rodata.py

@@ -112,6 +112,16 @@ class CommonSegRodata(CommonSegData):
             )
             generated_symbol.linker_section = self.get_linker_section_linksection()
 
+            # Gather symbols found by spimdisasm and create those symbols in splat's side
+            for referenced_vram in symbol.referencedVrams:
+                context_sym = self.spim_section.get_section().getSymbol(
+                    referenced_vram, tryPlusOffset=False
+                )
+                if context_sym is not None:
+                    symbols.create_symbol_from_spim_symbol(
+                        self.get_most_parent(), context_sym
+                    )
+
             possible_text = self.get_possible_text_subsegment_for_symbol(symbol)
             if possible_text is not None:
                 text_segment, refenceeFunction = possible_text

splat/segtypes/common/segment.py

@@ -1,4 +1,4 @@
-from ...segtypes.segment import Segment
+from ...segtypes.segment import Segment, SegmentType
 
 
 class CommonSegment(Segment):

splat/segtypes/segment.py

@@ -1,3 +1,5 @@
+import collections
+import dataclasses
 import importlib
 import importlib.util
 from pathlib import Path
@@ -67,6 +69,27 @@ def parse_segment_section_order(segment: Union[dict, list]) -> List[str]:
     return default
 
 
+SegmentType = str
+
+
+@dataclasses.dataclass
+class SegmentStatisticsInfo:
+    size: int
+    count: int
+
+    def merge(self, other: "SegmentStatisticsInfo") -> "SegmentStatisticsInfo":
+        return SegmentStatisticsInfo(
+            size=self.size + other.size, count=self.count + other.count
+        )
+
+
+SegmentStatistics = dict[SegmentType, SegmentStatisticsInfo]
+
+
+def empty_statistics() -> SegmentStatistics:
+    return collections.defaultdict(lambda: SegmentStatisticsInfo(size=0, count=0))
+
+
 class Segment:
     require_unique_name = True
 
@@ -520,6 +543,17 @@ class Segment:
         else:
             return None
 
+    @property
+    def statistics(self) -> SegmentStatistics:
+        stats = empty_statistics()
+        if self.size is not None:
+            stats[self.statistics_type] = SegmentStatisticsInfo(size=self.size, count=1)
+        return stats
+
+    @property
+    def statistics_type(self) -> SegmentType:
+        return self.type
+
     @property
     def vram_end(self) -> Optional[int]:
         if self.vram_start is not None and self.size is not None:

splat/util/statistics.py

@@ -24,15 +24,15 @@ class Statistics:
             self.seg_sizes[typ] = 0
         self.seg_sizes[typ] += 0 if size is None else size
 
-    def count_split(self, typ: str):
+    def count_split(self, typ: str, count: int = 1):
         if typ not in self.seg_split:
             self.seg_split[typ] = 0
-        self.seg_split[typ] += 1
+        self.seg_split[typ] += count
 
-    def count_cached(self, typ: str):
+    def count_cached(self, typ: str, count: int = 1):
         if typ not in self.seg_cached:
             self.seg_cached[typ] = 0
-        self.seg_cached[typ] += 1
+        self.seg_cached[typ] += count
 
     def print_statistics(self, total_size: int):
         unk_size = self.seg_sizes.get("unk", 0)

{splat64-0.32.0.dist-info → splat64-0.32.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: splat64
-Version: 0.32.0
+Version: 0.32.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
@@ -26,6 +26,7 @@ License: MIT License
         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
         SOFTWARE.
+License-File: LICENSE
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
@@ -41,7 +42,7 @@ Requires-Dist: mypy; extra == 'dev'
 Requires-Dist: n64img>=0.3.3; extra == 'dev'
 Requires-Dist: pygfxd; extra == 'dev'
 Requires-Dist: rabbitizer<2.0.0,>=1.12.0; extra == 'dev'
-Requires-Dist: spimdisasm<2.0.0,>=1.31.0; extra == 'dev'
+Requires-Dist: spimdisasm<2.0.0,>=1.32.0; extra == 'dev'
 Requires-Dist: types-colorama; extra == 'dev'
 Requires-Dist: types-pyyaml; extra == 'dev'
 Provides-Extra: mips
@@ -49,7 +50,7 @@ Requires-Dist: crunch64<1.0.0,>=0.5.1; extra == 'mips'
 Requires-Dist: n64img>=0.3.3; extra == 'mips'
 Requires-Dist: pygfxd; extra == 'mips'
 Requires-Dist: rabbitizer<2.0.0,>=1.12.0; extra == 'mips'
-Requires-Dist: spimdisasm<2.0.0,>=1.31.0; extra == 'mips'
+Requires-Dist: spimdisasm<2.0.0,>=1.32.0; extra == 'mips'
 Description-Content-Type: text/markdown
 
 # splat
@@ -75,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.0,<1.0.0
+splat64[mips]>=0.32.2,<1.0.0
 ```
 
 ### Optional dependencies

{splat64-0.32.0.dist-info → splat64-0.32.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-splat/__init__.py,sha256=s7UKbK2EKKRakorwkWyarL3p9JgerrDcbJLYTfv-ucg,291
+splat/__init__.py,sha256=a-EuQ-1jQ9RLrnfrNmIp7R4dCc2ShUTZv0j4car-jHI,291
 splat/__main__.py,sha256=T333dHDgr-2HYYhtARnYMEjdECnYiNIKfcXDD99o22A,732
 splat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 splat/disassembler/__init__.py,sha256=IubLMnm_F5cZ7WUPBfk1VJ7vdj6i1if5GG6RBvEoBEA,226
@@ -6,7 +6,7 @@ splat/disassembler/disassembler.py,sha256=2ynehZRz1P6UnaBk6DWRy4c3ynRnnWApMhf0K9
 splat/disassembler/disassembler_instance.py,sha256=09GW7QYoNolgE2wnO7ALngw_CxgF-mfyLiXBsyv22jA,916
 splat/disassembler/disassembler_section.py,sha256=J9jtplQVDVeGBmyEOcMpC3Hv3DyecqaNjlYc7zqEqDI,7459
 splat/disassembler/null_disassembler.py,sha256=jYuDMtfPiBifwz0H-ZHLMWtpGa19X_iLgy4K-dQhPYY,328
-splat/disassembler/spimdisasm_disassembler.py,sha256=WZf2Vtyq2P95Lc_D6TtKXSy8zMWmQLKdSkDyNhyWuEI,5685
+splat/disassembler/spimdisasm_disassembler.py,sha256=Z3eLbmO1Q7uY9zdbFzGJH1zE1LgHSLRQWRwyYpNFuzQ,5685
 splat/platforms/__init__.py,sha256=qjqKi63k5N3DUdILNfuk6qpJJkVeAWpjAs36L97vvP4,100
 splat/platforms/n64.py,sha256=kgWr6nesGC0X-qVydmu8tSq48NbqVf9mF6EyqvUuoUM,421
 splat/platforms/ps2.py,sha256=QI_8Ve43LZeNqpuk8_CFxIqsNJpMTacRHXdZVh3iY6c,336
@@ -15,35 +15,35 @@ splat/platforms/psx.py,sha256=YxQERdOBr4p3ab9Wk80FNhVYi-uvmh7p_jeykSFp23M,40
 splat/scripts/__init__.py,sha256=OY0nHg6a7JB437Sb96qLbZ_7ByVsal1gStj35wJAI_Y,101
 splat/scripts/capy.py,sha256=svbOfLO34-QN3xLiBy9vk2RGs_To8TWMWEKBw6yx2xQ,3674
 splat/scripts/create_config.py,sha256=nFwIt1UWzlWE9C3i-2dGsVyGX2cuXzIqkp2kur2-pdE,7670
-splat/scripts/split.py,sha256=oY4gFTfEr7bHsO9-VatvBxv1gdGYQGag9fFXHqA6HjA,20604
+splat/scripts/split.py,sha256=INZ8gwyv9ulSfrNYJuPykkg5BWWsYLnto6JVXXIiHG0,20704
 splat/segtypes/__init__.py,sha256=-upUw_4JGQtvyp6IfTMzOq_CK3xvVaT_0K0_EipHyOo,208
 splat/segtypes/linker_entry.py,sha256=m2qrZEZaRqsurUVlgo5rQt-4OZwDywK8hTqY1SoF2D8,24689
-splat/segtypes/segment.py,sha256=wTvx4AyL8jacHJ9PeqmqrvfCF8JOnCTOflVE7fLboM8,27902
+splat/segtypes/segment.py,sha256=Ey4d4hxGWL4e8ZsxVRGXafP9GCFXB-3F6loaBFVDU-k,28764
 splat/segtypes/common/__init__.py,sha256=mnq0acScilSCCo6q2PvkDk0Or3V8qitA7I8QMVw8haI,631
 splat/segtypes/common/asm.py,sha256=_EfIbDOlQdmvAVqPq_Jxgp335zIxEPLnuQc96x9EyOY,1819
 splat/segtypes/common/asmtu.py,sha256=hrflvDGZ4BcVEA8CRkkIOlqt0tUCC4iNb4oclht2o6s,2274
-splat/segtypes/common/bin.py,sha256=3wBV6qe9xSXqq-WONylLM5UmFLa8xbU-N22atGyOYQk,1032
+splat/segtypes/common/bin.py,sha256=6rxYRXTdAVEs3AFMgmhelOwOmKMg3bbkl-j4k4wqql4,1229
 splat/segtypes/common/bss.py,sha256=EIN8E7CfqwcWRMWb_JIbGBicu6VKREdIbvQZNBM-6sM,3037
 splat/segtypes/common/c.py,sha256=NWLc1ArOQ3t2xfIJj8I2AGzm8xNR9DPbb5Wgg9L1VNY,19755
 splat/segtypes/common/code.py,sha256=23VZJXNFi3PYq3xH269DlxjCiqasSQnMuxwQkh-1qXU,10629
-splat/segtypes/common/codesubsegment.py,sha256=hkwuTBjxhn3IeiEoO-FhSg5lsyj9rxkuOSdsFrj-hME,7029
+splat/segtypes/common/codesubsegment.py,sha256=fRDFUu9RzBSMeHo_vsT0Ko1qoeLDq8kLaIX4asJGMa4,7015
 splat/segtypes/common/cpp.py,sha256=p-duowCt4czrmaWgj1LuFw5LGfdyB_uaeLTKVmH80Cg,180
-splat/segtypes/common/data.py,sha256=EvR2aXnRqIAMOKYZgBFt2WSxEZ5d52IB4gdRGkjLeeA,5513
+splat/segtypes/common/data.py,sha256=ZR6ZVgAOWuKJOMpKAe4nK2ORH9oAjQ8uSszcTJaZ1j8,5997
 splat/segtypes/common/databin.py,sha256=ucbbsc_M1332KifjExuDsf1wqm4-GZAiLqOwwrUwUpQ,1194
 splat/segtypes/common/eh_frame.py,sha256=MzL373ej2E38leM47py3T5beLq2IolsYszLZM8PYS2Y,913
 splat/segtypes/common/gcc_except_table.py,sha256=-ZrQL5dCcRu7EPFFPgL8lIJwWL5FsEeeQoSUVfTkyIg,2112
-splat/segtypes/common/group.py,sha256=gTZUgBSlWPmjExdM-RS6T1-vv5hCVv-i10Ob1faxgbY,5634
+splat/segtypes/common/group.py,sha256=DIDLeiOlpguIPatw8a9vHmvsQ2LXI-QWbFy_D7PhVgQ,5928
 splat/segtypes/common/hasm.py,sha256=HW6OADo-2D3Jln0q5KAoE8zUGOUiJAUEHqHOG4dRmw8,1130
 splat/segtypes/common/header.py,sha256=NspQdk-L69j9dOBzBtDKb7bc11Gwa0WDWIVCd2P4mfE,1257
 splat/segtypes/common/lib.py,sha256=WaJH0DH0B8iJvhYQWYBjThbNeEXz3Yh7E8ZyONe5JtQ,2349
 splat/segtypes/common/linker_offset.py,sha256=IaEXMXq62BS2g95I4lS0wax5Ehjfi3O3C-uSDUbMjvI,767
 splat/segtypes/common/pad.py,sha256=-7SaRgXrmGeOINKVV9v1c3e9jn8aVQknD8EVaEPcPrw,758
 splat/segtypes/common/rdata.py,sha256=ab2MFZVjlnD2p5nDVNroo3W9blaVJND2jN2PJPy6a_Y,142
-splat/segtypes/common/rodata.py,sha256=YLCRkEZB_EyUVU8-f8UNMRN8VDXtkXZdmVr7F-ToUqg,5691
+splat/segtypes/common/rodata.py,sha256=sv-QCqKTQ2RNB5W0-BjiiSQhxB99pU0gEBFbd8e9SZo,6175
 splat/segtypes/common/rodatabin.py,sha256=uqp60QuwHwvlMwHq0nZrU3y3yYcHbv2twT0PIDp4NzM,1199
 splat/segtypes/common/sbss.py,sha256=blIEuVYie4qNEOYMmlSdltn5f4MvgJu3AV8vqVD8Nh4,131
 splat/segtypes/common/sdata.py,sha256=dnLzNSNtSyclLZiNUmFTv0e0BWN8glxB1km1MSRq6xY,136
-splat/segtypes/common/segment.py,sha256=gFPzEi0Jq0NGtL4xlblIlNZus7dHkxebLKkr6jhOkxs,81
+splat/segtypes/common/segment.py,sha256=vVFyFjs-gS5qIWO8Pd0pMJYxboP-iBRKvxcDV8YxdYM,94
 splat/segtypes/common/textbin.py,sha256=6WXGaAPJhqFYamqoUPeSr2nq2M6Go3BxG1_s7UozEUA,4296
 splat/segtypes/n64/__init__.py,sha256=tf2yWlijeKmOp1OhEEL-aW88mU-mWQRC2lSjQ5Ww1eI,569
 splat/segtypes/n64/ci.py,sha256=An7wIHcoZ89KiGCKpCRbM7IrmDNYBidXT-6kjKn2vH0,2400
@@ -84,7 +84,7 @@ splat/util/options.py,sha256=XrOq83KPdNU-RjrIMx-G6jZ8-y0wtsnazuuqcSaSWeY,28061
 splat/util/palettes.py,sha256=d3KoZnwt-zunI9eNwb3txysXg4DY3xnF0O5aQRxM4so,2920
 splat/util/progress_bar.py,sha256=41VehpIFK1cphENaXV_Aq6_3mFx25eQ8V7Z51SKFPeM,166
 splat/util/relocs.py,sha256=cgQYSaAtNpLlUZQdhEfa7ZpI8i0HqoDhwB88QtFqdJs,4212
-splat/util/statistics.py,sha256=Y8XDVoupo_gy_Nm0VApd2kDZH3p4wQHWFaOACfwNpng,1866
+splat/util/statistics.py,sha256=8C88vLW8q4Xd4i1Crz8X24NLoraLyKd0lw3ebbeonSo,1906
 splat/util/symbols.py,sha256=CMYn6dQDJJEx6bd6IHai8jnqkRwC3EkLdtvMJWz4AlM,29688
 splat/util/utils.py,sha256=EtuU2f7S3vI8kH9C9KaIpjANsUCUkoFz4VBNLWK9lQY,187
 splat/util/vram_classes.py,sha256=UH4rkugEwoec_-alJ4smNOcnU51G-V5OG7Pfsj47eaM,3491
@@ -93,8 +93,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.32.0.dist-info/METADATA,sha256=91ka7AhW5E0tUZs6oYiujZXFf8KJflCGREDZK_nwZE8,3808
-splat64-0.32.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-splat64-0.32.0.dist-info/entry_points.txt,sha256=O7Xy-qNOHcI87-OQrWJ-OhRDws74SuwVb_4rtnp0eLo,52
-splat64-0.32.0.dist-info/licenses/LICENSE,sha256=97VMVzjG8yQvsf8NG2M9IFSbh7R8cifJnc6QK1cZqj8,1070
-splat64-0.32.0.dist-info/RECORD,,
+splat64-0.32.2.dist-info/METADATA,sha256=yd7HFS__8mQ3lqO6kA14ZYdwImHBVTcQc0zdtOaGDYI,3830
+splat64-0.32.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+splat64-0.32.2.dist-info/entry_points.txt,sha256=O7Xy-qNOHcI87-OQrWJ-OhRDws74SuwVb_4rtnp0eLo,52
+splat64-0.32.2.dist-info/licenses/LICENSE,sha256=97VMVzjG8yQvsf8NG2M9IFSbh7R8cifJnc6QK1cZqj8,1070
+splat64-0.32.2.dist-info/RECORD,,

{splat64-0.32.0.dist-info → splat64-0.32.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any