splat64 0.34.0__py3-none-any.whl → 0.34.2__py3-none-any.whl

splat/__init__.py

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

splat/scripts/split.py

@@ -452,7 +452,8 @@ def main(
     make_full_disasm_for_code=False,
 ):
     if stdout_only:
-        progress_bar.out_file = sys.stdout
+        log.write("--stdout-only flag is deprecated", status="warn")
+    progress_bar.out_file = sys.stdout
 
     # Load config
     global config
@@ -538,7 +539,9 @@ def add_arguments_to_parser(parser: argparse.ArgumentParser):
         help="Skips the disassembler's version check",
     )
     parser.add_argument(
-        "--stdout-only", help="Print all output to stdout", action="store_true"
+        "--stdout-only",
+        help="Print all output to stdout (deprecated)",
+        action="store_true",
     )
     parser.add_argument(
         "--disassemble-all",

splat/segtypes/segment.py

@@ -414,6 +414,26 @@ class Segment:
 
         ret.parent = parent
 
+        # Import here to avoid circular imports
+        from .common.code import CommonSegCode
+        from .common.bss import CommonSegBss
+
+        if options.opts.ld_bss_is_noload and isinstance(ret, CommonSegBss):
+            # We need to know the bss space for the segment.
+            if isinstance(parent, CommonSegCode):
+                if parent.bss_size <= 0:
+                    log.error(
+                        f"Top-level segment '{parent.name}' is missing a `bss_size` value.\n    A non-zero `bss_size` value must be defined on the top-level segments that contain '{ret.type}' sections (produced by the '{ret.name}' section)."
+                    )
+                if (
+                    isinstance(ret.vram_start, int)
+                    and isinstance(parent.vram_end, int)
+                    and ret.vram_start >= parent.vram_end
+                ):
+                    log.error(
+                        f"The section '{ret.name}' (vram 0x{ret.vram_start:08X}) is outside its parent's address range '{parent.name}' (0x{parent.vram_start:08X} ~ 0x{parent.vram_end:08X}).\n    This may happen when the specified `bss_size` value is too small."
+                    )
+
         ret.given_section_order = parse_segment_section_order(yaml)
         ret.given_subalign = parse_segment_subalign(yaml)
 

splat/util/log.py

@@ -18,7 +18,12 @@ def write(*args, status=None, **kwargs):
         print("")
         newline = True
 
-    print(status_to_ansi(status) + str(args[0]), *args[1:], **kwargs)
+    print(
+        status_to_ansi(status) + str(args[0]),
+        *args[1:],
+        **kwargs,
+        file=output_file(status),
+    )
 
 
 def error(*args, **kwargs) -> NoReturn:
@@ -44,3 +49,9 @@ def status_to_ansi(status: Status):
         return Style.DIM
     else:
         return ""
+
+
+def output_file(status: Status):
+    if status == "warn" or status == "error":
+        return sys.stderr
+    return sys.stdout

{splat64-0.34.0.dist-info → splat64-0.34.2.dist-info}/METADATA

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

{splat64-0.34.0.dist-info → splat64-0.34.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-splat/__init__.py,sha256=ZaaW0dJgw7eCldOFBG7ux4Eh9_CkLS6q2OY_tN1fG6I,291
+splat/__init__.py,sha256=IrNBs4z5PshShOZJ2rWshns8vP39aL7U8wl3c3bkpiE,291
 splat/__main__.py,sha256=T333dHDgr-2HYYhtARnYMEjdECnYiNIKfcXDD99o22A,732
 splat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 splat/disassembler/__init__.py,sha256=IubLMnm_F5cZ7WUPBfk1VJ7vdj6i1if5GG6RBvEoBEA,226
@@ -15,10 +15,10 @@ 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=GEjoOD8LNb9oQp5uHys7r6GXwk7sxoQH_7NOqKM2FdE,19338
+splat/scripts/split.py,sha256=pzNPJRy11YwIA_2wbRYU2m-zIfBRpo2RySJ9nKVBqRI,19433
 splat/segtypes/__init__.py,sha256=-upUw_4JGQtvyp6IfTMzOq_CK3xvVaT_0K0_EipHyOo,208
 splat/segtypes/linker_entry.py,sha256=e2IzjAWC1B_JCx5pxBdKJrzOCse4SYUBrLHM8l3AR3o,24765
-splat/segtypes/segment.py,sha256=pWpX_PqPCRo8ZFVhqoiYcopzuAyB8PnKa0euEGUV5qc,29094
+splat/segtypes/segment.py,sha256=UByBPNSNb5AThjx2J9PspeQALobc-4_jh0qKQ9ycEjg,30281
 splat/segtypes/common/__init__.py,sha256=mnq0acScilSCCo6q2PvkDk0Or3V8qitA7I8QMVw8haI,631
 splat/segtypes/common/asm.py,sha256=k3p4vgbQJP40iyTgQkIci1j3CpKkWksqoWBx2Pb2oh8,703
 splat/segtypes/common/asmtu.py,sha256=C52kKh-8YeDHu0EucEfQ-tQMtDgfKfwAJ6wwiW6nOBU,354
@@ -80,7 +80,7 @@ splat/util/cache_handler.py,sha256=N0SggmvYwh0k-0fngHXoHG1CosC2rCsnlCTDsG8z5aE,1
 splat/util/color.py,sha256=FSmy0dAQJ9FzRBc99Yt4kBEyB62MC_YiVkqoWgPMsRU,371
 splat/util/compiler.py,sha256=xDDNdnutmkB7T21j-BccBMdkA2leU3GzXuTYEWgVgNw,1530
 splat/util/conf.py,sha256=aM6O2QikosjL95pCxI2FcCxrwDsLP8T8sRf2Uev_Pac,3236
-splat/util/log.py,sha256=GguW9AolH-EXGBmh-8aZXgUeBFJthqAOb3qKtRYUSj8,999
+splat/util/log.py,sha256=aJA1rg8IirJu1wGzjNuATHvepYvD3k5CtEyMasyJWxI,1193
 splat/util/options.py,sha256=iIwI3ZVbwWNIK4_0BIe3Iu9NxhEfIoXyjVGWgjPmG-Q,29157
 splat/util/palettes.py,sha256=d3KoZnwt-zunI9eNwb3txysXg4DY3xnF0O5aQRxM4so,2920
 splat/util/progress_bar.py,sha256=41VehpIFK1cphENaXV_Aq6_3mFx25eQ8V7Z51SKFPeM,166
@@ -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.34.0.dist-info/METADATA,sha256=ZlrQhRSpiF0y2xLSlKG32SXRxV7gZJ4K9uBylUb92Go,3830
-splat64-0.34.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-splat64-0.34.0.dist-info/entry_points.txt,sha256=O7Xy-qNOHcI87-OQrWJ-OhRDws74SuwVb_4rtnp0eLo,52
-splat64-0.34.0.dist-info/licenses/LICENSE,sha256=97VMVzjG8yQvsf8NG2M9IFSbh7R8cifJnc6QK1cZqj8,1070
-splat64-0.34.0.dist-info/RECORD,,
+splat64-0.34.2.dist-info/METADATA,sha256=iZ1tPzIOR4OIj8wVR5nxgMuniEL0hkBPONWgIAlHxM8,3830
+splat64-0.34.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+splat64-0.34.2.dist-info/entry_points.txt,sha256=O7Xy-qNOHcI87-OQrWJ-OhRDws74SuwVb_4rtnp0eLo,52
+splat64-0.34.2.dist-info/licenses/LICENSE,sha256=97VMVzjG8yQvsf8NG2M9IFSbh7R8cifJnc6QK1cZqj8,1070
+splat64-0.34.2.dist-info/RECORD,,