From patchwork Wed Mar 1 02:56:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 657783 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3271759wrb; Tue, 28 Feb 2023 19:04:40 -0800 (PST) X-Google-Smtp-Source: AK7set9Bt8srDATL2S0Jm8j+U9I3YBHdK5SdQM+w7vM9EXGsdYb+Qd5gV+wiNMHhx45IagPs3oOo X-Received: by 2002:a05:622a:134a:b0:3bf:d07e:ee17 with SMTP id w10-20020a05622a134a00b003bfd07eee17mr7949235qtk.39.1677639880540; Tue, 28 Feb 2023 19:04:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677639880; cv=none; d=google.com; s=arc-20160816; b=rRQKUybR/t/wD8GJSc63vTLQ/oWNHHfobypawh7A8+SS4A/2ze+HG2x/zoQ9ghJUIF Hwxn9mSBjxAXriKss2z9TJ0oNMtETPkcE7ODZoApFtrSJNgR4BlkXq6rV4zT7K1pNf11 bjaJO11fnaSbPxpQSINgeZdlwKRXbwnDKnPNFw71tizInVqATR8gNz+ps5smBndC9/UG 3zyq5JxN9eB1smNjRcBm6i43BUY5ogAGrpWXBwcojztN+TTtR6KtKK3FsS4kCnee5Ut1 JOyAgtMHbhp+H7H2FGSjS5whDEo0uIkzzoTKsDiwgqiG6FNGCqaxV1oecFDNpkKmYN7n 92UA== 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=c/FsI5n4WgHRv66eevhE+xAIN7J7lkFbjUwPoPOuuXQ=; b=lUryID7UTY0OOtO3zWiguWrMPyUhzlo3bLTLVJxDEIUJY7RtzdmVz/sI7ittlJmTdW SywiORTFA8B8yskwaI6l3nutNflqN8Px8evu/kJFxk9zs2JcePtn+jwCPK4yQLFf42lq qpiRYL+o3vxWNzJ9l7qKccUUcYqkiVqyfufyth0vP9HeoQxRGElmkzBn/svLZ16JLK78 Jzzp6ps5jwk/DvaZwZZtbbznBta2HpQLtJCjpHaQn1eNeSjj3dSFLwSuSNSrku8dev4Q nwyrzabTIkdSwavFPOGcvDg0wc8Ab56lrubiVtjrnSDTFKNOemri8aIB3kxYm9rvxc4j 9Naw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="f2K50/5M"; 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 u19-20020a05620a0c5300b0072daf2bec9esi10084592qki.621.2023.02.28.19.04.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 19:04:40 -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="f2K50/5M"; 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 1pXCie-0002xo-E1; Tue, 28 Feb 2023 22:01:28 -0500 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 1pXCib-0002Xt-Ey for qemu-devel@nongnu.org; Tue, 28 Feb 2023 22:01:25 -0500 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXCiJ-0004G4-FI for qemu-devel@nongnu.org; Tue, 28 Feb 2023 22:01:09 -0500 Received: by mail-pj1-x1029.google.com with SMTP id h11-20020a17090a2ecb00b00237c740335cso10554757pjs.3 for ; Tue, 28 Feb 2023 19:01:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=c/FsI5n4WgHRv66eevhE+xAIN7J7lkFbjUwPoPOuuXQ=; b=f2K50/5MuR+l0eE2Yw/wdMpCI0rQmY5KIE/3oBa522Va2OHvIxrcPi1mC/FWLVfhvm c8mkkSK3vQsQU3/b/UN6aYn2fQqHcf95SC1gHCldpj+ySbnViDEcRoM6QLTV1Am05+/g 13CaRxQv43hal8b3rNCqIEnZQj5TIxwaHcgtfMEGnriLcc1DHon4AEyd2fip+0Kszix/ IE5m7MQNt/XTNN9beoMKZPwkJR2l8bB0MUbzhk/LV5yk0I9hsAW0NpRYCuUcgy4oTeYP 8PSAyCZHAg4CzlddQDo34pJnKznb9Opo7/rG01Dw5IzHW5T8N72uxYksIL4l6W64zoUe q+zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=c/FsI5n4WgHRv66eevhE+xAIN7J7lkFbjUwPoPOuuXQ=; b=I1I+jaLVDOaLtEqI4FlGqpVgIAVZJ0vWgpnHg2b+iORO/Sq8TA0ahp+wPmbdMRsiDa 6DToo5eA8cH4pW43mTbwwAqqoprH+9P7zmp/BhmRRcOLhn1aDYKImlHgOQPc1S5I6N44 xTdOY+mt145cpkz58E3G55QicKMW+59pIUgtvgxbA6bday2zecfmSbzsivLlBmmP4rgi 4CitZaihGmdHu0NxFkOkCzmKN5QqjPCQUDXztfr5K/76AFf3geHfDeJ5aM6GwOUiwA8B P3os0d8PmLLzl0jWDE8seBG3EmK719YhSnoFeTP8Z6Md2Gg8VIwru2QSvxjvY2hCuv0O cMKw== X-Gm-Message-State: AO0yUKWc9XiqSJukiE7Xeps3bZ3eE0TW//u29yLEH2CBQyr79Ejq1734 uz8x0ou+VNS5jQTx4U/exTofA8rm46m4ZDle4Jk= X-Received: by 2002:a17:902:e549:b0:19a:a815:2876 with SMTP id n9-20020a170902e54900b0019aa8152876mr5916745plf.62.1677639666587; Tue, 28 Feb 2023 19:01:06 -0800 (PST) Received: from stoup.. (rrcs-173-198-77-218.west.biz.rr.com. [173.198.77.218]) by smtp.gmail.com with ESMTPSA id r11-20020a170902be0b00b0019aca830869sm7181444pls.238.2023.02.28.19.01.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 19:01:05 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 47/62] accel/tcg/plugin: Tidy plugin_gen_disable_mem_helpers Date: Tue, 28 Feb 2023 16:56:28 -1000 Message-Id: <20230301025643.1227244-48-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230301025643.1227244-1-richard.henderson@linaro.org> References: <20230301025643.1227244-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1029.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Here we are creating a temp whose value needs to be replaced, but always storing NULL into CPUState.plugin_mem_cbs. Use tcg_constant_ptr(0) explicitly. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- accel/tcg/plugin-gen.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 9b793ac62c..c42a436c0c 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -630,8 +630,6 @@ static void inject_mem_disable_helper(struct qemu_plugin_insn *plugin_insn, /* called before finishing a TB with exit_tb, goto_tb or goto_ptr */ void plugin_gen_disable_mem_helpers(void) { - TCGv_ptr ptr; - /* * We could emit the clearing unconditionally and be done. However, this can * be wasteful if for instance plugins don't track memory accesses, or if @@ -644,10 +642,8 @@ void plugin_gen_disable_mem_helpers(void) if (!tcg_ctx->plugin_tb->mem_helper) { return; } - ptr = tcg_const_ptr(NULL); - tcg_gen_st_ptr(ptr, cpu_env, offsetof(CPUState, plugin_mem_cbs) - - offsetof(ArchCPU, env)); - tcg_temp_free_ptr(ptr); + tcg_gen_st_ptr(tcg_constant_ptr(NULL), cpu_env, + offsetof(CPUState, plugin_mem_cbs) - offsetof(ArchCPU, env)); } static void plugin_gen_tb_udata(const struct qemu_plugin_tb *ptb,