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 76DD4C64E7A for ; Tue, 1 Dec 2020 19:30:00 +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 CCF1E204EC for ; Tue, 1 Dec 2020 19:29:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UZcRkjaz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CCF1E204EC 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]:36790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkBLa-0000PG-HO for qemu-devel@archiver.kernel.org; Tue, 01 Dec 2020 14:29:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkBJy-00074u-3g for qemu-devel@nongnu.org; Tue, 01 Dec 2020 14:28:18 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:39761) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kkBJw-0006Co-Gn for qemu-devel@nongnu.org; Tue, 01 Dec 2020 14:28:17 -0500 Received: by mail-wr1-x444.google.com with SMTP id e7so4492328wrv.6 for ; Tue, 01 Dec 2020 11:28:16 -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=zSlFyG+azHlf1O1jZlNYMT5Vr3wLituVoG139gBOWj0=; b=UZcRkjaz37n9UKoNvTk7V7Cfmcocf6VCT0kizSVSz7Wvj1dO+nvdlupidn0GWFKYug qiCqJN8u183uoEoZiTMgmqBoFD5wGNddPeDFaAbFzrMt7bBwH2FDSklHC8z1N3pTP1CO 5P9ZJPXVT9/hBAtAjibR8h8H94r/fagnFRCPQ0KWN2ZC4vTXoBW6lyi3SJ8c9XrHfffk GKzJY5SEFJk2/67DmwJl9NkI9cFjx7yJ8ZJvSfzFuVxAfCq/wcAo/+RF0Ze+aodzBj/L ymqlyyTdjt7hljJlgbjUf7zd+SQ+RvYhAfVq440S4r6vmrppXhfXuMYQhVMPWduss8FY Lntw== 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=zSlFyG+azHlf1O1jZlNYMT5Vr3wLituVoG139gBOWj0=; b=lYqeY4owN9Z3CxFzLidM5CaGbQdDlSyhV6JfXtj9+tkD0iIgLIXd/Z1YYVnVSMrHeg cC5PjFYxs9JzuhIayORlKv00SSLiPRXPYHAECAklapWKf9e9fSp3ElQuVD2Hq6b66c5h SISqO5GSWzG5YleO7rp23yswj+NFiIvtWY87WczX6mgtrs7cKsGU723HheJvpnE5jKQ+ 9cWYKCTuoaFhA58frQypvjpqvxJFo0xZhPnk0jFxXoh3YQXUfCu5Tq2eXha4g3UAPxXU hzFHEpeNb843ee97iurkPHZWrMnnkN9oPLGnnkiI/pp2BlOQcaYYj/a3pOTiqSrMB1XM 5bUQ== X-Gm-Message-State: AOAM531gD4UpnDrvUjsNP1g5XXkcsW1Q7XdNF6QvYMzw6KdUjMZJ+cJP QWZnRZExhihAeDnCI4pbvXs= X-Google-Smtp-Source: ABdhPJyluTtORl4OcC/Kbc/K9zmgrIk663o6Kn6axvHrFDZCmUZy5LGZ16/mJzY7xoDQNM49HCn1DQ== X-Received: by 2002:a5d:5505:: with SMTP id b5mr5841491wrv.410.1606850895215; Tue, 01 Dec 2020 11:28:15 -0800 (PST) Received: from localhost.localdomain (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id z11sm1330178wmc.39.2020.12.01.11.28.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 11:28:14 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Jiaxun Yang , qemu-devel@nongnu.org, Huacai Chen Subject: [PATCH v3 1/6] linux-user/elfload: Move GET_FEATURE macro out of get_elf_hwcap() body Date: Tue, 1 Dec 2020 20:28:02 +0100 Message-Id: <20201201192807.1094919-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201201192807.1094919-1-f4bug@amsat.org> References: <20201201192807.1094919-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::444; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x444.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.25, 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: Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Aurelien Jarno , Meng Zhuo Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" As we are going to add more macros, keep the function body clear. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- linux-user/elfload.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 0b02a926025..aae28fd929d 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -989,22 +989,22 @@ enum { #define ELF_HWCAP get_elf_hwcap() +#define GET_FEATURE(_flag, _hwcap) \ + do { if (cpu->env.insn_flags & (_flag)) { hwcaps |= _hwcap; } } while (0) + static uint32_t get_elf_hwcap(void) { MIPSCPU *cpu = MIPS_CPU(thread_cpu); uint32_t hwcaps = 0; -#define GET_FEATURE(flag, hwcap) \ - do { if (cpu->env.insn_flags & (flag)) { hwcaps |= hwcap; } } while (0) - GET_FEATURE(ISA_MIPS32R6 | ISA_MIPS64R6, HWCAP_MIPS_R6); GET_FEATURE(ASE_MSA, HWCAP_MIPS_MSA); -#undef GET_FEATURE - return hwcaps; } +#undef GET_FEATURE + #endif /* TARGET_MIPS */ #ifdef TARGET_MICROBLAZE -- 2.26.2