Skip to contentSkip to conversation

target/i386: Clear OF, SF, and AF for fcomi/fucomi

PATCH Superseded Simon Scherer 2 participants 3 messages Aug 6 – Aug 7

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target/i386: Clear OF, SF, and AF for fcomi/fucomi

helper_fcomi_ST0_FT0() and helper_fucomi_ST0_FT0() only cleared CC_Z, CC_P, and CC_C before merging in the comparison result, leaving CC_O, CC_S, and CC_A untouched from whatever they were set to beforehand.

The Intel SDM documents FCOMI/FCOMIP/FUCOMI/FUCOMIP as setting OF, SF, and AF to 0 unconditionally. The AMD manual doesn't mention them at all. However, testing on multiple real Intel and AMD systems confirms all three are unconditionally cleared regardless of the comparison result or their prior value. Widen the mask so OF/SF/AF are cleared along with CF/ZF/PF instead of being carried over from before the instruction.

Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4133

---
 target/i386/tcg/fpu_helper.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
target/i386/tcg/fpu_helper.c +6 -2
index 978eb1411b..215547110a 100644
@@ -554,7 +554,9 @@ void helper_fcomi_ST0_FT0(CPUX86State *env)
     FloatRelation ret;
 
     ret = floatx80_compare(ST0, FT0, &env->fp_status);
-    eflags = cpu_cc_compute_all(env) & ~(CC_Z | CC_P | CC_C);
+    /* OF, SF, and AF are unconditionally cleared to 0 */
+    eflags = cpu_cc_compute_all(env) &
+                 ~(CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C);
     CC_SRC = eflags | fcomi_ccval[ret + 1];
     CC_OP = CC_OP_EFLAGS;
     merge_exception_flags(env, old_flags);
@@ -567,7 +569,9 @@ void helper_fucomi_ST0_FT0(CPUX86State *env)
     FloatRelation ret;
 
     ret = floatx80_compare_quiet(ST0, FT0, &env->fp_status);
-    eflags = cpu_cc_compute_all(env) & ~(CC_Z | CC_P | CC_C);
+    /* OF, SF, and AF are unconditionally cleared to 0 */
+    eflags = cpu_cc_compute_all(env) &
+                 ~(CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C);
     CC_SRC = eflags | fcomi_ccval[ret + 1];
     CC_OP = CC_OP_EFLAGS;
     merge_exception_flags(env, old_flags);
Signature · 1 line
2.53.0
#1 lore raw

target/i386/tcg/fpu_helper.c void helper_fcomi_ST0_FT0(CPUX86State *env) · line 559

Quoted 3 lines · Simon Scherer
target/i386/tcg/fpu_helper.c +3 -0
+    /* OF, SF, and AF are unconditionally cleared to 0 */
+    eflags = cpu_cc_compute_all(env) &
+                 ~(CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C);

There are only 6 flags, and you have cleared all of them. Which means you don't need to compute any of them, just

- CC_SRC = eflags | fcomi_ccval[ret + 1];
+ CC_SRC = fcomi_ccval[ret + 1];

r~

#2 lore raw

Good catch, sent as v2!

Quoted 14 lines · Richard Henderson

target/i386/tcg/fpu_helper.c void helper_fcomi_ST0_FT0(CPUX86State *env) · line 559

Quoted 3 lines · Simon Scherer
target/i386/tcg/fpu_helper.c +3 -0
+    /* OF, SF, and AF are unconditionally cleared to 0 */
+    eflags = cpu_cc_compute_all(env) &
+                 ~(CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C);

There are only 6 flags, and you have cleared all of them. Which means you don't need to compute any of them, just

(quoted diff) +1 -1
-     CC_SRC = eflags | fcomi_ccval[ret + 1];
+     CC_SRC = fcomi_ccval[ret + 1];

r~