From patchwork Thu Jan 7 20:14:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 358269 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp787073jai; Thu, 7 Jan 2021 12:32:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJy4KzKicTUzx8qxUOAMeU1wmzNfB8Qwfga+m0h/5BctwnhVEEWUeAfpPTh5kFzCvJmkFNzY X-Received: by 2002:a25:778c:: with SMTP id s134mr823344ybc.411.1610051538680; Thu, 07 Jan 2021 12:32:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610051538; cv=none; d=google.com; s=arc-20160816; b=Y3k+KfH1rNVbj3Cnjo7NBwNbWY7UVJQR/dEteN7GJHTUCEjM138r4yuk5gwASq2+Fl gtxHl/eR56zWyoRB73VwDNNidUaLi9w1SbxQFSQsz7dqlbmE+/eAis1w4wIBq/gdkdak 7L1KEKgFqD/k1vqucHCuBGvH/pxXy+2zJPbXLBwodseQGlp/htD7GHNl3nSb3vjkfWyt sPQxEZObyRG71Ga4bGf8biWEUhwagx3rGV/QfpYplpiDM+4yNurJrXgUN48oGI0X9FUE w4vUsAeC1tbbTEdtj2/8vTsFeE2VEevjHfagIuLxN5eaZoxTCxg/8H6n2L567VWY3Unb CKVA== 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=gCTNNZGR2Nv/YxZ5iu2Rwl94cKut5s9Wts7t2uaTEAo=; b=mbLBiIc3yU+ncZq4A+L/M8Of04YqgQcCIcbyiL4TQ1wkTCMZwcXMCjpR93nslgH8eW Fyy1/IhOxFvreYuT6K63fs+kM7KBOoXc0fqbJGwATuuIqyoLrXZa5RqGqPnCAlw9bOQg /l9WwYSZNpGl42x0OVC+7uHrFd9NrD2z4YGmU01LYKkiWDTML3surF3UoV/PaoAbWB+U Hf8nB6eB66V8Repkb7Ogl2i/YNiLjkvn9+DJlqYV/uERNKXT1c5ZF1lgEG4ZkudMWfzY jCTQAGWOp8uWbleqNaef7D1szYmNuJzpQRNvTXG/iF+Eu96pQGzXBuvJed4mymxMx4Nc jr/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Jnruojja; 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 m1si6244526ybt.340.2021.01.07.12.32.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Jan 2021 12:32:18 -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=Jnruojja; 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]:39102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxbxC-0004eK-3g for patch@linaro.org; Thu, 07 Jan 2021 15:32:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxbhg-0001fu-CT for qemu-devel@nongnu.org; Thu, 07 Jan 2021 15:16:16 -0500 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]:52554) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kxbhc-0001lC-Lv for qemu-devel@nongnu.org; Thu, 07 Jan 2021 15:16:16 -0500 Received: by mail-pj1-x102d.google.com with SMTP id v1so2111162pjr.2 for ; Thu, 07 Jan 2021 12:16:09 -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=gCTNNZGR2Nv/YxZ5iu2Rwl94cKut5s9Wts7t2uaTEAo=; b=Jnruojja2wwFBxlXpPKxeytFNIhlxz/oniKPV+L01BoJi5bN+zj26WlNzK02SBcIH4 X5QpDcPsR/R1DjQ8W+1VbPmlK25VkGJBORbp9QECcoT+TuetO1Bgq8Gtie80pVJ5wn17 CWcUItQc4PD/BbVFYvKS+qIDDGEDSlsClwQO/nHXCPsbxXrugWrs+eqV4womzlvrlipk bCa15GjUyOQnFwlfPhpE2ArxxAPVBqvmRMCcQlK4dW2JFxc3XvWXFarEXeQ+92GgyGkw GKfBMLJMZHPXnjax0iMucjKCXLAiy2mq7Ndm6T/Kd7zvfQs1zzEV20iGb+vKxlAp3rfB OGSw== 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=gCTNNZGR2Nv/YxZ5iu2Rwl94cKut5s9Wts7t2uaTEAo=; b=dV7CEneU0eobNLVx/4kHoWK05UMWxn+Ir3BntYk2sm/hxKBuwKzb/CtLskBfOPJUgj hX6eMRaShyozh6YXzVTWJs0hjaQlO23aTbImzPbM2BPx6QmbJyf/NLQZQfZXH8QQHYD2 L3t0AeoW25nHMnfbPvEliq2rP1hoPVc6AHmwDHg92GfPeQJo8d5aC78JhzNUflXLid9f rjQEwHBgnzPGsmuXif7ggvkM9URFHkzRB0NmIR80UUzDaOnN+O9JsHKp7pmXvUEfu7Rm dAmkJqD/D1njtlwlVpgorq14Sf13zdk7/hyCLqsJ41/JjmWUM26dANoLmZcWD+Ss3t6g mVRA== X-Gm-Message-State: AOAM532NW9Oa19McN1QzxNr2PBnHQ/72PxIg0N3VJvSwELFeeEhc6sZ6 DDUvTbT2d7/VntB/W+1AD/e/j60u+t7ZZg== X-Received: by 2002:a17:90a:d307:: with SMTP id p7mr186629pju.214.1610050568448; Thu, 07 Jan 2021 12:16:08 -0800 (PST) Received: from localhost.localdomain (rrcs-173-197-107-21.west.biz.rr.com. [173.197.107.21]) by smtp.gmail.com with ESMTPSA id v6sm6516265pfi.31.2021.01.07.12.16.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 12:16:07 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 45/47] tcg: Remove TCG_TARGET_SUPPORT_MIRROR Date: Thu, 7 Jan 2021 10:14:46 -1000 Message-Id: <20210107201448.1152301-46-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210107201448.1152301-1-richard.henderson@linaro.org> References: <20210107201448.1152301-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 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: peter.maydell@linaro.org, Joelle van Dyne Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now that all native tcg hosts support splitwx, remove the define. Replace the one use with a test for CONFIG_TCG_INTERPRETER. Reviewed-by: Joelle van Dyne Signed-off-by: Richard Henderson --- tcg/aarch64/tcg-target.h | 1 - tcg/arm/tcg-target.h | 1 - tcg/i386/tcg-target.h | 1 - tcg/mips/tcg-target.h | 1 - tcg/ppc/tcg-target.h | 1 - tcg/riscv/tcg-target.h | 1 - tcg/s390/tcg-target.h | 1 - tcg/sparc/tcg-target.h | 1 - tcg/tci/tcg-target.h | 1 - accel/tcg/translate-all.c | 16 +++++++++------- 10 files changed, 9 insertions(+), 16 deletions(-) -- 2.25.1 diff --git a/tcg/aarch64/tcg-target.h b/tcg/aarch64/tcg-target.h index 079828ea71..5ec30dba25 100644 --- a/tcg/aarch64/tcg-target.h +++ b/tcg/aarch64/tcg-target.h @@ -155,6 +155,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t); #define TCG_TARGET_NEED_LDST_LABELS #endif #define TCG_TARGET_NEED_POOL_LABELS -#define TCG_TARGET_SUPPORT_MIRROR 1 #endif /* AARCH64_TCG_TARGET_H */ diff --git a/tcg/arm/tcg-target.h b/tcg/arm/tcg-target.h index fdf75ba93f..8d1fee6327 100644 --- a/tcg/arm/tcg-target.h +++ b/tcg/arm/tcg-target.h @@ -142,6 +142,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t); #define TCG_TARGET_NEED_LDST_LABELS #endif #define TCG_TARGET_NEED_POOL_LABELS -#define TCG_TARGET_SUPPORT_MIRROR 1 #endif diff --git a/tcg/i386/tcg-target.h b/tcg/i386/tcg-target.h index cb1b138b66..b693d3692d 100644 --- a/tcg/i386/tcg-target.h +++ b/tcg/i386/tcg-target.h @@ -235,6 +235,5 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, uintptr_t jmp_rx, #define TCG_TARGET_NEED_LDST_LABELS #endif #define TCG_TARGET_NEED_POOL_LABELS -#define TCG_TARGET_SUPPORT_MIRROR 1 #endif diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h index ed5c347374..c2c32fb38f 100644 --- a/tcg/mips/tcg-target.h +++ b/tcg/mips/tcg-target.h @@ -201,7 +201,6 @@ extern bool use_mips32r2_instructions; #define TCG_TARGET_DEFAULT_MO (0) #define TCG_TARGET_HAS_MEMORY_BSWAP 1 -#define TCG_TARGET_SUPPORT_MIRROR 1 void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t); diff --git a/tcg/ppc/tcg-target.h b/tcg/ppc/tcg-target.h index ec51f474a7..d1339afc66 100644 --- a/tcg/ppc/tcg-target.h +++ b/tcg/ppc/tcg-target.h @@ -185,6 +185,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t); #define TCG_TARGET_NEED_LDST_LABELS #endif #define TCG_TARGET_NEED_POOL_LABELS -#define TCG_TARGET_SUPPORT_MIRROR 1 #endif diff --git a/tcg/riscv/tcg-target.h b/tcg/riscv/tcg-target.h index c50ecf4dab..727c8df418 100644 --- a/tcg/riscv/tcg-target.h +++ b/tcg/riscv/tcg-target.h @@ -171,6 +171,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t); #define TCG_TARGET_NEED_POOL_LABELS #define TCG_TARGET_HAS_MEMORY_BSWAP 0 -#define TCG_TARGET_SUPPORT_MIRROR 1 #endif diff --git a/tcg/s390/tcg-target.h b/tcg/s390/tcg-target.h index 4edcb06044..641464eea4 100644 --- a/tcg/s390/tcg-target.h +++ b/tcg/s390/tcg-target.h @@ -159,6 +159,5 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, uintptr_t jmp_rx, #define TCG_TARGET_NEED_LDST_LABELS #endif #define TCG_TARGET_NEED_POOL_LABELS -#define TCG_TARGET_SUPPORT_MIRROR 1 #endif diff --git a/tcg/sparc/tcg-target.h b/tcg/sparc/tcg-target.h index 6426e24f17..95ab9af955 100644 --- a/tcg/sparc/tcg-target.h +++ b/tcg/sparc/tcg-target.h @@ -172,6 +172,5 @@ extern bool use_vis3_instructions; void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t); #define TCG_TARGET_NEED_POOL_LABELS -#define TCG_TARGET_SUPPORT_MIRROR 1 #endif diff --git a/tcg/tci/tcg-target.h b/tcg/tci/tcg-target.h index d8c78d1dc7..bb784e018e 100644 --- a/tcg/tci/tcg-target.h +++ b/tcg/tci/tcg-target.h @@ -198,7 +198,6 @@ void tci_disas(uint8_t opc); #define TCG_TARGET_DEFAULT_MO (0) #define TCG_TARGET_HAS_MEMORY_BSWAP 1 -#define TCG_TARGET_SUPPORT_MIRROR 0 static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, uintptr_t jmp_rx, uintptr_t jmp_rw, uintptr_t addr) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 02e1b05c42..e9de6ff9dd 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1132,6 +1132,7 @@ static bool alloc_code_gen_buffer_anon(size_t size, int prot, return true; } +#ifndef CONFIG_TCG_INTERPRETER #ifdef CONFIG_POSIX #include "qemu/memfd.h" @@ -1254,17 +1255,18 @@ static bool alloc_code_gen_buffer_splitwx_vmremap(size_t size, Error **errp) return true; } #endif /* CONFIG_DARWIN */ +#endif /* CONFIG_TCG_INTERPRETER */ static bool alloc_code_gen_buffer_splitwx(size_t size, Error **errp) { - if (TCG_TARGET_SUPPORT_MIRROR) { -#ifdef CONFIG_DARWIN - return alloc_code_gen_buffer_splitwx_vmremap(size, errp); +#ifndef CONFIG_TCG_INTERPRETER +# ifdef CONFIG_DARWIN + return alloc_code_gen_buffer_splitwx_vmremap(size, errp); +# endif +# ifdef CONFIG_POSIX + return alloc_code_gen_buffer_splitwx_memfd(size, errp); +# endif #endif -#ifdef CONFIG_POSIX - return alloc_code_gen_buffer_splitwx_memfd(size, errp); -#endif - } error_setg(errp, "jit split-wx not supported"); return false; }