From patchwork Sat Mar 16 01:57:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 780740 Delivered-To: patch@linaro.org Received: by 2002:a5d:46c1:0:b0:33e:7753:30bd with SMTP id g1csp489362wrs; Fri, 15 Mar 2024 18:58:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV7qv2Fpxkp6GMZdJpLKWSeRrO/1wvo2wkFSZZrCF1UWE4ESEVzsLVCWMuHpN/m9k9z1i4PCpbQhpPwObQzWtwi X-Google-Smtp-Source: AGHT+IHpVB2Atml2QJgA89XvFC/31ncSaq1EI80OplM0+F6fYBzEQLMo0hzdxLANQzYzXFWjl87e X-Received: by 2002:a0c:e705:0:b0:690:beb7:c6da with SMTP id d5-20020a0ce705000000b00690beb7c6damr5805016qvn.38.1710554332146; Fri, 15 Mar 2024 18:58:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710554332; cv=none; d=google.com; s=arc-20160816; b=bRuk1qbTu9H84JRE8VZjwQzII7803FJrLY00JM64FXh+JgNkN7FiHE3mklyUHr5xbb 1qafptrMMWFjjckk2OTs2sdOqQYHq11d589L8L3Z1yQMknEwbshZh0OWwB0tStJByXRQ ayVrZ9UMykLi7ntxqskk0p3nGPcmTF//qqeGfLtW/NvBYnmkO14Ec9kppAVPvDFaJaGC mHhtkxk7w71IMuraJxAQ7zxGRjnvtJajID+8CIzP90R2i2dArcWJ4tnDLni4g2r85uCq ddZe68tjsDwCEjUYhZfmSwRjZ8Mmk6XTvyXNfwvGcERD1aZ2OB0eukTQRTkJZ+v9i4uD Qx2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=pfrhB6wtiY1dRspgCcVihnqjgoTQCBAZYhtK1KymQU8=; fh=DfUxOGz7MnM49MBgqH5VPROGi+97fYtPWhcEZCG1Y5Q=; b=v2xxA20j61AIZK0Mzn78OwG16TZdTmAznLY+h3Zu1LuJ9i8oa1RGt3xNpS7dwxIyej XBus9hYFrNG+RiH5uV4KjxPAYrJg7hcrTbDPJlGwXP/2yF5ZZ9duHfxIN3ifIUF3L3H8 99eufy4NYh1a0PkJjtDW7qeIdWyIQgD+TkRP7oeKMnKebo/rlygg1ZlYtM2jX2566b2S 0nc/bjEPaBXUQ9fs8v1P5ZriEaDh++veKa75jBtBvmgPnIPFAPdelyeojjmMjCUGfSOa 0ERcyKm3LGoEfSN9O5RFY4m/oDprSPo159rbp/yo+0CKVb1d5Sv2Zbaj5bFGZAATF+k+ R96A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZDXl6Je7; 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 r11-20020a0562140c8b00b006910d0d2ae4si3895523qvr.211.2024.03.15.18.58.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Mar 2024 18:58:52 -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=ZDXl6Je7; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rlJJC-0002v5-Ej; Fri, 15 Mar 2024 21:58:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rlJJ6-0002s5-Uh for qemu-devel@nongnu.org; Fri, 15 Mar 2024 21:57:59 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rlJJ5-0000m2-5g for qemu-devel@nongnu.org; Fri, 15 Mar 2024 21:57:56 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1dee5daa236so15052625ad.0 for ; Fri, 15 Mar 2024 18:57:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710554273; x=1711159073; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pfrhB6wtiY1dRspgCcVihnqjgoTQCBAZYhtK1KymQU8=; b=ZDXl6Je7jGLn16nCYdR4z7RTllvyIjvsYUgmSvNxFvajUIegfVv7WS1K3IyT1GRLR0 4vbxdgm5gGq+K1JuqUpTAr8bDOEwh8CX0P2/48gcMoYyd1yCDUzsJ8kBv6J8q0+dvcJd j17DJIvvTZaG69KkbxBzULHRHSEYomgfAiqy/zYSV8nE+Q17iraTBa2sUJ5uH2PNXpVi IqOijzjNkTfsiDec/5jRZbCna1eQIdl4UaUtqm9zoakPfnR8rh5dIB7I8sLA+fyF0+qG E4vxMWGwpr2tKjnBpMA8obUg+mRMR4a/+3iKRz0wYp96Z0n6+MkgeGLSkRmDMgfHCdyY bzhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710554273; x=1711159073; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pfrhB6wtiY1dRspgCcVihnqjgoTQCBAZYhtK1KymQU8=; b=eEMu38Yu0suMy4qqDrvIuTOYIy3pSO6NqKLmd0IXFfYNLoC6i79ZZ1oPkECs1fNdyO /bBBGsoTUfMlAOplqccVc0BlvwkXDTzjlo/3B3Xoz6jhIBryKP3M8VnhcoNkseqqkt/x ZwTvlamAVhFYvkMeU1f8bJ7lbwAvNSGta9+yK7w6MYgsv+P462mtsIIrZ6meIeMjmLNX bLKLJdIrFG1dH3vz2rfOOOvBYcKirgbeWImz24rtAy7YchANvQPszUtUdr8P2JP2Ae+r MV2DtS8g7VNjrWoXBhsi6gn5N3TfzyohdY76kq0/iLEzgoSR022YC0KtTWJ5Sqz01vxz aVbA== X-Gm-Message-State: AOJu0Yx126+IM7Xikvo7covqNxSrref0+40kV4fqjL1j1CWBVq17ReF5 Up2SCLVUb7/Xs8EUWD83hg/uNT7zJomlfInwyaQi29UdvLqLwqCYp+UHT6hmm8kNnS89qiFn2g7 w X-Received: by 2002:a17:902:d2d0:b0:1dc:6d64:dcff with SMTP id n16-20020a170902d2d000b001dc6d64dcffmr6432966plc.37.1710554272928; Fri, 15 Mar 2024 18:57:52 -0700 (PDT) Received: from stoup.. (173-197-098-125.biz.spectrum.com. [173.197.98.125]) by smtp.gmail.com with ESMTPSA id b3-20020a170903228300b001dd42bbb08asm4592985plh.253.2024.03.15.18.57.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 18:57:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pierrick.bouvier@linaro.org, alex.bennee@linaro.org Subject: [PATCH 14/22] tcg: Remove INDEX_op_plugin_cb_{start,end} Date: Fri, 15 Mar 2024 15:57:12 -1000 Message-Id: <20240316015720.3661236-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240316015720.3661236-1-richard.henderson@linaro.org> References: <20240316015720.3661236-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org These opcodes are no longer used. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- include/tcg/tcg-op-common.h | 2 -- include/tcg/tcg-opc.h | 2 -- accel/tcg/plugin-gen.c | 18 ------------------ tcg/tcg-op.c | 10 ---------- 4 files changed, 32 deletions(-) diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h index 72b80b20d0..009e2778c5 100644 --- a/include/tcg/tcg-op-common.h +++ b/include/tcg/tcg-op-common.h @@ -76,8 +76,6 @@ void tcg_gen_lookup_and_goto_ptr(void); void tcg_gen_plugin_cb(unsigned from); void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo); -void tcg_gen_plugin_cb_start(unsigned from, unsigned type, unsigned wr); -void tcg_gen_plugin_cb_end(void); /* 32 bit ops */ diff --git a/include/tcg/tcg-opc.h b/include/tcg/tcg-opc.h index be9e36e386..546eb49c11 100644 --- a/include/tcg/tcg-opc.h +++ b/include/tcg/tcg-opc.h @@ -199,8 +199,6 @@ DEF(goto_ptr, 0, 1, 0, TCG_OPF_BB_EXIT | TCG_OPF_BB_END) DEF(plugin_cb, 0, 0, 1, TCG_OPF_NOT_PRESENT) DEF(plugin_mem_cb, 0, 1, 1, TCG_OPF_NOT_PRESENT) -DEF(plugin_cb_start, 0, 0, 3, TCG_OPF_NOT_PRESENT) -DEF(plugin_cb_end, 0, 0, 0, TCG_OPF_NOT_PRESENT) /* Replicate ld/st ops for 32 and 64-bit guest addresses. */ DEF(qemu_ld_a32_i32, 1, 1, 1, diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index b5261edc38..c8f0e0ecaa 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -58,29 +58,11 @@ # define CONFIG_SOFTMMU_GATE 0 #endif -/* - * plugin_cb_start TCG op args[]: - * 0: enum plugin_gen_from - * 1: enum plugin_gen_cb - * 2: set to 1 for mem callback that is a write, 0 otherwise. - */ - enum plugin_gen_from { PLUGIN_GEN_FROM_TB, PLUGIN_GEN_FROM_INSN, PLUGIN_GEN_AFTER_INSN, PLUGIN_GEN_AFTER_TB, - PLUGIN_GEN_N_FROMS, -}; - -enum plugin_gen_cb { - PLUGIN_GEN_CB_UDATA, - PLUGIN_GEN_CB_UDATA_R, - PLUGIN_GEN_CB_INLINE, - PLUGIN_GEN_CB_MEM, - PLUGIN_GEN_ENABLE_MEM_HELPER, - PLUGIN_GEN_DISABLE_MEM_HELPER, - PLUGIN_GEN_N_CBS, }; static void plugin_gen_empty_callback(enum plugin_gen_from from) diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 0ae12fa49d..eff3728622 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -322,16 +322,6 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo) tcg_gen_op2(INDEX_op_plugin_mem_cb, tcgv_i64_arg(addr), meminfo); } -void tcg_gen_plugin_cb_start(unsigned from, unsigned type, unsigned wr) -{ - tcg_gen_op3(INDEX_op_plugin_cb_start, from, type, wr); -} - -void tcg_gen_plugin_cb_end(void) -{ - tcg_emit_op(INDEX_op_plugin_cb_end, 0); -} - /* 32 bit ops */ void tcg_gen_discard_i32(TCGv_i32 arg)