From patchwork Mon Feb 8 02:37:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 378451 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4317011jah; Sun, 7 Feb 2021 19:00:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJzuM8J8p4zZd+BidOXq2Bbx9Pyofdo7/QaiH+ut+58brU6dncZJYnx5TeyvxfCbJZHX84IU X-Received: by 2002:a25:24c:: with SMTP id 73mr21088788ybc.362.1612753249274; Sun, 07 Feb 2021 19:00:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612753249; cv=none; d=google.com; s=arc-20160816; b=oqckeoEJAjQtnKPR7mIa2C3PPRffxE2I8vbac4gm1Jy6aTdoNv+XIVjpbcPqiVkEZa U+XrImH9tdImeJU7cH+QAD48J4hVN+OWanrb3qY0KmWiQFOmSi/CzuqcblEU1EPXbFsj rihYN+UFihX2NKfiqe96Zb5z4WjuQ4Y2kh9eyw6DXgCDMzYxa+rEeVtdrAE1jg3NH3za hCDqIhcDpDLLBNWWT7FuKJdrQRcD1ePOR2R6yThXtq9vMhDf8Y2UucItJu1iC7is9Msh dudkXVMNSbz82/MDhbqmf31GVwm9l6Zijp+uYFevcTOUgwwA8TD6ppYs7Ijas92x5sNL ZvHA== 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=nLwOsyO0LIePZbanFLMg77EMdmZd3QPy/SBwJ8JDkus=; b=Y03AF1j56FH1NIYQyuln5ByWI/TBu8X+1I3JmFZEdyEgGi8FllPWQgAeDC4KAo/Dss im+RZvHp3pGIrqJEOsYHVUqz+4LiQazNljAfOz4ojgQNBo5xWmNOaIdlki+ukI/2OBMx jEvaTZGUy9Lgr+PpCc9mlKZI2ldzj9F6328y/ahRF2pqcOSPUTPo2eJX17Nr3y8op83b JvpcVt1zBQyh+D14KsfMbToIUDq47gVS8ttEPMqY6HpB6uikMAVUu7/71TUUXqJQhIso 0HVYw44vnrGwuzk2c0v8jpINZZEHbsUJi0tKrWK9TmaqIbnOgVvUJUqKD9NDXyZTXUdh 2SKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="PJR28Wf/"; 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 m139si16767455ybm.411.2021.02.07.19.00.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 07 Feb 2021 19:00:49 -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=pass header.i=@linaro.org header.s=google header.b="PJR28Wf/"; 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]:56342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l8wn7-00012H-5r for patch@linaro.org; Sun, 07 Feb 2021 22:00:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l8wRn-0001fx-TI for qemu-devel@nongnu.org; Sun, 07 Feb 2021 21:38:43 -0500 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:41418) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l8wRc-0005sE-Ho for qemu-devel@nongnu.org; Sun, 07 Feb 2021 21:38:43 -0500 Received: by mail-pf1-x434.google.com with SMTP id q20so8752554pfu.8 for ; Sun, 07 Feb 2021 18:38:32 -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=nLwOsyO0LIePZbanFLMg77EMdmZd3QPy/SBwJ8JDkus=; b=PJR28Wf/Mu/cRJvkPbAtCL+q5QDVf+hHtlp5JOQLbZ0P1Ku4zWe4F5KAAuEHvqknfU XxFyWF3nfVB+kXQVZ/GgHd1LuPcsP3HCaaQWP6rOnfi30vip37G5AN5o/OtSzoUo3QVD xFX9JmIUs6khv8TGQL1+rLGEYZ/HdCwGN0gduWzUcEaHkoPCvjGQ1B4BCPhMMlQYrBGf xCqe+bVy3Rslie7kTGcNZe135sZssQBFIYw3nI7uZxm1iLrrd5ax6Nmov1nY04vOEBCY mMuUXdm+NUqbjiR5hifnthAoMxmpDCGuAR4S3ZzECBwg0zMKmM+XiaJlfjRUUe4N9OCk 6e9g== 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=nLwOsyO0LIePZbanFLMg77EMdmZd3QPy/SBwJ8JDkus=; b=CG7UH5gyqR6xFHFOBxi02ANlIytNL0f0f5PWgw+M3LYybFAFvEXWl49AgpHldjtFMd P8JNXQ/V7y6IcrDG0pjAoLO9+ZKLInEyy5thwNhK3H+nKVxxeh9Nur0crZQ8NnbbBeE8 thElQNQ9dozNhkFpffWPffoR3GuVfdBLP/p9npzeCKxfEsRR2jLjl5TEJu29IQ+FAEBW yOU+B9rTNBCbuwi6H8HmfeAQDkaYncEddHpsPdzmT2gRs0UV5pNkXR0UCfAhII6mmN5J SjtqpJaF80jjAZWOhGquaTrx3+26UxG87kaIG2eLF3ZGM3ghm+4IeN9a2irgaWuAaGgO whzg== X-Gm-Message-State: AOAM533qbHShlvxCs/MFZkuPcWxiFvu2zYbfueJtaVwfKylqE/cmakgf E9B8a8++83FvvHAVeWEZdaQy5No9RRr0ow== X-Received: by 2002:a62:e407:0:b029:1dc:1ef6:b2da with SMTP id r7-20020a62e4070000b02901dc1ef6b2damr4547570pfh.67.1612751911227; Sun, 07 Feb 2021 18:38:31 -0800 (PST) Received: from localhost.localdomain (174-21-150-71.tukw.qwest.net. [174.21.150.71]) by smtp.gmail.com with ESMTPSA id j17sm16158689pfh.183.2021.02.07.18.38.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Feb 2021 18:38:30 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 30/70] tcg/tci: Split out tci_args_rrrr Date: Sun, 7 Feb 2021 18:37:12 -0800 Message-Id: <20210208023752.270606-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210208023752.270606-1-richard.henderson@linaro.org> References: <20210208023752.270606-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: sw@weilnetz.de 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 84d77855ee..cb24295cd9 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) { @@ -676,11 +685,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