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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 26F3BC433DB for ; Tue, 2 Mar 2021 10:29:29 +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 A590464F0A for ; Tue, 2 Mar 2021 10:29:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A590464F0A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lH2HP-0003j8-L2 for qemu-devel@archiver.kernel.org; Tue, 02 Mar 2021 05:29:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lH2G6-0001x7-2x; Tue, 02 Mar 2021 05:28:06 -0500 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]:40860) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lH2G4-0008P9-Hf; Tue, 02 Mar 2021 05:28:05 -0500 Received: by mail-ed1-x532.google.com with SMTP id w21so24514430edc.7; Tue, 02 Mar 2021 02:28:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DgLtxhW6TCh0Vt3N87A01jn3z88UQCjsPYLiOsnHu/I=; b=YlynJAlXKis3xlvlp8b6xXHhq0ZpkGKKUsa//dsaBGpYIxs1ee/4OjZMCRqF7puPiO MAwS7tiamXTZgyTqqn62PHPhe+SAStlPIrlUQ8L9EEeObQf+c3mthlsnxKdD3ndP5JbT P9s0lyYCSH7V43/m4zpPv9w/CPbWrmcgyuxJk3cNlUoaj5QarlqBGD9FWTk2PgLCjFI4 wcMnz4FQgr8jldgJckscDY7lK4QlWVWWR0eVlEdNgt4xXJHHVjPDXaj/F5EfwZ4b+KYk MrgHJS5hkpgMscFTsK3yejPKqySFuAIca00epUiNV/nilYnhDlsw6jt7rA/Q02j+4UNh jPZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DgLtxhW6TCh0Vt3N87A01jn3z88UQCjsPYLiOsnHu/I=; b=UGLKsqKgfS2R8wvcCqm62B4esHuPfYIPlZ1N9pIvd1OZBLzwyuD+rebqNvt+pYOKBs 2VifayVVYFptfehbrBIwWmSchhiaCk0kESEb8WHFLoO13wdiKeZexWIBiUCdgjzChpG8 jsbeFniOO5z7n/Ar6XOMLzfnU765SQYZOsLQYp7xeyv6lkaaL3wzE9J2wbTMlJLu+quZ FN5W6FLiSA06mEgUmaaliUMkE43TSU90yOefg4dk3oxZThCeyrp/IxJoVlgkb9Romnyg 1ymVJFFrBjfE354qh3eAAdp4IQeUVOUuY7rAG0e2mpWc1CqoIT7Npum9U2jX+5ZyYx5q PdCg== X-Gm-Message-State: AOAM530y05s6XZu5LnTQWsiGc2QhD3CIj4z3bqarmkSE2+bJkYnmG+HX AHcPttmlK0njBM9FA3oLziQwwmt8Qw4= X-Google-Smtp-Source: ABdhPJxtBe1JyuD647B2YHW3dOzrYqzhDwPtmH10I8kjKvgq6yC2fTZ+sviIRfIIHi1N2BTa1Atj0Q== X-Received: by 2002:a05:6402:1d39:: with SMTP id dh25mr18074868edb.282.1614680881533; Tue, 02 Mar 2021 02:28:01 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id y11sm17365132ejd.72.2021.03.02.02.27.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Mar 2021 02:28:01 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/7] target/arm: Directly use arm_cpu_has_work instead of CPUClass::has_work Date: Tue, 2 Mar 2021 11:27:33 +0100 Message-Id: <20210302102737.1031287-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210302102737.1031287-1-f4bug@amsat.org> References: <20210302102737.1031287-1-f4bug@amsat.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::532; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x532.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 , Sarah Harris , Chris Wulff , Sagar Karandikar , David Hildenbrand , Anthony Green , Mark Cave-Ayland , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Filippov , Taylor Simpson , Alistair Francis , "Edgar E. Iglesias" , Guan Xuetao , Marek Vasut , Yoshinori Sato , Claudio Fontana , Palmer Dabbelt , Artyom Tarasenko , Thomas Huth , Eduardo Habkost , Richard Henderson , Greg Kurz , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Michael Rolnik , Stafford Horne , David Gibson , qemu-riscv@nongnu.org, Bastian Koppelmann , Cornelia Huck , Laurent Vivier , Michael Walle , qemu-ppc@nongnu.org, Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" There is only one CPUClass::has_work() ARM handler: arm_cpu_has_work(). Avoid a dereference by declaring it in "internals.h" and call it directly in the WFI helper. Signed-off-by: Philippe Mathieu-Daudé --- target/arm/internals.h | 1 + target/arm/cpu.c | 2 +- target/arm/op_helper.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 05cebc8597c..1930be08828 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -172,6 +172,7 @@ static inline int r14_bank_number(int mode) void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu); void arm_translate_init(void); +bool arm_cpu_has_work(CPUState *cs); #ifdef CONFIG_TCG void arm_cpu_synchronize_from_tb(CPUState *cs, const TranslationBlock *tb); #endif /* CONFIG_TCG */ diff --git a/target/arm/cpu.c b/target/arm/cpu.c index b8bc89e71fc..d03607c2684 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -76,7 +76,7 @@ void arm_cpu_synchronize_from_tb(CPUState *cs, } #endif /* CONFIG_TCG */ -static bool arm_cpu_has_work(CPUState *cs) +bool arm_cpu_has_work(CPUState *cs) { ARMCPU *cpu = ARM_CPU(cs); diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index 65cb37d088f..a4da6f4fde8 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -289,7 +289,7 @@ void HELPER(wfi)(CPUARMState *env, uint32_t insn_len) CPUState *cs = env_cpu(env); int target_el = check_wfx_trap(env, false); - if (cpu_has_work(cs)) { + if (arm_cpu_has_work(cs)) { /* Don't bother to go into our "low power state" if * we would just wake up immediately. */ -- 2.26.2