From patchwork Thu May 23 14:23:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 165014 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2261537ili; Thu, 23 May 2019 07:24:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqz4Kpqb81AvJJr/3BfoUr5zfKVqphYe57exqypGkuahSiFHVNmig5BeWpFJbiqWRpBvLujN X-Received: by 2002:a17:906:720e:: with SMTP id m14mr3440165ejk.84.1558621466426; Thu, 23 May 2019 07:24:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558621466; cv=none; d=google.com; s=arc-20160816; b=WwLK2sG7Jt/qv7AViDQA0lI+QQh7Jh7GcTpWyN3lkxE+f8XS7WBWpBvCWYPFFvgTWv Xl7qa4fMQUACaKdCjPj/LcEUyyRMctpqWqd7PcD6INPF7585G9rbB4HM5Mz1tsx6bgME e29o2liEaOKtY4YewIEhPhpdJGPNXD+eIVcoeMLEkdrIlPz/cViGmGfFbHEEtJpdviy9 VRW5yeuojXuXCqBmamdSJiEVKVRXolyjrgo3MFIQPuHizjJnaL/kqCO6RwDdX1e3IQrF qKpZkyfsOHoa24ELMSmCyT28kfMJ8TQFs+bvjuxc7pVx7DEAyFZu7cWQ9Hh6xIEBM7cQ IOWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=GWOxRv/DyhNDr3+OGIc40iczzclis5p5MGykNCNdjFE=; b=jUNxaflKNZR8lruKzd5edQu++LgnGjy8tr08k3izMIoBm11uKWqspEdSRJNkn6b6i5 eXOMrQ4OkKUcDklo5NijLsdCqrRzsj0H70XORikLZlW/dINxtrRuFc6AtmBsynMHPWpv BsERD7m0XddLeASIg8YhklbxsiKGun1DvleGQE0y7O1oo1J5GT3BeajHKFT/DAxfItUy GGCxaJqQvqSEPSZMs0KRpIs7Qz0Wcy2XNKZYqbuhBprYUxWk7HzHTo/rR5SaXb42MQDU ym5Wmo1dcUBQiLmrSMRG02Hno0dpzyNq3vmEsdnpEpD1BVLqpBfiVAPCUBGIXXcreBar nwvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qx+qNk6R; 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=fail (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 t55si13943942eda.113.2019.05.23.07.24.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 23 May 2019 07:24:26 -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=fail header.i=@linaro.org header.s=google header.b=qx+qNk6R; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:37400 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTodt-0002Zs-B0 for patch@linaro.org; Thu, 23 May 2019 10:24:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTodX-0002Wa-FT for qemu-devel@nongnu.org; Thu, 23 May 2019 10:24:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTodW-0006pa-06 for qemu-devel@nongnu.org; Thu, 23 May 2019 10:24:03 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:39954) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTodV-0006nx-Nv for qemu-devel@nongnu.org; Thu, 23 May 2019 10:24:01 -0400 Received: by mail-wm1-x330.google.com with SMTP id 15so5995176wmg.5 for ; Thu, 23 May 2019 07:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GWOxRv/DyhNDr3+OGIc40iczzclis5p5MGykNCNdjFE=; b=qx+qNk6RGzpErVHtUr7Vd0Dfz4OXlfxBnhsB9e8rjKMNJ6FDbdxmsi7yN6PUKrI/hG WwUFZBO1QvxO017dSA/L4D88EW1sYBtfedsKuJa53kwIJiK4szRVVrwC9eSTEwJUf8rz nTA1skNHpZSAKWRcKTkVg5CTuZwb5RlvY1v4oDiDzz78pNGhV1ARPc7qPgxKKudPfbUd /f6cw6cr/i7pqn15RpJOwks+tN3C60DVllz3PqBaTwQxsiI/VzpjZ+x1cXAW7/W2b+zc KXWrR7fhGgdvqxg9SuhvA8AJoH/CWTTOIPOtpoMg7r3J1U2x3dG7JQFne4ugHdgSUzGH 9X0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GWOxRv/DyhNDr3+OGIc40iczzclis5p5MGykNCNdjFE=; b=DkD8HzYgL2szmdE1D74MP5XRC2wbmpbo1pGfZqkNf4/JUcj9NV9E+GkE9K8SC7Q99s DFAiRXtC5wqYh+0ARf/TpsxQ2ZNOW1ojEsVwQ+u3nto8NG0+TblQZRMPTy/OvMU7nS07 PVcHQeA8bO8gmmnkO8RO9tHUk43lDcmJqjyD6/WwhwsRReBBvGYHvCzyfJPKG2/GnPqN vOBhD5ztiikWh2Nw2tnEV3sLj6tGTXH0zTf43iMXF+i53LisKf9JuQR+fnhn5ISUb++n 9imA6r539Bj74Rwz4EKu00F/FlMDsdJU+VeEtpKfCd2qSsmzdQ83qkKQF/xnlpK5u0si dTAw== X-Gm-Message-State: APjAAAX8wrJ90QxgMRxguh3ygH+JP+M+Hfhs2DjTX+24ow35fQbLQrW4 ZBKR3h8qfcLaXGkOMVMoJzwPQYGnOh+YYA== X-Received: by 2002:a1c:c7c8:: with SMTP id x191mr11056686wmf.126.1558621440436; Thu, 23 May 2019 07:24:00 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id z5sm9700617wmi.34.2019.05.23.07.23.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 May 2019 07:23:59 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 23 May 2019 15:23:46 +0100 Message-Id: <20190523142357.5175-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190523142357.5175-1-peter.maydell@linaro.org> References: <20190523142357.5175-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 Subject: [Qemu-devel] [PULL 01/12] target/arm: Use extract2 for EXTR 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson This is, after all, how we implement extract2 in tcg/aarch64. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20190514011129.11330-2-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/translate-a64.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) -- 2.20.1 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index b7c5a928b4a..2b135b938ce 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -4114,25 +4114,27 @@ static void disas_extract(DisasContext *s, uint32_t insn) } else { tcg_gen_ext32u_i64(tcg_rd, cpu_reg(s, rm)); } - } else if (rm == rn) { /* ROR */ - tcg_rm = cpu_reg(s, rm); - if (sf) { - tcg_gen_rotri_i64(tcg_rd, tcg_rm, imm); - } else { - TCGv_i32 tmp = tcg_temp_new_i32(); - tcg_gen_extrl_i64_i32(tmp, tcg_rm); - tcg_gen_rotri_i32(tmp, tmp, imm); - tcg_gen_extu_i32_i64(tcg_rd, tmp); - tcg_temp_free_i32(tmp); - } } else { - tcg_rm = read_cpu_reg(s, rm, sf); - tcg_rn = read_cpu_reg(s, rn, sf); - tcg_gen_shri_i64(tcg_rm, tcg_rm, imm); - tcg_gen_shli_i64(tcg_rn, tcg_rn, bitsize - imm); - tcg_gen_or_i64(tcg_rd, tcg_rm, tcg_rn); - if (!sf) { - tcg_gen_ext32u_i64(tcg_rd, tcg_rd); + tcg_rm = cpu_reg(s, rm); + tcg_rn = cpu_reg(s, rn); + + if (sf) { + /* Specialization to ROR happens in EXTRACT2. */ + tcg_gen_extract2_i64(tcg_rd, tcg_rm, tcg_rn, imm); + } else { + TCGv_i32 t0 = tcg_temp_new_i32(); + + tcg_gen_extrl_i64_i32(t0, tcg_rm); + if (rm == rn) { + tcg_gen_rotri_i32(t0, t0, imm); + } else { + TCGv_i32 t1 = tcg_temp_new_i32(); + tcg_gen_extrl_i64_i32(t1, tcg_rn); + tcg_gen_extract2_i32(t0, t0, t1, imm); + tcg_temp_free_i32(t1); + } + tcg_gen_extu_i32_i64(tcg_rd, t0); + tcg_temp_free_i32(t0); } } }