diff --git a/unittests/InstructionCountCI/FlagM/x87.json b/unittests/InstructionCountCI/FlagM/x87.json
index 1cc138f7b..021a095c3 100644
--- a/unittests/InstructionCountCI/FlagM/x87.json
+++ b/unittests/InstructionCountCI/FlagM/x87.json
@@ -9959,7 +9959,7 @@
       ]
     },
     "fisttp word [rax]": {
-      "ExpectedInstructionCount": 30,
+      "ExpectedInstructionCount": 31,
       "Comment": [
         "0xdf !11b /1"
       ],
@@ -9968,14 +9968,15 @@
         "add x21, x28, x20, lsl #4",
         "ldr q2, [x21, #1056]",
         "mov x21, v2.d[1]",
+        "mov w22, #0x7fff",
         "and x21, x21, #0x7fff",
-        "mrs x22, nzcv",
-        "tst x21, #0x7fff",
-        "cset x23, eq",
+        "mrs x23, nzcv",
+        "cmp x21, x22",
+        "cset x22, eq",
         "mov w24, #0x400e",
         "cmp x21, x24",
         "cset x21, hs",
-        "orr x21, x23, x21",
+        "orr x21, x22, x21",
         "strb w21, [x28, #1040]",
         "str x30, [sp, #-16]!",
         "mov v0.16b, v2.16b",
@@ -9987,7 +9988,7 @@
         "strh w21, [x4]",
         "add w21, w20, #0x1 (1)",
         "and w21, w21, #0x7",
-        "msr nzcv, x22",
+        "msr nzcv, x23",
         "strb w21, [x28, #1051]",
         "ldrb w21, [x28, #1202]",
         "mov w22, #0x1",
@@ -9997,7 +9998,7 @@
       ]
     },
     "fist word [rax]": {
-      "ExpectedInstructionCount": 22,
+      "ExpectedInstructionCount": 23,
       "Comment": [
         "0xdf !11b /2"
       ],
@@ -10006,14 +10007,15 @@
         "add x20, x28, x20, lsl #4",
         "ldr q2, [x20, #1056]",
         "mov x20, v2.d[1]",
+        "mov w21, #0x7fff",
         "and x20, x20, #0x7fff",
-        "mrs x21, nzcv",
-        "tst x20, #0x7fff",
-        "cset x22, eq",
+        "mrs x22, nzcv",
+        "cmp x20, x21",
+        "cset x21, eq",
         "mov w23, #0x400e",
         "cmp x20, x23",
         "cset x20, hs",
-        "orr x20, x22, x20",
+        "orr x20, x21, x20",
         "strb w20, [x28, #1040]",
         "str x30, [sp, #-16]!",
         "mov v0.16b, v2.16b",
@@ -10023,11 +10025,11 @@
         "ldr x30, [sp], #16",
         "mov w20, w0",
         "strh w20, [x4]",
-        "msr nzcv, x21"
+        "msr nzcv, x22"
       ]
     },
     "fistp word [rax]": {
-      "ExpectedInstructionCount": 30,
+      "ExpectedInstructionCount": 31,
       "Comment": [
         "0xdf !11b /3"
       ],
@@ -10036,14 +10038,15 @@
         "add x21, x28, x20, lsl #4",
         "ldr q2, [x21, #1056]",
         "mov x21, v2.d[1]",
+        "mov w22, #0x7fff",
         "and x21, x21, #0x7fff",
-        "mrs x22, nzcv",
-        "tst x21, #0x7fff",
-        "cset x23, eq",
+        "mrs x23, nzcv",
+        "cmp x21, x22",
+        "cset x22, eq",
         "mov w24, #0x400e",
         "cmp x21, x24",
         "cset x21, hs",
-        "orr x21, x23, x21",
+        "orr x21, x22, x21",
         "strb w21, [x28, #1040]",
         "str x30, [sp, #-16]!",
         "mov v0.16b, v2.16b",
@@ -10055,7 +10058,7 @@
         "strh w21, [x4]",
         "add w21, w20, #0x1 (1)",
         "and w21, w21, #0x7",
-        "msr nzcv, x22",
+        "msr nzcv, x23",
         "strb w21, [x28, #1051]",
         "ldrb w21, [x28, #1202]",
         "mov w22, #0x1",
diff --git a/unittests/InstructionCountCI/x87.json b/unittests/InstructionCountCI/x87.json
index ae8c980f4..4ee49dce8 100644
--- a/unittests/InstructionCountCI/x87.json
+++ b/unittests/InstructionCountCI/x87.json
@@ -9894,7 +9894,7 @@
       ]
     },
     "fisttp word [rax]": {
-      "ExpectedInstructionCount": 30,
+      "ExpectedInstructionCount": 31,
       "Comment": [
         "0xdf !11b /1"
       ],
@@ -9903,14 +9903,15 @@
         "add x21, x28, x20, lsl #4",
         "ldr q2, [x21, #1056]",
         "mov x21, v2.d[1]",
+        "mov w22, #0x7fff",
         "and x21, x21, #0x7fff",
-        "mrs x22, nzcv",
-        "tst x21, #0x7fff",
-        "cset x23, eq",
+        "mrs x23, nzcv",
+        "cmp x21, x22",
+        "cset x22, eq",
         "mov w24, #0x400e",
         "cmp x21, x24",
         "cset x21, hs",
-        "orr x21, x23, x21",
+        "orr x21, x22, x21",
         "strb w21, [x28, #1040]",
         "str x30, [sp, #-16]!",
         "mov v0.16b, v2.16b",
@@ -9922,7 +9923,7 @@
         "strh w21, [x4]",
         "add w21, w20, #0x1 (1)",
         "and w21, w21, #0x7",
-        "msr nzcv, x22",
+        "msr nzcv, x23",
         "strb w21, [x28, #1051]",
         "ldrb w21, [x28, #1202]",
         "mov w22, #0x1",
@@ -9932,7 +9933,7 @@
       ]
     },
     "fist word [rax]": {
-      "ExpectedInstructionCount": 22,
+      "ExpectedInstructionCount": 23,
       "Comment": [
         "0xdf !11b /2"
       ],
@@ -9941,14 +9942,15 @@
         "add x20, x28, x20, lsl #4",
         "ldr q2, [x20, #1056]",
         "mov x20, v2.d[1]",
+        "mov w21, #0x7fff",
         "and x20, x20, #0x7fff",
-        "mrs x21, nzcv",
-        "tst x20, #0x7fff",
-        "cset x22, eq",
+        "mrs x22, nzcv",
+        "cmp x20, x21",
+        "cset x21, eq",
         "mov w23, #0x400e",
         "cmp x20, x23",
         "cset x20, hs",
-        "orr x20, x22, x20",
+        "orr x20, x21, x20",
         "strb w20, [x28, #1040]",
         "str x30, [sp, #-16]!",
         "mov v0.16b, v2.16b",
@@ -9958,11 +9960,11 @@
         "ldr x30, [sp], #16",
         "mov w20, w0",
         "strh w20, [x4]",
-        "msr nzcv, x21"
+        "msr nzcv, x22"
       ]
     },
     "fistp word [rax]": {
-      "ExpectedInstructionCount": 30,
+      "ExpectedInstructionCount": 31,
       "Comment": [
         "0xdf !11b /3"
       ],
@@ -9971,14 +9973,15 @@
         "add x21, x28, x20, lsl #4",
         "ldr q2, [x21, #1056]",
         "mov x21, v2.d[1]",
+        "mov w22, #0x7fff",
         "and x21, x21, #0x7fff",
-        "mrs x22, nzcv",
-        "tst x21, #0x7fff",
-        "cset x23, eq",
+        "mrs x23, nzcv",
+        "cmp x21, x22",
+        "cset x22, eq",
         "mov w24, #0x400e",
         "cmp x21, x24",
         "cset x21, hs",
-        "orr x21, x23, x21",
+        "orr x21, x22, x21",
         "strb w21, [x28, #1040]",
         "str x30, [sp, #-16]!",
         "mov v0.16b, v2.16b",
@@ -9990,7 +9993,7 @@
         "strh w21, [x4]",
         "add w21, w20, #0x1 (1)",
         "and w21, w21, #0x7",
-        "msr nzcv, x22",
+        "msr nzcv, x23",
         "strb w21, [x28, #1051]",
         "ldrb w21, [x28, #1202]",
         "mov w22, #0x1",