From patchwork Tue Mar 1 16:24:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Koppelmann X-Patchwork-Id: 8466631 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A91B59F9A0 for ; Tue, 1 Mar 2016 16:27:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 086F0201ED for ; Tue, 1 Mar 2016 16:27:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 43BFE200DF for ; Tue, 1 Mar 2016 16:27:11 +0000 (UTC) Received: from localhost ([::1]:50774 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aan8g-00009U-Ki for patchwork-qemu-devel@patchwork.kernel.org; Tue, 01 Mar 2016 11:27:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50670) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aan6L-0004xN-Ti for qemu-devel@nongnu.org; Tue, 01 Mar 2016 11:24:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aan6G-0005Nu-3u for qemu-devel@nongnu.org; Tue, 01 Mar 2016 11:24:45 -0500 Received: from mail.uni-paderborn.de ([131.234.142.9]:34266) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aan6F-0005Mi-R0 for qemu-devel@nongnu.org; Tue, 01 Mar 2016 11:24:40 -0500 From: Bastian Koppelmann To: qemu-devel@nongnu.org Date: Tue, 1 Mar 2016 17:24:24 +0100 Message-Id: <1456849468-30217-4-git-send-email-kbastian@mail.uni-paderborn.de> X-Mailer: git-send-email 2.7.2 In-Reply-To: <1456849468-30217-1-git-send-email-kbastian@mail.uni-paderborn.de> References: <1456849468-30217-1-git-send-email-kbastian@mail.uni-paderborn.de> X-IMT-Spam-Score: 0.0 () X-PMX-Version: 6.2.1.2493963, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.3.1.161817 X-IMT-Authenticated-Sender: uid=kbastian,ou=People,o=upb,c=de X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 131.234.142.9 Cc: rth@twiddle.net Subject: [Qemu-devel] [PATCH 3/7] target-tricore: add add.f/sub.f instructions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Bastian Koppelmann --- target-tricore/fpu_helper.c | 31 +++++++++++++++++++++++++++++++ target-tricore/helper.h | 2 ++ target-tricore/translate.c | 6 ++++++ 3 files changed, 39 insertions(+) diff --git a/target-tricore/fpu_helper.c b/target-tricore/fpu_helper.c index ddf877e..b840c20 100644 --- a/target-tricore/fpu_helper.c +++ b/target-tricore/fpu_helper.c @@ -81,3 +81,34 @@ static inline void f_set_flags(CPUTriCoreState *env) set_flush_to_zero(1, &env->fp_status); set_float_exception_flags(0, &env->fp_status); } + +#define FADD_SUB(name) \ +uint32_t helper_f##name(CPUTriCoreState *env, uint32_t r1, uint32_t r2) \ +{ \ + float32 arg1 = make_float32(r1); \ + float32 arg2 = make_float32(r2); \ + float32 f_result; \ + \ + f_set_flags(env); \ + \ + arg1 = float32_squash_input_denormal(arg1, &env->fp_status); \ + arg2 = float32_squash_input_denormal(arg2, &env->fp_status); \ + \ + if (float32_is_any_nan(arg1) || float32_is_any_nan(arg2)) { \ + f_result = QUIET_NAN; \ + if (float32_is_signaling_nan(arg1) || \ + float32_is_signaling_nan(arg2)) { \ + env->fp_status.float_exception_flags |= float_flag_invalid; \ + } \ + } else if (f_is_pos_inf(arg1) && f_is_neg_inf(arg2)) { \ + f_result = ADD_NAN; \ + } else if (f_is_pos_inf(arg2) && f_is_neg_inf(arg1)) { \ + f_result = ADD_NAN; \ + } else { \ + f_result = float32_##name(arg1, arg2 , &env->fp_status); \ + } \ + f_update_psw_flags(env, false); \ + return (uint32_t)f_result; \ +} +FADD_SUB(add) +FADD_SUB(sub) diff --git a/target-tricore/helper.h b/target-tricore/helper.h index 2c8ed78..2f4a2bb 100644 --- a/target-tricore/helper.h +++ b/target-tricore/helper.h @@ -105,6 +105,8 @@ DEF_HELPER_FLAGS_1(parity, TCG_CALL_NO_RWG_SE, i32, i32) /* float */ DEF_HELPER_FLAGS_4(pack, TCG_CALL_NO_RWG_SE, i32, i32, i32, i32, i32) DEF_HELPER_1(unpack, i64, i32) +DEF_HELPER_3(fadd, i32, env, i32, i32) +DEF_HELPER_3(fsub, i32, env, i32, i32) /* dvinit */ DEF_HELPER_3(dvinit_b_13, i64, env, i32, i32) DEF_HELPER_3(dvinit_b_131, i64, env, i32, i32) diff --git a/target-tricore/translate.c b/target-tricore/translate.c index 84313d2..04620a7 100644 --- a/target-tricore/translate.c +++ b/target-tricore/translate.c @@ -7061,6 +7061,12 @@ static void decode_rrr_divide(CPUTriCoreState *env, DisasContext *ctx) gen_helper_pack(cpu_gpr_d[r4], cpu_PSW_C, cpu_gpr_d[r3], cpu_gpr_d[r3+1], cpu_gpr_d[r1]); break; + case OPC2_32_RRR_ADD_F: + gen_helper_fadd(cpu_gpr_d[r4], cpu_env, cpu_gpr_d[r1], cpu_gpr_d[r3]); + break; + case OPC2_32_RRR_SUB_F: + gen_helper_fsub(cpu_gpr_d[r4], cpu_env, cpu_gpr_d[r1], cpu_gpr_d[r3]); + break; default: generate_trap(ctx, TRAPC_INSN_ERR, TIN2_IOPC); }