From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=46797 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Py6pI-0002ui-VP for qemu-devel@nongnu.org; Fri, 11 Mar 2011 13:12:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Py6pH-0005mo-O6 for qemu-devel@nongnu.org; Fri, 11 Mar 2011 13:12:36 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:53506) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Py6pH-0005kF-Gr for qemu-devel@nongnu.org; Fri, 11 Mar 2011 13:12:35 -0500 From: Peter Maydell Date: Fri, 11 Mar 2011 18:12:22 +0000 Message-Id: <1299867146-22049-4-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1299867146-22049-1-git-send-email-peter.maydell@linaro.org> References: <1299867146-22049-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 3/7] target-arm: Return right result for Neon comparison with NaNs List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org Fix the helper functions implementing the Neon floating point comparison ops (VCGE, VCGT, VCEQ, VACGT, VACGE) to return the right answer when one of the values being compared is a NaN. Signed-off-by: Peter Maydell --- target-arm/neon_helper.c | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/target-arm/neon_helper.c b/target-arm/neon_helper.c index 4039036..8eb4cef 100644 --- a/target-arm/neon_helper.c +++ b/target-arm/neon_helper.c @@ -1809,32 +1809,40 @@ uint32_t HELPER(neon_mul_f32)(CPUState *env, uint32_t a, uint32_t b) } /* Floating point comparisons produce an integer result. */ -#define NEON_VOP_FCMP(name, cmp) \ +#define NEON_VOP_FCMP(name, ok) \ uint32_t HELPER(neon_##name)(CPUState *env, uint32_t a, uint32_t b) \ { \ - if (float32_compare_quiet(make_float32(a), make_float32(b), NFS) cmp 0) { \ - return ~0; \ - } else { \ - return 0; \ + switch (float32_compare_quiet(make_float32(a), make_float32(b), NFS)) { \ + ok return ~0; \ + default: return 0; \ } \ } -NEON_VOP_FCMP(ceq_f32, ==) -NEON_VOP_FCMP(cge_f32, >=) -NEON_VOP_FCMP(cgt_f32, >) +NEON_VOP_FCMP(ceq_f32, case float_relation_equal:) +NEON_VOP_FCMP(cge_f32, case float_relation_equal: case float_relation_greater:) +NEON_VOP_FCMP(cgt_f32, case float_relation_greater:) uint32_t HELPER(neon_acge_f32)(CPUState *env, uint32_t a, uint32_t b) { float32 f0 = float32_abs(make_float32(a)); float32 f1 = float32_abs(make_float32(b)); - return (float32_compare_quiet(f0, f1,NFS) >= 0) ? ~0 : 0; + switch (float32_compare_quiet(f0, f1, NFS)) { + case float_relation_equal: + case float_relation_greater: + return ~0; + default: + return 0; + } } uint32_t HELPER(neon_acgt_f32)(CPUState *env, uint32_t a, uint32_t b) { float32 f0 = float32_abs(make_float32(a)); float32 f1 = float32_abs(make_float32(b)); - return (float32_compare_quiet(f0, f1, NFS) > 0) ? ~0 : 0; + if (float32_compare_quiet(f0, f1, NFS) == float_relation_greater) { + return ~0; + } + return 0; } #define ELEM(V, N, SIZE) (((V) >> ((N) * (SIZE))) & ((1ull << (SIZE)) - 1)) -- 1.7.1