From patchwork Fri Jun 9 10:46:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 690903 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp746919wru; Fri, 9 Jun 2023 03:49:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4geW6o1oakwBoxpx6DDcIG1mkiP69PJcfg224x030iKWWKUHXk2UiX4ZRFUVTGKcwNgIXd X-Received: by 2002:a05:6214:2a8f:b0:628:2067:2165 with SMTP id jr15-20020a0562142a8f00b0062820672165mr1313346qvb.17.1686307759625; Fri, 09 Jun 2023 03:49:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686307759; cv=none; d=google.com; s=arc-20160816; b=LehzTbEiicUPt6iIlf2dLd7yg16sBNhs5GB+I/YPWJzBvVGp0DUgNIWBSikRMMjisQ j9DI8XcnZ+3TYj2y3CmoPVCBl1+b54T630LYq9zksD1Uo5mjyqVJk5NPJZTMycpGJVn+ VZae+3FoIpphJE3y2LM6waS3zIvX0JhJ6aBHIvHivm+f3JnQX1KHTFCZV/O3MU3CKdVd 2E7e1ZQUKNS+HZ8elbrsjJERxVWbzPwZNyXHChvvrzRYQp4xR6NCW89if9CE9lIEcFsF 9XrHmbT6gB5Cf2IorzcfavjTQJE6DtSJsePCjXzJrMCh/SlCIBrvMKMVzANkbEr3KXnA eywg== 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=tKweUm+um7BdrfNBLJAXxXtSgHD1qY+FtAWIpdBpZZk=; b=GHPLas3KlOR6XUwoI7A2fLVGHFlNofYM6lHefmeHuj9l/gTuO/LqrBe5LXJLZLNIou TKbPZZkSiKoAjFDUVc7AwOZ1xw86G2MH8ZHL4wcrk7sbF5W/CINFgdiYoT81jM03IpG3 eMGFZgl0nJs86TnE8yqSFyd+2WHwyieH3TTDQ7p1Mkl3PDJsJamZYx2xMloIkF3NPDX3 q+Projw1ZK7fuxlyHkUYC/guU6p3JGukTVMcUUmJTZTFHjKfM6wy5P47h+FfEMMd16TB nA/njIkH4cxJ261lIv6dSJlc2ST3N754MnZlwA/Nbxn9YmWt2QVAuY8tw4YVrt0gfSFd FolQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rCGC2gTU; 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 gi4-20020a056214248400b005ef7fec6142si2032305qvb.438.2023.06.09.03.49.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 09 Jun 2023 03:49: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=rCGC2gTU; 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 1q7Zel-0000uM-2e; Fri, 09 Jun 2023 06:47:47 -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 1q7Zej-0000q1-5d for qemu-devel@nongnu.org; Fri, 09 Jun 2023 06:47:45 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7Zef-0001Co-Lb for qemu-devel@nongnu.org; Fri, 09 Jun 2023 06:47:44 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-30e53cacc10so1110271f8f.0 for ; Fri, 09 Jun 2023 03:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686307659; x=1688899659; 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=tKweUm+um7BdrfNBLJAXxXtSgHD1qY+FtAWIpdBpZZk=; b=rCGC2gTU/9KGtVjglyjTAQ5nPPQ8YdLm4D2P9KMDJ9H4vFAuYWLJBclc/P8BwZ1s10 CMtsMI94BtkKlPaauJ9zHdaj0zxRpNTmLEghgJHE4ihbl+QJ3v35+ww+21PoH36Ymxk4 LFg4vNEjeGGQrB/wxomzArAXH/W6sNu+p9vPMnnXH/T6WC8JjfnoRTCQUaBneKpCviPJ AqirFrIdBBSFbthkW7PC+7gT54MxSsPkApj3cSzqHyhaeKRojpnnp0OTyxDngwiJ6LAf F3ZovC9yjrQqwXZy1L7I+y06qg+JZlIZrduAh8hfmHylRE0bF1FYLP9FviHFB/r5vkBf MrYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686307659; x=1688899659; 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=tKweUm+um7BdrfNBLJAXxXtSgHD1qY+FtAWIpdBpZZk=; b=jtMjarxoTuR+8LN7CrTwREKm7l3T3kmu2vQ4OthmFF9bNyx4ebBGgCaZTYGGOYH1Y+ 39qyjV6cMJAQYQ+etG8Qnl2yh0xzzVjuKRdJVhdRTf42mD31+nE8S0ORHETPiI+PO11M JfgnpytxGpsj+fyVfNfCEXYpCMcZQ4+2Y1p4tb1rqAqZRfQUPTrxwjGSJPaSzXSfXq9d nM23sIlCnYKypS/u/2A0JYeJ4lNToT7NAFh2iqcGcM2mRFSQ1ug9P9PEfpQshewqhpT7 u7DC6/96YIX8GxpOsd0YFWR0OQ4U9bxwlerj8pJpPxcYjnhGfFtst6HyA3nsk51TTUzh lAuA== X-Gm-Message-State: AC+VfDy72b6tE3XDg7Mz2F7pHH8VLJM855NKc+/kDKuNTIpjuPVwxgKK dDQAUf4Nlxw45ObsrGHgYLFOhvBxYGN9boTLmNcGvg== X-Received: by 2002:a05:6000:1941:b0:30e:3dce:c49a with SMTP id e1-20020a056000194100b0030e3dcec49amr636763wry.2.1686307658956; Fri, 09 Jun 2023 03:47:38 -0700 (PDT) Received: from localhost.localdomain (23.171.88.92.rev.sfr.net. [92.88.171.23]) by smtp.gmail.com with ESMTPSA id d8-20020a5d6dc8000000b0030aec5e020fsm4066472wrz.86.2023.06.09.03.47.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 09 Jun 2023 03:47:38 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-arm@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH 03/22] target/arm/tcg: Remove CONFIG_TCG #ifdef'ry check Date: Fri, 9 Jun 2023 12:46:58 +0200 Message-Id: <20230609104717.95555-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230609104717.95555-1-philmd@linaro.org> References: <20230609104717.95555-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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=unavailable 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 CONFIG_TCG is always defined within target/arm/tcg/. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/arm/tcg/cpu32.c | 4 +--- target/arm/tcg/m_helper.c | 6 ------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c index 47d2e8e781..0672519b89 100644 --- a/target/arm/tcg/cpu32.c +++ b/target/arm/tcg/cpu32.c @@ -13,11 +13,9 @@ #include "hw/core/tcg-cpu-ops.h" #include "internals.h" #include "target/arm/idau.h" +#include "cpregs.h" #if !defined(CONFIG_USER_ONLY) #include "hw/boards.h" -#endif -#include "cpregs.h" -#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG) #include "hw/intc/armv7m_nvic.h" #endif diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c index 9cef70e5c9..0891acc29c 100644 --- a/target/arm/tcg/m_helper.c +++ b/target/arm/tcg/m_helper.c @@ -15,10 +15,8 @@ #include "qemu/bitops.h" #include "qemu/log.h" #include "exec/exec-all.h" -#ifdef CONFIG_TCG #include "exec/cpu_ldst.h" #include "semihosting/common-semi.h" -#endif #if !defined(CONFIG_USER_ONLY) #include "hw/intc/armv7m_nvic.h" #endif @@ -2345,11 +2343,7 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs) qemu_log_mask(CPU_LOG_INT, "...handling as semihosting call 0x%x\n", env->regs[0]); -#ifdef CONFIG_TCG do_common_semihosting(cs); -#else - g_assert_not_reached(); -#endif env->regs[15] += env->thumb ? 2 : 4; return; case EXCP_BKPT: