InstCountCI: Update for segment changes

FEX-Emu · Dec 21, 2023 · 175d407 · 175d407
1 parent ae2f98e
commit 175d407
Show file tree

Hide file tree

Showing 22 changed files with 2,675 additions and 2,635 deletions.
diff --git a/unittests/InstructionCountCI/Crypto/H0F3A.json b/unittests/InstructionCountCI/Crypto/H0F3A.json
@@ -55,7 +55,7 @@
         "0x66 0x0f 0x3a 0xdf"
       ],
       "ExpectedArm64ASM": [
-        "ldr q2, [x28, #2080]",
+        "ldr q2, [x28, #2208]",
         "movi v3.2d, #0x0",
         "mov v16.16b, v17.16b",
         "unimplemented (Unimplemented)",
@@ -68,7 +68,7 @@
         "0x66 0x0f 0x3a 0xdf"
       ],
       "ExpectedArm64ASM": [
-        "ldr q2, [x28, #2080]",
+        "ldr q2, [x28, #2208]",
         "movi v3.2d, #0x0",
         "mov v16.16b, v17.16b",
         "unimplemented (Unimplemented)",

diff --git a/unittests/InstructionCountCI/FlagM/SecondaryGroup.json b/unittests/InstructionCountCI/FlagM/SecondaryGroup.json
@@ -1200,7 +1200,7 @@
       "ExpectedInstructionCount": 58,
       "Comment": "GROUP15 0x0F 0xAE /0",
       "ExpectedArm64ASM": [
-        "ldrh w20, [x28, #1024]",
+        "ldrh w20, [x28, #1152]",
         "strh w20, [x4]",
         "mov w20, #0x0",
         "ldrb w21, [x28, #747]",
@@ -1214,7 +1214,7 @@
         "orr x20, x20, x23, lsl #10",
         "orr x20, x20, x24, lsl #14",
         "strh w20, [x4, #2]",
-        "ldrb w20, [x28, #1026]",
+        "ldrb w20, [x28, #1154]",
         "strb w20, [x4, #4]",
         "ldr q2, [x28, #768]",
         "str q2, [x4, #32]",
@@ -1279,7 +1279,7 @@
       "Comment": "GROUP15 0x0F 0xAE /1",
       "ExpectedArm64ASM": [
         "ldrh w20, [x4]",
-        "strh w20, [x28, #1024]",
+        "strh w20, [x28, #1152]",
         "ldrh w20, [x4, #2]",
         "ubfx w21, w20, #11, #3",
         "strb w21, [x28, #747]",
@@ -1292,7 +1292,7 @@
         "strb w23, [x28, #746]",
         "strb w20, [x28, #750]",
         "ldrb w20, [x4, #4]",
-        "strb w20, [x28, #1026]",
+        "strb w20, [x28, #1154]",
         "ldr q2, [x4, #32]",
         "str q2, [x28, #768]",
         "ldr q2, [x4, #48]",
@@ -1417,7 +1417,7 @@
         "ubfx x22, x20, #0, #1",
         "cbnz x22, #+0x8",
         "b #+0x84",
-        "ldrh w22, [x28, #1024]",
+        "ldrh w22, [x28, #1152]",
         "strh w22, [x21]",
         "mov w22, #0x0",
         "ldrb w23, [x28, #747]",
@@ -1431,7 +1431,7 @@
         "orr x22, x22, x25, lsl #10",
         "orr x22, x22, x30, lsl #14",
         "strh w22, [x21, #2]",
-        "ldrb w22, [x28, #1026]",
+        "ldrb w22, [x28, #1154]",
         "strb w22, [x21, #4]",
         "ldr q2, [x28, #768]",
         "str q2, [x21, #32]",
@@ -1502,7 +1502,7 @@
         "cbnz x22, #+0x8",
         "b #+0x84",
         "ldrh w22, [x20]",
-        "strh w22, [x28, #1024]",
+        "strh w22, [x28, #1152]",
         "ldrh w22, [x20, #2]",
         "ubfx w23, w22, #11, #3",
         "strb w23, [x28, #747]",
@@ -1515,7 +1515,7 @@
         "strb w25, [x28, #746]",
         "strb w22, [x28, #750]",
         "ldrb w22, [x20, #4]",
-        "strb w22, [x28, #1026]",
+        "strb w22, [x28, #1154]",
         "ldr q2, [x20, #32]",
         "str q2, [x28, #768]",
         "ldr q2, [x20, #48]",
@@ -1535,13 +1535,13 @@
         "b #+0x4c",
         "mov w22, #0x0",
         "mov w23, #0x37f",
-        "strh w23, [x28, #1024]",
+        "strh w23, [x28, #1152]",
         "strb w22, [x28, #747]",
         "strb w22, [x28, #744]",
         "strb w22, [x28, #745]",
         "strb w22, [x28, #746]",
         "strb w22, [x28, #750]",
-        "strb w22, [x28, #1026]",
+        "strb w22, [x28, #1154]",
         "movi v2.2d, #0x0",
         "str q2, [x28, #768]",
         "str q2, [x28, #784]",

diff --git a/unittests/InstructionCountCI/FlagM/SecondaryModRM.json b/unittests/InstructionCountCI/FlagM/SecondaryModRM.json
@@ -41,8 +41,8 @@
         "st1 {v20.2d, v21.2d, v22.2d, v23.2d}, [x0], #64",
         "st1 {v24.2d, v25.2d, v26.2d, v27.2d}, [x0], #64",
         "st1 {v28.2d, v29.2d, v30.2d, v31.2d}, [x0], #64",
-        "ldr x0, [x28, #1112]",
-        "ldr x2, [x28, #1128]",
+        "ldr x0, [x28, #1240]",
+        "ldr x2, [x28, #1256]",
         "mov w1, w5",
         "blr x2",
         "ldr w4, [x28, #728]",
@@ -85,7 +85,7 @@
         "str w0, [x28, #728]",
         "str x8, [x28, #40]",
         "mov w0, #0x100",
-        "str x0, [x28, #1056]",
+        "str x0, [x28, #1184]",
         "sub sp, sp, #0x10 (16)",
         "mov w8, #0xa8",
         "mov x0, sp",
@@ -96,7 +96,7 @@
         "ldr w8, [x28, #728]",
         "msr nzcv, x8",
         "ldr x8, [x28, #40]",
-        "str xzr, [x28, #1056]",
+        "str xzr, [x28, #1184]",
         "orr x5, x0, x1, lsl #12"
       ]
     }