| Message ID | 20230718213531.117976-4-iii@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/s390x: Miscellaneous TCG fixes, part 2 | expand |
On 18.07.23 23:21, Ilya Leoshkevich wrote: > CONVERT TO LOGICAL/FIXED deviate from IEEE 754 in that they raise an > inexact exception on out-of-range inputs. float_flag_invalid_cvti > aligns nicely with that behavior, so convert it to > S390_IEEE_MASK_INEXACT. > > Cc: qemu-stable@nongnu.org > Fixes: defb0e3157af ("s390x: Implement opcode helpers") > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> > --- > target/s390x/tcg/fpu_helper.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/target/s390x/tcg/fpu_helper.c b/target/s390x/tcg/fpu_helper.c > index 4b7fa58af3e..3d941ed2d28 100644 > --- a/target/s390x/tcg/fpu_helper.c > +++ b/target/s390x/tcg/fpu_helper.c > @@ -52,7 +52,8 @@ uint8_t s390_softfloat_exc_to_ieee(unsigned int exc) > s390_exc |= (exc & float_flag_divbyzero) ? S390_IEEE_MASK_DIVBYZERO : 0; > s390_exc |= (exc & float_flag_overflow) ? S390_IEEE_MASK_OVERFLOW : 0; > s390_exc |= (exc & float_flag_underflow) ? S390_IEEE_MASK_UNDERFLOW : 0; > - s390_exc |= (exc & float_flag_inexact) ? S390_IEEE_MASK_INEXACT : 0; > + s390_exc |= (exc & (float_flag_inexact | float_flag_invalid_cvti)) ? > + S390_IEEE_MASK_INEXACT : 0; > > return s390_exc; > } Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/target/s390x/tcg/fpu_helper.c b/target/s390x/tcg/fpu_helper.c index 4b7fa58af3e..3d941ed2d28 100644 --- a/target/s390x/tcg/fpu_helper.c +++ b/target/s390x/tcg/fpu_helper.c @@ -52,7 +52,8 @@ uint8_t s390_softfloat_exc_to_ieee(unsigned int exc) s390_exc |= (exc & float_flag_divbyzero) ? S390_IEEE_MASK_DIVBYZERO : 0; s390_exc |= (exc & float_flag_overflow) ? S390_IEEE_MASK_OVERFLOW : 0; s390_exc |= (exc & float_flag_underflow) ? S390_IEEE_MASK_UNDERFLOW : 0; - s390_exc |= (exc & float_flag_inexact) ? S390_IEEE_MASK_INEXACT : 0; + s390_exc |= (exc & (float_flag_inexact | float_flag_invalid_cvti)) ? + S390_IEEE_MASK_INEXACT : 0; return s390_exc; }
CONVERT TO LOGICAL/FIXED deviate from IEEE 754 in that they raise an inexact exception on out-of-range inputs. float_flag_invalid_cvti aligns nicely with that behavior, so convert it to S390_IEEE_MASK_INEXACT. Cc: qemu-stable@nongnu.org Fixes: defb0e3157af ("s390x: Implement opcode helpers") Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> --- target/s390x/tcg/fpu_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)