target/i386: clear C1 for all x87 compare instructions
PATCH v2 1/1 target/i386: clear C1 for all x87 compare instructions
The SDM specifies that FCOM/FCOMP/FCOMPP/FUCOM/FUCOMP/FUCOMPP/FICOM/FICOMP/ FCOMI/FCOMIP/FUCOMI/FUCOMIP unconditionally clear C1 in the FPU status word, regardless of the comparison result.
helper_fcom_ST0_FT0/helper_fucom_ST0_FT0 only cleared C3, C2, C0 (mask 0x4500) before OR-ing in the comparison result, leaving C1 (bit 9) at whatever value it already had. FICOM/FICOMP dispatch through the same helpers after converting their integer operand, so they inherited the same bug.
helper_fcomi_ST0_FT0/helper_fucomi_ST0_FT0 never touched the FPU status word at all, so C1 was left untouched by those too.
This patch clears C1 explicitly in all four helpers, adding the clear into the existing fpus mask for fcom/fucom since fcom_ccval never sets bit 9. For fcomi/fucomi add a new separate clear.
Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4378
---
v2: merge the C1 clear into the existing fpus mask for
fcom_ST0_FT0/fucom_ST0_FT0 (Richard Henderson)
--- target/i386/tcg/fpu_helper.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
target/i386/tcg/fpu_helper.c +8 -2
@@ -531,7 +531,8 @@ void helper_fcom_ST0_FT0(CPUX86State *env)FloatRelation ret; ret =floatx80_compare (ST0 ,FT0 , &env->fp_status); - env->fpus = (env->fpus & ~0x4500 ) | fcom_ccval[ret +1 ]; +/* C1 is unconditionally cleared to 0 */ + env->fpus = (env->fpus & ~0x4700 ) | fcom_ccval[ret +1 ];merge_exception_flags (env, old_flags); }
@@ -541,7 +542,8 @@ void helper_fucom_ST0_FT0(CPUX86State *env)FloatRelation ret; ret =floatx80_compare_quiet (ST0 ,FT0 , &env->fp_status); - env->fpus = (env->fpus & ~0x4500 ) | fcom_ccval[ret +1 ]; +/* C1 is unconditionally cleared to 0 */ + env->fpus = (env->fpus & ~0x4700 ) | fcom_ccval[ret +1 ];merge_exception_flags (env, old_flags); }
@@ -556,6 +558,8 @@ void helper_fcomi_ST0_FT0(CPUX86State *env)/* OF, SF, and AF are unconditionally cleared to 0 */ CC_SRC = fcomi_ccval[ret +1 ];CC_OP =CC_OP_EFLAGS ; +/* C1 is unconditionally cleared to 0 */ + env->fpus &= ~0x0200 ;merge_exception_flags (env, old_flags); }
@@ -568,6 +572,8 @@ void helper_fucomi_ST0_FT0(CPUX86State *env)/* OF, SF, and AF are unconditionally cleared to 0 */ CC_SRC = fcomi_ccval[ret +1 ];CC_OP =CC_OP_EFLAGS ; +/* C1 is unconditionally cleared to 0 */ + env->fpus &= ~0x0200 ;merge_exception_flags (env, old_flags); }
Signature · 1 line
2.53.0
Update on this patch: I tested the C1 behavior directly on real x86-64 hardware again for all of these instructions, and it turns out the FCOMI/FCOMIP/FUCOMI/FUCOMIP part is wrong.
FCOM/FCOMP/FCOMPP/FUCOM/FUCOMP/FUCOMPP/FICOM/FICOMP do genuinely clear C1 on real hardware, matching the SDM and the helper_fcom_ST0_FT0/helper_fucom_ST0_FT0 fix in this patch.
FCOMI/FCOMIP/FUCOMI/FUCOMIP, however, leave C1 unchanged on real silicon, despite the SDM listing "C1 Set to 0" under FPU Flags Affected for these too. My best guess is that this line in the SDM was carried over from the FCOM/FUCOM description.
I will send a v3 that drops the helper_fcomi_ST0_FT0/helper_fucomi_ST0_FT0 changes.
Thanks,
Simon
Quoted 74 lines · Simon Scherer
The SDM specifies that FCOM/FCOMP/FCOMPP/FUCOM/FUCOMP/FUCOMPP/FICOM/FICOMP/ FCOMI/FCOMIP/FUCOMI/FUCOMIP unconditionally clear C1 in the FPU status word, regardless of the comparison result.
helper_fcom_ST0_FT0/helper_fucom_ST0_FT0 only cleared C3, C2, C0 (mask
0x4500) before OR-ing in the comparison result, leaving C1 (bit 9) at whatever value it already had. FICOM/FICOMP dispatch through the same helpers after converting their integer operand, so they inherited the same bug.helper_fcomi_ST0_FT0/helper_fucomi_ST0_FT0 never touched the FPU status word at all, so C1 was left untouched by those too.
This patch clears C1 explicitly in all four helpers, adding the clear into the existing fpus mask for fcom/fucom since
fcom_ccvalnever sets bit 9. For fcomi/fucomi add a new separate clear.Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4378
Signed-off-by Simon Scherer <[email protected]>---
v2: merge the C1 clear into the existing fpus mask for
fcom_ST0_FT0/fucom_ST0_FT0 (Richard Henderson)Signed-off-by Simon Scherer <[email protected]>--- target/i386/tcg/fpu_helper.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)target/i386/tcg/fpu_helper.c +8
-3@@ -531,7 +531,8 @@ void helper_fcom_ST0_FT0(CPUX86State *env)FloatRelation ret; ret =floatx80_compare (ST0 ,FT0 , &env->fp_status); - env->fpus = (env->fpus & ~0x4500 ) | fcom_ccval[ret +1 ]; +/* C1 is unconditionally cleared to 0 */ + env->fpus = (env->fpus & ~0x4700 ) | fcom_ccval[ret +1 ];merge_exception_flags (env, old_flags); }@@ -541,7 +542,8 @@ void helper_fucom_ST0_FT0(CPUX86State *env)FloatRelation ret; ret =floatx80_compare_quiet (ST0 ,FT0 , &env->fp_status); - env->fpus = (env->fpus & ~0x4500 ) | fcom_ccval[ret +1 ]; +/* C1 is unconditionally cleared to 0 */ + env->fpus = (env->fpus & ~0x4700 ) | fcom_ccval[ret +1 ];merge_exception_flags (env, old_flags); }@@ -556,6 +558,8 @@ void helper_fcomi_ST0_FT0(CPUX86State *env)/* OF, SF, and AF are unconditionally cleared to 0 */ CC_SRC = fcomi_ccval[ret +1 ];CC_OP =CC_OP_EFLAGS ; +/* C1 is unconditionally cleared to 0 */ + env->fpus &= ~0x0200 ;merge_exception_flags (env, old_flags); }@@ -568,6 +572,8 @@ void helper_fucomi_ST0_FT0(CPUX86State *env)/* OF, SF, and AF are unconditionally cleared to 0 */ CC_SRC = fcomi_ccval[ret +1 ];CC_OP =CC_OP_EFLAGS ; +/* C1 is unconditionally cleared to 0 */ + env->fpus &= ~0x0200 ;merge_exception_flags (env, old_flags); } --2.53.0