Fix r5900 disassembly issues

CHANGELOG.md

@@ -1,5 +1,9 @@
 # splat Release Notes
 
+### 0.19.1
+
+* Fixed disassembly of certain ps2 instructions to properly re-assemble in a compatible and matching way.
+
 ### 0.19.0: vram_classes
 
 * New top-level yaml feature: `vram_classes`. This allows you to make common definitions for vram locations that can be applied to multiple segments. Please see the [documentation](docs/VramClasses.md) for more details!

requirements.txt

@@ -5,6 +5,6 @@ intervaltree
 colorama
 # This value should be keep in sync with the version listed on disassembler/spimdisasm_disassembler.py
 spimdisasm>=1.18.0
-rabbitizer>=1.7.0
+rabbitizer>=1.8.0
 pygfxd
 n64img>=0.1.4

segtypes/common/codesubsegment.py

@@ -130,6 +130,16 @@ def process_insns(
 
         # Main loop
         for i, insn in enumerate(func_spim.instructions):
+            if options.opts.platform == "ps2":
+                from segtypes.common.c import CommonSegC
+                from rabbitizer import TrinaryValue
+
+                if isinstance(self, CommonSegC):
+                    insn.flag_r5900UseDollar = TrinaryValue.FALSE
+                else:
+                    insn.flag_r5900UseDollar = TrinaryValue.TRUE
+                insn.flag_r5900DisasmAsData = TrinaryValue.TRUE
+
             instr_offset = i * 4
 
             # update pointer accesses from this function

split.py

@@ -24,7 +24,7 @@
 from segtypes.segment import Segment
 from util import log, options, palettes, symbols, relocs
 
-VERSION = "0.19.0"
+VERSION = "0.19.1"
 
 parser = argparse.ArgumentParser(
     description="Split a rom given a rom, a config, and output directory"