From patchwork Wed Mar 17 15:34:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 403191 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp601775jai; Wed, 17 Mar 2021 08:52:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfGrUktVtCzzjttbVxcEyZcVC8vs+MD1YgqjO1teMOnSJqwpdK/32pguZEZ0ej9mIsNSJl X-Received: by 2002:a92:ce84:: with SMTP id r4mr7995307ilo.112.1615996358504; Wed, 17 Mar 2021 08:52:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615996358; cv=none; d=google.com; s=arc-20160816; b=ew6T1kFKdQZrxplNulDPKY6Zq8T614H92d0wKjV4GKWDk9ddMO+QoBbyif0BCH2TTF 36y+c7C4vLagBdV6itxVDwyL9AIkuXSv/DQcBohwYOWOOt6HdBVg+j42NK780jxsMuZ3 d+NB0f532HAUhrotYB9o/aDjklMafxupjJgfgMYda/ekSiEKvgrzI+6nj2nslwqEjxaw F9mE2U5UHL2vpKu6CR1tcQ8eL3MqgSCMWBO4/bSZ6evuxjTY2aVhM9bxFLLdP8CO2TcZ Z7OQOPOpDdweGxcOD01obfaVAsKUdXsE4En18Bfy8yyi0BBuful/bfqPrK+qp/Jpiqoa IGHg== 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=BPLK/1amd4KCcNjMbn3QSjoEMmr6k2cwNg1lkL3Tpg4=; b=RlQcz7JUemnb2DcmA/GJghzwngARTrTUOMYjJ+MPmGSD6CV0yWd/Tpnlsgjt1j3+yr zJF0tRn49w2aA7zOeJ1B4/DNB3FMihO2HLfWAnJvN6k+PlTzZx7Ich0rJwSE/fnr/+pj 7nL1J7Bm8YhSSfy85CI37SXBeSfRbyDb+EOWq8HGI/zeU2AZRvQiKDkozOv8bzIMrFzX geR26yUKx1cwvm/4GBYfDbXCOes9Y43IZNcMNwi6bJ4Bs4SD7Lwo0G5S6DOyzB6T8Z6z 8syv1L4ezg0dQP2Q/s7lO7F7ABGTz1WO5+4MT+mf1pKypgPC57qZSwgE/dFK3f3+rP6a /RTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=t+IdojBi; 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 l12si15063128ilj.149.2021.03.17.08.52.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 08:52:38 -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=t+IdojBi; 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]:46360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMYTN-0006mx-TH for patch@linaro.org; Wed, 17 Mar 2021 11:52:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMYCo-0005Kc-75 for qemu-devel@nongnu.org; Wed, 17 Mar 2021 11:35:30 -0400 Received: from mail-oi1-x230.google.com ([2607:f8b0:4864:20::230]:43438) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lMYCa-0007HT-VR for qemu-devel@nongnu.org; Wed, 17 Mar 2021 11:35:29 -0400 Received: by mail-oi1-x230.google.com with SMTP id y7so2814644oih.10 for ; Wed, 17 Mar 2021 08:35:15 -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=BPLK/1amd4KCcNjMbn3QSjoEMmr6k2cwNg1lkL3Tpg4=; b=t+IdojBik1RhrXBQHCnrcFbS7Lcb2ulww/8pJsvlJXpc4bA16swN7ujvzeRgY0+OLp duEgf9fxGnMvN9ekNDf+MKVDNRx90qo8WmnM9eTxuxPfeqgRngMCYtqPXt4XVahwJrhB zjX1/vb+R04i7BlLV1MjKetRSdr1UeU86i245pkkQGjcOeyuHgeu/B6JbtusHZpC5XXr wyEU0axOWvqMZKYVPOwqUCftVXW8gPTBqXKKP94p70bWRtK6kwBlmkQKvPP2kHNPKnQQ br3DCTtK6Ks+gTRGiR35ro0ZVoAT4E43mVAMtsqnTxD7mRhSgqDjMzs7p1umr+4U+gg6 wWEA== 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=BPLK/1amd4KCcNjMbn3QSjoEMmr6k2cwNg1lkL3Tpg4=; b=kTNifMmOwHvdizjtkvBCARxAKxaDOJSJZMFrwWJ9b/DcTRcjmicKEOBvjRAUPyIRX8 nj40mLymUh9cez0uY8jRfkIS/vPkI3A7nk2MZoyvZH1oHXZEdlv2Du0H+8zjwlOBvCp3 vT3Isbbmf4Ww8xCN0JTZoTDB9kavdbxwnlQ/a/ifX4yzISYSYgeMmGVE3/Dz2/UCH9ir HWC70IuU+PTo3ggwjU8OXgc3N6P7Y8D0f6z8e58wnUSof3f8z9Ly1h82jJd7hncbuWYv nhsLMZb4taksFR+t0bCbD64x6m7PIZZVrg9Qx4NpzvuU31YAVsKhNn0h2mZWV0YayFmM OZ9g== X-Gm-Message-State: AOAM533Y26C0x8SRNWdRJ7v0a4gebjjc3bwyJ+F+f2kRXjgVc6VxLJYJ jgRgrBRVOslmBWkwxMVgCEZEa+3gRj6R3UUi X-Received: by 2002:aca:1c18:: with SMTP id c24mr3098796oic.7.1615995315380; Wed, 17 Mar 2021 08:35:15 -0700 (PDT) Received: from localhost.localdomain (fixed-187-189-51-144.totalplay.net. [187.189.51.144]) by smtp.gmail.com with ESMTPSA id i11sm8271154otp.76.2021.03.17.08.35.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 08:35:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 29/38] tcg/tci: Split out tcg_out_op_rrrrrc Date: Wed, 17 Mar 2021 09:34:35 -0600 Message-Id: <20210317153444.310566-30-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317153444.310566-1-richard.henderson@linaro.org> References: <20210317153444.310566-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::230; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x230.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=unavailable 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@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- tcg/tci/tcg-target.c.inc | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) -- 2.25.1 diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index d4207818cf..8504e82e95 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -369,6 +369,25 @@ static void tcg_out_op_rrrc(TCGContext *s, TCGOpcode op, old_code_ptr[1] = s->code_ptr - old_code_ptr; } +#if TCG_TARGET_REG_BITS == 32 +static void tcg_out_op_rrrrrc(TCGContext *s, TCGOpcode op, + TCGReg r0, TCGReg r1, TCGReg r2, + TCGReg r3, TCGReg r4, TCGCond c5) +{ + uint8_t *old_code_ptr = s->code_ptr; + + tcg_out_op_t(s, op); + tcg_out_r(s, r0); + tcg_out_r(s, r1); + tcg_out_r(s, r2); + tcg_out_r(s, r3); + tcg_out_r(s, r4); + tcg_out8(s, c5); + + old_code_ptr[1] = s->code_ptr - old_code_ptr; +} +#endif + static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg val, TCGReg base, intptr_t offset) { @@ -473,15 +492,8 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, #if TCG_TARGET_REG_BITS == 32 case INDEX_op_setcond2_i32: - /* setcond2_i32 cond, t0, t1_low, t1_high, t2_low, t2_high */ - tcg_out_op_t(s, opc); - tcg_out_r(s, args[0]); - tcg_out_r(s, args[1]); - tcg_out_r(s, args[2]); - tcg_out_r(s, args[3]); - tcg_out_r(s, args[4]); - tcg_out8(s, args[5]); /* condition */ - old_code_ptr[1] = s->code_ptr - old_code_ptr; + tcg_out_op_rrrrrc(s, opc, args[0], args[1], args[2], + args[3], args[4], args[5]); break; #endif