From patchwork Fri Jan 15 21:04:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 363784 Delivered-To: patch@linaro.org Received: by 2002:a02:ccad:0:0:0:0:0 with SMTP id t13csp216079jap; Fri, 15 Jan 2021 13:22:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQ5KE8p3+gXrtUfdzqJZY1jGW0wwjQbaZKCcT70ObB2tGRI2xzV21C4Fe7VdBXl6hkQsTP X-Received: by 2002:a25:bc44:: with SMTP id d4mr3145508ybk.522.1610745742976; Fri, 15 Jan 2021 13:22:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610745742; cv=none; d=google.com; s=arc-20160816; b=qP37/uDgP3hJ6rSn1TQAfrltyxydk3GFt3P/iXsMxFt/LJDcqhQIBG7NpOwkUrUGvA OZ9ZSDubkvx+mB+sm7ZoCAwprAtdhJk8a86DVQzcHtZse1OuuGhmQAwP7jX6IeizV4g/ qUSClvd5JhjmcF+Y+upqephwnaWnFFaGMDyFk8/JDFpyajGi4m5AGFlsk5Es7WO8tcaG N9sXclj4jjs3bYT8Tr3oKF2U3LJBSDII6fmCgypJYXt/Q3jmTR3N51EDv58b3u4pDx9Q 6BnZix5oe+PExDar5Ubh0v7Kd+FiADOnhR1pba+9y+fZPfadm3usRnUbMlCnknUofV3y 0Uew== 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=M+mEimshrpDmW7dShVzEOTUVx8FhHmR6OQKgf+xqsf0=; b=mHPrRSvO8XXU5Lx+pIebo3NG1mJ47Vvj07q6eHxbGRgajBETNlAp/iCf1axaI979Dd W+i/ofPEAZ5aHiYumVQ3BM05YY3fhpa+1CBLPGRZIJyqgWyOSCMS/UVRsuGq3T4a4BBE 8F1VBqOHA1od7rakES9dn26ZWVbadoOuyrdG8KQkc2xt7Jy/yd2T1IR8zc4strrC0wR6 00DxjEmobi+N5v5T9OWc5kBwpMQwvXUz/HAVcWoUaPe7aIheMUOuzqqTkGLqbUYJmWSC cth9C3w61wt7xRLltAF2PXltbyFJuX/cYazxhSJ3KfMJfjR46mvjs9TB1iLR4e+HDj5o ElNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="i/19yCOc"; 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 r18si5081775ybj.192.2021.01.15.13.22.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jan 2021 13:22:22 -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="i/19yCOc"; 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]:56888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0WY2-0005H6-D1 for patch@linaro.org; Fri, 15 Jan 2021 16:22:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0WHm-0004G9-MF for qemu-devel@nongnu.org; Fri, 15 Jan 2021 16:05:34 -0500 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]:44776) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0WHk-0004KM-DB for qemu-devel@nongnu.org; Fri, 15 Jan 2021 16:05:34 -0500 Received: by mail-pf1-x42b.google.com with SMTP id t29so1137317pfg.11 for ; Fri, 15 Jan 2021 13:05:31 -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=M+mEimshrpDmW7dShVzEOTUVx8FhHmR6OQKgf+xqsf0=; b=i/19yCOc5ecJLPct8EX0sI2dVKOLhArkzXFcj+3HXXHId8kZHBwIPKL9zsYLiP3RFA sPo456klZ7Fiml6VvvJVzXSjjiOdXMy5JBOrqvXzzKZdAshgB4WfNEOx2FTctwrhS0cS uEkijaBpwZkBPLorko8ljSvvEhBHnT5UpI+Bn8IF3dvcEpfYdAHuvhAw/SeEaSGHSNJy QzYYUJV3EXwiaO52fHF63PIDH69SFby9aqVNpDCs7XULJKBChq2ahTKx2FhI7/cZYX2l jznKQfMFEXWUpEQdLQM5kO8rEBkIuA6e6BEBXgIS6Ns7GUp735OukpdydDVbIf+Iq1J9 QcTA== 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=M+mEimshrpDmW7dShVzEOTUVx8FhHmR6OQKgf+xqsf0=; b=psq/xj636ZIRD0uaj2xLcd0heNelqrM9g39aKY7huSExKZCtLuzqLCe6WjktKQ0NO9 Vkd244faKFRRBaO5L1SEYYcfVBTHVXL6M91pc8X/n1JWP+URGZNNBWYJvUXS3Lno1vFA mAVeHWR9JxUixVfMbxAB5uihZH0j0URBz6GG3sXh/+txiEhuAitUk4rlrwR7SWN203J6 e9Cc0xHIli8sFj8S2VOicCMj35ntkjERZ8tNHH5U0HPKfi+Gd5I5kDsfBLkOSBKid83V r7bi1kS9D4uMSl25wrhw+6yUulF6OCPFBhtJ5XzSV+b/voXsL4xts86HP0ErIeXMaJ7u /ZVQ== X-Gm-Message-State: AOAM532ZDBx2x1DIIV6uXFESjsTY0njKy30bEcCm6drqOFkVYnpI0cBj o++8Uu3fG+3G7LrFlsym6QGB4R9tz30zpc8P X-Received: by 2002:a62:6845:0:b029:1ae:2731:8a89 with SMTP id d66-20020a6268450000b02901ae27318a89mr14863722pfc.73.1610744730880; Fri, 15 Jan 2021 13:05:30 -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 h15sm8920221pfo.71.2021.01.15.13.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 13:05:30 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 22/22] tcg: Remove TCG_TARGET_CON_SET_H Date: Fri, 15 Jan 2021 11:04:56 -1000 Message-Id: <20210115210456.1053477-23-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210115210456.1053477-1-richard.henderson@linaro.org> References: <20210115210456.1053477-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42b.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: Alistair Francis Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" All backends have now been converted to tcg-target-con-set.h, so we can remove the fallback code. Reviewed-by: Alistair Francis 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 | 2 -- tcg/tcg.c | 12 ------------ 10 files changed, 22 deletions(-) -- 2.25.1 Reviewed-by: Peter Maydell diff --git a/tcg/aarch64/tcg-target.h b/tcg/aarch64/tcg-target.h index 200e9b5e0e..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_CON_SET_H #endif /* AARCH64_TCG_TARGET_H */ diff --git a/tcg/arm/tcg-target.h b/tcg/arm/tcg-target.h index 4d201b1216..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_CON_SET_H #endif diff --git a/tcg/i386/tcg-target.h b/tcg/i386/tcg-target.h index 48a6f2a336..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_CON_SET_H #endif diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h index e520a9d6e3..c2c32fb38f 100644 --- a/tcg/mips/tcg-target.h +++ b/tcg/mips/tcg-target.h @@ -207,6 +207,5 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t); #ifdef CONFIG_SOFTMMU #define TCG_TARGET_NEED_LDST_LABELS #endif -#define TCG_TARGET_CON_SET_H #endif diff --git a/tcg/ppc/tcg-target.h b/tcg/ppc/tcg-target.h index 551f8d0fc9..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_CON_SET_H #endif diff --git a/tcg/riscv/tcg-target.h b/tcg/riscv/tcg-target.h index a998b951e4..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_CON_SET_H #endif diff --git a/tcg/s390/tcg-target.h b/tcg/s390/tcg-target.h index 7aafd25a46..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_CON_SET_H #endif diff --git a/tcg/sparc/tcg-target.h b/tcg/sparc/tcg-target.h index f50e8d50ee..f66f5d07dc 100644 --- a/tcg/sparc/tcg-target.h +++ b/tcg/sparc/tcg-target.h @@ -168,6 +168,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_CON_SET_H #endif diff --git a/tcg/tci/tcg-target.h b/tcg/tci/tcg-target.h index 1efd8c4fb0..bb784e018e 100644 --- a/tcg/tci/tcg-target.h +++ b/tcg/tci/tcg-target.h @@ -207,6 +207,4 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, uintptr_t jmp_rx, /* no need to flush icache explicitly */ } -#define TCG_TARGET_CON_SET_H - #endif /* TCG_TARGET_H */ diff --git a/tcg/tcg.c b/tcg/tcg.c index 36fdeef10f..4d4f4e9b71 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -69,9 +69,6 @@ /* Forward declarations for functions declared in tcg-target.c.inc and used here. */ static void tcg_target_init(TCGContext *s); -#ifndef TCG_TARGET_CON_SET_H -static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode); -#endif static void tcg_target_qemu_prologue(TCGContext *s); static bool patch_reloc(tcg_insn_unit *code_ptr, int type, intptr_t value, intptr_t addend); @@ -349,7 +346,6 @@ static void set_jmp_reset_offset(TCGContext *s, int which) s->tb_jmp_reset_offset[which] = tcg_current_code_size(s); } -#ifdef TCG_TARGET_CON_SET_H #define C_PFX1(P, A) P##A #define C_PFX2(P, A, B) P##A##_##B #define C_PFX3(P, A, B, C) P##A##_##B##_##C @@ -463,8 +459,6 @@ static const TCGTargetOpDef constraint_sets[] = { #define C_O2_I4(O1, O2, I1, I2, I3, I4) \ C_PFX6(c_o2_i4_, O1, O2, I1, I2, I3, I4) -#endif /* TCG_TARGET_CON_SET_H */ - #include "tcg-target.c.inc" /* compare a pointer @ptr and a tb_tc @s */ @@ -2536,13 +2530,7 @@ static void process_op_defs(TCGContext *s) continue; } -#ifdef TCG_TARGET_CON_SET_H tdefs = &constraint_sets[tcg_target_op_def(op)]; -#else - tdefs = tcg_target_op_def(op); - /* Missing TCGTargetOpDef entry. */ - tcg_debug_assert(tdefs != NULL); -#endif for (i = 0; i < nb_args; i++) { const char *ct_str = tdefs->args_ct_str[i];