From patchwork Fri Apr 1 14:30:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 89264 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 842A0B6F94 for ; Sat, 2 Apr 2011 01:32:45 +1100 (EST) Received: from localhost ([127.0.0.1]:47739 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5fP0-0002n8-D5 for incoming@patchwork.ozlabs.org; Fri, 01 Apr 2011 10:32:42 -0400 Received: from [140.186.70.92] (port=57137 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5fNH-0002jZ-Bs for qemu-devel@nongnu.org; Fri, 01 Apr 2011 10:30:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q5fNF-0004s5-QL for qemu-devel@nongnu.org; Fri, 01 Apr 2011 10:30:55 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:45963) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q5fNF-0004or-Eb for qemu-devel@nongnu.org; Fri, 01 Apr 2011 10:30:53 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1Q5fN5-0007mX-5f; Fri, 01 Apr 2011 15:30:43 +0100 From: Peter Maydell To: Anthony Liguori , qemu-devel@nongnu.org Date: Fri, 1 Apr 2011 15:30:35 +0100 Message-Id: <1301668243-29886-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1301668243-29886-1-git-send-email-peter.maydell@linaro.org> References: <1301668243-29886-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: Aurelien Jarno Subject: [Qemu-devel] [PATCH 02/10] target-arm/neon_helper.c: Use make_float32/float32_val macros X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use the softfloat make_float32 and float32_val macros to convert between softfloat's float32 type and raw uint32_t types, rather than private conversion functions. Signed-off-by: Peter Maydell Reviewed-by: Nathan Froyd --- target-arm/neon_helper.c | 56 ++++++++++++++-------------------------------- 1 files changed, 17 insertions(+), 39 deletions(-) diff --git a/target-arm/neon_helper.c b/target-arm/neon_helper.c index 97bc1e6..4039036 100644 --- a/target-arm/neon_helper.c +++ b/target-arm/neon_helper.c @@ -20,29 +20,6 @@ #define NFS (&env->vfp.standard_fp_status) -/* Helper routines to perform bitwise copies between float and int. */ -static inline float32 vfp_itos(uint32_t i) -{ - union { - uint32_t i; - float32 s; - } v; - - v.i = i; - return v.s; -} - -static inline uint32_t vfp_stoi(float32 s) -{ - union { - uint32_t i; - float32 s; - } v; - - v.s = s; - return v.i; -} - #define NEON_TYPE1(name, type) \ typedef struct \ { \ @@ -1795,50 +1772,51 @@ uint32_t HELPER(neon_qneg_s32)(CPUState *env, uint32_t x) /* NEON Float helpers. */ uint32_t HELPER(neon_min_f32)(CPUState *env, uint32_t a, uint32_t b) { - float32 f0 = vfp_itos(a); - float32 f1 = vfp_itos(b); + float32 f0 = make_float32(a); + float32 f1 = make_float32(b); return (float32_compare_quiet(f0, f1, NFS) == -1) ? a : b; } uint32_t HELPER(neon_max_f32)(CPUState *env, uint32_t a, uint32_t b) { - float32 f0 = vfp_itos(a); - float32 f1 = vfp_itos(b); + float32 f0 = make_float32(a); + float32 f1 = make_float32(b); return (float32_compare_quiet(f0, f1, NFS) == 1) ? a : b; } uint32_t HELPER(neon_abd_f32)(CPUState *env, uint32_t a, uint32_t b) { - float32 f0 = vfp_itos(a); - float32 f1 = vfp_itos(b); - return vfp_stoi((float32_compare_quiet(f0, f1, NFS) == 1) + float32 f0 = make_float32(a); + float32 f1 = make_float32(b); + return float32_val((float32_compare_quiet(f0, f1, NFS) == 1) ? float32_sub(f0, f1, NFS) : float32_sub(f1, f0, NFS)); } uint32_t HELPER(neon_add_f32)(CPUState *env, uint32_t a, uint32_t b) { - return vfp_stoi(float32_add(vfp_itos(a), vfp_itos(b), NFS)); + return float32_val(float32_add(make_float32(a), make_float32(b), NFS)); } uint32_t HELPER(neon_sub_f32)(CPUState *env, uint32_t a, uint32_t b) { - return vfp_stoi(float32_sub(vfp_itos(a), vfp_itos(b), NFS)); + return float32_val(float32_sub(make_float32(a), make_float32(b), NFS)); } uint32_t HELPER(neon_mul_f32)(CPUState *env, uint32_t a, uint32_t b) { - return vfp_stoi(float32_mul(vfp_itos(a), vfp_itos(b), NFS)); + return float32_val(float32_mul(make_float32(a), make_float32(b), NFS)); } /* Floating point comparisons produce an integer result. */ #define NEON_VOP_FCMP(name, cmp) \ uint32_t HELPER(neon_##name)(CPUState *env, uint32_t a, uint32_t b) \ { \ - if (float32_compare_quiet(vfp_itos(a), vfp_itos(b), NFS) cmp 0) \ + if (float32_compare_quiet(make_float32(a), make_float32(b), NFS) cmp 0) { \ return ~0; \ - else \ + } else { \ return 0; \ + } \ } NEON_VOP_FCMP(ceq_f32, ==) @@ -1847,15 +1825,15 @@ NEON_VOP_FCMP(cgt_f32, >) uint32_t HELPER(neon_acge_f32)(CPUState *env, uint32_t a, uint32_t b) { - float32 f0 = float32_abs(vfp_itos(a)); - float32 f1 = float32_abs(vfp_itos(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; } uint32_t HELPER(neon_acgt_f32)(CPUState *env, uint32_t a, uint32_t b) { - float32 f0 = float32_abs(vfp_itos(a)); - float32 f1 = float32_abs(vfp_itos(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; }