From patchwork Wed Mar 17 15:34:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 403195 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp603867jai; Wed, 17 Mar 2021 08:55:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzLBSbo+8chWOhQqXGlH9ruvyoL8HmwfMhgESXR4Y+8jsVp2SPDGv7FGLQvKxfU/wVuf1Bc X-Received: by 2002:a05:6e02:54e:: with SMTP id i14mr8239741ils.136.1615996520693; Wed, 17 Mar 2021 08:55:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615996520; cv=none; d=google.com; s=arc-20160816; b=v8xEjii8A6S7YvQW8y6VHUyY2vfrU1dd2W2Tt3Cu7ykZ/DXdSSjpsdTCTiEyFq13d0 20y6pbemuxwliSCVTVlMg1/g/LaSAAIPjlRCOLgb3UoN40We21CPYPNboqGLni0CgTQH K6rEML8J6dyjdjhO1FSNhJ2WH+Khm5LI1xmMW6eOaBg3ScmgaspaXk0IJCSMgMnCvKdg DBE+zRiw9YbLdvAuKVY40lj5+ZYg42VwwmpCxEJNpHYpawxBDUtQ8DNnbptprvsA+dgY c5auoHJi3O2mTvtW0foYNAGwnvHvoQ54WCQ5kKwmavEJ29hL34oNH7kro1bL7PD5ywQI roow== 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=ACE1sMT8wY4iUN+EqRzW5k07GACFzZCdY0lH0VS72yo=; b=ZyYd4m0BMEY5MI2PT+5SMY5giVcS2BqoJjg/paLEWi6WOl1d/hjSMZZJbJYJOO2TCu /ZVKhY+0Dsqm79LxOp2MTu+7T/t7KdD3gQ4cBBmLc78WGz8unTex5MyfOcyruP6Ipk+l kzpvZ8gfk79Q7jul6TPJ96abxhFjYE74LmazZ/ALXaAjHvPqOzQWNCQkhbjTM8yTJLgk 8qGZ45BvjscIz8GhBa3XXD2u9H54n88/QVMqfXD9+7cx/VyXKhF0oDP3pR8c+f1x2htB JB7Z7Xn6Y4zifl4ZDKceMqy+uBXaa2jzwGBSqk+7ZAP8oTOaCYqiPT29Xc6fcmkQJauz gHpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fUEvKG6a; 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 q13si15022129ilj.116.2021.03.17.08.55.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 08:55:20 -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=fUEvKG6a; 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]:54774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMYW0-0001p7-4z for patch@linaro.org; Wed, 17 Mar 2021 11:55:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMYCp-0005N4-Hh for qemu-devel@nongnu.org; Wed, 17 Mar 2021 11:35:32 -0400 Received: from mail-oi1-x22f.google.com ([2607:f8b0:4864:20::22f]:37850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lMYCf-0007Iy-CM for qemu-devel@nongnu.org; Wed, 17 Mar 2021 11:35:31 -0400 Received: by mail-oi1-x22f.google.com with SMTP id u198so37226696oia.4 for ; Wed, 17 Mar 2021 08:35:20 -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=ACE1sMT8wY4iUN+EqRzW5k07GACFzZCdY0lH0VS72yo=; b=fUEvKG6aAEMjtm9GaEPWzq9fpbo/JJKWgrX301eFWv9n8h9SSnkcywja4V76ElfnJp gjiI1az1tGunOArtxVCnPZQM7eo8kj6o1WncgX03AAeWHb0JXbNmVRvKx3+Qe1VoXgiv BdvH1wjx8uGL1aOIurIjCHNremP6HTdapwAFqA3RtoGD8jwGCi7ZX09BlE2nX6jKkHy/ MSMu3ZzztEJNq+Ah/SD7Csey1t6/DV+WdJXAmkddxC/yEbeWIw0+z6xA0tPYsMQBZl7N sR0Frezvs+L15lNNI0WjHu8wvsJuNeDrkyIOUAJJOFTGhkrPjcluzNwLlFLvMJCoZqzP whHw== 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=ACE1sMT8wY4iUN+EqRzW5k07GACFzZCdY0lH0VS72yo=; b=Gk93iELJFPyf0CAVlhDNTvx11bXkC/FXv7IPh1SEoYXDottfw7rc+QodSJJwwgtw8w BZ6iF2WJqyVWo7pfM2Q5KXrNe36pnOB8XfD2KiWRkObWB03Kke3Dg8A5wiaOFTAQtyyi VdV6WIMOUFVq2S89oUiF+a1jbQ1ZMf9prjG1jNBXks/fErD/wTy1rGZagXFF2roLLYDA elVC0B5f672nhq7sZvNGGiKd2++pW0u6i7nAdHUXUkNdzjqZlqKDPMYSeSrzdWaldXuO SrYkMbPk6vE3f5dCWUEPTPHBeWeJMtyWFfET5ykjYCbNRijOQOItBPHEyXnO0ydsmI/s gbpg== X-Gm-Message-State: AOAM531SCjwUuVCHmR02rPumY+QwPP7g3LjfABkKjINZAznw2DvSRtOC vJadHeSNU+lvVD/C0ExfWs1YH7Weg3wGJQRZ X-Received: by 2002:aca:3046:: with SMTP id w67mr3161043oiw.57.1615995320383; Wed, 17 Mar 2021 08:35:20 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 08:35:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 34/38] tcg/tci: Split out tcg_out_op_rrrrcl Date: Wed, 17 Mar 2021 09:34:40 -0600 Message-Id: <20210317153444.310566-35-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::22f; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22f.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: 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 | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) -- 2.25.1 diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index 1e98c73417..86b59179bb 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -413,6 +413,23 @@ static void tcg_out_op_rrrr(TCGContext *s, TCGOpcode op, old_code_ptr[1] = s->code_ptr - old_code_ptr; } +static void tcg_out_op_rrrrcl(TCGContext *s, TCGOpcode op, + TCGReg r0, TCGReg r1, TCGReg r2, TCGReg r3, + TCGCond c4, TCGLabel *l5) +{ + 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_out8(s, c4); + tci_out_label(s, l5); + + old_code_ptr[1] = s->code_ptr - old_code_ptr; +} + static void tcg_out_op_rrrrrc(TCGContext *s, TCGOpcode op, TCGReg r0, TCGReg r1, TCGReg r2, TCGReg r3, TCGReg r4, TCGCond c5) @@ -636,14 +653,8 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, args[3], args[4], args[5]); break; case INDEX_op_brcond2_i32: - 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_out8(s, args[4]); /* condition */ - tci_out_label(s, arg_label(args[5])); - old_code_ptr[1] = s->code_ptr - old_code_ptr; + tcg_out_op_rrrrcl(s, opc, args[0], args[1], args[2], + args[3], args[4], arg_label(args[5])); break; case INDEX_op_mulu2_i32: tcg_out_op_rrrr(s, opc, args[0], args[1], args[2], args[3]);