From patchwork Fri Nov 3 20:26:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 834083 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 3yTD6F0BjBz9sNV for ; Sat, 4 Nov 2017 07:27:49 +1100 (AEDT) Received: from localhost ([::1]:38338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAiZ9-0001vz-4F for incoming@patchwork.ozlabs.org; Fri, 03 Nov 2017 16:27:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAiYC-0001WV-Pf for qemu-devel@nongnu.org; Fri, 03 Nov 2017 16:26:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eAiYB-0000a9-RX for qemu-devel@nongnu.org; Fri, 03 Nov 2017 16:26:48 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:64866) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eAiY7-0000VV-25; Fri, 03 Nov 2017 16:26:43 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0M5L11-1dCq1l4BeZ-00zViU; Fri, 03 Nov 2017 21:26:27 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 3 Nov 2017 21:26:21 +0100 Message-Id: <20171103202624.5956-2-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:HI5tfJBDjPgpDao3BVB6lEjKyHGG6DwE2ZQje4C8RxeevFY0rWh fjYCh7WHaxZB/uMhgvXx6X2XPeP37Fxukc+3KGa7bjjxE0PwTxwVQkFUgD5/UxEO6aU1HV0 5rfNplt7ccZXYk3eDhXtORZ/wjKSVXbuDipINdJfO1NK3R+WdTsAJkbc84NopI6YPnZp7wR G1XWfAqXvFj9ojKt0Ia9w== X-UI-Out-Filterresults: notjunk:1; V01:K0:cTltJCExIq8=:tkfOkpRHBMbPYrp84JgZ91 aT7aY8K0fLr/znUPUzGzBjZUtVRschlWBk6SikY3ya+H0Ugq5TgYpA5vXJRDgnnUg5H8dwduS PlGt+is0GLunBH1Ce5MZD/a2kNzgt+sM/R9VaiUANeNQ53sI98PlPxNI/1kw2slFEzuQHvjMQ KYMQCrDZwvi/pbc/sCGLV+4C0q6EImq9kVIVTs0V6e/ADp2QtoM+er7IkO6zqmx4tcRLTW9OX quQ9WTWBDdfJp42uMmhVxSYt4qtATGEHJPuS7IbLfsuMMplRG6ovB9EISWPJxQIj/Si5zZJKW iR1Bf/KgKucbQwgz0EI4ajDLPDM1VhM2aA9Zex1DopkH7xaTzenvnixgRz3GqEl6U1+txl3R3 PhaBLSz1fN/F90GFE/L68GqyXZjS3lxUeYIi7BMcXjwnFrWhDiKoqfr2sqlCuLSsp0kCAPpjw odFtyB33ss+6pQgrjFF+HkZHc7OZdJVdTIHXEmLG1zz9itLB5wDVVjqVXWGcu85UYaiyTV1uG R5RzgfHaD2VzOQ4EehZGVq2FZkKCVXmDlfET17ZP1gG4w57Y24hFtCX7HLA7Neu6quDbZS4NA PlvPKcMZ9Fg/KuAuY1nYXe9iDbe7eokFWjrgOEX/6WMtD+72VIDJFw8TIdfcT8GHd5Lynb4rt rdslRO8yFmBPI6djeCfa8uQkQpWZsUG3i18fyGHdmrDIIBShEbVRjI0wHZofmyBEoUaNLT/pC 8AHXBcxwOX0mTOH4RlbgZAvxDCanjvIrnFDp3g== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PATCH 1/4] arm: fix float64 helper definitions 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" neon_ceq_f64(), neon_cge_f64() and neon_cgt_f64() take float64 as parameter, fix the definition in helper-a64.h Signed-off-by: Laurent Vivier --- target/arm/helper-a64.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/arm/helper-a64.h b/target/arm/helper-a64.h index 85d86741db..b5e9ba03c0 100644 --- a/target/arm/helper-a64.h +++ b/target/arm/helper-a64.h @@ -26,9 +26,9 @@ DEF_HELPER_3(vfp_cmped_a64, i64, f64, f64, ptr) DEF_HELPER_FLAGS_5(simd_tbl, TCG_CALL_NO_RWG_SE, i64, env, i64, i64, i32, i32) DEF_HELPER_FLAGS_3(vfp_mulxs, TCG_CALL_NO_RWG, f32, f32, f32, ptr) DEF_HELPER_FLAGS_3(vfp_mulxd, TCG_CALL_NO_RWG, f64, f64, f64, ptr) -DEF_HELPER_FLAGS_3(neon_ceq_f64, TCG_CALL_NO_RWG, i64, i64, i64, ptr) -DEF_HELPER_FLAGS_3(neon_cge_f64, TCG_CALL_NO_RWG, i64, i64, i64, ptr) -DEF_HELPER_FLAGS_3(neon_cgt_f64, TCG_CALL_NO_RWG, i64, i64, i64, ptr) +DEF_HELPER_FLAGS_3(neon_ceq_f64, TCG_CALL_NO_RWG, i64, f64, f64, ptr) +DEF_HELPER_FLAGS_3(neon_cge_f64, TCG_CALL_NO_RWG, i64, f64, f64, ptr) +DEF_HELPER_FLAGS_3(neon_cgt_f64, TCG_CALL_NO_RWG, i64, f64, f64, ptr) DEF_HELPER_FLAGS_3(recpsf_f32, TCG_CALL_NO_RWG, f32, f32, f32, ptr) DEF_HELPER_FLAGS_3(recpsf_f64, TCG_CALL_NO_RWG, f64, f64, f64, ptr) DEF_HELPER_FLAGS_3(rsqrtsf_f32, TCG_CALL_NO_RWG, f32, f32, f32, ptr) From patchwork Fri Nov 3 20:26:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 834082 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 3yTD5y1BJyz9sNV for ; Sat, 4 Nov 2017 07:27:34 +1100 (AEDT) Received: from localhost ([::1]:38334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAiYu-0001ZA-7Z for incoming@patchwork.ozlabs.org; Fri, 03 Nov 2017 16:27:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAiYC-0001WQ-1g for qemu-devel@nongnu.org; Fri, 03 Nov 2017 16:26:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eAiY8-0000XR-VG for qemu-devel@nongnu.org; Fri, 03 Nov 2017 16:26:48 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:55657) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eAiY8-0000WJ-KF; Fri, 03 Nov 2017 16:26:44 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MflE8-1dnXM72wUu-00NA1Z; Fri, 03 Nov 2017 21:26:28 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 3 Nov 2017 21:26:22 +0100 Message-Id: <20171103202624.5956-3-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:tXCMgKZdZEId52KYrmNKJ3P4gEbzOFfLi03UtFlurG32p8+khyu zbN4NZpVvsRuQw2tzZ4a44qRvc1+o7m5RFMOnLt0Pv2VteIkW0LyFXMaGAn/fMJViI2euOS 17ruPhegcL1xfDxAAEL4OIVDnzgKUy9tG9rS9NdLR2KI5vik/M/TeZcy5vKNlB5hX98si4M xEv9n8N5AJX3yeaex4FQQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:HJY8xxFoM5s=:tm9CRsoeDJvrEIn9gphEA8 lzZMn4Pz6grfxDo/C2kCaJnlfP9rFAbVPwaE/SHj9nhr1biHH2cfLbECfLoiHNixWN/CBDctY 3nloGsIGCJXAYWM1tLUtwTahpDDCpZOvjdlyw0XTRvITkesOhJ8WPR6ubnMdOM1AerxwV1ve3 H6zzup0thJLFgPaSa3EzjmPnH0AqN2wQxLIwUtHAeun4sdx7pu40XFVh2gyCVVt5xfQlZwKPD 7taWyBZHqNqRFPAW4kcgZDNlwCZEZfwA1i/p/QN+o3wAzCAfjt1J8faUNA+SYPgchcHzuWJUt soX5D8MEB8hfDz0R/QB+9TyaBR3BYYzytI2nPALGLfCK6QHYwqb9dbxzs6iXyV09gFaY1DOUt ZaiAt680RSV+Zk+AKete5BDdywe1Vq4W1Y3yOMidx6L3DCNE8dNefww5Fq/maesPktl0EJvND xVll6lcDRFT2jevF717B5P3bAWTiTE3ibgDttIaoo2UbhM3NePaeKiDubn7MXaqoFmPs/e1rS 5tf4RGov+XVbQ6OcdvZH9li2XWgqUwUafhEwv3RP6d2tfYy7QkY7NuhRcGupNjo02KwtkuKs6 o3v1toGIWZbZBHXQer/UNIrplQ9WSCW04cV0EGl+aV7aGHz2j9kLAmRqjIWBpo4oNWOZjO+9N 2MtdSdM3C+rW627b5nofdGySj0w+DhjRSI4zNHa6vVuKa8LwlK8LTiDBRPO7u1lQy6xlS/H/+ jo8z9uxHj7NuROHohOov+PzKK9PfP6QMe7mg/A== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PATCH 2/4] openrisc: fix float32 and float64 helper definitions 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: Stafford Horne Acked-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- target/openrisc/fpu_helper.c | 52 ++++++++++++++++++++++---------------------- target/openrisc/helper.h | 20 ++++++++--------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/target/openrisc/fpu_helper.c b/target/openrisc/fpu_helper.c index 1375cea948..f84f8bf26a 100644 --- a/target/openrisc/fpu_helper.c +++ b/target/openrisc/fpu_helper.c @@ -66,9 +66,9 @@ static inline void update_fpcsr(OpenRISCCPU *cpu) } } -uint64_t HELPER(itofd)(CPUOpenRISCState *env, uint64_t val) +float64 HELPER(itofd)(CPUOpenRISCState *env, uint64_t val) { - uint64_t itofd; + float64 itofd; OpenRISCCPU *cpu = openrisc_env_get_cpu(env); set_float_exception_flags(0, &cpu->env.fp_status); @@ -78,9 +78,9 @@ uint64_t HELPER(itofd)(CPUOpenRISCState *env, uint64_t val) return itofd; } -uint32_t HELPER(itofs)(CPUOpenRISCState *env, uint32_t val) +float32 HELPER(itofs)(CPUOpenRISCState *env, uint32_t val) { - uint32_t itofs; + float32 itofs; OpenRISCCPU *cpu = openrisc_env_get_cpu(env); set_float_exception_flags(0, &cpu->env.fp_status); @@ -90,7 +90,7 @@ uint32_t HELPER(itofs)(CPUOpenRISCState *env, uint32_t val) return itofs; } -uint64_t HELPER(ftoid)(CPUOpenRISCState *env, uint64_t val) +uint64_t HELPER(ftoid)(CPUOpenRISCState *env, float32 val) { uint64_t ftoid; OpenRISCCPU *cpu = openrisc_env_get_cpu(env); @@ -102,7 +102,7 @@ uint64_t HELPER(ftoid)(CPUOpenRISCState *env, uint64_t val) return ftoid; } -uint32_t HELPER(ftois)(CPUOpenRISCState *env, uint32_t val) +uint32_t HELPER(ftois)(CPUOpenRISCState *env, float32 val) { uint32_t ftois; OpenRISCCPU *cpu = openrisc_env_get_cpu(env); @@ -117,10 +117,10 @@ uint32_t HELPER(ftois)(CPUOpenRISCState *env, uint32_t val) #define FLOAT_OP(name, p) void helper_float_##_##p(void) #define FLOAT_CALC(name) \ -uint64_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ - uint64_t fdt0, uint64_t fdt1) \ +float64 helper_float_ ## name ## _d(CPUOpenRISCState *env, \ + float64 fdt0, float64 fdt1) \ { \ - uint64_t result; \ + float64 result; \ OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ set_float_exception_flags(0, &cpu->env.fp_status); \ result = float64_ ## name(fdt0, fdt1, &cpu->env.fp_status); \ @@ -128,10 +128,10 @@ uint64_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ return result; \ } \ \ -uint32_t helper_float_ ## name ## _s(CPUOpenRISCState *env, \ - uint32_t fdt0, uint32_t fdt1) \ +float32 helper_float_ ## name ## _s(CPUOpenRISCState *env, \ + float32 fdt0, float32 fdt1) \ { \ - uint32_t result; \ + float32 result; \ OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ set_float_exception_flags(0, &cpu->env.fp_status); \ result = float32_ ## name(fdt0, fdt1, &cpu->env.fp_status); \ @@ -147,11 +147,11 @@ FLOAT_CALC(rem) #undef FLOAT_CALC -uint64_t helper_float_madd_d(CPUOpenRISCState *env, uint64_t a, - uint64_t b, uint64_t c) +float64 helper_float_madd_d(CPUOpenRISCState *env, float64 a, + float64 b, float64 c) { OpenRISCCPU *cpu = openrisc_env_get_cpu(env); - uint64_t result; + float64 result; set_float_exception_flags(0, &cpu->env.fp_status); /* Note that or1ksim doesn't use merged operation. */ result = float64_mul(b, c, &cpu->env.fp_status); @@ -160,11 +160,11 @@ uint64_t helper_float_madd_d(CPUOpenRISCState *env, uint64_t a, return result; } -uint32_t helper_float_madd_s(CPUOpenRISCState *env, uint32_t a, - uint32_t b, uint32_t c) +float32 helper_float_madd_s(CPUOpenRISCState *env, float32 a, + float32 b, float32 c) { OpenRISCCPU *cpu = openrisc_env_get_cpu(env); - uint32_t result; + float32 result; set_float_exception_flags(0, &cpu->env.fp_status); /* Note that or1ksim doesn't use merged operation. */ result = float32_mul(b, c, &cpu->env.fp_status); @@ -176,7 +176,7 @@ uint32_t helper_float_madd_s(CPUOpenRISCState *env, uint32_t a, #define FLOAT_CMP(name) \ uint64_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ - uint64_t fdt0, uint64_t fdt1) \ + float64 fdt0, float64 fdt1) \ { \ int res; \ OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ @@ -187,7 +187,7 @@ uint64_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ } \ \ uint32_t helper_float_ ## name ## _s(CPUOpenRISCState *env, \ - uint32_t fdt0, uint32_t fdt1)\ + float32 fdt0, float32 fdt1) \ { \ int res; \ OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ @@ -205,7 +205,7 @@ FLOAT_CMP(lt) #define FLOAT_CMPNE(name) \ uint64_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ - uint64_t fdt0, uint64_t fdt1) \ + float64 fdt0, float64 fdt1) \ { \ int res; \ OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ @@ -216,7 +216,7 @@ uint64_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ } \ \ uint32_t helper_float_ ## name ## _s(CPUOpenRISCState *env, \ - uint32_t fdt0, uint32_t fdt1) \ + float32 fdt0, float32 fdt1) \ { \ int res; \ OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ @@ -231,7 +231,7 @@ FLOAT_CMPNE(ne) #define FLOAT_CMPGT(name) \ uint64_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ - uint64_t fdt0, uint64_t fdt1) \ + float64 fdt0, float64 fdt1) \ { \ int res; \ OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ @@ -242,7 +242,7 @@ uint64_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ } \ \ uint32_t helper_float_ ## name ## _s(CPUOpenRISCState *env, \ - uint32_t fdt0, uint32_t fdt1) \ + float32 fdt0, float32 fdt1) \ { \ int res; \ OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ @@ -256,7 +256,7 @@ FLOAT_CMPGT(gt) #define FLOAT_CMPGE(name) \ uint64_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ - uint64_t fdt0, uint64_t fdt1) \ + float64 fdt0, float64 fdt1) \ { \ int res; \ OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ @@ -267,7 +267,7 @@ uint64_t helper_float_ ## name ## _d(CPUOpenRISCState *env, \ } \ \ uint32_t helper_float_ ## name ## _s(CPUOpenRISCState *env, \ - uint32_t fdt0, uint32_t fdt1) \ + float32 fdt0, float32 fdt1) \ { \ int res; \ OpenRISCCPU *cpu = openrisc_env_get_cpu(env); \ diff --git a/target/openrisc/helper.h b/target/openrisc/helper.h index 4fd1a6bb8e..081606527b 100644 --- a/target/openrisc/helper.h +++ b/target/openrisc/helper.h @@ -24,17 +24,17 @@ DEF_HELPER_FLAGS_1(ove_ov, TCG_CALL_NO_WG, void, env) DEF_HELPER_FLAGS_1(ove_cyov, TCG_CALL_NO_WG, void, env) /* float */ -DEF_HELPER_FLAGS_2(itofd, TCG_CALL_NO_WG, i64, env, i64) -DEF_HELPER_FLAGS_2(itofs, TCG_CALL_NO_WG, i32, env, i32) -DEF_HELPER_FLAGS_2(ftoid, TCG_CALL_NO_WG, i64, env, i64) -DEF_HELPER_FLAGS_2(ftois, TCG_CALL_NO_WG, i32, env, i32) +DEF_HELPER_FLAGS_2(itofd, TCG_CALL_NO_WG, f64, env, i64) +DEF_HELPER_FLAGS_2(itofs, TCG_CALL_NO_WG, f32, env, i32) +DEF_HELPER_FLAGS_2(ftoid, TCG_CALL_NO_WG, i64, env, f32) +DEF_HELPER_FLAGS_2(ftois, TCG_CALL_NO_WG, i32, env, f32) -DEF_HELPER_FLAGS_4(float_madd_s, TCG_CALL_NO_WG, i32, env, i32, i32, i32) -DEF_HELPER_FLAGS_4(float_madd_d, TCG_CALL_NO_WG, i64, env, i64, i64, i64) +DEF_HELPER_FLAGS_4(float_madd_s, TCG_CALL_NO_WG, f32, env, f32, f32, f32) +DEF_HELPER_FLAGS_4(float_madd_d, TCG_CALL_NO_WG, f64, env, f64, f64, f64) #define FOP_CALC(op) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _s, TCG_CALL_NO_WG, i32, env, i32, i32) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _d, TCG_CALL_NO_WG, i64, env, i64, i64) +DEF_HELPER_FLAGS_3(float_ ## op ## _s, TCG_CALL_NO_WG, f32, env, f32, f32) \ +DEF_HELPER_FLAGS_3(float_ ## op ## _d, TCG_CALL_NO_WG, f64, env, f64, f64) FOP_CALC(add) FOP_CALC(sub) FOP_CALC(mul) @@ -43,8 +43,8 @@ FOP_CALC(rem) #undef FOP_CALC #define FOP_CMP(op) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _s, TCG_CALL_NO_WG, i32, env, i32, i32) \ -DEF_HELPER_FLAGS_3(float_ ## op ## _d, TCG_CALL_NO_WG, i64, env, i64, i64) +DEF_HELPER_FLAGS_3(float_ ## op ## _s, TCG_CALL_NO_WG, i32, env, f32, f32) \ +DEF_HELPER_FLAGS_3(float_ ## op ## _d, TCG_CALL_NO_WG, i64, env, f64, f64) FOP_CMP(eq) FOP_CMP(lt) FOP_CMP(le) 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; } From patchwork Fri Nov 3 20:26:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 834084 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 3yTD871rFPz9sNV for ; Sat, 4 Nov 2017 07:29:27 +1100 (AEDT) Received: from localhost ([::1]:38343 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAiaj-0003dB-DA for incoming@patchwork.ozlabs.org; Fri, 03 Nov 2017 16:29:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAiYD-0001Xd-Vs for qemu-devel@nongnu.org; Fri, 03 Nov 2017 16:26:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eAiYD-0000cK-5q for qemu-devel@nongnu.org; Fri, 03 Nov 2017 16:26:50 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:50357) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eAiY8-0000WK-KU; Fri, 03 Nov 2017 16:26:44 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LzneB-1d7MN41Tlb-014zN0; Fri, 03 Nov 2017 21:26:29 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 3 Nov 2017 21:26:24 +0100 Message-Id: <20171103202624.5956-5-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:4uH8cMy9vOzlQD96QkFK1E5nz+SzqxZ/7XRsJu+noBVUvo4WLsk urFvLe+9QkNr2BTWvnizG5owedD+ugEeKEnOeV0imvzbBRQpOvbk3V5DrMPwWgzxGdTG7Om /HpDNMd8+R8RDxE4xE3LT/IpqkOrwU6G5f65yKQ36xg5VUogwC0Qj7wVr/nbkZYD5GKH3PE MNOH4XKf9ptFu1c5ZWTHg== X-UI-Out-Filterresults: notjunk:1; V01:K0:I8IxDBST+28=:2bsflxApj7snSKEuX7ySp6 UbXprH33SGeeDfi0a1eqlJ/PWNmdnklrDrLifUa1u8V8Sz9mIrlcsSj142j2qm1U6uW1j0htg aePfkxzskWShtO4a3jtEkFOF5e0jsdpc4eyvgxT0p2tNvlVfEjqwaTW9u2zP3YoR4xpBc6LNl J5oyDZhwNTqgyDiBZYmaFwCHGwOMlcHkEnaRsHkD77WGLwkSBhvQacF3M03VO9i3259cSEq1r aVwLWCf+AnOcgKRY009zNBYg1KaEk+xesZtC3jusMz+myHDhvlnTzXAXXAHl4Pm2g0vaEGaqF S06Nofk6j3eFeIE5nm3Xy1U5OGSDxoP5xP8HOzxbQUY3v4k9kzu/5oMIsAnlSlEjBkJOH7hdF GbRtAhaEi8/c9wBAy/11/aFsUG/yWW2ABLRxaMCrk/J35NerSUsR/EvfPybK2R8+gXfm7EvZB 5DlBOp+o95MoS+4YHI5pjHzIPNR06VUH4kBXhirM2yLRBcMjsZgNTF8MCN8bmI/Is5VJNYnsT Pt4VLdQMK1UxQukd+Kx5U8mhNEpHTQfewQMndursP13j13u4cM/5Jga+U9+Fglb9bd+Awpv6u A9zJDaGGu4Tt9wtEjetfIsLHbv10r8KvBIfN9cNMzaoczxZtdfrTfGUerWkywUo6GL5NWYQoR 8q4ISGuy9NAQlynaEIThIJoabUUzZpjUbFYn8AMUdotDryicSQ4hqafAJWE0Ak7y2OgzUe1YK rSnopyyItud88UzZSzZ/WCnZzv8r/0yC0BuOPA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PATCH 4/4] softfloat: use floatXX_val() in XX_minmax() 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 --- fpu/softfloat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 433c5dad2d..331d78e848 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -7700,11 +7700,9 @@ static inline float ## s float ## s ## _minmax(float ## s a, float ## s b, \ } \ aSign = extractFloat ## s ## Sign(a); \ bSign = extractFloat ## s ## Sign(b); \ - av = float ## s ## _val(a); \ - bv = float ## s ## _val(b); \ if (ismag) { \ - aav = float ## s ## _abs(av); \ - abv = float ## s ## _abs(bv); \ + aav = float ## s ## _val(float ## s ## _abs(a)); \ + abv = float ## s ## _val(float ## s ## _abs(b)); \ if (aav != abv) { \ if (ismin) { \ return (aav < abv) ? a : b; \ @@ -7713,6 +7711,8 @@ static inline float ## s float ## s ## _minmax(float ## s a, float ## s b, \ } \ } \ } \ + av = float ## s ## _val(a); \ + bv = float ## s ## _val(b); \ if (aSign != bSign) { \ if (ismin) { \ return aSign ? a : b; \