From patchwork Thu Mar 11 14:39:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 397525 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp395981jai; Thu, 11 Mar 2021 07:09:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJxjAWdZOOPLDl/KE9SWigk+m3tuLehjg8RL4IaBcJK1WPPl6PRtAEswIjvORPTUXJUm6pQx X-Received: by 2002:a67:6786:: with SMTP id b128mr5626199vsc.9.1615475390959; Thu, 11 Mar 2021 07:09:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615475390; cv=none; d=google.com; s=arc-20160816; b=Sk1ENL4AxQEA9cDO/BISLO0y4pXoS763cAxPl4fDXd53DbPKMsziNef93pgaPKzQHl CjVMN33LN+oWvgHOR5ZYHE12Kc0JfWDyxNUuVM0eU95PCciegvjI4JsbFpboNs2UerCE oecSksSmyCFE7te6jA3WiVlMn5PNYINHmN1TPIyoCLWSzJzWf5iEGME0xUIELu5Yn1ST qbrKpr5tSg1Sptq5SgrBY5kUD+FwEyiLRxgdilOdXn/oGWSNOzeQVhL7mJw6pFhYN5IV ZRMeFQNGSCdvsBJzExiLcIpCq3/TsljJ7rTgOGSVyHBYdlQKBD0ZhoHBNJPS4xY9q+Ug 1msA== 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=kQwYPaxcLPGVIBaZFpt4Ukjta9EglPQhHZw+11ye7O8=; b=PsH0yFRLtQ9uKdWO6s3YPODHGJvywgDOL7zJP08PLlBCt2ajXnzwusWZZRFOMII4TC teRq6bGdrPP8YaoHm9K5qVtNUSL/1UsOMo5ka/+Qcps9Jelt9k7PMJu05rDUV4JZMRqV Sw9KbhJEXXEQtBdBjQBNmDmV8JUiHi0kH2a5mRv7pVhGOKJ0vDdyFl65crm7z+IuL0x3 WYGE7NAY/Gh0M7qKSI6id/ntP6kPJ++H1I2By887tltfvzWKY3KJP5UZjIxfYJDdOD8b NO6sDt4myuLVRbnHohyZgsX6J3vaFhwYhWFr7EhfyxTVCtLoGlo6nqydTiingAbzpaUB So7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hM5ir3Pb; 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 c18si569070uak.219.2021.03.11.07.09.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Mar 2021 07:09:50 -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=hM5ir3Pb; 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]:55486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKMwg-00041v-Bk for patch@linaro.org; Thu, 11 Mar 2021 10:09:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKMVJ-000416-K8 for qemu-devel@nongnu.org; Thu, 11 Mar 2021 09:41:33 -0500 Received: from mail-qv1-xf2f.google.com ([2607:f8b0:4864:20::f2f]:46036) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lKMVD-0006ri-Lj for qemu-devel@nongnu.org; Thu, 11 Mar 2021 09:41:33 -0500 Received: by mail-qv1-xf2f.google.com with SMTP id t16so2632708qvr.12 for ; Thu, 11 Mar 2021 06:41:27 -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=kQwYPaxcLPGVIBaZFpt4Ukjta9EglPQhHZw+11ye7O8=; b=hM5ir3Pb6N4yNI2AUagTzdwa+SLromBoBNfeCrFrNXoblUKXFY7C5c3eKY6ufNk/0/ mJnx57ZfcWRG1PJFamrtEf+M0qSjDcTl+2IvKMtS+zhB0BKTM/LGtbFZjE9nfLy4cus+ KkH8pDSkM6uUWglhP4HGQvKbt1usQ1yY2yxnGMowU+YGjN7l0iSobuWs5kG6L86ouZ6r 6/Ib7VWBs66QnG8R3Vv8hSE6kId2UF6SpKIhh6oWU1k5uWY493XjAL6ETXDuh53aIni4 8LJAPGQAQ6dg+kySPzZharMMi9VwzgfdH4iyNW4v0FwW5XEptWz52Mqk+BXK8P77B4Ie q1Pw== 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=kQwYPaxcLPGVIBaZFpt4Ukjta9EglPQhHZw+11ye7O8=; b=r6MgLp/jkBquZZb4mjKf5Trk2zI9eGP3N34FsXf+723+8TSjeggyOEh0MrvTpVPE7Q WarTxKDV+0gmSWOg5KfzXxCdLOzmeKw1Ukatf13PWUjEhVlzDXxgyMa2mlHkty/SYVc3 qX6+yRq/NgPNRorDUETiaFYcfhRNOdvjGxpflU58En2wI+syYLa0DvVCP4Qh+U8xzbX2 kdgsp8NjtkbwD59/6N9w1ffT2ocXkKatWSZa3k521GDYaSHJ066oE9RYhA3sS8oX5fwp 3xhBieq3tkciiBYPHMUPtLNRQJVUpOiG/gxVti9lBzDHRfNqeDcEdEvDu3vQ4cbzySeV 6A1g== X-Gm-Message-State: AOAM532qCIZI69wlxrXvkahNMlKNJ6hZ2V6Ch+IxW7uhNsa0NRXTHUDS j3YeSQ8tRTBMltJy93+c/p1qjrsuuSBZituM X-Received: by 2002:a0c:c1cc:: with SMTP id v12mr7716706qvh.47.1615473686763; Thu, 11 Mar 2021 06:41:26 -0800 (PST) Received: from localhost.localdomain (fixed-187-189-51-144.totalplay.net. [187.189.51.144]) by smtp.gmail.com with ESMTPSA id g14sm1962421qkm.98.2021.03.11.06.41.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 06:41:26 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 41/57] tcg/tci: Split out tcg_out_op_np Date: Thu, 11 Mar 2021 08:39:42 -0600 Message-Id: <20210311143958.562625-42-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210311143958.562625-1-richard.henderson@linaro.org> References: <20210311143958.562625-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::f2f; envelope-from=richard.henderson@linaro.org; helo=mail-qv1-xf2f.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/tcg-target.c.inc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) -- 2.25.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index eeafec6d44..e4a5872b2a 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -312,6 +312,18 @@ static void tcg_out_op_v(TCGContext *s, TCGOpcode op) old_code_ptr[1] = s->code_ptr - old_code_ptr; } +static void tcg_out_op_np(TCGContext *s, TCGOpcode op, + uint8_t n0, const void *p1) +{ + uint8_t *old_code_ptr = s->code_ptr; + + tcg_out_op_t(s, op); + tcg_out8(s, n0); + tcg_out_i(s, (uintptr_t)p1); + + old_code_ptr[1] = s->code_ptr - old_code_ptr; +} + static void tcg_out_op_rr(TCGContext *s, TCGOpcode op, TCGReg r0, TCGReg r1) { uint8_t *old_code_ptr = s->code_ptr; @@ -561,7 +573,6 @@ static void tcg_out_movi(TCGContext *s, TCGType type, static void tcg_out_call(TCGContext *s, const tcg_insn_unit *arg) { - uint8_t *old_code_ptr = s->code_ptr; const TCGHelperInfo *info; uint8_t which; @@ -574,11 +585,8 @@ static void tcg_out_call(TCGContext *s, const tcg_insn_unit *arg) tcg_debug_assert(info->cif->rtype->size == 8); which = 2; } - tcg_out_op_t(s, INDEX_op_call); - tcg_out8(s, which); - tcg_out_i(s, (uintptr_t)info); - old_code_ptr[1] = s->code_ptr - old_code_ptr; + tcg_out_op_np(s, INDEX_op_call, which, info); } #if TCG_TARGET_REG_BITS == 64