From nobody Tue Feb 10 03:38:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) client-ip=209.85.128.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1606829749; cv=none; d=zohomail.com; s=zohoarc; b=kb28ogs31PnRT85azJwF3ZSUq4TzlJ72wTHTG3BVaOotCCOdBAzOhmfahDXu75+YYH5D4TqqKIqRzK4y8s1X0jYvn8/CBYF4uk/is4TAKqfsrZihYLOKgxs11fjbJt6D5cL3bIeb/UtAaxNl47PrsSseCIlEQ7dhtjALo3slqWQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606829749; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KpnrV7YwK9WYm4vVFUQwZNgnw+LJbwKa3oXlJxpsFpw=; b=E/WWX+I6RHyyv4k/l2UtXUcQ/OZZnwT+U2lXZdFy8XlO3wg6JNurpXW8D78YspT2jt6y+s9GxlNqqD+uQuQSSeCrQ1c4NuldWxNqSenYn9zmX169kvGeg8Q4QOQkU9VsoCmvOyw2S6ltCCGKCOfP1AS/LdUIdncExt8TL4+q38s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mx.zohomail.com with SMTPS id 1606829749927621.4286737435773; Tue, 1 Dec 2020 05:35:49 -0800 (PST) Received: by mail-wm1-f65.google.com with SMTP id g185so4992461wmf.3 for ; Tue, 01 Dec 2020 05:35:49 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id j14sm3233631wrs.49.2020.12.01.05.35.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 05:35:47 -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=KpnrV7YwK9WYm4vVFUQwZNgnw+LJbwKa3oXlJxpsFpw=; b=bhNiS0dKN/8c9Hzi2wj4c4FkyfkWXl6Fob6fX8Ts32lqVF61lmG406MgsmJOhYxcJe 2WVV+ZoxKPRHVY3Km2VhuIlHkvh18AyYbmWNhQtLJMxPcQ7jbqnaJVw68cjLWCY9YDAZ r/foFy/2z9NT47EPTPWzEN+lQOOXukLIVd6AXl24Gba8AYBmiSO5XzOIuhT98Nr3ObNq 5jSb1ojIAzGbgNMWW60ZQCFEXD1U1TlB4cSbexpZJdAvsXkSfFMKZYmioHm7sM1ISuYI yLteG8bgH4hu/ZB5zse0VUFz4kqWJwVTVFFjUwZpRn2fnSZc6oK7XJuhjC919yCjBd1S ucAA== 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=KpnrV7YwK9WYm4vVFUQwZNgnw+LJbwKa3oXlJxpsFpw=; b=H9rX50OEt4Qp4nn+/cLWz9+HHZ5UplizqorZZhaOs22UVsS55nq5Urk9tBkQ4Ln/Sc JYPyvuRQT9yIKAwQ8tqGOtIFzigxvaMGs9dksVY1+jWe0KDieahGr2Vr1//kjSWQ7Gbs kGLksBSYYIoYMqspOtk0LqiZPfRWRVFVV36bzs9E8HBsjbNKPOSnNVTvqOPwwhE7F9QK XOjE2kVqEgnMFBKOFQ53DSbG2PNIehTEG/sAYo4Q4DMZDpJOaLc2dMizY+s/8053vmvu lsI+V/Pm0J+LSy7yZkN7rnwLMd/7dAI8ftfThiPLGCt/mIPoQ/4Qxwyi0PlgAc7igrnO FuHA== X-Gm-Message-State: AOAM531trZGEyuQ8RwCDW+dq5m00Dgy42qgI9vBGpWNib7piPkY1yy6t Ew0OzVbELJ2usG89gYB8fnEtxni2h0I= X-Google-Smtp-Source: ABdhPJyk2V4S+zPDBmBLZlzLLWadgQrXu4zCos3yXuSPElAHytzu4K5tIM2wG0pFHx0jVxvsnSysOA== X-Received: by 2002:a1c:3cd5:: with SMTP id j204mr2724984wma.53.1606829747950; Tue, 01 Dec 2020 05:35:47 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Huacai Chen , Jiaxun Yang , qemu-devel@nongnu.org Cc: Laurent Vivier , Aurelien Jarno , Meng Zhuo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson Subject: [PATCH v2 4/6] linux-user/elfload: Introduce MIPS GET_FEATURE_REG_EQU() macro Date: Tue, 1 Dec 2020 14:35:23 +0100 Message-Id: <20201201133525.2866838-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201201133525.2866838-1-f4bug@amsat.org> References: <20201201133525.2866838-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) ISA features are usually denoted in read-only bits from CPU registers. Add the GET_FEATURE_REG_EQU() macro which checks if a CPU register has bits set to a specific value. Use the macro to check the 'Architecture Revision' level of the Config0 register, which is '2' when the Release 6 ISA is implemented. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/elfload.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index b7c6d30723a..73c1972183b 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -995,17 +995,25 @@ enum { #define GET_FEATURE_REG_SET(_reg, _mask, _hwcap) \ do { if (cpu->env._reg & (_mask)) { hwcaps |=3D _hwcap; } } while (0) =20 +#define GET_FEATURE_REG_EQU(_reg, _mask, _val, _hwcap) \ + do { \ + if ((cpu->env._reg & (_mask)) =3D=3D _val) { \ + hwcaps |=3D _hwcap; \ + } \ + } while (0) + static uint32_t get_elf_hwcap(void) { MIPSCPU *cpu =3D MIPS_CPU(thread_cpu); uint32_t hwcaps =3D 0; =20 - GET_FEATURE_INSN(ISA_MIPS32R6 | ISA_MIPS64R6, HWCAP_MIPS_R6); + GET_FEATURE_REG_EQU(CP0_Config0, 7 << CP0C0_AR, 2, HWCAP_MIPS_R6); GET_FEATURE_REG_SET(CP0_Config3, 1 << CP0C3_MSAP, HWCAP_MIPS_MSA); =20 return hwcaps; } =20 +#undef GET_FEATURE_REG_EQU #undef GET_FEATURE_REG_SET #undef GET_FEATURE_INSN =20 --=20 2.26.2