From patchwork Thu Feb 4 01:44:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 376202 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp858609jah; Wed, 3 Feb 2021 18:34:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJxWUCxPiNS0iWB3W2Lq9Q8E5N4wcD0OdgR5xBaLqx1ipjLyRhIhCU6KEX6lgh1E8mhlIl+6 X-Received: by 2002:a25:83d0:: with SMTP id v16mr9863099ybm.40.1612406088260; Wed, 03 Feb 2021 18:34:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612406088; cv=none; d=google.com; s=arc-20160816; b=ZPZ8wVsfckvO5Je6m51E+eo+mlqJ8+hur4OgWGlv0N8S7OvYhzejQm8+mavLOyChmE /Gb+r36uXmPTjvbU0Z7iak+u5HO7lnLMAiXx6bZrXgCrYDMReZqxZWOD5Yy2uu52GhsD TL4DIOBUVa1rDrnz7bioyzXH+rOFAECni4tOhqULbZa7SELeRGWHonfbhc/taUfbj1bN JGjsa5/tvGjhRMpO0T6pzt4/fgJ0Z4EYjip8I+PztaEZyzTDQdKnsgX/CDiA5qOwXCrc pAdyn5kB1vQ0bRrq5LRXsN3pSA3bN55C2lCxJVPUQ8dDI+kqt6hyh1M7dG8jt0Ihs9wx l6uQ== 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=faQEOWkrexwmyQSBuLUQhn1Lzwu8VN30wFMSaYFn3prSyA2OdTGOaB9cnDgwwMJWCL raDOGEPp2oVqxdFBtoSQ54J6gUBVQCR0hEa5yOMVkVHgeUZM+GjFwkgZl5zdyfn91i9C +FOM4lhTuooAMiko+UQjPFVtq1M7FOODgOweCk2RZmLXnJLo1aqZm44QMTS95V/vM+pO dzgbOnET1H2KYHU1j/mg+ATO0Sg4iVfvkTvUMueMHN8lUZKtEnvWf0OL/fJkArI5PWVP D49cSHbNWibQsWDczkLwh8aiHcX6qm6b+d1YMFMoFwVSrZj4dXujFIAvHvKM81JcbBCp BQNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=l9WN+zAT; 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 b71si3589139yba.35.2021.02.03.18.34.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Feb 2021 18:34:48 -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=l9WN+zAT; 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]:52648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7UTn-0003Ze-Mk for patch@linaro.org; Wed, 03 Feb 2021 21:34:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7TjR-0005be-10 for qemu-devel@nongnu.org; Wed, 03 Feb 2021 20:46:53 -0500 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]:34193) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l7TjP-00043J-Ei for qemu-devel@nongnu.org; Wed, 03 Feb 2021 20:46:52 -0500 Received: by mail-pg1-x533.google.com with SMTP id o7so1053830pgl.1 for ; Wed, 03 Feb 2021 17:46:50 -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=l9WN+zATzNqEXOczx5DUp3oVFvdvWDLnJi276EF1NJO2nJmCpj5wsybeSFLv3r31hD 9MJBobsz9Hk1c71/tZHqXwHpM6hESMQkk33MWtOfMj6M15T0fl+TzQfnGMY9P9JbK5D+ 1v3GYzIM6YB19lfotDykflEnNyPToqK1x/F8y3G7Pp/fXvzPWGrTwPIGjI7aPmWrphPY VO0uMlNuUte91xhNiXFtCZsz1Y3Xy+pEMevjEca2e91lyfVNtoS/TOdtHLwr7ayhBjgc TytFi+ul2p4kZlo5NTnL50733l+tsjX5uJLqH8oXC1uRyQbHjJDNemAOJqSLiGAVBT2z xNDg== 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=VCkXe38gO/O5DiO6CJGnqVH2zdsrxPklkZm7iC4MQKQHTbxUF77pz9Q9N7CfknZAq0 ZXzDuw3NH6rQaaoLcYShaedmJ6IqUn3qPSF351Cb7yD23tuxaXZtLS2eZm/7C2i6tZnZ M6StohsIzd7XfVuNZjGoagGliMgfBhl2cPYdvfLyNXlJVNlAgO/TkpZTKur70FL4oAQm w8uwvu2WJS1A2tiSxoMvf+TWwQ66twPbkVBOFly3BbtbKNBC2kJX91X22gQ8Onjp+c9k WenvP0R6THbKzuOcutvmd8IPL+wb9hLbv+/gkvMGkif0izNAgrzizE9FkYwNjbCgo0lb fBMQ== X-Gm-Message-State: AOAM5331/Ttjf+CF3dAhNH9S+WbfQvkdmbj7+TUWYGhqHWyRKiibYWlw TwOK9SkcHA4ezv2UsHi93lzzpdpYK+ECfOXl X-Received: by 2002:a62:484:0:b029:1b7:878b:c170 with SMTP id 126-20020a6204840000b02901b7878bc170mr5701593pfe.28.1612403210161; Wed, 03 Feb 2021 17:46:50 -0800 (PST) Received: from localhost.localdomain (cpe-66-27-222-29.hawaii.res.rr.com. [66.27.222.29]) by smtp.gmail.com with ESMTPSA id q132sm3835462pfq.171.2021.02.03.17.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 17:46:49 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 55/93] tcg/tci: Split out tci_args_rrrr Date: Wed, 3 Feb 2021 15:44:31 -1000 Message-Id: <20210204014509.882821-56-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210204014509.882821-1-richard.henderson@linaro.org> References: <20210204014509.882821-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::533; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x533.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