From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1F83C432C1 for ; Tue, 24 Sep 2019 11:07:40 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7524E2146E for ; Tue, 24 Sep 2019 11:07:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7524E2146E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCifT-0000TY-GM for qemu-devel@archiver.kernel.org; Tue, 24 Sep 2019 07:07:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39254) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCied-0008GQ-3C for qemu-devel@nongnu.org; Tue, 24 Sep 2019 07:06:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCieb-00026C-5V for qemu-devel@nongnu.org; Tue, 24 Sep 2019 07:06:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47258) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCieW-00024F-D7; Tue, 24 Sep 2019 07:06:40 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 88A1A307D844; Tue, 24 Sep 2019 11:06:39 +0000 (UTC) Received: from thuth.remote.csb (ovpn-116-95.ams2.redhat.com [10.36.116.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C1A519C58; Tue, 24 Sep 2019 11:06:30 +0000 (UTC) Subject: Re: [PATCH 2/4] target/arm: Move cortex-m related functions to new file v7m.c To: Auger Eric , qemu-devel@nongnu.org, Peter Maydell References: <20190921150420.30743-1-thuth@redhat.com> <20190921150420.30743-3-thuth@redhat.com> <8585b93b-e239-829b-d634-b89941f27aed@redhat.com> <5b967a2a-e1db-9a9f-7590-fc6905354f7a@redhat.com> From: Thomas Huth Openpgp: preference=signencrypt Autocrypt: addr=thuth@redhat.com; prefer-encrypt=mutual; keydata= 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 Organization: Red Hat Message-ID: <240ae462-9f6e-bb1f-3657-1baaba4051ca@redhat.com> Date: Tue, 24 Sep 2019 13:06:29 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <5b967a2a-e1db-9a9f-7590-fc6905354f7a@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 24 Sep 2019 11:06:39 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 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: Richard Henderson , qemu-arm@nongnu.org, =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 24/09/2019 13.02, Auger Eric wrote: > Hi Thomas, > > On 9/23/19 8:09 PM, Thomas Huth wrote: >> On 23/09/2019 16.31, Auger Eric wrote: >>> Hi Thomas, >>> >>> On 9/21/19 5:04 PM, Thomas Huth wrote: >>>> We are going to make CONFIG_ARM_V7M optional, so the related cortex-m >>>> CPUs should only be created if the switch is enabled. This can best >>>> be done if the code resides in a separate file, thus move the related >>>> functions to a new file v7m.c which only gets compiled if CONFIG_ARM_V7M >>>> is enabled. >>>> >>>> Signed-off-by: Thomas Huth >>>> --- >>>> target/arm/Makefile.objs | 1 + >>>> target/arm/cpu.c | 146 ----------------------------- >>>> target/arm/v7m.c | 193 +++++++++++++++++++++++++++++++++++++++ >>>> 3 files changed, 194 insertions(+), 146 deletions(-) >>>> create mode 100644 target/arm/v7m.c >> [...] >>>> diff --git a/target/arm/v7m.c b/target/arm/v7m.c >>>> new file mode 100644 >>>> index 0000000000..505043febe >>>> --- /dev/null >>>> +++ b/target/arm/v7m.c >>>> @@ -0,0 +1,193 @@ >>>> +/* >>>> + * ARM v7m helpers. >>>> + * >>>> + * This code is licensed under the GNU GPL v2 or later. >>>> + * >>>> + * SPDX-License-Identifier: GPL-2.0-or-later >>>> + */ >>>> + >>>> +#include "qemu/osdep.h" >>>> +#include "qemu/qemu-print.h" >>>> +#include "qemu-common.h" >>>> +#include "target/arm/idau.h" >>>> +#include "qemu/module.h" >>>> +#include "qapi/error.h" >>>> +#include "qapi/visitor.h" >>>> +#include "cpu.h" >>>> +#include "internals.h" >>>> +#include "exec/exec-all.h" >>>> +#include "hw/qdev-properties.h" >>>> +#if !defined(CONFIG_USER_ONLY) >>>> +#include "hw/loader.h" >>>> +#include "hw/boards.h" >>>> +#endif >>>> +#include "sysemu/sysemu.h" >>>> +#include "sysemu/tcg.h" >>>> +#include "sysemu/hw_accel.h" >>>> +#include "disas/capstone.h" >>>> +#include "fpu/softfloat.h" >>> >>> I guess some of those headers are not needed. >> >> Yeah, I just copy-n-pasted from the source file ... I'll check what can >> be omitted (if this patch series has a chance at all...) >> >>>> + >>>> +#if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) >>>> + >>>> +static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request) >>>> +{ >>>> + CPUClass *cc = CPU_GET_CLASS(cs); >>>> + ARMCPU *cpu = ARM_CPU(cs); >>>> + CPUARMState *env = &cpu->env; >>>> + bool ret = false; >>>> + >>>> + /* >>>> + * ARMv7-M interrupt masking works differently than -A or -R. >>>> + * There is no FIQ/IRQ distinction. Instead of I and F bits >>>> + * masking FIQ and IRQ interrupts, an exception is taken only >>>> + * if it is higher priority than the current execution priority >>>> + * (which depends on state like BASEPRI, FAULTMASK and the >>>> + * currently active exception). >>>> + */ >>>> + if (interrupt_request & CPU_INTERRUPT_HARD >>>> + && (armv7m_nvic_can_take_pending_exception(env->nvic))) { >>> >>> so what is the status wrt m_helper.c which stays unconditionally >>> compiled. m_helper functions seem to called from target/arm/translate.c >>> mostly. Have you abandoned the stub idea. It may be confusing to have 2 >>> different helper files. At least a comment explaining where a new helper >>> shall go may be useful. >> >> All the HELPER() functions should definitely stay in m_helper.c. They >> are required for linking. Or do you prefer a stub file instead? Then we >> could maybe make the whole m_helper.c conditional in the Makefile.objs >> instead. > > I was simply referring to your previous approach: > > Applying [Qemu-devel] [RFC PATCH 3/3] target/arm: Make m_helper.c > optional via CONFIG_ARM_V7M seems to fix the issue > https://lists.gnu.org/archive/html/qemu-devel/2019-09/msg00333.html > > It seems to work fine as it removes the call to armv7m_nvic.c functions > so no need to move the interrupt controller code? Yes, but then we either need stubs in a separate file, or have to put lots of #ifdefs into translate.c ... none of those solutions seem to be really perfect :-( Anyway, Philippe is currently respinning his series (I think), so I'll postpone my work now to avoid to interfere with him. Thomas