From patchwork Fri Mar 11 18:12:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 513 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:43:14 -0000 Delivered-To: patches@linaro.org Received: by 10.224.67.207 with SMTP id s15cs69390qai; Fri, 11 Mar 2011 10:12:31 -0800 (PST) Received: by 10.52.89.18 with SMTP id bk18mr4012755vdb.270.1299867151687; Fri, 11 Mar 2011 10:12:31 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk [81.2.115.146]) by mx.google.com with ESMTPS id v10si6055237vcr.2.2011.03.11.10.12.30 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 11 Mar 2011 10:12:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1Py6p8-0005k8-W4; Fri, 11 Mar 2011 18:12:26 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 2/7] target-arm/neon_helper.c: Use make_float32/float32_val macros Date: Fri, 11 Mar 2011 18:12:21 +0000 Message-Id: <1299867146-22049-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1299867146-22049-1-git-send-email-peter.maydell@linaro.org> References: <1299867146-22049-1-git-send-email-peter.maydell@linaro.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; }