From patchwork Mon Jun 21 23:18:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 464619 Delivered-To: patch@linaro.org Received: by 2002:a17:906:71d0:0:0:0:0 with SMTP id i16csp4669933ejk; Mon, 21 Jun 2021 16:22:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwlKsFgK6JKL5GbA3/H6SK5LPlX7Jg5AtAV6c12E9YeA/J4A2WCd4gS9MphzmXDpnc7uE4m X-Received: by 2002:ab0:7516:: with SMTP id m22mr1243035uap.66.1624317774030; Mon, 21 Jun 2021 16:22:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624317774; cv=none; d=google.com; s=arc-20160816; b=uPj0OtWCoAhpVW3j5GVQissH5xqgEfuFrsqrsvRO0XKk5VJC4H2Jx+o7oajWOCjmat vALCmtqx91wktVYZpMfJgFE+kxdRKc3sIw2pBUHxPcO12FlPTkXhzWoFUg+JC1l9OjB2 rr4QnnZaeNJTayyCI7lt6+PFeMmE6D83hItsxwuiKylfpDAn/vp/rAmyr0ouFOlSs8Kb wnEaY3g4fwrSvst+ZDUMBZuLTge7zUodT4qNgKzmwK312xpWE5rhZi6V9j8aa9AOx0Xr JHYpV5ntQTpArjFrBBu9+bS6OVeLbpzTYqRQhdJGwcpDMIlXycK1Uqm5KuQcOhlOCxWh m0Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=fXrizxcUnvvf6PXr7Yc72AhaPXA1gSYgiDq85iqI09c=; b=rc+9Z/z327jr60XaAq6StH9isnh1F7+OW4jLn+lfKvQrVDj3zPs2sOk5F1RWw3npjM Yh5qxWTFwYfH6slqEbQmtS8YzdD7c7p+tVce4C6KTQxItHVPFsokF0us+d74SASWuexq VIKdRzKC02pqC7WBqqrII2MdvLXUg0AAKkUKLYet9q95oBgotry66cdpaomPetvUg+nL Tx7hky7t+HhDkzmVv/xFuAvT1KcBTXXz2S/uF6vzPYsI3xJz7zmvsBh6S6LYwz0eK271 c/pvDVDKkVnMZNy5uUvTG9nL9HMhp9nzbWLMxPTxJxOIkgKwg+whfwVSdYvCKsxzqBHH te4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NOzJzQ1r; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ay19si566283uab.78.2021.06.21.16.22.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Jun 2021 16:22:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NOzJzQ1r; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvTFl-0008SE-BN for patch@linaro.org; Mon, 21 Jun 2021 19:22:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvTC3-0000ko-8H for qemu-devel@nongnu.org; Mon, 21 Jun 2021 19:19:03 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:44908) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lvTBx-0005us-5L for qemu-devel@nongnu.org; Mon, 21 Jun 2021 19:19:02 -0400 Received: by mail-pf1-x434.google.com with SMTP id u18so9489299pfk.11 for ; Mon, 21 Jun 2021 16:18:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fXrizxcUnvvf6PXr7Yc72AhaPXA1gSYgiDq85iqI09c=; b=NOzJzQ1rK4iVrOabtS+/jX4IvUkap8Wo9jTJdUqfyPg1fNfNw3f8NCIoazY1XBuq2Z OZQNhHykQ/PzFO8PSNtSCA4Ihy/mrZCTAj9B9LDpzsByV+dsw9wUZEAlCcmZl4qgEa6D AtIxlTY91NBcymHrtXgRe1tnQ6KjiD1tKKuYV5XF4jmmmujNtxhpBSXFS+wTz9/MdMlF J/z8UNA632IgXQQs5ACxOkZNn3x6NX0q92GXlZ+JLX7YSa6mtKRjIuSRm9E/9+sE6Lfu +URtWSL3T6MWGO2BYW77w7xmKCQu4SWGJ2V0/SZH4AW5BpEd47Y6YaOeUv+/lKDTDntW ez+A== 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:mime-version:content-transfer-encoding; bh=fXrizxcUnvvf6PXr7Yc72AhaPXA1gSYgiDq85iqI09c=; b=FFlm9NdUvJj7J11qceE/78zDv1Hm9bqzaiDFy3MzvE2yMlBqyuORwA2iHK060l99tB 6ZUVX55mTxWhSexLOMiLuMu53CCzBbfWMynPn88iAbS1YDxTJvMY0izkYvGO/eI+mi+f bfi+n4hf1K4E8Nbhu6B0HjVHP34kvLWAlfIYca52mxdtH85HJdE12FtL+QhS52G0Xeji 75rgEnk7zsrOaJ/AwGOMNE+r+fCWmNm3kPDIZQDlG0akn/IyCqEnHinbh1uLup1hvtqG k0y9ajWJZzQ4sEnOheoNKhRe3/d8yIPSvbB+CzBzor2krx0/SOWrf9d3VQcmhqGlZYHT Vbww== X-Gm-Message-State: AOAM531pn6xj5uLazDCls8ZaY1uzD5phMAV0TiIf9gmCqFeohr3rE+Db 1YlW+L4QAYBmYs6CHayTl82I+HOgbCbDxQ== X-Received: by 2002:a63:4906:: with SMTP id w6mr849139pga.212.1624317535909; Mon, 21 Jun 2021 16:18:55 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id 135sm14429952pgf.20.2021.06.21.16.18.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jun 2021 16:18:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 07/29] tcg/ppc: Split out tcg_out_sari{32,64} Date: Mon, 21 Jun 2021 16:18:27 -0700 Message-Id: <20210621231849.1871164-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210621231849.1871164-1-richard.henderson@linaro.org> References: <20210621231849.1871164-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x434.google.com 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We will shortly require sari in other context; split out both for cleanliness sake. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.c.inc | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) -- 2.25.1 diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index aa35ff8250..50347182d7 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -768,6 +768,12 @@ static inline void tcg_out_shli64(TCGContext *s, TCGReg dst, TCGReg src, int c) tcg_out_rld(s, RLDICR, dst, src, c, 63 - c); } +static inline void tcg_out_sari32(TCGContext *s, TCGReg dst, TCGReg src, int c) +{ + /* Limit immediate shift count lest we create an illegal insn. */ + tcg_out32(s, SRAWI | RA(dst) | RS(src) | SH(c & 31)); +} + static inline void tcg_out_shri32(TCGContext *s, TCGReg dst, TCGReg src, int c) { tcg_out_rlw(s, RLWINM, dst, src, 32 - c, c, 31); @@ -778,6 +784,11 @@ static inline void tcg_out_shri64(TCGContext *s, TCGReg dst, TCGReg src, int c) tcg_out_rld(s, RLDICL, dst, src, 64 - c, c); } +static inline void tcg_out_sari64(TCGContext *s, TCGReg dst, TCGReg src, int c) +{ + tcg_out32(s, SRADI | RA(dst) | RS(src) | SH(c & 0x1f) | ((c >> 4) & 2)); +} + /* Emit a move into ret of arg, if it can be done in one insn. */ static bool tcg_out_movi_one(TCGContext *s, TCGReg ret, tcg_target_long arg) { @@ -2601,8 +2612,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, break; case INDEX_op_sar_i32: if (const_args[2]) { - /* Limit immediate shift count lest we create an illegal insn. */ - tcg_out32(s, SRAWI | RS(args[1]) | RA(args[0]) | SH(args[2] & 31)); + tcg_out_sari32(s, args[0], args[1], args[2]); } else { tcg_out32(s, SRAW | SAB(args[1], args[0], args[2])); } @@ -2690,8 +2700,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, break; case INDEX_op_sar_i64: if (const_args[2]) { - int sh = SH(args[2] & 0x1f) | (((args[2] >> 5) & 1) << 1); - tcg_out32(s, SRADI | RA(args[0]) | RS(args[1]) | sh); + tcg_out_sari64(s, args[0], args[1], args[2]); } else { tcg_out32(s, SRAD | SAB(args[1], args[0], args[2])); }