From 7843f01c996dde14c8f2f5cf733311039dd750c8 Mon Sep 17 00:00:00 2001
From: somewhatlurker <52014015+somewhatlurker@users.noreply.github.com>
Date: Thu, 30 Jul 2020 15:18:38 +1000
Subject: [PATCH] ARB patcher: use a generic patch for instruction suffixes

---
 .../ARB Patcher Source/gamesettings/divaaft.py      |  7 ++-----
 .../data/amd-tools/ARB Patcher Source/rules.py      | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/source-code/data/amd-tools/ARB Patcher Source/gamesettings/divaaft.py b/source-code/data/amd-tools/ARB Patcher Source/gamesettings/divaaft.py
index 35c0900..745e193 100644
--- a/source-code/data/amd-tools/ARB Patcher Source/gamesettings/divaaft.py	
+++ b/source-code/data/amd-tools/ARB Patcher Source/gamesettings/divaaft.py	
@@ -9,7 +9,7 @@ VP_SKINNING_SUB = "TEMP _adr;\n#\\1 \nTEMP mtx_tmp, mtx_tmp1, mtx_tmp2;\\2"
 
 # load the address temp with a texture coordinate instead
 # hardcoded to assume a 768*1 pixel texture
-VP_SKINNING_REGEX_2 = recompile(r"(BUFFER4[\s\S]*?)CVT.S32.F32\s*?(.*?),\s*?(.*?);")
+VP_SKINNING_REGEX_2 = recompile(r"(BUFFER4[\s\S]*?)CVT(?:.S32.F32)?\s*?(.*?),\s*?(.*?);")
 VP_SKINNING_SUB_2 = "\\1MUL \\2, \\3, 0.0013037809647979;" #1/767
 
 VP_SKINNING_REGEX_3 = recompile(r"(BUFFER4[\s\S]*?)(DP4 ([^;]*?), _mtxpal\[([^\]]*?\.x) \])")
@@ -27,7 +27,7 @@ VP_SKINNING_SUB_4 = "\\1mtx_tmp\\3"
 # make these run before VP_SKINNING_REGEX_4
 #TIGHTS_SKINNING_EFFECT_REGEX = recompile(r"(BUFFER4[\s\S]*?)SUBC .*?, vertex.attrib\[15\], .*?;\s*?SUBC1 tmp, vertex.attrib\[15\], .*?;[\s\S]*?XPD .*?, .*?, .*?;\s*?DP3_SAT (.*?), .*?, .*?;")
 #TIGHTS_SKINNING_EFFECT_SUB = "\\1MOV \\2, 0;"
-TIGHTS_SKINNING_EFFECT_REGEX = recompile(r"(BUFFER4[\s\S]*?)CVT.S32.F32\s*?(.*?),\s*?(.*?);")
+TIGHTS_SKINNING_EFFECT_REGEX = recompile(r"(BUFFER4[\s\S]*?)CVT(?:.S32.F32)?\s*?(.*?),\s*?(.*?);")
 TIGHTS_SKINNING_EFFECT_SUB = "\\1MUL \\2, \\3, 0.0013037809647979;"
 #TIGHTS_SKINNING_EFFECT_REGEX_2 = recompile(r"(BUFFER4[\s\S]*?)(IF GT1.y;[\s\S]*?|)(DP3 ([^;]*?), _mtxpal\[([^\]]*?\.x) \])(?![\s\S]*MUL  _adr)")
 #TIGHTS_SKINNING_EFFECT_REGEX_2b = recompile(r"(BUFFER4[\s\S]*?)(IF GT1.y;[\s\S]*?|)(DP3 ([^;]*?), _mtxpal\[([^\]]*?\.y) \])(?![\s\S]*MUL  _adr)")
@@ -91,9 +91,6 @@ def filename_filter(fname):
 
 # use to tweak reasults after patching
 def post_filter(fname, f_full):
-    # ideally this could do with a generic version in the main script...
-    f_full = f_full.replace('MOV.F.CC1 ', 'MOVC1 ')
-    
     f_full = f_full.replace('\nBUFFER4', '\n#BUFFER4')
     
     # fix tex sampler offsets
diff --git a/source-code/data/amd-tools/ARB Patcher Source/rules.py b/source-code/data/amd-tools/ARB Patcher Source/rules.py
index 1c81b8b..7d8546b 100644
--- a/source-code/data/amd-tools/ARB Patcher Source/rules.py	
+++ b/source-code/data/amd-tools/ARB Patcher Source/rules.py	
@@ -10,7 +10,7 @@ PARAM_REGEX = recompile(r"(?<!#)(?<!#\s)((SHORT\s*?|LONG\s*?)?PARAM\s*?([^\[\]\s
 UNUSED_PARAM_REGEX = recompile(r"(?<!#)(?<!#\s)((SHORT\s*?|LONG\s*?)?PARAM\s*?([^\[\]\s]*?)(\s*?\[.*?\])?\s*?=\s*?([^\s].*?);)\s*(?![\s\S]*[\s\-{]\3[\s,;\[])")
 
 # I think some of these instructions might still be left after other patches..  they will be commented out
-BAD_INSTR_REGEX = recompile(r"((?<!#)(?<!#\s)(CVT.S32.F32|BUFFER4|POW|NRM|REP)\s+?.*?;|ENDREP;|[^;\n]*\s*?(p_coef2d\[idx.x\]).*?;)\s*")
+BAD_INSTR_REGEX = recompile(r"((?<!#)(?<!#\s)(CVT|BUFFER4|POW|NRM|REP)\s+?.*?;|ENDREP;|[^;\n]*\s*?(p_coef2d\[idx.x\]).*?;)\s*")
 
 # find the header tag to replace with !!ARBxx1.0 and an NV OPTION
 NVFP_HEADER_REGEX = recompile(r"!!NVfp\d\.\d")
@@ -52,6 +52,15 @@ CONDITIONAL_CAL_REGEX = recompile(r"CAL\s+?(.*?)\s+?\((.*?)\)\s*?;")
 CONDITIONAL_CAL_SUB = "IF \\2; CAL \\1; ENDIF;"
 
 
+# seems like some suffixes (eg .F, .CC1) don't work
+# first regex: drop everything before the CC suffix, and convert CC suffix to appended C0/C1
+INSTR_SUFFIX_REGEX = recompile(r"(;\s*?)([A-Z\d]+)[A-Z\d\.]*?\.CC(\d)")
+INSTR_SUFFIX_SUB = "\\1\\2C\\3"
+# second regex: remove all remaining suffixes (or all suffixes for instructions without CC)
+INSTR_SUFFIX_REGEX_2 = recompile(r"(;\s*?)([A-Z\d]+)\.[A-Z\.\d]+")
+INSTR_SUFFIX_SUB_2 = "\\1\\2"
+
+
 MATCH_FP_FNAME = recompile(r".*fp")
 MATCH_VP_FNAME = recompile(r".*vp")
 MATCH_ALL_FNAME = recompile(r".*")
@@ -65,4 +74,6 @@ fix_repls = [
     (MATCH_ALL_FNAME, RET_IF_REGEX, RET_IF_SUB, False),
     (MATCH_ALL_FNAME, CONDITIONAL_RET_REGEX, CONDITIONAL_RET_SUB, True),
     (MATCH_ALL_FNAME, CONDITIONAL_CAL_REGEX, CONDITIONAL_CAL_SUB, False),
+    (MATCH_ALL_FNAME, INSTR_SUFFIX_REGEX, INSTR_SUFFIX_SUB, False),
+    (MATCH_ALL_FNAME, INSTR_SUFFIX_REGEX_2, INSTR_SUFFIX_SUB_2, False),
 ]