From patchwork Tue Jun 9 16:28:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandar Markovic X-Patchwork-Id: 11596071 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0D92560D for ; Tue, 9 Jun 2020 16:32:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D5A6720774 for ; Tue, 9 Jun 2020 16:31:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rP9R+JOM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D5A6720774 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:41216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jihAN-0001Tm-06 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 09 Jun 2020 12:31:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jih7E-0005v3-Fu for qemu-devel@nongnu.org; Tue, 09 Jun 2020 12:28:44 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:39461) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jih7D-000171-CD for qemu-devel@nongnu.org; Tue, 09 Jun 2020 12:28:44 -0400 Received: by mail-wr1-x42c.google.com with SMTP id t18so22032167wru.6 for ; Tue, 09 Jun 2020 09:28:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GR4eimU9t63Pw1mCFxbwUNXUU4YvTN5YihjHWjA0XDI=; b=rP9R+JOM9hBsPI90mXZwxxnd1UTkAWwSs/sAPHPmvqu3uWrX67D8VlVICpvWufCA4b GXNCBg8Jk6SC4FbqLGhlaKhUCr1x2ULItpIIK/fUVYYnVr0fwsBZBqaq+JcdueD6gJqp t0yeA3M0cvMIJ2DEc79hcqf0kIm3ddW0ywhNYbR049ZmS19AMDlv+Gjylz+1G7KAvfMp TBxowUdTsTLV2Oj4Fd+082+3Ye1/nlC2zTLD1Af7R689kchqLOsUN8T96e7gTZ80DrgA +MlDQN3tK58kcwALNsNF3kzywqarBkwzmNBzvrEPmVQDh+rtOlaYdS6EXZeETovr92QL gluw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GR4eimU9t63Pw1mCFxbwUNXUU4YvTN5YihjHWjA0XDI=; b=KKeNHtbePSKK7d1jyL7O6FJmxclzWz79soyjBA5B9MswWvr1nyINc0p6C1T19JEi38 9PNH9IIbO5R8hVpxg8iMdG6OU45bGp+jd6Pq5g8Io8lJWsrJ/n3BqTBUEftSoJNxihHy JFPvZaRy5Js9FBWCk74Mxg3IF0WAsLQ/IHX4+crstz7KSXen+2r5yZy105ZR/DGebkSf bMBSuBK6btJ6jRrgRr3YATMDUKI/2TS3ND92jFeJavkXU95Ino/WHWLZASYu/4ExcKPB WylSv8Emn1eIyQDE+o/J8OEZ/bWzIutyLvKTRE4yfE4nAruQSwjOWvpqXwA+7PLkwNeG jxYw== X-Gm-Message-State: AOAM533LSGN0+tVd6vxd1xbdYMvwETPZB5qkUMAz+1I1hTx0TjTwFja/ +qu5ywcA+8QNw6vhwUyZpS9l4rGN X-Google-Smtp-Source: ABdhPJwqzHiJJnj6SomA9HzcA/dc+yZ0jm3i+3wWu5EU2n4hZ/Sd7mOwrhoU9nVJZpKi33cg1GPXgA== X-Received: by 2002:adf:fe8d:: with SMTP id l13mr5216035wrr.282.1591720121886; Tue, 09 Jun 2020 09:28:41 -0700 (PDT) Received: from rtrkw774-lin.syrmia.com ([46.240.135.226]) by smtp.gmail.com with ESMTPSA id 23sm3643598wmo.18.2020.06.09.09.28.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jun 2020 09:28:41 -0700 (PDT) From: Aleksandar Markovic To: qemu-devel@nongnu.org, peter.maydell@linaro.org Subject: [PULL 03/20] target/mips: fpu: Demacro ADD. Date: Tue, 9 Jun 2020 18:28:21 +0200 Message-Id: <1591720118-7378-4-git-send-email-aleksandar.qemu.devel@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591720118-7378-1-git-send-email-aleksandar.qemu.devel@gmail.com> References: <1591720118-7378-1-git-send-email-aleksandar.qemu.devel@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=aleksandar.qemu.devel@gmail.com; helo=mail-wr1-x42c.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aleksandar.qemu.devel@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" This is just a cosmetic change to enable tools like gcov, gdb, callgrind, etc. to better display involved source code. Reviewed-by: Aleksandar Rikalo Signed-off-by: Aleksandar Markovic Message-Id: <20200518200920.17344-2-aleksandar.qemu.devel@gmail.com> --- target/mips/fpu_helper.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/target/mips/fpu_helper.c b/target/mips/fpu_helper.c index 5287c86..984f3f4 100644 --- a/target/mips/fpu_helper.c +++ b/target/mips/fpu_helper.c @@ -1208,12 +1208,48 @@ uint64_t helper_float_ ## name ## _ps(CPUMIPSState *env, \ return ((uint64_t)wth2 << 32) | wt2; \ } -FLOAT_BINOP(add) FLOAT_BINOP(sub) FLOAT_BINOP(mul) FLOAT_BINOP(div) #undef FLOAT_BINOP +uint64_t helper_float_add_d(CPUMIPSState *env, + uint64_t fdt0, uint64_t fdt1) +{ + uint64_t dt2; + + dt2 = float64_add(fdt0, fdt1, &env->active_fpu.fp_status); + update_fcr31(env, GETPC()); + return dt2; +} + +uint32_t helper_float_add_s(CPUMIPSState *env, + uint32_t fst0, uint32_t fst1) +{ + uint32_t wt2; + + wt2 = float32_sub(fst0, fst1, &env->active_fpu.fp_status); + update_fcr31(env, GETPC()); + return wt2; +} + +uint64_t helper_float_add_ps(CPUMIPSState *env, + uint64_t fdt0, uint64_t fdt1) +{ + uint32_t fstl0 = fdt0 & 0XFFFFFFFF; + uint32_t fsth0 = fdt0 >> 32; + uint32_t fstl1 = fdt1 & 0XFFFFFFFF; + uint32_t fsth1 = fdt1 >> 32; + uint32_t wtl2; + uint32_t wth2; + + wtl2 = float32_add(fstl0, fstl1, &env->active_fpu.fp_status); + wth2 = float32_add(fsth0, fsth1, &env->active_fpu.fp_status); + update_fcr31(env, GETPC()); + return ((uint64_t)wth2 << 32) | wtl2; +} + + /* MIPS specific binary operations */ uint64_t helper_float_recip2_d(CPUMIPSState *env, uint64_t fdt0, uint64_t fdt2) {