Merge remote-tracking branch 'upstream/main' into promote_overlapping…

…_warning_to_error
ethteck · Dec 2, 2024 · b260b0c · b260b0c
2 parents b0798fb + 0a29471
commit b260b0c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ### 0.31.1
 
+* Tag `PSYQ` as a compiler that uses `j` instructions as branches.
+  * Fixes incorrect detection of non existing functions under the mentioned compiler.
 * Try to tell the users what segments are causing the overlapping issue.
 * The overlap warning has been promoted to an error.
 

diff --git a/src/splat/util/compiler.py b/src/splat/util/compiler.py
@@ -48,7 +48,10 @@ class Compiler:
 )
 
 # PS1
-PSYQ = Compiler("PSYQ")
+PSYQ = Compiler(
+    "PSYQ",
+    j_as_branch=True,
+)
 
 # PS2
 MWCCPS2 = Compiler("MWCCPS2")