From patchwork Wed Feb 17 20:19:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 383868 Delivered-To: patch@linaro.org Received: by 2002:a02:c80e:0:0:0:0:0 with SMTP id p14csp3120555jao; Wed, 17 Feb 2021 12:41:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJwJTsrwdJhBX7vIpw79L7vouKVE0ju6GVuGs7Uhmc/r+xo319YRrm3VcZ8ifpwGtAwepXxl X-Received: by 2002:a25:8b8b:: with SMTP id j11mr1921764ybl.305.1613594476836; Wed, 17 Feb 2021 12:41:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613594476; cv=none; d=google.com; s=arc-20160816; b=jr7cSdqrPv1c4FG7t5q+AQeDtcNscHouJeBa6oKPUqAJ5wpFgXqz6X+ki/H49wPWtu Kg1mU1ny6tmPxU+j4zjmgSL4GFQ/5HjW4gM2Y68GGlCaUTNmvZlSFYh3m/uWjvgKYx8k d5ehsa3I7eG77hf9GFnCu+YCq7EE3/c4zGPtfjQYJMdE55MLkKpvixSK3IrnduLnahJB eAYYzb068Rq2OjwiW8ga5wC6tpTko2Ds8UQzbuclfOwc9PNuuz4fvqKRNGYYFRXAe/DC 54Fd/MMikV3KUnRBWpPfAxZMYThMxjTBSEFnT4+YwZBfm7Qf4OFFHX/qKnf9rYLjKmXS HPpA== 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=tWt9l+M7f3QWN4u3GyxAdQRX+QI3GedTTpv25vEiGn4=; b=eFsgvEzXkM5EomwTjURTNplVFe6sk3hjVxDY8VzpbtH1+moR6ogLU5/mScCSqEX2ZO 1Nx/VRYxKgRkUw+NcVVRF4sXSa5fiCvHOfxZsDI1aut2dIOQXhRX7c8JqaP9/2BdgdxP 0MWderTnsx9q5WO3aGpIbnFn2GkE+4LqueRUe6jEQZWcShM3SKK1O9Sk7iWXORo5gdlr VoHo42mFrnchLpzdqG6XoRAR9ic5ZK91+3+75qsl9EDM+TKDpP1ufaekJYRQAenZ+I0T t/gMnryn0vO9Rrv7ZDqiVgIJ6i/SXHJ1srad9GKnM5Fts4XGxb6oksrrr7dS+m2a+JTz mJzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GFEdAIwc; 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 w191si1228664ybe.183.2021.02.17.12.41.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Feb 2021 12:41:16 -0800 (PST) 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=GFEdAIwc; 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 ([::1]:33458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCTdM-0000FX-9I for patch@linaro.org; Wed, 17 Feb 2021 15:41:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCTLd-0008EL-Rc for qemu-devel@nongnu.org; Wed, 17 Feb 2021 15:22:57 -0500 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:45779) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCTLc-0007Mx-42 for qemu-devel@nongnu.org; Wed, 17 Feb 2021 15:22:57 -0500 Received: by mail-pl1-x632.google.com with SMTP id b8so8022750plh.12 for ; Wed, 17 Feb 2021 12:22:55 -0800 (PST) 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=tWt9l+M7f3QWN4u3GyxAdQRX+QI3GedTTpv25vEiGn4=; b=GFEdAIwc9QKIQWZFi7QTxwXJ9lUvesqlViPDzhUTUIzYSWx0QlqzWLDK5Ps2ViBixg xvuLU7CDV5d74iwz3Gpnz9VbeCo1bSH4Nt91bbbOioZqB8MQascKVFFL+f7+/b8tLk9j bjks3uIqLpHU0L8txfavvIQgPeqaipqiiHoBFyGFVY/gXgWA5nRRMjBV2I8I3tg1dbSh bVa6Zm6bCo98TGHA78Y7q1obVINo8GbKii5OYQc77a+puhuJUI0YKWSOwHRWCKI4GT3U kRJmSvPvZfRXAlYK/SUeuRkgewOG0BxqLi5ZIF8YseaWXi3WQeejVMPwrnGUM3KD1NKn eaJA== 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=tWt9l+M7f3QWN4u3GyxAdQRX+QI3GedTTpv25vEiGn4=; b=qRwfGiQ09hxPrHMjbydu1R5LK9OLhmXLVhP54iyjNtt2q2lTLe6HQSFqXzGcuVv/3b 6d3HGa3Qt8E4sxl1jRDWMCQDnLz6y5mI+b5f4Ox4+WBI/GiF7yQPugVa7xOb2H3isSQ8 y89PLVbw1CfKkYKK1c6i7HH/B7OuEOCgKkFzShTESlvhmRefBzyKPUPs+cn7qvROYgse snJD9EXcNcSem8G7Dep1vodX390yS6UON2UeFEDF2+xGsYMebMfmeRsvBYGlL/MvwT7O 7X1pTiQ7HuwFQUm5BKVhtwqGX2fogJilfUiWjsg8txOozNPIi+neOhb9v1CG+nHK+Aob iY8w== X-Gm-Message-State: AOAM530s2Hv0sOzH9/n8Pb2/072bs8e8GlIAWg0b/bM0kaht88EN5Gxq 7EXBoyB8UnOYqHjOWAZ+XdM+6CoOFJE84A== X-Received: by 2002:a17:902:eb45:b029:e3:99ad:7fb9 with SMTP id i5-20020a170902eb45b02900e399ad7fb9mr778297pli.24.1613593374905; Wed, 17 Feb 2021 12:22:54 -0800 (PST) Received: from localhost.localdomain (047-051-160-125.biz.spectrum.com. [47.51.160.125]) by smtp.gmail.com with ESMTPSA id 3sm3001576pjk.26.2021.02.17.12.22.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 12:22:53 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 30/71] tcg/tci: Split out tci_args_rrrr Date: Wed, 17 Feb 2021 12:19:55 -0800 Message-Id: <20210217202036.1724901-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210217202036.1724901-1-richard.henderson@linaro.org> References: <20210217202036.1724901-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.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: sw@weilnetz.de, alex.bennee@linaro.org, f4bug@amsat.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- tcg/tci.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) -- 2.25.1 diff --git a/tcg/tci.c b/tcg/tci.c index 8b38687d9a..10f58e4f25 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -237,6 +237,15 @@ static void tci_args_rrrc(const uint8_t **tb_ptr, } #if TCG_TARGET_REG_BITS == 32 +static void tci_args_rrrr(const uint8_t **tb_ptr, + TCGReg *r0, TCGReg *r1, TCGReg *r2, TCGReg *r3) +{ + *r0 = tci_read_r(tb_ptr); + *r1 = tci_read_r(tb_ptr); + *r2 = tci_read_r(tb_ptr); + *r3 = tci_read_r(tb_ptr); +} + static void tci_args_rrrrcl(const uint8_t **tb_ptr, TCGReg *r0, TCGReg *r1, TCGReg *r2, TCGReg *r3, TCGCond *c4, void **l5) { @@ -659,11 +668,8 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, } break; case INDEX_op_mulu2_i32: - t0 = *tb_ptr++; - t1 = *tb_ptr++; - t2 = tci_read_rval(regs, &tb_ptr); - tmp64 = (uint32_t)tci_read_rval(regs, &tb_ptr); - tci_write_reg64(regs, t1, t0, (uint32_t)t2 * tmp64); + tci_args_rrrr(&tb_ptr, &r0, &r1, &r2, &r3); + tci_write_reg64(regs, r1, r0, (uint64_t)regs[r2] * regs[r3]); break; #endif /* TCG_TARGET_REG_BITS == 32 */ #if TCG_TARGET_HAS_ext8s_i32 || TCG_TARGET_HAS_ext8s_i64