From patchwork Mon Feb 8 02:37:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 378470 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4326019jah; Sun, 7 Feb 2021 19:16:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwySl4TNkFfHcQv/a/laxg2vUvoL9jGxn2FpEngLO8GFaaMtjFyO/jF5TGp8f8aNZxqHeVu X-Received: by 2002:a25:908f:: with SMTP id t15mr21739129ybl.47.1612754213817; Sun, 07 Feb 2021 19:16:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612754213; cv=none; d=google.com; s=arc-20160816; b=ld7LsvjSDRm/ZIFgICA5nlw/8iJiK5rIeT74KAXOIKuj73KNbrOmYx/kCq1TA2rYBR tyTzRO1/NvjaKJqwrJKQfbK1rVZs8ULZxgXDkSwMNpKRLzTHEWdGizQ5vatzZ4hDdqdM MzeozWvfbr3inCEH4X95K68NmSiE21XeaIF19b9pVF9BSFhgsA8y7zjnbvczQD/xhXbC vLf/B3xOev1huLFGZ1Jeefk9Fb2keWiUpEjcyjdXgTItUva0AVikwJiw46ldYwfbRtkl Up4WwrTrbg35xj5C4hFucCcASHmfyivYI9twP0vikXsKvgzaclnthz3Vswhmphb4YwcS xSVw== 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=pkp4aXi3+w8F3jY0rhA8T5Xz+pAiS2r2rYmikBP8fUZ1Ckcvhqv8TF51iA9GZcN75f w9SzEzbJTd53qXx/cHg5TzmCSsjAL0IILVP/QuQxdK8FO3iE3UiKAfXdeY9ZmPS64b01 rNk6deZlIL5a82jtB8DZbhxUD5c1l8ovxJ3wP7tNjhruY180CPgBeBVWqFY84Jz7A/3l fq/kOYlanMOmqtrUz1yBo636G7KjkH1MoxqozxND7C9QmFfQ6g2RY5Z1OxThyCh5e1Vu ovqewAhIGNmDEth6RxcFygbmhefymVIHfLyXVwzi1Wjbdp+dCU8Vy2DtdnRm7kGZ3wdD E5Wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ORa21O8g; 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 h67si9381013ybh.479.2021.02.07.19.16.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 07 Feb 2021 19:16:53 -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=ORa21O8g; 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]:36650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l8x2j-0000Uk-8s for patch@linaro.org; Sun, 07 Feb 2021 22:16:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l8wSc-0002nw-HF for qemu-devel@nongnu.org; Sun, 07 Feb 2021 21:39:34 -0500 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]:35309) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l8wSa-0006BS-Tm for qemu-devel@nongnu.org; Sun, 07 Feb 2021 21:39:34 -0500 Received: by mail-pg1-x531.google.com with SMTP id t25so9273339pga.2 for ; Sun, 07 Feb 2021 18:39: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=kQwYPaxcLPGVIBaZFpt4Ukjta9EglPQhHZw+11ye7O8=; b=ORa21O8g8bjUFTm8fFDWUIfGceTvFFgmvj82hGVAXNKcKeH0CZyw7W8o0Kd4iY5g69 XsS16XJduZnbNwzcwLgzfQroNXGlhbxo11TjPohafvdediAX9XQLcUwsKPLp/GZg7EOh E82R3STyCbrNhaeOyBVbVFYlOf03NnRfb2cIGg0cpZ+/KlXXh0KJZrNHT7BM7a0iVh07 x0x20M5YFp/9hSf6IMrLjYaq4dAtcscAKYlLHdVrm88HIeYZq7sz35e7/NzDOSjnixlj sCFIZ3xe+dN2inswL1YZn7O3obwdMmsj+MyG2FDv7JXEFRJimFDQzwCvk4Dbqx6R+g/5 WCjA== 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=XyLAArlC3NibwM2TOgiSoD9t1aRRSMu05DafcwtkckZo6Ku9dAUYEYZo9TSVrIL+Lc TLOD/Xd/L6KsqGUhGK0RAt4b9WCx1Zxqi1L21RrgGy/6f9z4x2zyG7jiUzO9VHAe7fIS sUdJSqsDyUDtn7S/lAKJeCsDIKNSwpPtrfbu7GsIJl1nbZjcVcdT5DtvVfFaMYSoamjn +68FzipIFMkyA7uA/U3aAeIIzdInzE48VQ0F2CgCwFzkNI5eHh4p/bY2vXlyIWr342jN YyYTAWOuyDa6bPvhcTgfSmXVhmIN1spWt1K5l7GA0cv4s0HJKP/4255LruV9kdhAF4tY 5+7g== X-Gm-Message-State: AOAM531hJOk5ZORfFeBq7lFGI2dOzAwd/pCCHj7tKA/6W8Zw9//hG5eV itSfCM7FLt/1W0zepvrWGriMiFVBN7ejRw== X-Received: by 2002:a62:87c1:0:b029:1d6:2bf4:8699 with SMTP id i184-20020a6287c10000b02901d62bf48699mr15420293pfe.79.1612751971667; Sun, 07 Feb 2021 18:39: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 74sm650954pfw.53.2021.02.07.18.39.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Feb 2021 18:39:31 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 56/70] tcg/tci: Split out tcg_out_op_np Date: Sun, 7 Feb 2021 18:37:38 -0800 Message-Id: <20210208023752.270606-57-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::531; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x531.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/tcg-target.c.inc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) -- 2.25.1 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