From patchwork Fri Nov 3 20:26:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 834085 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yTD9P3N2Rz9sRm for ; Sat, 4 Nov 2017 07:30:33 +1100 (AEDT) Received: from localhost ([::1]:38352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAibn-0004N5-KA for incoming@patchwork.ozlabs.org; Fri, 03 Nov 2017 16:30:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAiYG-0001aJ-P4 for qemu-devel@nongnu.org; Fri, 03 Nov 2017 16:26:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eAiYF-0000f3-Ko for qemu-devel@nongnu.org; Fri, 03 Nov 2017 16:26:52 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:61141) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eAiYA-0000Xy-Pl; Fri, 03 Nov 2017 16:26:47 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MBFvV-1e18Hx2iQv-00AFqS; Fri, 03 Nov 2017 21:26:28 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 3 Nov 2017 21:26:23 +0100 Message-Id: <20171103202624.5956-4-laurent@vivier.eu> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171103202624.5956-1-laurent@vivier.eu> References: <20171103202624.5956-1-laurent@vivier.eu> X-Provags-ID: V03:K0:jKnaAGW+3t6b8ts5+0nBOFzmxdCCTSLVg/fr+T/NnUn940VPpnx QXHTNe16Nd6mr2Mkn48ZCexjj5lJbFBRvTMATXM2r4gbkDSkNYvP/Div53Z9i6mKX+pQgyg 3MDFe2A7nMrsXVHOVAkoF7AtYNXOflBl9ea3+yL5rB9xc3ohcSq/d4Iq1gHd/gkNHBTaEPM oFPJPXPjUFjboRc76OLAw== X-UI-Out-Filterresults: notjunk:1; V01:K0:wps4dm/rXCQ=:dYzW642U1bw+hRIL9kayIn Cts/GGBjqFTDkDr7pE5i5QaEt2cbVAm8FsTGWmAVCqOPFFlwp7OFnG9c8B6MStsi2sqo5951H /tQTVGeIsBMTEJpJIvNRNeyPAVbyWZJBFAVMUWw9dX8pihvClRnbpRSWLKB5iJZrV0fd9T93k Fq8Z2bqTiJ/kxhBBAo2hGwDqWkVVcIMnyiwqfLk75k2l+cK8agUmOIWfMoZIeDBV1iEyUvZLy BHf814VY6U+5r6FvhsyLw0dmHJCs6js3F1dTHD4AvarkL+iCWXkJrYxOiIrHWIoGypcov12aO ko0aMc9ANHKBOceun5oUytM9RDVx3jLyIdH9x2zXOfOKx3V2zgYCbUdMPU9qSLvdQjXzzAX25 pD1Bau7EpaGyGpn14ALEY+8fiduPTTqOyjqVrbVX5y0sQg7LO5URwdN3cwVFVhjkM7UuPnJPU VDrRrjzhgc5Np62mBSREno5z0QEiNF50dMo7jtBVkExi3dVct+4OG7DYU/xOWoMOEFtgCZ9tQ 0KRFbyrnyyTJTjJ9djkZEEaolvTxkYn9XJg4UTyrW7b869rmv/o2vFd2ArzWiS0FoKmO0jQSj LQomWUudRm3giNvG0o/uNjM0CemZHsR8ZBGaI90cPQMSds1EPz/h60nFZt1Pc5Re6VZomYPSt 4F9KOw71cDFXDJUS0kMr86ZHC9YPwyypMDSUCPz8un2bW+J0zj8KCkNXZ8SFIV9By0Wfx8PXG gIauoEf3fVDPao77pl8OwKsccgo+59cET0b2Xg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PATCH 3/4] tricore: use make_float32() and float32_val() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Bastian Koppelmann , Laurent Vivier , qemu-arm@nongnu.org, Stafford Horne , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Laurent Vivier Acked-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- target/tricore/fpu_helper.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/target/tricore/fpu_helper.c b/target/tricore/fpu_helper.c index 7979bb6692..d233d010c5 100644 --- a/target/tricore/fpu_helper.c +++ b/target/tricore/fpu_helper.c @@ -21,10 +21,10 @@ #include "cpu.h" #include "exec/helper-proto.h" -#define QUIET_NAN 0x7fc00000 -#define ADD_NAN 0x7fc00001 -#define DIV_NAN 0x7fc00008 -#define MUL_NAN 0x7fc00002 +#define QUIET_NAN make_float32(0x7fc00000) +#define ADD_NAN make_float32(0x7fc00001) +#define DIV_NAN make_float32(0x7fc00008) +#define MUL_NAN make_float32(0x7fc00002) #define FPU_FS PSW_USB_C #define FPU_FI PSW_USB_V #define FPU_FV PSW_USB_SV @@ -63,13 +63,13 @@ static inline float32 f_maddsub_nan_result(float32 arg1, float32 arg2, } else if (float32_is_zero(arg1) && float32_is_infinity(arg2)) { return MUL_NAN; } else { - aSign = arg1 >> 31; - bSign = arg2 >> 31; - cSign = arg3 >> 31; + aSign = float32_val(arg1) >> 31; + bSign = float32_val(arg2) >> 31; + cSign = float32_val(arg3) >> 31; - aExp = (arg1 >> 23) & 0xff; - bExp = (arg2 >> 23) & 0xff; - cExp = (arg3 >> 23) & 0xff; + aExp = (float32_val(arg1) >> 23) & 0xff; + bExp = (float32_val(arg2) >> 23) & 0xff; + cExp = (float32_val(arg3) >> 23) & 0xff; if (muladd_negate_c) { cSign ^= 1; @@ -139,7 +139,7 @@ uint32_t helper_f##op(CPUTriCoreState *env, uint32_t r1, uint32_t r2) \ } else { \ env->FPU_FS = 0; \ } \ - return (uint32_t)f_result; \ + return float32_val(f_result); \ } FADD_SUB(add) FADD_SUB(sub) @@ -166,7 +166,7 @@ uint32_t helper_fmul(CPUTriCoreState *env, uint32_t r1, uint32_t r2) } else { env->FPU_FS = 0; } - return (uint32_t)f_result; + return float32_val(f_result); } @@ -193,7 +193,7 @@ uint32_t helper_fdiv(CPUTriCoreState *env, uint32_t r1, uint32_t r2) env->FPU_FS = 0; } - return (uint32_t)f_result; + return float32_val(f_result); } uint32_t helper_fmadd(CPUTriCoreState *env, uint32_t r1, @@ -219,7 +219,7 @@ uint32_t helper_fmadd(CPUTriCoreState *env, uint32_t r1, } else { env->FPU_FS = 0; } - return (uint32_t)f_result; + return float32_val(f_result); } uint32_t helper_fmsub(CPUTriCoreState *env, uint32_t r1, @@ -247,7 +247,7 @@ uint32_t helper_fmsub(CPUTriCoreState *env, uint32_t r1, } else { env->FPU_FS = 0; } - return (uint32_t)f_result; + return float32_val(f_result); } uint32_t helper_fcmp(CPUTriCoreState *env, uint32_t r1, uint32_t r2) @@ -304,7 +304,7 @@ uint32_t helper_itof(CPUTriCoreState *env, uint32_t arg) } else { env->FPU_FS = 0; } - return (uint32_t)f_result; + return float32_val(f_result); } uint32_t helper_ftouz(CPUTriCoreState *env, uint32_t arg) @@ -321,7 +321,7 @@ uint32_t helper_ftouz(CPUTriCoreState *env, uint32_t arg) if (float32_is_any_nan(f_arg)) { result = 0; } - } else if (float32_lt_quiet(f_arg, 0, &env->fp_status)) { + } else if (float32_lt_quiet(f_arg, float32_zero, &env->fp_status)) { flags = float_flag_invalid; result = 0; }