splat64 0.36.1__tar.gz → 0.36.2__tar.gz

{splat64-0.36.1 → splat64-0.36.2}/CHANGELOG.md

@@ -1,8 +1,13 @@
 # splat Release Notes
 
+### 0.36.2
+
+* Fix a regression on the R3000GTE `dpct` instruction on autogenerated the `gte_macros.s` file.
+
 ### 0.36.1
+
 * Files generated with `generate_asm_macros_files` will not be overwritten if they already exist on disk unchanged.
-* Updated GTE macros to better document opcode encodings
+* Updated GTE macros to better document opcode encodings.
 
 ### 0.36.0
 

{splat64-0.36.1 → splat64-0.36.2}/PKG-INFO

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

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

{splat64-0.36.1 → splat64-0.36.2}/pyproject.toml

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

{splat64-0.36.1 → splat64-0.36.2}/src/splat/__init__.py

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

{splat64-0.36.1 → splat64-0.36.2}/src/splat/segtypes/linker_entry.py

@@ -594,7 +594,7 @@ class LinkerWriter:
         if not noload:
             seg_rom_start = get_segment_rom_start(seg_name)
             line += f" AT({seg_rom_start})"
-        if options.opts.emit_subalign and segment.subalign != None:
+        if options.opts.emit_subalign and segment.subalign is not None:
             line += f" SUBALIGN({segment.subalign})"
 
         self._writeln(line)
@@ -636,7 +636,7 @@ class LinkerWriter:
         if noload:
             line += " (NOLOAD)"
         line += " :"
-        if options.opts.emit_subalign and segment.subalign != None:
+        if options.opts.emit_subalign and segment.subalign is not None:
             line += f" SUBALIGN({segment.subalign})"
 
         self._writeln(line)

{splat64-0.36.1 → splat64-0.36.2}/src/splat/segtypes/segment.py

@@ -56,7 +56,7 @@ def parse_segment_subalign(segment: Union[dict, list]) -> Optional[int]:
     default = options.opts.subalign
     if isinstance(segment, dict):
         subalign = segment.get("subalign", default)
-        if subalign != None:
+        if subalign is not None:
             subalign = int(subalign)
         return subalign
     return default

{splat64-0.36.1 → splat64-0.36.2}/src/splat/util/file_presets.py

@@ -342,17 +342,17 @@ def write_assembly_inc_files():
 
 
 def write_gte_macros():
-    # Taken directly from https://github.com/Decompollaborate/rabbitizer/blob/develop/docs/r3000gte/gte_macros.s
+    # Taken directly from https://github.com/Decompollaborate/rabbitizer/blob/-/docs/r3000gte/gte_macros.s
     # Please try to upstream any fix/update done here.
-    gte_macros = """
+    gte_macros = """\
 .ifndef .L_GTE_MACRO_INC
 .L_GTE_MACRO_INC:
 
 ## GTE instruction macros
 ## These are meant for use with GAS and replace DMPSX
 
-.macro cop2op pseudo, op, sf = 1, mx = 0, v = 0, cv = 0, lm = 0
-    cop2 \\pseudo << 20 | \\sf << 19 | \\mx << 17 | \\v << 15 | \\cv << 13 | \\lm << 10 | \\op
+.macro cop2op fake_op, op, gbg = 0, sf = 1, mx = 0, v = 0, cv = 0, lm = 0
+    cop2 \\fake_op << 20 | \\gbg << 20 | \\sf << 19 | \\mx << 17 | \\v << 15 | \\cv << 13 | \\lm << 10 | \\op
 .endm
 
 /*  RTPS    15      0x4A180001  Perspective transform */
@@ -375,9 +375,9 @@ def write_gte_macros():
     cop2op 0x07, 0x10
 .endm
 
-/*  DPCT    17      0x4A88002A  Depth cue color RGB0,RGB1,RGB2 */
+/*  DPCT    17      0x4AF8002A  Depth cue color RGB0,RGB1,RGB2 */
 .macro dpct
-    cop2op 0x08, 0x2A
+    cop2op 0x0F, 0x2A
 .endm
 
 /*  INTPL   8       0x4A980011  Interpolation of vector and far color */
@@ -442,6 +442,7 @@ def write_gte_macros():
 
 
 ## Instructions which take an argument
+# gbg: arg is 5 bit wide
 # sf : arg is 1 bit wide
 # mx : arg is 2 bit wide
 # v  : arg is 2 bit wide