From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qtn4M-0000Nx-4i for qemu-devel@nongnu.org; Wed, 17 Aug 2011 16:50:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qtn4K-00077T-SN for qemu-devel@nongnu.org; Wed, 17 Aug 2011 16:50:34 -0400 Received: from mail-yi0-f45.google.com ([209.85.218.45]:35219) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qtn4K-0006n9-Pm for qemu-devel@nongnu.org; Wed, 17 Aug 2011 16:50:32 -0400 Received: by mail-yi0-f45.google.com with SMTP id 10so1232200yih.4 for ; Wed, 17 Aug 2011 13:50:32 -0700 (PDT) From: Bryce Lanham Date: Wed, 17 Aug 2011 15:47:32 -0500 Message-Id: <1313614076-28878-88-git-send-email-blanham@gmail.com> In-Reply-To: <1313614076-28878-1-git-send-email-blanham@gmail.com> References: <1313614076-28878-1-git-send-email-blanham@gmail.com> Subject: [Qemu-devel] [PATCH 087/111] m68k: fcmp correctly compares infinity. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laurent Vivier From: Laurent Vivier seen with gcc testsuite, gcc-4.1.2/gcc/testsuite/gcc.c-torture/execute/960405-1.c Signed-off-by: Laurent Vivier --- target-m68k/helper.c | 4 ++-- tests/m68k/Makefile | 2 +- tests/m68k/inf.S | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 tests/m68k/inf.S diff --git a/target-m68k/helper.c b/target-m68k/helper.c index 62aadfd..6cc4202 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -1581,8 +1581,8 @@ void HELPER(fcmp_FP0_FP1)(CPUState *env) /* +/-inf compares equal against itself, but sub returns nan. */ if (!floatx80_is_any_nan(FP0_to_floatx80(env)) && !floatx80_is_any_nan(FP1_to_floatx80(env))) { - if (floatx80_lt_quiet(FP1_to_floatx80(env), floatx80_zero, - &env->fp_status)) + res = floatx80_zero; + if (floatx80_lt_quiet(FP1_to_floatx80(env), res, &env->fp_status)) res = floatx80_chs(res); } } diff --git a/tests/m68k/Makefile b/tests/m68k/Makefile index d043aeb..27525d3 100644 --- a/tests/m68k/Makefile +++ b/tests/m68k/Makefile @@ -1,5 +1,5 @@ TESTS=fmovecr fmove fmovem fsub fdiv fmul fabs fgetexp fscale flogn fetox \ - bfins + bfins inf all: $(TESTS) diff --git a/tests/m68k/inf.S b/tests/m68k/inf.S new file mode 100644 index 0000000..2b2de84 --- /dev/null +++ b/tests/m68k/inf.S @@ -0,0 +1,17 @@ + .include "trap.i" + + .data +X: .long 0x7ffe0000, 0x80000000, 0x00000000 + + .text + .globl _start +_start: + fmove.x X, %fp0 + fmove.x X, %fp1 + fadd.x %fp0, %fp1 + fmul.l #2,%fp0 + fcmp.x %fp0, %fp1 + fbeq a + nop +a: + exit 0 -- 1.7.2.3