From nobody Thu Dec 18 22:23:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1714574388; cv=none; d=zohomail.com; s=zohoarc; b=SaS/P6zP0JTK4D9h+kR3RiLZTjBlvDSTALI73Iq5MRsPio1eN64ZtjfQogRpQQhlHZoEWtNTQKrAgBqks2W2XdMnlJrAQTwh3Aj4jMNOsFa3v6I8I5ZqMH3gt+1EleG5Cck1U73Z1Tl1fkjFZf6TOdwuoyzIdUNE7itBfu8v2FA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714574388; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LosuIyCzAc9oB5OxDPZNgW94mh4MJImjLMLCS31GDcs=; b=FClTZwmraYqBeKdFo0dgaURwRFPYvyd5HNzqDkUUH0lgUxLvIigmbQdru9oADPQ5gQufeTvqdhbTjh/GcLir8MyybErc3OM9jdzN/De0estWkV6AfQtZt99NsS68EWkJltDtd6iAL8eLjH2Di9lt61Wh0lTBAPNW2o44BBi6WjM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1714574388020608.368968709059; Wed, 1 May 2024 07:39:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2B6I-0002wR-GY; Wed, 01 May 2024 10:38:27 -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 1s2B5s-0002i3-1r for qemu-devel@nongnu.org; Wed, 01 May 2024 10:38:00 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2B5q-0002BA-9u for qemu-devel@nongnu.org; Wed, 01 May 2024 10:37:59 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1e834159f40so54901245ad.2 for ; Wed, 01 May 2024 07:37:57 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id h12-20020a170902f54c00b001ebd73f61fcsm5751573plf.121.2024.05.01.07.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 07:37:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714574277; x=1715179077; 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=LosuIyCzAc9oB5OxDPZNgW94mh4MJImjLMLCS31GDcs=; b=vTCB5tQvM50YpdBeVz8D6pebQI80Q+7T455w0ay2f0krxCo2D/Dn6uyWahXq3s0+EN 07BGdZzCraE2Eki8QbZXK7omRAKirB8k+DRfGdPgTr0NEELmoU9LQwhupvmn+0do72eb Zbpq/st4Y8Yvy2Gq5kFYMxzZ+irkdkf+7WlLCJO9+tHb9SNcsxjWYUeHB+TC2AAtWr+C js/hrmHOpigU4H/F2Mv+xxN7UCXvQlcrX0J20BDUgKeHzx1VmQj2Fnwx/fhYkjv1gCiE rV5EmG1CDnEuhpuDjGLGV9aTrVeJZKbK7OrYEUgPRrkLG6keXO/mbK+cg5Lo4/JTU1zE VDrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714574277; x=1715179077; 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=LosuIyCzAc9oB5OxDPZNgW94mh4MJImjLMLCS31GDcs=; b=ZsoF6Mtw2UH8lTsY2vl19SAi/MpDmtt8L9Fm2Wv57nQr4OMEevev6CUZEKfHLrYMwp anKfkYtAxcBMB+COW1cwKZZRQPcAOc+hgZORtmkZML0mr0yQ+1c/YBVlH8VMAPv6nJ3K VrFL7v3jpET6hjbs1HqqWp1FworGFJv+VoORRfJoHcx04H6xljGZm5f81qpQ1GoHSEXe vx9HUf2B1nMKoU7uPLbfppOAT3AAjnh3ZlB7GQjKS8+UohKPYkKMkLABayLGCh+rb73N LzZNvP8ElsrNtcJ5JLb8ikZnnUTmdHh/PXPffNjy/Evm1Z7oXZY+EYRnLypDsefMO/HP 0ZUA== X-Gm-Message-State: AOJu0Yx+qQcwrETPXYHQmwD87cmgavoGlznlabpQbySiRw565O4URTpH xDwU6PsFJjR8ozONYH8U6JbM3E/xpSs8NImnGYsqI3IKhzcKM4q743YQeNMYEQc2jYZE6IgT/vv j X-Google-Smtp-Source: AGHT+IF+y7oen/nC5CMg+KmtOnc7dTRsuA7S5HcdrsUy4BA6fz3On2HA/UmBGQ7nUn9tYRvTFsx3rQ== X-Received: by 2002:a17:903:1d1:b0:1e4:d548:81a0 with SMTP id e17-20020a17090301d100b001e4d54881a0mr2275720plh.67.1714574276973; Wed, 01 May 2024 07:37:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PULL 17/20] plugins: Split out common cb expanders Date: Wed, 1 May 2024 07:37:36 -0700 Message-Id: <20240501143739.10541-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240501143739.10541-1-richard.henderson@linaro.org> References: <20240501143739.10541-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1714574389000100004 Content-Type: text/plain; charset="utf-8" Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- accel/tcg/plugin-gen.c | 84 +++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 43 deletions(-) diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 49d9b07438..5b63b93114 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -187,6 +187,37 @@ static void gen_mem_cb(struct qemu_plugin_dyn_cb *cb, tcg_temp_free_i32(cpu_index); } =20 +static void inject_cb(struct qemu_plugin_dyn_cb *cb) + +{ + switch (cb->type) { + case PLUGIN_CB_REGULAR: + gen_udata_cb(cb); + break; + case PLUGIN_CB_INLINE: + gen_inline_cb(cb); + break; + default: + g_assert_not_reached(); + } +} + +static void inject_mem_cb(struct qemu_plugin_dyn_cb *cb, + enum qemu_plugin_mem_rw rw, + qemu_plugin_meminfo_t meminfo, TCGv_i64 addr) +{ + if (cb->rw & rw) { + switch (cb->type) { + case PLUGIN_CB_MEM_REGULAR: + gen_mem_cb(cb, meminfo, addr); + break; + default: + inject_cb(cb); + break; + } + } +} + static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) { TCGOp *op, *next; @@ -248,19 +279,8 @@ static void plugin_gen_inject(struct qemu_plugin_tb *p= lugin_tb) =20 cbs =3D plugin_tb->cbs; for (i =3D 0, n =3D (cbs ? cbs->len : 0); i < n; i++) { - struct qemu_plugin_dyn_cb *cb =3D - &g_array_index(cbs, struct qemu_plugin_dyn_cb, i); - - switch (cb->type) { - case PLUGIN_CB_REGULAR: - gen_udata_cb(cb); - break; - case PLUGIN_CB_INLINE: - gen_inline_cb(cb); - break; - default: - g_assert_not_reached(); - } + inject_cb( + &g_array_index(cbs, struct qemu_plugin_dyn_cb, i)); } break; =20 @@ -271,19 +291,8 @@ static void plugin_gen_inject(struct qemu_plugin_tb *p= lugin_tb) =20 cbs =3D insn->insn_cbs; for (i =3D 0, n =3D (cbs ? cbs->len : 0); i < n; i++) { - struct qemu_plugin_dyn_cb *cb =3D - &g_array_index(cbs, struct qemu_plugin_dyn_cb, i); - - switch (cb->type) { - case PLUGIN_CB_REGULAR: - gen_udata_cb(cb); - break; - case PLUGIN_CB_INLINE: - gen_inline_cb(cb); - break; - default: - g_assert_not_reached(); - } + inject_cb( + &g_array_index(cbs, struct qemu_plugin_dyn_cb, i)); } break; =20 @@ -300,33 +309,22 @@ static void plugin_gen_inject(struct qemu_plugin_tb *= plugin_tb) { TCGv_i64 addr =3D temp_tcgv_i64(arg_temp(op->args[0])); qemu_plugin_meminfo_t meminfo =3D op->args[1]; + enum qemu_plugin_mem_rw rw =3D + (qemu_plugin_mem_is_store(meminfo) + ? QEMU_PLUGIN_MEM_W : QEMU_PLUGIN_MEM_R); struct qemu_plugin_insn *insn; const GArray *cbs; - int i, n, rw; + int i, n; =20 assert(insn_idx >=3D 0); insn =3D g_ptr_array_index(plugin_tb->insns, insn_idx); - rw =3D qemu_plugin_mem_is_store(meminfo) ? 2 : 1; =20 tcg_ctx->emit_before_op =3D op; =20 cbs =3D insn->mem_cbs; for (i =3D 0, n =3D (cbs ? cbs->len : 0); i < n; i++) { - struct qemu_plugin_dyn_cb *cb =3D - &g_array_index(cbs, struct qemu_plugin_dyn_cb, i); - - if (cb->rw & rw) { - switch (cb->type) { - case PLUGIN_CB_MEM_REGULAR: - gen_mem_cb(cb, meminfo, addr); - break; - case PLUGIN_CB_INLINE: - gen_inline_cb(cb); - break; - default: - g_assert_not_reached(); - } - } + inject_mem_cb(&g_array_index(cbs, struct qemu_plugin_dyn_c= b, i), + rw, meminfo, addr); } =20 tcg_ctx->emit_before_op =3D NULL; --=20 2.34.1