From patchwork Wed Apr 20 19:16:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 564034 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp4467346map; Wed, 20 Apr 2022 12:52:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxy4YzVrm5f4M34oTOqBPk4C/vptAZe6jfvdx3eUylNFSWM6tZBPzlU0tW7vLxgxWoBkxmZ X-Received: by 2002:a81:9248:0:b0:2ef:533a:abaf with SMTP id j69-20020a819248000000b002ef533aabafmr22331366ywg.30.1650484378188; Wed, 20 Apr 2022 12:52:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650484378; cv=none; d=google.com; s=arc-20160816; b=0hRzgQBbaJkcZECIeVP5iyztPoTFpkByW3hRrPOwQ5fYdkvcN7QxVNDlZJT+FQxKzQ oavkEjWjvDqnx45ZD6OWTPLJWclg73otvzm04bmcVmBc3kceGLxoTlfviJRpGb4FP/J4 KKIg4zm5bGP+m62M4Ll2RY92JF9nzs1ZeARO7AFdIHm4CepXhDtn3Gj6+iiOKQcGmz9+ TXUn8FWJhc3ua6DsTD6Dxic5v7yA8lsp2tvUT+cDvt/BUbKWbfYfaxsAu6RnuH9bjGto EltyGHqtci/OrZLc3Hoz4Eos6hIISqGagmn+NLpqlHiJzxVhfmS3msb/Ibd5PHBp6Nfq 5mWQ== 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=NiAO0R4c7i4ovsHyPxGnks5Yw6jFgOhVnzHqFoHT3+s=; b=qmYeh35p6rWaN3ingX2qy2/d0iFYDT1mbX56L6KEJVCy/KvOSGfv91v9xv0LEc2I6F fa8RlCC/OlWv0hWEeDIugsWdDn5LbQltrusKmpHfyj5wvex13AmJ8owIZNNH5ooaGi9q qihCf9WrZuzwqEib311I75eDqwfh/mLgmM7i+4e4MSGcV5o+GwOZIc1mPZVVCB+FKayi GiOlmb1CYVCHEhONw4UERSRiOH8BehW20wbzD5Z8MArfAgL3/gEa43KGkLmbauM+jKF5 k1CsQf+QreyvGYkA9RNIfI+Xxvm0W0ZOQi2uLUKihNhm+WgVkJEMF28QELXpx+O9Meuv IsvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZQsJfO5f; 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 r1-20020a25ac41000000b00644afdef0b5si839931ybd.502.2022.04.20.12.52.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Apr 2022 12:52:58 -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=ZQsJfO5f; 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]:34358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhGNl-0000SC-M0 for patch@linaro.org; Wed, 20 Apr 2022 15:52:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhFod-00011Y-1e for qemu-devel@nongnu.org; Wed, 20 Apr 2022 15:16:39 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]:46773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhFob-00039m-Bo for qemu-devel@nongnu.org; Wed, 20 Apr 2022 15:16:38 -0400 Received: by mail-pj1-x1035.google.com with SMTP id e62-20020a17090a6fc400b001d2cd8e9b0aso2931933pjk.5 for ; Wed, 20 Apr 2022 12:16:36 -0700 (PDT) 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=NiAO0R4c7i4ovsHyPxGnks5Yw6jFgOhVnzHqFoHT3+s=; b=ZQsJfO5fUHNalzzl8LcFiDGoomrTT4gimbk1DqgEogr88NZ5ngb7BmYMDu/D9sZbhB tjAXD5eBpFmVjJ4qSBTYh+exwV9KjRwNZZLFNfrO23jUKfp8FzraYERZP9RivhtPzRVp 8JlcBOmWu1hV2RVlkuhWDjOf8pIq8N+PGnUvijVqxpQ3E8O/hdu5s6NKtAlVxblQYQgu plYl6AYLPP6E7EsxuO9Ech49PI1fL1GFEuxg+YruzDEvg9gQjN5MjZ14Ib6JXA8Ee+sk upo9nF0ufDwqJEzKXBM4juwf/KKTzaO3ltmJMWq70USN57awexcWShq43/0kYh1qD3eK AhJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NiAO0R4c7i4ovsHyPxGnks5Yw6jFgOhVnzHqFoHT3+s=; b=YP3hGlmTV2aI5glprzC7W3pIDKxcRek0Vqt52hKv1zTxDIPAOH71UgMzXKf4Q/w+oo jXabfT3SQnaqYeiFGDvC22lRh0gqf6XljYNk9bIUYr+Q0gH1OG75c7n5PVK4Gky2dJe3 S/BcOU938y9M7nCBNnN698lJ43GyfEBnoNG1cJXV2sgkoXBvSPwuxz9VgIliowJg/WA1 LCFCNDqRaKKjui3uIzDZcdtg7qrguAxSZLqNkSqyghhBmWy8RiGImDelPb78W8o++m3+ k1uiclA7l/CZFvrOImNBrNfqjJ6gIFh0vWQZV2H5gYNTgaqccy8waADqMuef6Wsd5Qw7 fsww== X-Gm-Message-State: AOAM531XPyKyzIZYj3D5KgtfJPMxiHv7MNkezyxZANLTNPWYINXkSNKB yi8tuB7aLYqaETYwqZi5QAu6Pe6lV6rtCQ== X-Received: by 2002:a17:902:a710:b0:156:5650:f94a with SMTP id w16-20020a170902a71000b001565650f94amr21486046plq.86.1650482196089; Wed, 20 Apr 2022 12:16:36 -0700 (PDT) Received: from stoup.. (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id n24-20020aa79058000000b0050612d0fe01sm20599200pfo.2.2022.04.20.12.16.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 12:16:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 1/4] Don't include sysemu/tcg.h if it is not necessary Date: Wed, 20 Apr 2022 12:16:31 -0700 Message-Id: <20220420191634.1402437-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220420191634.1402437-1-richard.henderson@linaro.org> References: <20220420191634.1402437-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1035.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: , Cc: Thomas Huth , Markus Armbruster Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth This header only defines the tcg_allowed variable and the tcg_enabled() function - which are not required in many files that include this header. Drop the #include statement there. Signed-off-by: Thomas Huth Reviewed-by: Markus Armbruster Message-Id: <20220315144107.1012530-1-thuth@redhat.com> Signed-off-by: Richard Henderson --- accel/tcg/hmp.c | 1 - accel/tcg/tcg-accel-ops-icount.c | 1 - bsd-user/main.c | 1 - hw/virtio/vhost.c | 1 - linux-user/main.c | 1 - monitor/misc.c | 1 - target/arm/helper.c | 1 - target/s390x/cpu_models_sysemu.c | 1 - target/s390x/helper.c | 1 - 9 files changed, 9 deletions(-) diff --git a/accel/tcg/hmp.c b/accel/tcg/hmp.c index d2ea352655..bb67941420 100644 --- a/accel/tcg/hmp.c +++ b/accel/tcg/hmp.c @@ -4,7 +4,6 @@ #include "qapi/qapi-commands-machine.h" #include "exec/exec-all.h" #include "monitor/monitor.h" -#include "sysemu/tcg.h" static void hmp_tcg_register(void) { diff --git a/accel/tcg/tcg-accel-ops-icount.c b/accel/tcg/tcg-accel-ops-icount.c index 6436cd9349..24520ea112 100644 --- a/accel/tcg/tcg-accel-ops-icount.c +++ b/accel/tcg/tcg-accel-ops-icount.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" -#include "sysemu/tcg.h" #include "sysemu/replay.h" #include "sysemu/cpu-timers.h" #include "qemu/main-loop.h" diff --git a/bsd-user/main.c b/bsd-user/main.c index 88d347d05e..e274dd92d7 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -27,7 +27,6 @@ #include "qemu-common.h" #include "qemu/units.h" #include "qemu/accel.h" -#include "sysemu/tcg.h" #include "qemu-version.h" #include diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index e55ac32bf3..2bc72c27c5 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -26,7 +26,6 @@ #include "migration/blocker.h" #include "migration/qemu-file-types.h" #include "sysemu/dma.h" -#include "sysemu/tcg.h" #include "trace.h" /* enabled until disconnected backend stabilizes */ diff --git a/linux-user/main.c b/linux-user/main.c index fbc9bcfd5f..f1711b82ec 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -21,7 +21,6 @@ #include "qemu-common.h" #include "qemu/units.h" #include "qemu/accel.h" -#include "sysemu/tcg.h" #include "qemu-version.h" #include #include diff --git a/monitor/misc.c b/monitor/misc.c index b0fc0e5843..ebd49e13b6 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -48,7 +48,6 @@ #include "qapi/util.h" #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" -#include "sysemu/tcg.h" #include "sysemu/tpm.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" diff --git a/target/arm/helper.c b/target/arm/helper.c index 50d287f289..d7715c911a 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -27,7 +27,6 @@ #include "sysemu/cpus.h" #include "sysemu/cpu-timers.h" #include "sysemu/kvm.h" -#include "sysemu/tcg.h" #include "qemu/range.h" #include "qapi/qapi-commands-machine-target.h" #include "qapi/error.h" diff --git a/target/s390x/cpu_models_sysemu.c b/target/s390x/cpu_models_sysemu.c index 05c3ccaaff..d8a141a023 100644 --- a/target/s390x/cpu_models_sysemu.c +++ b/target/s390x/cpu_models_sysemu.c @@ -15,7 +15,6 @@ #include "s390x-internal.h" #include "kvm/kvm_s390x.h" #include "sysemu/kvm.h" -#include "sysemu/tcg.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "qapi/qmp/qerror.h" diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 6e35473c7f..473c8e51b0 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -27,7 +27,6 @@ #include "hw/s390x/pv.h" #include "sysemu/hw_accel.h" #include "sysemu/runstate.h" -#include "sysemu/tcg.h" void s390x_tod_timer(void *opaque) { From patchwork Wed Apr 20 19:16:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 564035 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp4468433map; Wed, 20 Apr 2022 12:55:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmcPhGWbeJQlP8nDU24hqh0uVLkRNeSi6Vo85dYrm8t0bsqVXB9fMJBIVcqg4K9TePn7oz X-Received: by 2002:a25:9845:0:b0:628:99a6:55ed with SMTP id k5-20020a259845000000b0062899a655edmr21371178ybo.221.1650484519430; Wed, 20 Apr 2022 12:55:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650484519; cv=none; d=google.com; s=arc-20160816; b=Gm2VDCA/j3Vl8O1CDquE6VagmzD9IZn/YiK0DkbkPFJIfyVSH6JcgYqAx2x958/+pG xzS+jFdDhvVzxWMHoa7MM+NfxlbKIvUAXc+9219/ySKCupnnsNIEEpXOqDUyoel4xbfr 0yOa1o40zj9oqXWzSMKJ9RPHSKcXCpqeaPghw6UEifexee/06/Mxe9upOXndTa3d9HUd VDNqbdBTDxMHWWVkAyeGbmLa29iS1P7S0qirkaNCWZUDgVdRARV7u2HuFq/09iEaK7zl oFOuyiUo5vQB2AYHml2Nt2N2Ajq9gwfMg9z5swBbg9LVO0ZwJCTDIav6GgwkReuo72Z2 9+BQ== 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=sj/SSJt7nvun+kV3U3qohvykaEIR74rwfzg6+qzkVmM=; b=CyjuLh/u/Rlv+BTTxguB6+Smw1rLKwYPEZlSI35bq2M1gWHpmaPWULdqcpaml3G3C3 9li7dcCMBVvuGUWZeW8pGK9L90r8B/T1iEn3ebkRLv/awkVVlQM6we2iK4KSvCulobQ/ RXCNXxdND9QsXbwYx0Z1EaL70kJPtgClQ3gJuJFD4tbhTEMFYCL9FlYgDB1flEo1HzSd ldTZntDk4dMtbGWblZNoflrGytGFn1qX3tN3K+jiegFGuzz8hpvy+jkZjT5S7doleXRH PKSvVS7J3Ntns3DccJRcCrzdq8dsUWap06Gh6H9Fhz1Cg91g+N0hETLmgnJq4Xil9OjI KRog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NbZYXVce; 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 m67-20020a812646000000b002e9603ffde4si783433ywm.5.2022.04.20.12.55.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Apr 2022 12:55:19 -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=NbZYXVce; 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]:42646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhGQ2-0006Wi-SU for patch@linaro.org; Wed, 20 Apr 2022 15:55:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhFoe-00013h-8Y for qemu-devel@nongnu.org; Wed, 20 Apr 2022 15:16:40 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:39657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhFoc-0003AK-Bw for qemu-devel@nongnu.org; Wed, 20 Apr 2022 15:16:39 -0400 Received: by mail-pf1-x431.google.com with SMTP id l127so2852262pfl.6 for ; Wed, 20 Apr 2022 12:16:37 -0700 (PDT) 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=sj/SSJt7nvun+kV3U3qohvykaEIR74rwfzg6+qzkVmM=; b=NbZYXVceWGlVe5wfIxzrX98iTA6oA32X4zBypowExI0m4aLqazTCnSfLLx6EESDux/ Vv5GAM4C6NgMZYYA9gQNemXrCcU8LMtitznxRq5sZSRH2jW59HkeGqaOiRzi9/JIUVQ+ 5ytxZdQPdt6/aR9woAb7YDdLRyM0VkyZXfLhQVvZ61smHgLTFqtTrGLDqO5gt2zUUMw9 T0UDY9GwXrsB15v67d2D+XD+BM9dRVEyhTR1Y0OHJ14qxnOFEdjjPTkOoXtO13HhuF56 jcwwnQBkyF7qfsoPKJXdHr2HqB1Y18hHUxGLOBpNpSOEdpQa0rifKip5/K0qhWlLxcO7 WWlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sj/SSJt7nvun+kV3U3qohvykaEIR74rwfzg6+qzkVmM=; b=t5lKqMHFEfYVDzfhxopGUYKGnLgbYQPQJ3efBlFkipmiGJkTDmXt/JlhgIuLMiIqWu NS6j7Kz3yPJb4hXZ5mAS5WhNuHpQ9NwDENyWm/flKN9oTuKwarVi7hy1+2FlbMSphSX8 5uPCoK0gS/99qYmDyekjCwqqhbmpXjX1ndenCxZqoAAsxYOZIikSCa4wyh+p5zU/xFQI r4QpopURVwVaHeTbGMN6ffQ7iTt9/lJC6V6CxlW1K4fdik8mS0FJ20QZtV4uXBw5Wo3F 3Z7vh8NArG20ML2P4hBVN9ftjcstIElWeUCHM1bQS8hcWLgMhKmtiogVauK6EE43wtjo 5twA== X-Gm-Message-State: AOAM533z4f7507dzDSEkHwSXphewXxDUIjFvk8G8ewp3mHOW+dttO88D o2wKy2hjK27YCpz+apPtgQ06SEj3WhNE9A== X-Received: by 2002:a63:a551:0:b0:3aa:5150:a94a with SMTP id r17-20020a63a551000000b003aa5150a94amr6431114pgu.144.1650482196899; Wed, 20 Apr 2022 12:16:36 -0700 (PDT) Received: from stoup.. (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id n24-20020aa79058000000b0050612d0fe01sm20599200pfo.2.2022.04.20.12.16.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 12:16:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 2/4] tcg: Fix indirect lowering vs TCG_OPF_COND_BRANCH Date: Wed, 20 Apr 2022 12:16:32 -0700 Message-Id: <20220420191634.1402437-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220420191634.1402437-1-richard.henderson@linaro.org> References: <20220420191634.1402437-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.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: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" With TCG_OPF_COND_BRANCH, we extended the lifetimes of globals across extended basic blocks. This means that the liveness computed in pass 1 does not kill globals in the same way as normal temps. Introduce TYPE_EBB to match this lifetime, so that we get correct register allocation for the temps that we introduce during the indirect lowering pass. Reviewed-by: Peter Maydell Fixes: b4cb76e6208 ("tcg: Do not kill globals at conditional branches") Signed-off-by: Richard Henderson --- include/tcg/tcg.h | 2 ++ tcg/tcg.c | 34 +++++++++++++++++++++++++++------- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index 73869fd9d0..27de13fae0 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -433,6 +433,8 @@ typedef enum TCGTempVal { typedef enum TCGTempKind { /* Temp is dead at the end of all basic blocks. */ TEMP_NORMAL, + /* Temp is live across conditional branch, but dead otherwise. */ + TEMP_EBB, /* Temp is saved across basic blocks but dead at the end of TBs. */ TEMP_LOCAL, /* Temp is saved across both basic blocks and translation blocks. */ diff --git a/tcg/tcg.c b/tcg/tcg.c index f8542529d0..f2d9ce19b8 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1024,9 +1024,18 @@ void tcg_temp_free_internal(TCGTemp *ts) TCGContext *s = tcg_ctx; int k, idx; - /* In order to simplify users of tcg_constant_*, silently ignore free. */ - if (ts->kind == TEMP_CONST) { + switch (ts->kind) { + case TEMP_CONST: + /* + * In order to simplify users of tcg_constant_*, + * silently ignore free. + */ return; + case TEMP_NORMAL: + case TEMP_LOCAL: + break; + default: + g_assert_not_reached(); } #if defined(CONFIG_DEBUG_TCG) @@ -1036,7 +1045,6 @@ void tcg_temp_free_internal(TCGTemp *ts) } #endif - tcg_debug_assert(ts->kind < TEMP_GLOBAL); tcg_debug_assert(ts->temp_allocated != 0); ts->temp_allocated = 0; @@ -1674,6 +1682,7 @@ static void tcg_reg_alloc_start(TCGContext *s) case TEMP_GLOBAL: break; case TEMP_NORMAL: + case TEMP_EBB: val = TEMP_VAL_DEAD; /* fall through */ case TEMP_LOCAL: @@ -1701,6 +1710,9 @@ static char *tcg_get_arg_str_ptr(TCGContext *s, char *buf, int buf_size, case TEMP_LOCAL: snprintf(buf, buf_size, "loc%d", idx - s->nb_globals); break; + case TEMP_EBB: + snprintf(buf, buf_size, "ebb%d", idx - s->nb_globals); + break; case TEMP_NORMAL: snprintf(buf, buf_size, "tmp%d", idx - s->nb_globals); break; @@ -2378,6 +2390,7 @@ static void la_bb_end(TCGContext *s, int ng, int nt) state = TS_DEAD | TS_MEM; break; case TEMP_NORMAL: + case TEMP_EBB: case TEMP_CONST: state = TS_DEAD; break; @@ -2405,8 +2418,9 @@ static void la_global_sync(TCGContext *s, int ng) } /* - * liveness analysis: conditional branch: all temps are dead, - * globals and local temps should be synced. + * liveness analysis: conditional branch: all temps are dead unless + * explicitly live-across-conditional-branch, globals and local temps + * should be synced. */ static void la_bb_sync(TCGContext *s, int ng, int nt) { @@ -2427,6 +2441,7 @@ static void la_bb_sync(TCGContext *s, int ng, int nt) case TEMP_NORMAL: s->temps[i].state = TS_DEAD; break; + case TEMP_EBB: case TEMP_CONST: continue; default: @@ -2797,6 +2812,7 @@ static bool liveness_pass_2(TCGContext *s) TCGTemp *dts = tcg_temp_alloc(s); dts->type = its->type; dts->base_type = its->base_type; + dts->kind = TEMP_EBB; its->state_ptr = dts; } else { its->state_ptr = NULL; @@ -3107,6 +3123,7 @@ static void temp_free_or_dead(TCGContext *s, TCGTemp *ts, int free_or_dead) new_type = TEMP_VAL_MEM; break; case TEMP_NORMAL: + case TEMP_EBB: new_type = free_or_dead < 0 ? TEMP_VAL_MEM : TEMP_VAL_DEAD; break; case TEMP_CONST: @@ -3353,6 +3370,7 @@ static void tcg_reg_alloc_bb_end(TCGContext *s, TCGRegSet allocated_regs) temp_save(s, ts, allocated_regs); break; case TEMP_NORMAL: + case TEMP_EBB: /* The liveness analysis already ensures that temps are dead. Keep an tcg_debug_assert for safety. */ tcg_debug_assert(ts->val_type == TEMP_VAL_DEAD); @@ -3370,8 +3388,9 @@ static void tcg_reg_alloc_bb_end(TCGContext *s, TCGRegSet allocated_regs) } /* - * At a conditional branch, we assume all temporaries are dead and - * all globals and local temps are synced to their location. + * At a conditional branch, we assume all temporaries are dead unless + * explicitly live-across-conditional-branch; all globals and local + * temps are synced to their location. */ static void tcg_reg_alloc_cbranch(TCGContext *s, TCGRegSet allocated_regs) { @@ -3390,6 +3409,7 @@ static void tcg_reg_alloc_cbranch(TCGContext *s, TCGRegSet allocated_regs) case TEMP_NORMAL: tcg_debug_assert(ts->val_type == TEMP_VAL_DEAD); break; + case TEMP_EBB: case TEMP_CONST: break; default: From patchwork Wed Apr 20 19:16:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 564036 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp4469964map; Wed, 20 Apr 2022 12:57:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytz/TlDMYdTNVyBNw8BBOKguENnmWgSd38bt5f03MhqUdPJ3mOb8c8SIG7YdZMeoRG5n4k X-Received: by 2002:a81:4d55:0:b0:2f3:d48a:4c9c with SMTP id a82-20020a814d55000000b002f3d48a4c9cmr6394802ywb.470.1650484667920; Wed, 20 Apr 2022 12:57:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650484667; cv=none; d=google.com; s=arc-20160816; b=P5YxvMVDk+WPMMk12aI3BlGkZHeXSnFiJXqVgvyzHJHHR71zTP95ri8dlfueX/ymSV hprYgjaXR4AD9UL0wC8SSOT5Q7A3f5+U5sYzDRMNAd4shq1lPA4x49ZU7OKhGK/6N44D u9WP54WOPvKhMq/qWv4oH24a1SU0GMEbbRSxvtCzR1tqFwoJ0pgLS7uRYPNHKABjXKKl hdVM7vn2HBY+6xMr57VRwBLJfg1LSFZCgkMcsCghxJLcDZyOnfQYDHNtbp2cMlkW3F7U 2odvD0VLeVjFanOaDjOaD6NooQ+1o7rAom+DOs6QgnjvmNLwnNYvgXaILwcwISqqlrI5 4kDw== 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=lqh/xOkffB1ftS+Rqae5WASRyFAS1IUV+ifzHuHPJMs=; b=wEjXErTJfXv3Qwc0tYguuCVIrBGRQMuGs/+5ACDnZ7y11ruS34CLXVU83BtYbeOZ53 pNvjnx071A1K9/aG4qvFnHOrZKWwq0tIDDbhmBkXgIMqjsGUG+QNDzrCqXSGCsbNp3Xs yI+EOL9eIciSCmfUhY8yy2j3E1IFcMLEluCQ1CNhlOQ33poOV8I36bSx+gHxSdO+NmVM HCtC4qiNduP+w1DHoSTIsEfur1Yqyutm/nHTeVDhW6ESFJG89N9ws5UmUIVyrFV9fhtl pygl33GbHpPDIs0O1wo3WbIgzrOMN5fj88ZpgTmZVO1lyPrC3MbDS0Sx2YwOdCIbPJw/ kvng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B5ZU5EJX; 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 r62-20020a815d41000000b002eb6461e4aasi811928ywb.389.2022.04.20.12.57.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Apr 2022 12:57:47 -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=B5ZU5EJX; 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]:50860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhGSR-00047d-EH for patch@linaro.org; Wed, 20 Apr 2022 15:57:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhFoe-00015b-PL for qemu-devel@nongnu.org; Wed, 20 Apr 2022 15:16:40 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]:53940) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhFod-0003AP-5E for qemu-devel@nongnu.org; Wed, 20 Apr 2022 15:16:40 -0400 Received: by mail-pj1-x102d.google.com with SMTP id bx5so2828250pjb.3 for ; Wed, 20 Apr 2022 12:16:38 -0700 (PDT) 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=lqh/xOkffB1ftS+Rqae5WASRyFAS1IUV+ifzHuHPJMs=; b=B5ZU5EJXUpSlNSkq5w84D7KK3DzD5NDAbM9jfLDwVJPLlTQTYLP82QSOl7qLhuQ3pL LRddfmwuI4QOjaolLPqLa+sZBULtCcD/6OKqQB6oLHBOa96Tbj8ipfTYrn9L/9NvuB/h EqVhV3c8ZWAfpxy4d+SI1s9biD9QhhchHelrAFPQZLAZxNSzLw9uDIS29SgxHy2iDi0H q44dJNzkAUqPcN6b69AHnVR0gOK9i7BlnrbVXTWItO2dVnyejjXYOJZWqbqK1HRC8bUH NWuAfoa8J+lafSdO9WVZzD6PCuiBeDTQIaEUll7cqWue+ACBYAq4izR1IvTGpA5DCZ43 SZvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lqh/xOkffB1ftS+Rqae5WASRyFAS1IUV+ifzHuHPJMs=; b=sfPLDHQdRTTHQI5Y6sygj6sMZRI3SNJco2YNyCAjSZj4oLeOjiK44E372EN34IIJs4 owp8eINHUhQ6YPtshJ9xaOtd6BHFWYvxB9elyCBZ/d4yAMMJegAkuu1GshZvHS6I2z/b 7cc70psNTIV0chWm0Fe8Fbt/X13Fwu2eYdlCLiO/c5ZmH+arkoYIQzGlv+8+KQs2kv9f FgnuxTRqyp4xqBrdgpFt1gOAY5DipX5hI4AdpsCQex3VNC5w3aWs8+LoUYU3dIDaG6vt PDwQvc7Ym1XuDE6wfvDuhUMFIp3qWseQF729fllZIqlph4CxW+D2Lb6Zns488gp533yR XaaA== X-Gm-Message-State: AOAM533x9RevgDqT3ae7+cb+gHw/lqHxWhyF4U8d+cEMk9eJlJNq+ZMM ZX9j1Eqv1e9HjzqnaAg7k0A1SPMN8jHJGg== X-Received: by 2002:a17:902:7887:b0:156:788a:56d1 with SMTP id q7-20020a170902788700b00156788a56d1mr21970562pll.110.1650482197720; Wed, 20 Apr 2022 12:16:37 -0700 (PDT) Received: from stoup.. (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id n24-20020aa79058000000b0050612d0fe01sm20599200pfo.2.2022.04.20.12.16.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 12:16:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 3/4] accel/tcg: Remove ATOMIC_MMU_IDX Date: Wed, 20 Apr 2022 12:16:33 -0700 Message-Id: <20220420191634.1402437-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220420191634.1402437-1-richard.henderson@linaro.org> References: <20220420191634.1402437-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102d.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: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The last use of this macro was removed in f3e182b10013 ("accel/tcg: Push trace info building into atomic_common.c.inc") Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- accel/tcg/cputlb.c | 1 - accel/tcg/user-exec.c | 1 - 2 files changed, 2 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 2035b2ac0a..dd45e0467b 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -2552,7 +2552,6 @@ void cpu_stq_le_mmu(CPUArchState *env, target_ulong addr, uint64_t val, glue(glue(glue(cpu_atomic_ ## X, SUFFIX), END), _mmu) #define ATOMIC_MMU_CLEANUP -#define ATOMIC_MMU_IDX get_mmuidx(oi) #include "atomic_common.c.inc" diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 8edf0bbaa1..ac57324d4f 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -506,7 +506,6 @@ static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr, #define ATOMIC_NAME(X) \ glue(glue(glue(cpu_atomic_ ## X, SUFFIX), END), _mmu) #define ATOMIC_MMU_CLEANUP do { clear_helper_retaddr(); } while (0) -#define ATOMIC_MMU_IDX MMU_USER_IDX #define DATA_SIZE 1 #include "atomic_template.h" From patchwork Wed Apr 20 19:16:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 564032 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp4464283map; Wed, 20 Apr 2022 12:47:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXKAFimLGyPMkQDg9b2bL2X34t2iMY4WvI0svt1hLUnxj36o6ufvy/EFcComq8znzuvmwi X-Received: by 2002:a25:8546:0:b0:61e:1d34:ec71 with SMTP id f6-20020a258546000000b0061e1d34ec71mr20081641ybn.259.1650484036257; Wed, 20 Apr 2022 12:47:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650484036; cv=none; d=google.com; s=arc-20160816; b=x3eQBU8mVpJioXsdnfT2ZX+0QuOrZ3jXh06Zbb9y5ya51U8bXciwADj1mepfaSaw5i QniCDv3SwYgprItdngxvmmJihk40aTUu5/J++2yRvjJred4PBbh7psGuQEdhEpIFYiI5 0v3Km6QsFJZ63NOdowmtWqHnBTCfu2ZWROLoN7z84LsAb5QWNbJW3WMX8D1Yif4WFR4a 6AQQ5G646GdWR7W3dXOBsZOdszkErD42PpL84ekVA7tvkiRhdMOVsKAzm8oyDXuH+l+t sLddeuq2pcDtpzfkYAIXkhmbHuRvAaTDop9Sn/q6NXi5FgfxbDV+KAwGLlktEdvZ5l5i Dgxw== 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=aa7GfLrKnbPUA3z5/lLY+yzkqrRSnD4Vr5dTEmFhIns=; b=Jxo4FNBAlnHWptiB2+0yvLGUyTkuUb9DMHpj+W4lbKXz9RUc4bmP5IYNNi22QMqFNM FO2fo9k+mBQoqkHVgQRpUdo1NHLIyxaI4+sOBniM/N+FJioiBhi7i1LS4WkTxXy+x9yg rHXppq+SfTmoJclQUb240KTD4OoOiTrVNZcgPpZMl4rKlgC53nEy2vNbb6oXyb1VMldl rxxdFVG870PSSaxCwvjAAxSf+Uj2+iAWTyvmQQcNpzLyCvIAnV/h8+eFN3RNQyqwPgNA j9yZS9HLKYb6fLV9R6o/SHgN7Z1l3pzoADBZATs4mhDWAOrgrrw5Bks4Zm7FM9yqR6YX CHvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BH8H0mVq; 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 y80-20020a253253000000b00641198671b6si732190yby.692.2022.04.20.12.47.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Apr 2022 12:47:16 -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=BH8H0mVq; 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]:44042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhGIF-0003SZ-Oe for patch@linaro.org; Wed, 20 Apr 2022 15:47:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhFog-00017j-JM for qemu-devel@nongnu.org; Wed, 20 Apr 2022 15:16:42 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]:51154) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhFod-0003Ad-Os for qemu-devel@nongnu.org; Wed, 20 Apr 2022 15:16:41 -0400 Received: by mail-pj1-x102b.google.com with SMTP id o5so2869618pjr.0 for ; Wed, 20 Apr 2022 12:16:39 -0700 (PDT) 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=aa7GfLrKnbPUA3z5/lLY+yzkqrRSnD4Vr5dTEmFhIns=; b=BH8H0mVqlO9bAbH3qHCIXMgT61xjEVLJ4XxXGeNzragRjVyjNAj4ezStTpoE8U13wE 1wdey/pms3CtetrZU4SyI4GOU7sHT+iRloOp1UkSeiP3KG+yoJNeh00I1UMy/6jESeAO Vl3KDuqRbjJxbnLoEV8SriQqCcYJax/PQ9g9eBthpwYG/W/ICtuSqCOErf6EwaR1h/p0 oArBEUkckubWaGh+VKRmhgULEYFeyCFfaEWgr3MlBHzPgSeh9aQIN1jyspR6QdPj3Ajx MtGqsteybDZUKZVPVl1606ZBQyj3B6SSA86VlwOdmkft22wA2W5y9ZiapouPEZ2INTqt n2TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aa7GfLrKnbPUA3z5/lLY+yzkqrRSnD4Vr5dTEmFhIns=; b=o96ClLMMHXJtmwIyP30gVj+0UQ+C1S8lnrUUwNpx7t64Bq5rhwXe5T5MSwtJAkcr3n 1KaTQKskqcqok5mtmtzDSuuCND78R+kkETQ7s6ZiP1z1xghtetjE2kyJ1ffTxjz8KJdR RcKqg4Yd0ZZsmOjP3uogCs4Tf1hFu9IVbbJUuntZ8YA6FkM0UWuc8/CcwtARM/8Lpd4Y hH5SjYrf2Eit0UiIOIbTC80WMDg59ATmWCOl1jUKiqRFeQGBJV9xDEFD2cTzLcG0d4gZ 7+3Uwqs6jhx5XXoJ4scd+OZFQmDEVe3LupNWC/myCOuisp9WKo8C8tg5jhvydH9awcpJ KZ3g== X-Gm-Message-State: AOAM531x/y6cukDTq2nxotw46lCmqmoNXpB5WCJSUf8mqS+wuZ/6kSH5 PUyTcZnqoKyGVdfD1z3QmV9QL3AqsrsCkQ== X-Received: by 2002:a17:902:8504:b0:158:914f:ca3 with SMTP id bj4-20020a170902850400b00158914f0ca3mr22178908plb.67.1650482198510; Wed, 20 Apr 2022 12:16:38 -0700 (PDT) Received: from stoup.. (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id n24-20020aa79058000000b0050612d0fe01sm20599200pfo.2.2022.04.20.12.16.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 12:16:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 4/4] tcg: Add tcg_constant_ptr Date: Wed, 20 Apr 2022 12:16:34 -0700 Message-Id: <20220420191634.1402437-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220420191634.1402437-1-richard.henderson@linaro.org> References: <20220420191634.1402437-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102b.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: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Similar to tcg_const_ptr, defer to tcg_constant_{i32,i64}. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- include/tcg/tcg.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index 27de13fae0..61505d20ed 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -1056,9 +1056,11 @@ TCGv_vec tcg_constant_vec_matching(TCGv_vec match, unsigned vece, int64_t val); #if UINTPTR_MAX == UINT32_MAX # define tcg_const_ptr(x) ((TCGv_ptr)tcg_const_i32((intptr_t)(x))) # define tcg_const_local_ptr(x) ((TCGv_ptr)tcg_const_local_i32((intptr_t)(x))) +# define tcg_constant_ptr(x) ((TCGv_ptr)tcg_constant_i32((intptr_t)(x))) #else # define tcg_const_ptr(x) ((TCGv_ptr)tcg_const_i64((intptr_t)(x))) # define tcg_const_local_ptr(x) ((TCGv_ptr)tcg_const_local_i64((intptr_t)(x))) +# define tcg_constant_ptr(x) ((TCGv_ptr)tcg_constant_i64((intptr_t)(x))) #endif TCGLabel *gen_new_label(void);