| Message ID | 20230611085846.21415-4-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show
Delivered-To: patch@linaro.org
Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp1571344wru;
Sun, 11 Jun 2023 02:01:44 -0700 (PDT)
X-Google-Smtp-Source:
ACHHUZ7EeqKnaPYO+mPM2QChDtMzUM+0Df74Qr/MTcNbiHThUpk7P0dAoRjz9XYrsVqxMgraB47u
X-Received: by 2002:a05:620a:4048:b0:75d:5803:a20 with SMTP id
i8-20020a05620a404800b0075d58030a20mr7663392qko.68.1686474104568;
Sun, 11 Jun 2023 02:01:44 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1686474104; cv=none;
d=google.com; s=arc-20160816;
b=nYfPu0R+j8+1PmYYYVqn9d+h+5J191XMBKCuYPbCH2Gq/V3l0m0EllRFwyjAonLi8u
Vs7mt9sS3najCz7/iK9IPuqNTm5d8f/zvFm2+X0pqOpEm9Hmpeh33f7IQk06MiRiHBd1
9No4vjzk7mEzSYxAcFhfX/4B54xO8S03QBqqvmjOGxUj9SIG0QFO2ogkzNsNZIaPUtOI
jmW2JAVRUoZS1BM4tMJFHbBcTFDkPeQ+QucRYf3MNYHS3CZxy/SwnPF4GIyq3STAgsK+
/E/6KrjBwBjcaXu5huFQ/oonHtRwE6PR2dgqv5q9oUxmu0c6XqPVC1Zb1SYkG/ct160u
E2+w==
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=8mp+80uEQkt8/jSa2bwpDOFe4dhC6+cPTb9ADdk/0oE=;
b=Jn6vHZu1zseKULJxyjTdFTg7dMD8YwuPZR2JtlMXRX+kaEJbup8BHrpYTqsD0ZIoy3
cB9oFVGzH/NlBPcbCByrSPbh02zqddVUKwJpYhGTXPmmVVudi2RCiGSNXPb3E7/ych+V
s0pDb4zcs38cN/7M2t9G6GRSjdmev1jhbo/XvwLH62wfjJG9PrBHSPQiWW4I0Q2o3X62
cI8cPaBeid5uAPifL9eD9MZEYmxUAt7jMcgdnsRxEoxeMZ5KWM2z3iGzgWaPfsCd8FN5
x+QrBagzkp8mjG0hsn5TLW3/5jWvVpjNGQqp5hJqCcEB8VjfTx/liGQVVmpWB5Srydcn
7Org==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linaro.org header.s=google header.b="Lntpl/tL";
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: <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17])
by mx.google.com with ESMTPS id
l13-20020ae9f00d000000b0075bcc49f7b7si4339895qkg.165.2023.06.11.02.01.44
for <patch@linaro.org>
(version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256);
Sun, 11 Jun 2023 02:01:44 -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="Lntpl/tL";
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 <qemu-devel-bounces@nongnu.org>)
id 1q8Guf-0000ym-Bc; Sun, 11 Jun 2023 04:59:05 -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 <philmd@linaro.org>) id 1q8Gue-0000yQ-B7
for qemu-devel@nongnu.org; Sun, 11 Jun 2023 04:59:04 -0400
Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1q8Guc-0003Z7-QX
for qemu-devel@nongnu.org; Sun, 11 Jun 2023 04:59:04 -0400
Received: by mail-wm1-x32d.google.com with SMTP id
5b1f17b1804b1-3f7378a74faso23262855e9.0
for <qemu-devel@nongnu.org>; Sun, 11 Jun 2023 01:59:02 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1686473941; x=1689065941;
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=8mp+80uEQkt8/jSa2bwpDOFe4dhC6+cPTb9ADdk/0oE=;
b=Lntpl/tLzwChIdrOT2922M1h4tmPmJZV1cT8TRyvzNukM0+uhmGpwoZ2gacfHy1dNx
4Qicjss9uEAchFDNmuru2VCqaECt6NnDDLNHOLIDmQ+DGAhZ+wu5/5M0j1O8/BCX6Wey
SY1c1oa9kPVI4zr6RGh93rqoW+oF3Gff9hihZI/DqDa619SBlKQ81CDwPaC7LFlCrxnC
lcZY2obeJU9ZZFx08nEOaorGi6BrAOhjsu4LdrQpie8gEKfHLdvc7cikR1Dd+1T3L/NG
eX8klQ7zwMgBstw0S2t39ZEyooGR5SDyVqv3UXkCW/gTx/xE0pK4YFwmdsgU/NrEuhpn
AaRQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1686473941; x=1689065941;
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=8mp+80uEQkt8/jSa2bwpDOFe4dhC6+cPTb9ADdk/0oE=;
b=S1srw3Vaw8L70rqB1ddRYMYwuLgXivJueEA3S4fyHCm0bl7vL/M+Y/qwBrPhR6qNPO
JMErrnmPwKA+C9eBd5RHXngSJAg2WYZ4FiNpwegBpMhzQt8FHeZYSFx4yY0PqG7Vi5HO
sRO0T/S1t87Kfps1/EsQqE4ZwZU06YZDDw2n4PkA5R2nztOKkl4+Z8khMyJkYdIPRVS6
fV5/LFCTgq33izwjSMu28Qa7beub3qEyT5mCKvnz0xMFahqVp0s6C7hIH1PJ6gAtUcs/
WNrL6RwedeQNn0n5LWWKCrCMtTXEuyyRSP2W7EV+1c4qrOWv9KUkmhOMyJM8U62MEiva
2h8Q==
X-Gm-Message-State: AC+VfDwW3r9mkKn6/VvRg030KhRFFxLvYzJF9dFBGguR4j8TUCZlrMZm
o7Lu2iT6oYNJvZ4Q2blGW3UR7ImMn/k7SarepU4=
X-Received: by 2002:a7b:c397:0:b0:3f6:688:f658 with SMTP id
s23-20020a7bc397000000b003f60688f658mr3739595wmj.20.1686473941257;
Sun, 11 Jun 2023 01:59:01 -0700 (PDT)
Received: from localhost.localdomain (91-163-26-170.subs.proxad.net.
[91.163.26.170]) by smtp.gmail.com with ESMTPSA id
f3-20020a7bc8c3000000b003f1958eeadcsm7734318wml.17.2023.06.11.01.59.00
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sun, 11 Jun 2023 01:59:00 -0700 (PDT)
From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Richard Henderson <richard.henderson@linaro.org>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org, =?utf-8?q?Ph?=
=?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH v2 03/26] target/arm/tcg: Remove CONFIG_TCG #ifdef'ry check
Date: Sun, 11 Jun 2023 10:58:23 +0200
Message-Id: <20230611085846.21415-4-philmd@linaro.org>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20230611085846.21415-1-philmd@linaro.org>
References: <20230611085846.21415-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2a00:1450:4864:20::32d;
envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org
|
| Series |
target/arm/tcg: Remove inclusions of 'exec/helper-[proto/gen].h'
|
expand
|
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: