- WIP

tgiphil · Apr 29, 2024 · 47f94f7 · 47f94f7
1 parent 0cf03c7
commit 47f94f7
Show file tree

Hide file tree

Showing 90 changed files with 181 additions and 158 deletions.
diff --git a/Source/Data/X64-Optimizations-ConstantMove.json b/Source/Data/X64-Optimizations-ConstantMove.json
@@ -17,7 +17,7 @@
 			"Name": "Add##",
 			"SubName": "",
 			"Expression": "X64.Add## a (X64.Mov## c)",
-			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Add## a c)",
 			"Variations": "No",
 			"Log": "No"
@@ -27,7 +27,7 @@
 			"Name": "Sub##",
 			"SubName": "",
 			"Expression": "X64.Sub## a (X64.Mov## c)",
-			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Sub## a c)",
 			"Variations": "No",
 			"Log": "No"
@@ -37,7 +37,7 @@
 			"Name": "And##",
 			"SubName": "",
 			"Expression": "X64.And## a (X64.Mov## c)",
-			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.And## a c)",
 			"Variations": "No",
 			"Log": "No"
@@ -47,7 +47,7 @@
 			"Name": "Or##",
 			"SubName": "",
 			"Expression": "X64.Or## a (X64.Mov## c)",
-			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Or## a c)",
 			"Variations": "No",
 			"Log": "No"
@@ -57,7 +57,7 @@
 			"Name": "Xor##",
 			"SubName": "",
 			"Expression": "X64.Xor## a (X64.Mov## c)",
-			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Xor## a c)",
 			"Variations": "No",
 			"Log": "No"
@@ -67,7 +67,7 @@
 			"Name": "Sar##",
 			"SubName": "",
 			"Expression": "X64.Sar## a (X64.Mov## c)",
-			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Sar## a c)",
 			"Variations": "No",
 			"Log": "No"
@@ -77,7 +77,7 @@
 			"Name": "Shl##",
 			"SubName": "",
 			"Expression": "X64.Shl## a (X64.Mov## c)",
-			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Shl## a c)",
 			"Variations": "No",
 			"Log": "No"
@@ -87,7 +87,7 @@
 			"Name": "Shr##",
 			"SubName": "",
 			"Expression": "X64.Shr## a (X64.Mov## c)",
-			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Shr## a c)",
 			"Variations": "No",
 			"Log": "No"

diff --git a/Source/Data/X64-Optimizations-Lea.json b/Source/Data/X64-Optimizations-Lea.json
@@ -47,7 +47,7 @@
 			"Name": "Mul##ToLea##",
 			"SubName": "By3Or5Or9",
 			"Expression": "X64.Mul## a b",
-			"Filter": "!IsResult2Used(@) && !IsZero(a) && Contains(b, 3, 5, 9) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!IsResult2Used(@) && !IsZero(a) && Contains(b, 3, 5, 9) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Lea## a a [Sub##(To##(b),1)] [To##(0)])",
 			"Variations": "No",
 			"Log": "No"

diff --git a/Source/Data/X64-Optimizations-Standard.json b/Source/Data/X64-Optimizations-Standard.json
@@ -26,7 +26,7 @@
 			"Name": "Add##",
 			"SubName": "ByZero",
 			"Expression": "X64.Add## a 0",
-			"Filter": "!AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Mov## a)",
 			"Variations": "No"
 		},
@@ -35,7 +35,7 @@
 			"Name": "Sub##",
 			"SubName": "ByZero",
 			"Expression": "X64.Sub## a 0",
-			"Filter": "!AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Mov## a)",
 			"Variations": "Yes"
 		},
@@ -44,7 +44,7 @@
 			"Name": "IMul##",
 			"SubName": "ByZero",
 			"Expression": "X64.IMul## a 0",
-			"Filter": "!AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Mov## 0)",
 			"Variations": "No",
 			"Log": "No"
@@ -54,7 +54,7 @@
 			"Name": "IMul##",
 			"SubName": "ByOne",
 			"Expression": "X64.IMul## a 1",
-			"Filter": "!AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Mov## 1)",
 			"Variations": "No",
 			"Log": "No"
@@ -64,7 +64,7 @@
 			"Name": "And##",
 			"SubName": "ByFF",
 			"Expression": "X64.And## a 0xFF",
-			"Filter": "!IsCPURegister(a,%ESI) && !IsCPURegister(a,%EDI) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!IsCPURegister(a,%ESI) && !IsCPURegister(a,%EDI) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Movzx8To## a)",
 			"Variations": "Yes",
 			"Log": "No",
@@ -75,7 +75,7 @@
 			"Name": "Add##By1Not##",
 			"SubName": "",
 			"Expression": "X64.Add## (X64.Not## x) 1",
-			"Filter": "IsVirtualRegister(x) && !IsCarryFlagUsed(@, 10)",
+			"Filter": "IsVirtualRegister(x) && !IsCarryFlagUsed(@, $Window)",
 			"Result": "(X64.Neg## x)",
 			"Variations": "Yes"
 		},
@@ -84,7 +84,7 @@
 			"Name": "Inc##Not##",
 			"SubName": "",
 			"Expression": "X64.Inc## (X64.Not## x)",
-			"Filter": "IsVirtualRegister(x) && !IsCarryFlagUsed(@, 10)",
+			"Filter": "IsVirtualRegister(x) && !IsCarryFlagUsed(@, $Window)",
 			"Result": "(X64.Neg## x)",
 			"Variations": "No"
 		},
@@ -93,7 +93,7 @@
 			"Name": "And##Add##",
 			"SubName": "ToBlsr##",
 			"Expression": "X64.And## x (X64.Add## x -1)",
-			"Filter": "IsVirtualRegister(x) && !IsCarryFlagUsed(@, 10)",
+			"Filter": "IsVirtualRegister(x) && !IsCarryFlagUsed(@, $Window)",
 			"Result": "(X64.Blsr## x)",
 			"Variations": "Yes"
 		},
@@ -112,7 +112,7 @@
 			"Name": "And##",
 			"SubName": "ByZero",
 			"Expression": "X64.And## a 0",
-			"Filter": "!AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Mov## 0)",
 			"Variations": "Yes",
 			"Log": "No"
@@ -122,7 +122,7 @@
 			"Name": "And##",
 			"SubName": "ByMax",
 			"Expression": "X64.And## a 0xFFFFFFFF",
-			"Filter": "!AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Mov## [To##(0xFFFFFFFF)])",
 			"Variations": "Yes",
 			"Log": "No"
@@ -132,7 +132,7 @@
 			"Name": "Sar##",
 			"SubName": "ZeroValue",
 			"Expression": "X64.Sar## 0 a",
-			"Filter": "!AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Mov## 0)",
 			"Priority": "80"
 		},
@@ -141,7 +141,7 @@
 			"Name": "Sar##",
 			"SubName": "ByZero",
 			"Expression": "X64.Sar## a 0",
-			"Filter": "!AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Mov## a)",
 			"Priority": "80"
 		},
@@ -150,7 +150,7 @@
 			"Name": "Shl##",
 			"SubName": "ZeroValue",
 			"Expression": "X64.Shl## 0 a",
-			"Filter": "!AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Mov## 0)",
 			"Priority": "80"
 		},
@@ -159,7 +159,7 @@
 			"Name": "Shl##",
 			"SubName": "ByZero",
 			"Expression": "X64.Shl## a 0",
-			"Filter": "!AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Mov## a)",
 			"Priority": "80"
 		},
@@ -168,7 +168,7 @@
 			"Name": "Shr##",
 			"SubName": "ZeroValue",
 			"Expression": "X64.Shr## 0 a",
-			"Filter": "!AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Mov## 0)",
 			"Priority": "80"
 		},
@@ -177,7 +177,7 @@
 			"Name": "Shr##",
 			"SubName": "ByZero",
 			"Expression": "X64.Shr## a 0",
-			"Filter": "!AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Mov## a)",
 			"Priority": "80"
 		},
@@ -186,7 +186,7 @@
 			"Name": "IMul##Mov##",
 			"SubName": "ByZero",
 			"Expression": "X64.IMul## a (X64.Mov## 0)",
-			"Filter": "!AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Mov## 0)",
 			"Variations": "No",
 			"Log": "No"
@@ -196,7 +196,7 @@
 			"Name": "IMul##Mov##",
 			"SubName": "ByOne",
 			"Expression": "X64.IMul## a (X64.Mov## 1)",
-			"Filter": "!AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X64.Mov## a)",
 			"Variations": "No",
 			"Log": "No"

diff --git a/Source/Data/X86-Optimizations-ConstantMove.json b/Source/Data/X86-Optimizations-ConstantMove.json
@@ -13,7 +13,7 @@
 			"Name": "Add32",
 			"SubName": "",
 			"Expression": "X86.Add32 a (X86.Mov32 c)",
-			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X86.Add32 a c)",
 			"Variations": "No",
 			"Log": "No"
@@ -23,7 +23,7 @@
 			"Name": "Sub32",
 			"SubName": "",
 			"Expression": "X86.Sub32 a (X86.Mov32 c)",
-			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X86.Sub32 a c)",
 			"Variations": "No",
 			"Log": "No"
@@ -33,7 +33,7 @@
 			"Name": "And32",
 			"SubName": "",
 			"Expression": "X86.And32 a (X86.Mov32 c)",
-			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X86.And32 a c)",
 			"Variations": "No",
 			"Log": "No"
@@ -43,7 +43,7 @@
 			"Name": "Or32",
 			"SubName": "",
 			"Expression": "X86.Or32 a (X86.Mov32 c)",
-			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X86.Or32 a c)",
 			"Variations": "No",
 			"Log": "No"
@@ -53,7 +53,7 @@
 			"Name": "Xor32",
 			"SubName": "",
 			"Expression": "X86.Xor32 a (X86.Mov32 c)",
-			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X86.Xor32 a c)",
 			"Variations": "No",
 			"Log": "No"
@@ -63,7 +63,7 @@
 			"Name": "Sar32",
 			"SubName": "",
 			"Expression": "X86.Sar32 a (X86.Mov32 c)",
-			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X86.Sar32 a c)",
 			"Variations": "No",
 			"Log": "No"
@@ -73,7 +73,7 @@
 			"Name": "Shl32",
 			"SubName": "",
 			"Expression": "X86.Shl32 a (X86.Mov32 c)",
-			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X86.Shl32 a c)",
 			"Variations": "No",
 			"Log": "No"
@@ -83,7 +83,7 @@
 			"Name": "Shr32",
 			"SubName": "",
 			"Expression": "X86.Shr32 a (X86.Mov32 c)",
-			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "IsConstant(c) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X86.Shr32 a c)",
 			"Variations": "No",
 			"Log": "No"

diff --git a/Source/Data/X86-Optimizations-Lea.json b/Source/Data/X86-Optimizations-Lea.json
@@ -43,7 +43,7 @@
 			"Name": "Mul32ToLea32",
 			"SubName": "By3Or5Or9",
 			"Expression": "X86.Mul32 a b",
-			"Filter": "!IsResult2Used(@) && !IsZero(a) && Contains(b, 3, 5, 9) && !AreAnyStatusFlagsUsed(@, 10)",
+			"Filter": "!IsResult2Used(@) && !IsZero(a) && Contains(b, 3, 5, 9) && !AreAnyStatusFlagsUsed(@, $Window)",
 			"Result": "(X86.Lea32 a a [Sub32(To32(b),1)] [To32(0)])",
 			"Variations": "No",
 			"Log": "No"